4-shades greyscale graphics core for iriver H1x0. 4-grey rockbox logo and light grey background in splash() boxes. Simplified the splash() box creation as the new graphics core does clipping. Adapted screendump feature and added flexible preprocessing to construct the bmp header. Rockboy now uses 4-grey mode as well. 4-grey support for win32 simulator. Fixed win32 player sim to not use double bitmap conversion via a recorder-like framebuffer, and correctly display double-height text. X11 simulator temporarily adapted. The display won't be distorted, but it still shows b&w only.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7046 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 14 deletions

diff --git a/uisimulator/win32/lcd-win32.h b/uisimulator/win32/lcd-win32.h
index d2627e6a53..26a47208e5 100644
--- a/uisimulator/win32/lcd-win32.h
+++ b/uisimulator/win32/lcd-win32.h
@@ -23,24 +23,16 @@
 #include "uisw32.h"
 #include "lcd.h"
 
-// BITMAPINFO2
+// BITMAPINFO256
 typedef struct
 {
         BITMAPINFOHEADER bmiHeader;
-        RGBQUAD bmiColors[2];
-} BITMAPINFO2;
+        RGBQUAD bmiColors[256];
+} BITMAPINFO256;
 
-#ifdef HAVE_LCD_BITMAP
-
-extern unsigned char        display[LCD_WIDTH][LCD_HEIGHT/8]; // the display
-#else
-#define DISP_X              112
-#define DISP_Y              64
-#endif
-
-
-extern char                 bitmap[LCD_HEIGHT][LCD_WIDTH]; // the ui display
-extern BITMAPINFO2          bmi; // bitmap information
+extern char            bitmap[LCD_HEIGHT][LCD_WIDTH]; // the ui display
+extern BITMAPINFO256   bmi; // bitmap information
 
+void simlcdinit(void);
 
 #endif // #ifndef __LCDWIN32_H__