Index: trunk/Ohana/src/kapa/setup/Ximage.c
===================================================================
--- trunk/Ohana/src/kapa/setup/Ximage.c	(revision 4769)
+++ trunk/Ohana/src/kapa/setup/Ximage.c	(revision 5612)
@@ -3,12 +3,19 @@
 int main (int argc, char **argv) {
   
-  SetUpDisplay (&argc, argv);
-  SetUpWindow (&argc, argv);
+  /* this is a lame place to put this default */
+  graphic.x = 10;
+  graphic.y = 10;
+  graphic.dx = 512;
+  graphic.dy = 512; 
 
-  DefineLayout (argc, argv);
+  args (&argc, argv);
+
+  if (USE_XWINDOW) SetUpDisplay (&argc, argv); /* skip if Xless */
+  if (USE_XWINDOW) SetUpWindow (&argc, argv);  /* skip if Xless */
+
+  DefineLayout (argc, argv); 
   EventLoop ();
 
-  XFreeFont (graphic.display, graphic.font); 
-  CloseDisplay ();
+  if (USE_XWINDOW) CloseDisplay ();
   exit (0);
 }