summaryrefslogtreecommitdiffstats
path: root/uisimulator/win32
diff options
context:
space:
mode:
authorFelix Arends <edx@rockbox.org>2002-04-27 15:20:53 +0000
committerFelix Arends <edx@rockbox.org>2002-04-27 15:20:53 +0000
commita6ca085a35fc2b1739fc8d1e6cf064b45279e8ee (patch)
tree558e54de047a1cde0ac61ab110e54a4bda69d343 /uisimulator/win32
parent49ea8fb28140f9297a1d470e56761702a389e5b3 (diff)
downloadrockbox-a6ca085a35fc2b1739fc8d1e6cf064b45279e8ee.tar.gz
rockbox-a6ca085a35fc2b1739fc8d1e6cf064b45279e8ee.zip
removed unneeded code from lcd.c and renamed it do lcd-win32.c
updated modified constants (LCD_WIDTH, LCD_HEIGHT) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@261 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32')
-rw-r--r--uisimulator/win32/button.c23
-rw-r--r--uisimulator/win32/kernel.c2
-rw-r--r--uisimulator/win32/lcd-win32.c66
-rw-r--r--uisimulator/win32/lcd-win32.h23
-rw-r--r--uisimulator/win32/lcd.c440
-rw-r--r--uisimulator/win32/uisw32.cpp5
-rw-r--r--uisimulator/win32/uisw32.h3
-rw-r--r--uisimulator/win32/uisw32.suobin7680 -> 10752 bytes
-rw-r--r--uisimulator/win32/uisw32.vcproj17
9 files changed, 131 insertions, 448 deletions
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c
index ebcf973faa..6c4ec9962a 100644
--- a/uisimulator/win32/button.c
+++ b/uisimulator/win32/button.c
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Felix Arends
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
#include <windows.h>
#include "config.h"
#include "sh7034.h"
@@ -5,7 +24,9 @@
#define KEY(k) HIBYTE(GetKeyState (k))
-void button_init(void) {}int button_get(void)
+void button_init(void) {}
+
+int button_get(void)
{
int btn = 0;
if (KEY (VK_NUMPAD4) ||
diff --git a/uisimulator/win32/kernel.c b/uisimulator/win32/kernel.c
index 4277190dab..b6d36e3fa8 100644
--- a/uisimulator/win32/kernel.c
+++ b/uisimulator/win32/kernel.c
@@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/
* $Id$
*
- * Copyright (C) 2002 by Björn Stenberg, Felix Arends
+ * Copyright (C) 2002 by Felix Arends
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
diff --git a/uisimulator/win32/lcd-win32.c b/uisimulator/win32/lcd-win32.c
new file mode 100644
index 0000000000..4539696cef
--- /dev/null
+++ b/uisimulator/win32/lcd-win32.c
@@ -0,0 +1,66 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Felix Arends
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <windows.h>
+#include <process.h>
+#include "uisw32.h"
+#include "lcd.h"
+
+//
+// simulator specific code
+//
+
+// varaibles
+unsigned char display[LCD_WIDTH][LCD_HEIGHT/8]; // the display
+char bitmap[LCD_WIDTH][LCD_HEIGHT]; // the ui display
+
+BITMAPINFO2 bmi =
+{
+ sizeof (BITMAPINFOHEADER),
+ LCD_WIDTH, -LCD_HEIGHT, 1, 8,
+ BI_RGB, 0, 0, 0, 2, 2,
+ UI_LCD_COLOR, 0, // green background color
+ UI_LCD_BLACK, 0 // black color
+}; // bitmap information
+
+
+// lcd_init
+// init lcd controler
+void lcd_init()
+{
+ lcd_clear_display ();
+}
+
+// lcd_update
+// update lcd
+void lcd_update()
+{
+ int x, y;
+ if (hGUIWnd == NULL)
+ _endthread ();
+
+ for (x = 0; x < LCD_WIDTH; x++)
+ for (y = 0; y < LCD_HEIGHT; y++)
+ bitmap[y][x] = ((display[x][y/8] >> (y & 7)) & 1);
+
+ InvalidateRect (hGUIWnd, NULL, FALSE);
+
+ // natural sleep :)
+ Sleep (50);
+} \ No newline at end of file
diff --git a/uisimulator/win32/lcd-win32.h b/uisimulator/win32/lcd-win32.h
index 5049c2d70c..e4b1e3bd8e 100644
--- a/uisimulator/win32/lcd-win32.h
+++ b/uisimulator/win32/lcd-win32.h
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Felix Arends
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
#ifndef __LCDWIN32_H__
#define __LCDWIN32_H__
@@ -13,14 +32,14 @@ typedef struct
#ifdef HAVE_LCD_BITMAP
-extern unsigned char display[DISP_X][DISP_Y/8]; // the display
+extern unsigned char display[LCD_WIDTH][LCD_HEIGHT/8]; // the display
#else
#define DISP_X 112
#define DISP_Y 64
#endif
-extern char bitmap[DISP_Y][DISP_X]; // the ui display
+extern char bitmap[LCD_WIDTH][LCD_HEIGHT]; // the ui display
extern BITMAPINFO2 bmi; // bitmap information
diff --git a/uisimulator/win32/lcd.c b/uisimulator/win32/lcd.c
deleted file mode 100644
index 21c79bd620..0000000000
--- a/uisimulator/win32/lcd.c
+++ /dev/null
@@ -1,440 +0,0 @@
-#include <windows.h>
-#include <process.h>
-#include "uisw32.h"
-#include "lcd.h"
-
-#ifdef HAVE_LCD_CHARCELLS
-# ifndef JBP_OLD
-
-static char const lcd_ascii[] =
-{
-/*****************************************************************************************/
-/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
-/* ************************************************************************************/
-/* 0x */ 0x00,0x01,0x02,0x03,0x00,0x00,0x00,0x00,0x04,0x05,0x00,0x00,0x00,0x00,0x00,0x00,
-/* 1x */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-/* 2x */ 0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
-/* 3x */ 0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
-/* 4x */ 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
-/* 5x */ 0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
-/* 6x */ 0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
-/* 7x */ 0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x20,0x20,0x20,0x20,0x20,
-/* 8x */ 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-/* 9x */ 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-/* Ax */ 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-/* Bx */ 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-/* Cx */ 0x41,0x41,0x41,0x41,0x41,0x41,0x20,0x43,0x45,0x45,0x45,0x45,0x49,0x49,0x49,0x49,
-/* Dx */ 0x44,0x4E,0x4F,0x4F,0x4F,0x4F,0x4F,0x20,0x20,0x55,0x55,0x55,0x55,0x59,0x20,0x20,
-/* Ex */ 0x61,0x61,0x61,0x61,0x61,0x61,0x20,0x63,0x65,0x65,0x65,0x65,0x69,0x69,0x69,0x69,
-/* Fx */ 0x64,0x6E,0x6F,0x6F,0x6F,0x6F,0x6F,0x20,0x20,0x75,0x75,0x75,0x75,0x79,0x79,0x79
-/******/
- };
-
-# else
-
-static char const lcd_ascii[] =
- {
-/*****************************************************************************************/
-/* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */
-/* ************************************************************************************/
-/* 0x */ 0x00,0x01,0x02,0x03,0x00,0x00,0x00,0x00,0x85,0x89,0x00,0x00,0x00,0x00,0x00,0x00,
-/* 1x */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-/* 2x */ 0x24,0x25,0x26,0x37,0x06,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,
-/* 3x */ 0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,0x40,0x41,0x42,0x43,
-/* 4x */ 0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,
-/* 5x */ 0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0xA9,0x33,0xCE,0x00,0x15,
-/* 6x */ 0x00,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0x73,
-/* 7x */ 0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x24,0x24,0x24,0x24,0x24,
-/* 8x */ 0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,
-/* 9x */ 0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,
-/* Ax */ 0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,
-/* Bx */ 0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,0x24,
-/* Cx */ 0x45,0x45,0x45,0x45,0x45,0x45,0x24,0x47,0x49,0x49,0x49,0x49,0x4D,0x4D,0x4D,0x4D,
-/* Dx */ 0x48,0x52,0x53,0x53,0x53,0x53,0x53,0x24,0x24,0x59,0x59,0x59,0x59,0x5D,0x24,0x24,
-/* Ex */ 0x65,0x65,0x65,0x65,0x65,0x65,0x24,0x67,0x69,0x69,0x69,0x69,0x6D,0x6D,0x6D,0x6D,
-/* Fx */ 0x73,0x72,0x73,0x73,0x73,0x73,0x73,0x24,0x24,0x79,0x79,0x79,0x79,0x7D,0x24,0x7D
-/******/
- };
-
-# endif
-
-void lcd_puts (char const *string)
-{
- while (*string)
- lcd_data (LCD_ASCII(*string++));
-}
-
-void lcd_putns (char const *string,int n)
-{
- while (n--)
- lcd_data (LCD_ASCII(*string++));
-}
-
-void lcd_putc (int character)
-{
- lcd_data (LCD_ASCII(character));
-}
-
-void lcd_pattern (int which,char const *pattern,int count)
-{
- lcd_instruction (LCD_PRAM|which);
- lcd_copy ((void *)pattern,count);
-}
-
-void lcd_puthex (unsigned int value,int digits)
-{
- switch (digits) {
- case 8:
- lcd_puthex (value >> 16,4);
- case 4:
- lcd_puthex (value >> 8,2);
- case 2:
- lcd_puthex (value >> 4,1);
- case 1:
- value &= 15;
- lcd_putc (value+((value < 10) ? '0' : ('A'-10)));
- }
-}
-
-
-/* HAVE_LCD_CHARCELLS */
-#elif defined(HAVE_LCD_BITMAP)
-
-/*
- * All bitmaps have this format:
- * Bits within a byte are arranged veritcally, LSB at top.
- * Bytes are stored in column-major format, with byte 0 at top left,
- * byte 1 is 2nd from top, etc. Bytes following left-most column
- * starts 2nd left column, etc.
- *
- * Note: The HW takes bitmap bytes in row-major order.
- *
- * Memory copy of display bitmap
- */
-unsigned char display[DISP_X][DISP_Y/8];
-
-/*
- * ASCII character generation tables
- *
- * This contains only the printable characters (0x20-0x7f).
- * Each element in this table is a character pattern bitmap.
- */
-#define ASCII_MIN 0x20 /* First char in table */
-#define ASCII_MAX 0x7f /* Last char in table */
-
-extern const unsigned char char_gen_6x8[][5][1];
-extern const unsigned char char_gen_8x12[][7][2];
-extern const unsigned char char_gen_12x16[][11][2];
-
-
-/* All zeros and ones bitmaps for area filling */
-static const unsigned char zeros[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00 };
-static const unsigned char ones[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff };
-
-static int lcd_y; /* Current pixel row */
-static int lcd_x; /* Current pixel column */
-static int lcd_size; /* Current font width */
-
-/*
- * Clear the display
- */
-void lcd_clear_display (void)
-{
- lcd_position (0, 0, 8);
- memset (display, 0, sizeof display);
-}
-
-/*
- * Set current x,y position and font size
- */
-void lcd_position (int x, int y, int size)
-{
- if (x >= 0 && x < DISP_X && y >= 0 && y < DISP_Y)
- {
- lcd_x = x;
- lcd_y = y;
- }
-
- lcd_size = size;
-}
-
-/*
- * Display a string at current position and size
- */
-void lcd_string (const char *str)
-{
- int x = lcd_x;
- int nx = lcd_size;
- int ny, ch;
- const unsigned char *src;
-
- if (nx == 12)
- ny = 16;
- else if (nx == 8)
- ny = 12;
- else
- {
- nx = 6;
- ny = 8;
- }
-
- while ((ch = *str++) != '\0')
- {
- if (ch == '\n' || lcd_x + nx > DISP_X)
- {
- /* Wrap to next line */
- lcd_x = x;
- lcd_y += ny;
- }
-
- if (lcd_y + ny > DISP_Y)
- return;
-
- /* Limit to char generation table */
- if (ch >= ASCII_MIN && ch <= ASCII_MAX)
- {
- if (nx == 12)
- src = char_gen_12x16[ch-ASCII_MIN][0];
- else if (nx == 8)
- src = char_gen_8x12[ch-ASCII_MIN][0];
- else
- src = char_gen_6x8[ch-ASCII_MIN][0];
-
- lcd_bitmap (src, lcd_x, lcd_y, nx-1, ny, TRUE);
- lcd_bitmap (zeros, lcd_x+nx-1, lcd_y, 1, ny, TRUE);
-
- lcd_x += nx;
- }
- }
-}
-
-/*
- * Display a bitmap at (x, y), size (nx, ny)
- * clear is TRUE to clear destination area first
- */
-void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny,
- bool clear)
-{
- unsigned char *dst;
- unsigned char *dst2 = &display[x][y/8];
- unsigned int data, mask, mask2, mask3, mask4;
- int shift = y & 7;
-
- ny += shift;
-
- /* Calculate bit masks */
- mask4 = ~(0xfe << ((ny-1) & 7));
- if (clear)
- {
- mask = ~(0xff << shift);
- mask2 = 0;
- mask3 = ~mask4;
- if (ny <= 8)
- mask3 |= mask;
- }
- else
- mask = mask2 = mask3 = 0xff;
-
- /* Loop for each column */
- for (x = 0; x < nx; x++)
- {
- dst = dst2;
- dst2 += DISP_Y/8;
- data = 0;
- y = 0;
-
- if (ny > 8)
- {
- /* First partial row */
- data = *src++ << shift;
- *dst = (*dst & mask) ^ data;
- data >>= 8;
- dst++;
-
- /* Intermediate rows */
- for (y = 8; y < ny-8; y += 8)
- {
- data |= *src++ << shift;
- *dst = (*dst & mask2) ^ data;
- data >>= 8;
- dst++;
- }
- }
-
- /* Last partial row */
- if (y + shift < ny)
- data |= *src++ << shift;
- *dst = (*dst & mask3) ^ (data & mask4);
- }
-}
-
-/*
- * Clear a rectangular area at (x, y), size (nx, ny)
- */
-void lcd_clearrect (int x, int y, int nx, int ny)
-{
- int i;
- for (i = 0; i < nx; i++)
- lcd_bitmap (zeros, x+i, y, 1, ny, TRUE);
-}
-
-/*
- * Fill a rectangular area at (x, y), size (nx, ny)
- */
-void lcd_fillrect (int x, int y, int nx, int ny)
-{
- int i;
- for (i = 0; i < nx; i++)
- lcd_bitmap (ones, x+i, y, 1, ny, TRUE);
-}
-
-/* Invert a rectangular area at (x, y), size (nx, ny) */
-void lcd_invertrect (int x, int y, int nx, int ny)
-{
- int i;
- for (i = 0; i < nx; i++)
- lcd_bitmap (ones, x+i, y, 1, ny, FALSE);
-}
-
-#define DRAW_PIXEL(x,y) display[x][y/8] |= (1<<(y&7))
-#define CLEAR_PIXEL(x,y) display[x][y/8] &= ~(1<<(y&7))
-
-void lcd_drawline( int x1, int y1, int x2, int y2 )
-{
- int numpixels;
- int i;
- int deltax, deltay;
- int d, dinc1, dinc2;
- int x, xinc1, xinc2;
- int y, yinc1, yinc2;
-
- deltax = abs(x2 - x1);
- deltay = abs(y2 - y1);
-
- if(deltax >= deltay)
- {
- numpixels = deltax;
- d = 2 * deltay - deltax;
- dinc1 = deltay * 2;
- dinc2 = (deltay - deltax) * 2;
- xinc1 = 1;
- xinc2 = 1;
- yinc1 = 0;
- yinc2 = 1;
- }
- else
- {
- numpixels = deltay;
- d = 2 * deltax - deltay;
- dinc1 = deltax * 2;
- dinc2 = (deltax - deltay) * 2;
- xinc1 = 0;
- xinc2 = 1;
- yinc1 = 1;
- yinc2 = 1;
- }
- numpixels++; /* include endpoints */
-
- if(x1 > x2)
- {
- xinc1 = -xinc1;
- xinc2 = -xinc2;
- }
-
- if(y1 > y2)
- {
- yinc1 = -yinc1;
- yinc2 = -yinc2;
- }
-
- x = x1;
- y = y1;
-
- for(i=0; i<numpixels; i++)
- {
- DRAW_PIXEL(x,y);
-
- if(d < 0)
- {
- d += dinc1;
- x += xinc1;
- y += yinc1;
- }
- else
- {
- d += dinc2;
- x += xinc2;
- y += yinc2;
- }
- }
-}
-
-/*
- * Set a single pixel
- */
-void lcd_drawpixel(int x, int y)
-{
- DRAW_PIXEL(x,y);
-}
-
-/*
- * Clear a single pixel
- */
-void lcd_clearpixel(int x, int y)
-{
- CLEAR_PIXEL(x,y);
-}
-
-
-#else
-/* no LCD defined, no code to use */
-#endif
-
-//
-//
-//
-// simulator specific code
-//
-//
-//
-
-// varaibles
-unsigned char display[DISP_X][DISP_Y/8]; // the display
-char bitmap[DISP_Y][DISP_X]; // the ui display
-
-BITMAPINFO2 bmi =
-{
- sizeof (BITMAPINFOHEADER),
- DISP_X, -DISP_Y, 1, 8,
- BI_RGB, 0, 0, 0, 2, 2,
- UI_LCD_COLOR, 0, // green background color
- UI_LCD_BLACK, 0 // black color
-}; // bitmap information
-
-
-// lcd_init
-// init lcd controler
-void lcd_init()
-{
- lcd_clear_display ();
-}
-
-// lcd_update
-// update lcd
-void lcd_update()
-{
- int x, y;
- if (hGUIWnd == NULL)
- _endthread ();
-
- for (x = 0; x < DISP_X; x++)
- for (y = 0; y < DISP_Y; y++)
- bitmap[y][x] = ((display[x][y/8] >> (y & 7)) & 1);
-
- InvalidateRect (hGUIWnd, NULL, FALSE);
-
- // natural sleep :)
- Sleep (50);
-} \ No newline at end of file
diff --git a/uisimulator/win32/uisw32.cpp b/uisimulator/win32/uisw32.cpp
index 6bc1bedb00..529ecbfb4e 100644
--- a/uisimulator/win32/uisw32.cpp
+++ b/uisimulator/win32/uisw32.cpp
@@ -5,6 +5,7 @@
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
+ * $Id$
*
* Copyright (C) 2002 by Felix Arends
*
@@ -164,8 +165,8 @@ LRESULT GUIWndProc (
// draw lcd screen
StretchDIBits (hDc,
UI_LCD_POSX * r.right / UI_WIDTH, UI_LCD_POSY * r.bottom / UI_HEIGHT,
- DISP_X * r.right / UI_WIDTH, DISP_Y * r.bottom / UI_HEIGHT,
- 0, 0, DISP_X, DISP_Y,
+ LCD_WIDTH * r.right / UI_WIDTH, LCD_HEIGHT * r.bottom / UI_HEIGHT,
+ 0, 0, LCD_WIDTH, LCD_HEIGHT,
bitmap, (BITMAPINFO *) &bmi, DIB_RGB_COLORS, SRCCOPY);
EndPaint (hWnd, &ps);
diff --git a/uisimulator/win32/uisw32.h b/uisimulator/win32/uisw32.h
index 37edb0c4b8..d168c8955e 100644
--- a/uisimulator/win32/uisw32.h
+++ b/uisimulator/win32/uisw32.h
@@ -5,6 +5,7 @@
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
+ * $Id$
*
* Copyright (C) 2002 by Felix Arends
*
@@ -24,7 +25,7 @@
#define UI_WIDTH 240 // width of GUI window
#define UI_HEIGHT 360 // height of GUI window
-#define UI_LCD_COLOR 46, 57, 49 // bkgnd color of LCD
+#define UI_LCD_COLOR 46, 67, 49 // bkgnd color of LCD
#define UI_LCD_BLACK 0, 0, 0 // black
#define UI_LCD_POSX 59 // x position of lcd
#define UI_LCD_POSY 95 // y position of lcd
diff --git a/uisimulator/win32/uisw32.suo b/uisimulator/win32/uisw32.suo
index 63fcd66d0d..070ca781b2 100644
--- a/uisimulator/win32/uisw32.suo
+++ b/uisimulator/win32/uisw32.suo
Binary files differ
diff --git a/uisimulator/win32/uisw32.vcproj b/uisimulator/win32/uisw32.vcproj
index 39e7b82464..afc181d417 100644
--- a/uisimulator/win32/uisw32.vcproj
+++ b/uisimulator/win32/uisw32.vcproj
@@ -116,7 +116,22 @@
RelativePath="kernel.c">
</File>
<File
- RelativePath="lcd.c">
+ RelativePath="lcd-win32.c">
+ </File>
+ <File
+ RelativePath="..\..\firmware\drivers\lcd.c">
+ <FileConfiguration
+ Name="Debug|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+ </FileConfiguration>
</File>
<File
RelativePath="tetris.c">