2 files changed, 17 insertions, 2 deletions

diff --git a/uisimulator/x11/screenhack.c b/uisimulator/x11/screenhack.c
index 72915f41a5..3b94309a7f 100644
--- a/uisimulator/x11/screenhack.c
+++ b/uisimulator/x11/screenhack.c
@@ -83,7 +83,13 @@ static XrmOptionDescRec default_options [] = {
 
 static char *default_defaults[] = {
   ".root:               false",
-  "*geometry:           120x70", /* this should be .geometry, but nooooo... */
+  "*geometry:           "
+#ifdef HAVE_LCD_BITMAP
+  "120x68"
+#else
+  "138x54"
+#endif
+  , /* this should be .geometry, but nooooo... */
   "*mono:               false",
   "*installColormap:    false",
   "*visualID:           default",
diff --git a/uisimulator/x11/uibasic.c b/uisimulator/x11/uibasic.c
index 19ab9c5980..165b1cebe9 100644
--- a/uisimulator/x11/uibasic.c
+++ b/uisimulator/x11/uibasic.c
@@ -197,6 +197,10 @@ screenhack (Display *the_dpy, Window the_window)
 
   screen_redraw();
 
+#ifdef HAVE_LCD_CHARCELLS
+  lcd_setfont(2);
+#endif
+
   app_main();
 }
 
@@ -206,8 +210,13 @@ void screen_redraw()
 
 #define X1 0
 #define Y1 0
+#ifdef HAVE_LCD_BITMAP
 #define X2 (LCD_WIDTH + MARGIN_X*2)
-#define Y2 (LCD_HEIGHT + MARGIN_Y*2)
+#define Y2 (LCD_HEIGHT + MARGIN_Y)
+#else
+#define X2 137
+#define Y2 53
+#endif
 
   drawline(1, X1, Y1, X2, Y1);
   drawline(1, X2, Y1, X2, Y2);