Put the display colours for monochrome and greyscale targets into the target config files, and use them both for the simulator UI and screendumps. The Clip now shows the split display properly in screendumps and simulator. A side effect is that screendumps of ordinary monochrome targets are now 4-bit BMP files (saves an alternate code path, and might be more compatible with some gfx programs). * Simplify the simulation of split display, and also simplify greylib simulation. The simulator now always calculates 129 shades (2*128 for a Clip sim), and just uses 2 (or 4) of those for native display simulation. * Centralised the simulator LCD dimension definition.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/uisimulator/sdl/uisdl.c b/uisimulator/sdl/uisdl.c
index 81f9722a68..d6a49d3a60 100644
--- a/uisimulator/sdl/uisdl.c
+++ b/uisimulator/sdl/uisdl.c
@@ -130,15 +130,11 @@ bool gui_startup(void)
         height = UI_HEIGHT;
     } else {
 #ifdef HAVE_REMOTE_LCD
-        width = UI_LCD_WIDTH > UI_REMOTE_WIDTH ? UI_LCD_WIDTH : UI_REMOTE_WIDTH;
-        height = UI_LCD_HEIGHT + UI_REMOTE_HEIGHT;
+        width = SIM_LCD_WIDTH > SIM_REMOTE_WIDTH ? SIM_LCD_WIDTH : SIM_REMOTE_WIDTH;
+        height = SIM_LCD_HEIGHT + SIM_REMOTE_HEIGHT;
 #else
-        width = UI_LCD_WIDTH;
-        height = UI_LCD_HEIGHT
-#ifdef UI_LCD_SPLIT
-            + UI_LCD_SPLIT_BLACK_LINES
-#endif
-            ;
+        width = SIM_LCD_WIDTH;
+        height = SIM_LCD_HEIGHT;
 #endif
     }