19 files changed, 142 insertions, 65 deletions

diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index a711a8fa6d..00fa63cd4e 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -106,6 +106,9 @@ static int curfont = FONT_SYSFIXED;
 static int xoffset; /* needed for flip */
 #endif
 
+int lcd_width = 112;
+int lcd_height = 64;
+
 unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
 
 /* All zeros and ones bitmaps for area filling */
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index b72eb9794a..16085fb480 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -4,12 +4,18 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have a Recorder style 10-key keyboard */
 #define HAVE_RECORDER_KEYPAD 1
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -64,3 +70,4 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
new file mode 100644
index 0000000000..2efe4834a7
--- /dev/null
+++ b/firmware/export/config-h100.h
@@ -0,0 +1,28 @@
+/* define this if you have recording possibility */
+#define HAVE_RECORDING 1
+
+/* define this if you have a bitmap LCD display */
+#define HAVE_LCD_BITMAP 1
+
+/* LCD dimensions */
+#define LCD_WIDTH  160
+#define LCD_HEIGHT 128
+
+/* define this if you have the Recorder's 10-key keyboard */
+#define HAVE_RECORDER_KEYPAD 1
+
+#ifndef SIMULATOR
+
+/* Define this if the platform has batteries */
+#define HAVE_BATTERIES 1
+
+/* The start address index for ROM builds */
+#define ROM_START 0x11010
+
+/* Define this for programmable LED available */
+#define HAVE_LED
+
+/* Define this for LCD backlight available */
+#define HAVE_BACKLIGHT
+
+#endif
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index b7b557e1ec..33a4f91b5f 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -4,9 +4,15 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have an Ondio style 6-key keyboard */
 #define HAVE_ONDIO_KEYPAD
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -64,3 +70,4 @@
 /* Define this for MMC support instead of ATA harddisk */
 #define HAVE_MMC
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 4189448070..a4f95a2947 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -4,9 +4,15 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have an Ondio style 6-key keyboard */
 #define HAVE_ONDIO_KEYPAD
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -64,3 +70,5 @@
 /* Define this for MMC support instead of ATA harddisk */
 #define HAVE_MMC
 
+#endif /* SIMULATOR */
+
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index 2e50a2fc85..9f060512fa 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -1,9 +1,14 @@
 /* define this if you have a charcell LCD display */
 #define HAVE_LCD_CHARCELLS 1
 
+/* LCD dimensions (for the simulator) */
+#define LCD_WIDTH       (4*11*6)    /* Display width in pixels */
+#define LCD_HEIGHT      (4*16+2*24) /* 4*char + 2*icons */
+
 /* define this if you have the Player's keyboard */
 #define HAVE_PLAYER_KEYPAD 1
 
+#ifndef SIMULATOR
 /* Define this if you have a MAS3507D */
 #define HAVE_MAS3507D
 
@@ -44,3 +49,4 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index b228dea285..5edba3bf85 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -4,12 +4,18 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have the Recorder's 10-key keyboard */
 #define HAVE_RECORDER_KEYPAD 1
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -55,3 +61,4 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 1066ece536..d442ea2dd8 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -4,12 +4,18 @@
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
 
+/* LCD dimensions */
+#define LCD_WIDTH  112
+#define LCD_HEIGHT 64
+
 /* define this if you have a Recorder style 10-key keyboard */
 #define HAVE_RECORDER_KEYPAD 1
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+#ifndef SIMULATOR
+
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
@@ -64,3 +70,4 @@
 /* Define this for LCD backlight available */
 #define HAVE_BACKLIGHT
 
+#endif /* SIMULATOR */
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 782668f161..359eadd82d 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -34,6 +34,8 @@
 #include "config-ondiosp.h"
 #elif defined(ARCHOS_ONDIOFM)
 #include "config-ondiofm.h"
+#elif defined(IRIVER_H100)
+#include "config-h100.h"
 #else
 /* no known platform */
 #endif
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 7dda83d8da..21d1f4cc55 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -105,11 +105,6 @@ void lcd_remove_cursor(void);
 
 #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR)
 #if defined(HAVE_LCD_CHARCELLS) && defined(SIMULATOR)
-#define LCD_WIDTH       (4*11*6)  /* Display width in pixels */
-#define LCD_HEIGHT      (4*16+2*24) /* 4*char + 2*icons */
-#else
-#define LCD_WIDTH       112   /* Display width in pixels */
-#define LCD_HEIGHT      64    /* Display height in pixels */
 #endif
 
 #define DRAW_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] |= (1<<((y)&7))
diff --git a/tools/configure b/tools/configure
index ef03ed93f3..3bcb656754 100755
--- a/tools/configure
+++ b/tools/configure
@@ -75,15 +75,15 @@ VERSION=\$(shell date +%y%m%d-%H%M)
 all: sim
 
 sim:
