Changeset 41353

Timestamp:

May 9, 2020, 11:03:38 AM (6 years ago)

Author:

eugene

Message:

open without X if display is not available

Location:

trunk/Ohana/src/kapa2

Files:

• samples/minimal2.pdf (modified) ( previous)
• src/OpenDisplay.c (modified) (1 diff)
• src/SetUpGraphic.c (modified) (2 diffs)

trunk/Ohana/src/kapa2/src/OpenDisplay.c

@@ -9 +9 @@
   if (display == NULL) {
     fprintf (stderr, "Error could not open X display to %s\n", XDisplayName (name));
-    exit (2);
+    fprintf (stderr, "Running with background graphics\n");
+    // exit (2);
+    return NULL;
   }
   *screen = DefaultScreen (display);

trunk/Ohana/src/kapa2/src/SetUpGraphic.c

@@ -34 +34 @@
   graphic->smooth_sigma = 0.0;
 
+  name = CheckDisplayName (argc, argv);
+
+  if (USE_XWINDOW) {
+    graphic->display  = OpenDisplay     (name,    &graphic->screen);
+    if (!graphic->display) USE_XWINDOW = FALSE;
+  }
+
   if (!USE_XWINDOW) {
     ALLOCATE (graphic[0].pixels, unsigned long, NPIXELS_STATIC);
@@ -42 +49 @@
   }
 
-  name = CheckDisplayName (argc, argv);
-
-  graphic->display  = OpenDisplay     (name,    &graphic->screen);
   graphic->colormap = DefaultColormap (graphic->display, graphic->screen);
   graphic->depth    = DefaultDepth    (graphic->display, graphic->screen);