Changeset 5700 for trunk/Ohana/src/kii/setup/DefineLayout.c

Timestamp:

Dec 5, 2005, 3:55:45 PM (21 years ago)

Author:

eugene

Message:

adding no-X version of JPEG, other features

File:

• trunk/Ohana/src/kii/setup/DefineLayout.c (modified) (4 diffs)

trunk/Ohana/src/kii/setup/DefineLayout.c

@@ -1 +1 @@
 # include "Ximage.h"
+
+static char default_colormap[] = "grayscale";
 
 void DefineLayout (Layout *layout, Graphic *graphic, int argc, char **argv) {
@@ -5 +7 @@
   int i, status, N;
   struct sockaddr_un Address;
-  char temp[100];
+  char temp[100], *temp_name;
 
   /** initiate connection with mana **/
@@ -29 +31 @@
   
   /* get the display colors */
-  MakeColormap (graphic, layout, argc, argv);
+  if (USE_XWINDOW) {
+    MakeColormap (graphic, layout, argc, argv);
+  } else {
+    temp_name = default_colormap;
+    if ((N = get_argument (argc, argv, "-cm"))) {
+      remove_argument (N, &argc, argv);
+      temp_name = argv[N];
+    }
+    layout[0].Npixels = 256;
+    SetColormap (graphic, layout, temp_name);
+  }
 
   /** set up a bunch of default things **/
@@ -51 +63 @@
   ALLOCATE (layout[0].zoom.data, char, 1);      /* allocate so later free will not crash! */
 
-  CreatePicture (layout, graphic);
-  CreateColorbar (layout, graphic);
-  CreateZoom (layout, graphic, 0, 0); 
+  if (USE_XWINDOW) {
+    CreatePicture (layout, graphic);
+    CreateColorbar (layout, graphic);
+    CreateZoom (layout, graphic, 0, 0); 
+  }
 }