-        \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) LANGUAGE=\$(LANGUAGE)
+        \$(MAKE) -C \$(SIMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) LANGUAGE=\$(LANGUAGE)
 
 clean:
-        \$(MAKE) -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) clean
+        \$(MAKE) -C \$(SIMDIR) OBJDIR=\$(THISDIR) clean
         rm -rf rockbox.zip
 
 tags:
         @rm -f TAGS
-        make -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) tags
+        make -C \$(SIMDIR) OBJDIR=\$(THISDIR) tags
 
 zip:
         \$(TOOLSDIR)/buildzip.pl -r "\$(ROOTDIR)" sim\$(TARGET)
@@ -215,6 +215,7 @@ if [ -z "$archos" ]; then
   echo "6 - Neo 35"
   echo "7 - Archos Ondio SP"
   echo "8 - Archos Ondio FM"
+  echo "9 - Iriver H100"
 
   getit=`input`;
 
@@ -223,57 +224,46 @@ if [ -z "$archos" ]; then
    1)
     archos="player"
     target="-DARCHOS_PLAYER"
-    display="-DHAVE_LCD_CHARCELLS"
-    keypad="-DHAVE_PLAYER_KEYPAD"
     ;;
 
    3)
     archos="fmrecorder"
     target="-DARCHOS_FMRECORDER"
-    display="-DHAVE_LCD_BITMAP"
-    keypad="-DHAVE_RECORDER_KEYPAD"
     ;;
 
    4)
     archos="recorderv2"
     target="-DARCHOS_RECORDERV2"
-    display="-DHAVE_LCD_BITMAP"
-    keypad="-DHAVE_RECORDER_KEYPAD"
     ;;
 
    5)
     archos="neomstation"
     target="-DNEO_MSTATION"
-    display="-DHAVE_NEOLCD_CHARCELLS"
-    keypad="-DHAVE_NEO_KEYPAD"
     ;;
 
    6)
     archos="neo35"
     target="-DNEO_35"
-    display="-DHAVE_NEOLCD_CHARCELLS"
-    keypad="-DHAVE_NEO_KEYPAD"
     ;;
 
    7)
     archos="ondiosp"
     target="-DARCHOS_ONDIOSP"
-    display="-DHAVE_LCD_BITMAP"
-    keypad="-DHAVE_ONDIO_KEYPAD"
     ;;
 
    8)
     archos="ondiofm"
     target="-DARCHOS_ONDIOFM"
-    display="-DHAVE_LCD_BITMAP"
-    keypad="-DHAVE_ONDIO_KEYPAD"
+    ;;
+
+   9)
+    archos="h100"
+    target="-DIRIVER_H100"
     ;;
 
    *)
     archos="recorder"
     target="-DARCHOS_RECORDER"
-    display="-DHAVE_LCD_BITMAP"
-    keypad="-DHAVE_RECORDER_KEYPAD"
     ;;
 
   esac
diff --git a/uisimulator/common/sim_icons.c b/uisimulator/common/sim_icons.c
index e647455402..cb0aad0809 100644
--- a/uisimulator/common/sim_icons.c
+++ b/uisimulator/common/sim_icons.c
@@ -16,6 +16,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include "config.h"
 #ifdef HAVE_LCD_CHARCELLS
 
 #include "sim_icons.h"
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 6534425933..785e590623 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -23,13 +23,11 @@ PLAYDIR = $(APPDIR)/player
 PLUGINDIR = $(APPDIR)/plugins
 SIMCOMMON = ../common
 
-ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
-     MACHINEDIR = $(RECDIR)
-     # not very nice to set config stuff like this, but...
-     RTC += -DHAVE_RTC
-     RADIO += -DHAVE_FMRADIO
-else
+ISPLAYER := $(findstring PLAYER, $(TARGET))
+ifeq ($(ISPLAYER), PLAYER)
      MACHINEDIR = $(PLAYDIR)
+else
+     MACHINEDIR = $(RECDIR)
 endif
 
 PREVAPPDIR= ..
@@ -60,9 +58,8 @@ LANGUAGE = english
 
 TARGET = $(OBJDIR)/rockboxui
 
-DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
-$(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) \
-$(RTC) $(RADIO)
+DEFINES := -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
+$(TARGET) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) 
 
 # Use this for simulator-only files
 INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I$(SIMCOMMON) -I$(OBJDIR) -I$(PLUGINDIR)/lib
@@ -82,6 +79,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
 APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall
 
 UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/")
+EXEFILE = $(OBJDIR)/rockboxui
 ifeq ($(UNAME),Linux)
   LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl
   INCLUDES += -I/usr/X11R6/include
@@ -93,7 +91,7 @@ ifeq ($(UNAME),CYGWIN)
   INCLUDES += -I/usr/X11R6/include
   LIBDIRS = -L/usr/X11R6/lib
   DEFINES += -DHAVE_OSS -D_SSIZE_T_
-  TARGET = $(OBJDIR)/rockboxui.exe
+  EXEFILE = $(OBJDIR)/rockboxui.exe
 else
 ifeq ($(UNAME),FreeBSD)
   LIBS = -pthread
@@ -117,10 +115,10 @@ else
         SOUNDSRC = 
 endif
 
-ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
-        LCDSRSC = lcd-recorder.c sysfont.c font.c
-else
+ifeq ($(ISPLAYER), PLAYER)
         LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c
+else
+        LCDSRSC = lcd-recorder.c sysfont.c font.c
 endif
 COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c
 
@@ -134,7 +132,7 @@ APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \
         misc.c plugin.c playlist_viewer.c bookmark.c filetypes.c \
         settings_menu.c sound_menu.c playlist_menu.c
 
-ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
+ifneq ($(ISPLAYER), PLAYER)
    APPS += peakmeter.c bmp.c widgets.c radio.c
 endif
 
@@ -147,7 +145,7 @@ OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o)
 ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c))
 PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c))
 
-all: $(TOOLSDIR)/convbdf $(TARGET) $(ROCKS)
+all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS)
 
 $(ROCKS): $(OBJDIR)/libplugin.a
 
@@ -155,7 +153,7 @@ $(TOOLSDIR)/convbdf:
         $(MAKE) -C $(TOOLSDIR)
 
 clean:
-        $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/lang.[cho] \
+        $(RM) $(OBJS) *~ core $(EXEFILE) $(CLIENTS) $(OBJDIR)/lang.[cho] \
         $(OBJDIR)/build.lang $(OBJDIR)/*.o $(OBJDIR)/sysfont.c \
         $(ROCKS) $(OBJDIR)/credits.raw
         $(RM) -r $(DEPS)
@@ -173,50 +171,62 @@ $(OBJDIR)/credits.o: $(APPDIR)/credits.c $(APPDIR)/credits.h $(OBJDIR)/credits.r
 $(OBJDIR)/thread.o: ./thread.c
 $(OBJDIR)/plugin.o: $(APPDIR)/plugin.c
 $(OBJDIR)/build.lang: $(APPDIR)/lang/$(LANGUAGE).lang
-        perl $(TOOLSDIR)/uplang $(APPDIR)/lang/english.lang $< > $@
+        @echo "UPLANG"
+        @perl $(TOOLSDIR)/uplang $(APPDIR)/lang/english.lang $< > $@
 
 $(OBJDIR)/lang.o: $(OBJDIR)/build.lang
-        perl -s $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $<
-        $(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@
+        @echo GENLANG
+        @perl -s $(TOOLSDIR)/genlang -p=$(OBJDIR)/lang $<
+        @echo "CC lang.c"
+        @$(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@
 
 $(OBJDIR)/sysfont.o: $(FIRMWAREDIR)/fonts/clR6x8.bdf
-        $(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<
-        $(CC) $(APPCFLAGS) -c $(OBJDIR)/sysfont.c -o $@
+        @echo CC $<
+        @$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $<
+        @$(CC) $(APPCFLAGS) -c $(OBJDIR)/sysfont.c -o $@
 
 ################## Plugins ##################
 $(OBJDIR)/libplugin.a:  $(PLUGINLIBOBJS)
-        $(AR) ruv $@ $+
+        @echo AR $<
+        @$(AR) ru $@ $+
 
 $(OBJDIR)/%.o: $(PLUGINDIR)/lib/%.c
-        $(CC) $(CFLAGS) -DPLUGIN -c $< -o $@
+        @echo CC $<
+        @$(CC) $(CFLAGS) -DPLUGIN -c $< -o $@
 
 $(OBJDIR)/%.rock: $(APPDIR)/plugins/%.c $(APPDIR)/plugin.h
-        $(CC) $(APPCFLAGS) -DPLUGIN -L$(OBJDIR) -lplugin -shared $< -o $@
+        @echo CC $<
+        @$(CC) $(APPCFLAGS) -DPLUGIN -L$(OBJDIR) -lplugin -shared $< -o $@
+        @chmod -x $@
 
 ################## Patterns for building objects ##################
 $(OBJDIR)/%.o: ../x11/%.c
-        echo x11
-        $(CC) $(CFLAGS) -c $< -o $@
+        @echo CC $<
+        @$(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: $(SIMCOMMON)/%.c
-        echo simcommon
-        $(CC) $(APPCFLAGS) -c $< -o $@
+        @echo CC $<
+        @$(CC) $(APPCFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: $(MACHINEDIR)/%.c
-        $(CC) $(APPCFLAGS) -c $< -o $@
+        @echo CC $<
+        @$(CC) $(APPCFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: $(DRIVERS)/%.c
-        $(CC) $(APPCFLAGS) -c $< -o $@
+        @echo CC $<
+        @$(CC) $(APPCFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: $(FIRMWAREDIR)/%.c
-        echo firmware $<
-        $(CC) $(APPCFLAGS) -c $< -o $@
+        @echo CC $<
+        @$(CC) $(APPCFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: $(COMMON)/%.c
-        $(CC) $(APPCFLAGS) -c $< -o $@
+        @echo CC $<
+        @$(CC) $(APPCFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: $(APPDIR)/%.c
-        $(CC) $(APPCFLAGS) -c $< -o $@
+        @echo CC $<
+        @$(CC) $(APPCFLAGS) -c $< -o $@
 
 
 ################## Auto-dependencies ##################
@@ -239,11 +249,13 @@ $(OBJDIR)/%.o: %.c
         $(CC) $(CFLAGS) -c $< -o $@
 
 ifeq ($(UNAME),CYGWIN)
-$(TARGET): $(OBJS) $(OBJDIR)/libplugin.a
-        $(CC) -g -o $(TARGET) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS)
+$(EXEFILE): $(OBJS) $(OBJDIR)/libplugin.a
+        @echo LD $@
+        @$(CC) -g -o $(EXEFILE) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS)
 else
-$(TARGET): $(OBJS)  $(OBJDIR)/libplugin.a
-        $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS)
+$(EXEFILE): $(OBJS) $(OBJDIR)/libplugin.a
+        @echo LD $@
+        @$(CC) -g -o $(EXEFILE) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS)
 endif
 
 tags:
diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c
index 30daf6a3b7..951bf730c5 100644
--- a/uisimulator/x11/button-x11.c
+++ b/uisimulator/x11/button-x11.c
@@ -16,6 +16,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include "config.h"
 #include "button.h"
 #include "kernel.h"
 #include "debug.h"
diff --git a/uisimulator/x11/config.h b/uisimulator/x11/config-x11.h
index 1c520cfbac..1c520cfbac 100644
--- a/uisimulator/x11/config.h
+++ b/uisimulator/x11/config-x11.h
diff --git a/uisimulator/x11/lcd-x11.c b/uisimulator/x11/lcd-x11.c
index 9155a1caf0..bc03d7f822 100644
--- a/uisimulator/x11/lcd-x11.c
+++ b/uisimulator/x11/lcd-x11.c
@@ -31,6 +31,7 @@
 #include <time.h>
 
 #include "screenhack.h"
+#include "config.h"
 
 /*
  * Specific implementations for X11, using the generic LCD API and data.
diff --git a/uisimulator/x11/screenhack.c b/uisimulator/x11/screenhack.c
index e15f536d6d..052328fa6a 100644
--- a/uisimulator/x11/screenhack.c
+++ b/uisimulator/x11/screenhack.c
@@ -58,6 +58,7 @@
 #include "vroot.h"
 
 #include "debug.h"
+#include "config.h"
 
 #ifndef isupper
 # define isupper(c)  ((c) >= 'A' && (c) <= 'Z')
@@ -412,7 +413,8 @@ int main (int argc, char **argv)
     {
       static char geometry[40];
 #ifdef HAVE_LCD_BITMAP
-      snprintf(geometry, 40, "*geometry: %dx%d", 120*display_zoom, 68*display_zoom);
+      snprintf(geometry, 40, "*geometry: %dx%d",
+               LCD_WIDTH*display_zoom+14, LCD_HEIGHT*display_zoom+8);
 #else
       snprintf(geometry, 40, "*geometry: %dx%d", 280*display_zoom, 132*display_zoom);
 #endif
diff --git a/uisimulator/x11/screenhack.h b/uisimulator/x11/screenhack.h
index f4496d69c5..084f8769bd 100644
--- a/uisimulator/x11/screenhack.h
+++ b/uisimulator/x11/screenhack.h
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 
-#include "config.h"
+#include "config-x11.h"
 
 #ifdef __hpux
  /* Which of the ten billion standards does values.h belong to?
diff --git a/uisimulator/x11/utils.h b/uisimulator/x11/utils.h
index 284bb86dcd..5045d4aa6d 100644
--- a/uisimulator/x11/utils.h
+++ b/uisimulator/x11/utils.h
@@ -10,7 +10,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config-x11.h"
 #endif
 
 #include <stdlib.h>