Changeset 5700

Timestamp:

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

Author:

eugene

Message:

adding no-X version of JPEG, other features

Location:

trunk/Ohana/src/kii

Files:

• Makefile (modified) (3 diffs)
• button/ButtonFunctions.c (modified) (3 diffs)
• button/PSit.c (modified) (3 diffs)
• colorbar/SetColormap.c (modified) (3 diffs)
• event/CheckPipe.c (modified) (2 diffs)
• include/alphabet.h (added)
• include/bDraw.h (added)
• include/constants.h (modified) (1 diff)
• include/structures.h (modified) (1 diff)
• overlay/EraseOverlay.c (modified) (1 diff)
• overlay/LoadOverlay.c (modified) (1 diff)
• overlay/LoadTickmarks.c (modified) (1 diff)
• overlay/RotFont.c (added)
• overlay/bDrawColormap.c (added)
• overlay/bDrawFrame.c (added)
• overlay/bDrawFuncs.c (added)
• overlay/bDrawOverlay.c (added)
• overlay/bDrawRotFont.c (added)
• picture/Center.c (modified) (1 diff)
• picture/JPEGit24.c (modified) (11 diffs)
• picture/NewPicture.c (modified) (1 diff)
• picture/Resize.c (modified) (1 diff)
• setup/CheckVisual.c (modified) (2 diffs)
• setup/DefineLayout.c (modified) (4 diffs)
• setup/SetUpWindow.c (modified) (1 diff)
• setup/Ximage.c (modified) (1 diff)

trunk/Ohana/src/kii/Makefile

@@ -50 +50 @@
 $(ODIR)/EraseOverlay.$(ARCH).o            $(ODIR)/PaintOverlay.$(ARCH).o       \
 $(ODIR)/LoadOverlay.$(ARCH).o             $(ODIR)/SaveOverlay.$(ARCH).o        \
-$(ODIR)/DrawOverlay.$(ARCH).o             $(ODIR)/CSaveOverlay.$(ARCH).o        \
-$(ODIR)/PaintTickmarks.$(ARCH).o          $(ODIR)/LoadTickmarks.$(ARCH).o
+$(ODIR)/DrawOverlay.$(ARCH).o             $(ODIR)/CSaveOverlay.$(ARCH).o       \
+$(ODIR)/PaintTickmarks.$(ARCH).o          $(ODIR)/LoadTickmarks.$(ARCH).o      \
+$(ODIR)/bDrawColormap.$(ARCH).o           $(ODIR)/bDrawOverlay.$(ARCH).o       \
+$(ODIR)/bDrawFuncs.$(ARCH).o              $(ODIR)/bDrawRotFont.$(ARCH).o       \
+$(ODIR)/RotFont.$(ARCH).o
+
 
 POBJ = \
@@ -57 +61 @@
 $(PDIR)/NewPicture.$(ARCH).o              $(PDIR)/Center.$(ARCH).o             \
 $(PDIR)/PositionPictures.$(ARCH).o        $(PDIR)/StatusBox.$(ARCH).o          \
-$(PDIR)/cursor.$(ARCH).o                                                        \
 $(PDIR)/CursorOps.$(ARCH).o               $(PDIR)/Resize.$(ARCH).o              \
 $(PDIR)/Remap8.$(ARCH).o                  $(PDIR)/Remap24.$(ARCH).o             \
 $(PDIR)/Remap.$(ARCH).o                   $(PDIR)/Remap32.$(ARCH).o             \
-$(PDIR)/Remap16.$(ARCH).o
+$(PDIR)/Remap16.$(ARCH).o                 $(PDIR)/JPEGit24.$(ARCH).o            \
+$(PDIR)/cursor.$(ARCH).o
 
 SOBJ = \
@@ -75 +79 @@
 $(SDIR)/LoadFont.$(ARCH).o                $(SDIR)/TopWindow.$(ARCH).o          \
 $(SDIR)/MakeColormap.$(ARCH).o            $(SDIR)/Ximage.$(ARCH).o             \
-$(SDIR)/MakeCursor.$(ARCH).o              $(SDIR)/CheckVisual.$(ARCH).o
+$(SDIR)/MakeCursor.$(ARCH).o              $(SDIR)/CheckVisual.$(ARCH).o        \
+$(SDIR)/args.$(ARCH).o
 
 ZOBJ = \

trunk/Ohana/src/kii/button/ButtonFunctions.c

@@ -12 +12 @@
   Remap (graphic, layout, &layout[0].matrix);
   CreateZoom (layout, graphic, 0, 0); 
+  Refresh (graphic, layout, 0);
+  XFlush (graphic[0].display);
   return (TRUE);
 }
@@ -22 +24 @@
   Remap (graphic, layout, &layout[0].matrix);
   CreateZoom (layout, graphic, 0, 0); 
+  Refresh (graphic, layout, 0);
+  XFlush (graphic[0].display);
   return (TRUE);
 }
@@ -32 +36 @@
   Remap (graphic, layout, &layout[0].matrix);
   CreateZoom (layout, graphic, 0, 0); 
+  Refresh (graphic, layout, 0);
+  XFlush (graphic[0].display);
   return (TRUE);
 }

trunk/Ohana/src/kii/button/PSit.c

@@ -27 +27 @@
   }
   
+  if (!USE_XWINDOW) {
+    fprintf (stderr, "PS not working yet\n");
+    return (TRUE);
+  }
+
   scale = MIN ((500.0/(double)layout[0].picture.dx), (700.0/(double)layout[0].picture.dy));
   if (!Raw) {
@@ -63 +68 @@
 
   /******** First we draw the picture itself ********/
+  /* in !USE_XWINDOW, we'll have to change this to use the JPEG function */
   switch (graphic[0].Nbits) {
   case 8:
@@ -107 +113 @@
 }
 
+void ConvertPixmap (Layout *layout, File *f) {
+  
+  /* set up expansions */
+  expand = expand_in = expand_out = 1.0;
+  if (layout[0].expand == 0)
+    layout[0].expand = 1;
+  if (layout[0].expand > 0) {
+    expand = 1 / (1.0*layout[0].expand);
+    expand_out = layout[0].expand;
+    expand_in  = 1;
+  }
+  if (layout[0].expand < 0) {
+    expand = fabs((double)layout[0].expand);
+    expand_out = 1;
+    expand_in  = -layout[0].expand;
+  }
+
+  dx = layout[0].picture.dx;
+  dy = layout[0].picture.dy;
+  DX = layout[0].matrix.Naxis[0];
+  DY = layout[0].matrix.Naxis[1];
+
+  /* X,Y are the image coordinates of the first image pixel */
+  X = MAX(0.5*(DX - dx*expand) - layout[0].X, 0);
+  if ((int)X != X) 
+    X = (int) X + 1;
+  else 
+    X = (int) X;
+  Y = MAX(0.5*(DY - dy*expand) - layout[0].Y, 0);
+  if ((int)Y != Y) 
+    Y = (int) Y + 1;
+  else 
+    Y = (int) Y;
+
+  /* Rx,Ry are the screen coordinates of the first image pixel */
+  Rx = (X + layout[0].X - 0.5*DX)/expand + 0.5*dx;
+  Ry = (Y + layout[0].Y - 0.5*DY)/expand + 0.5*dy;
+
+  i_start = MIN (MAX (Rx, 0), dx - expand_out + 1);
+  j_start = MIN (MAX (Ry, 0), dy - expand_out + 1);
+  
+  if (layout[0].expand > 0) {
+    i_end = MAX (MIN (i_start + ((int)(expand*(dx-i_start)))/expand, expand_out*(DX-X) + Rx), 0);
+    j_end = MAX (MIN (j_start + ((int)(expand*(dy-j_start)))/expand, expand_out*(DY-Y) + Ry), 0);
+  } else {
+    i_end = MAX (MIN (dx, (DX-X)/expand + Rx), 0);
+    j_end = MAX (MIN (dy, (DY-Y)/expand + Ry), 0);
+  }    
+
+  dropback = expand_out - (i_end - i_start) % expand_out;
+  if ((i_end - i_start) % expand_out == 0) dropback = 0;
+
+  /* output line buffer */
+  ALLOCATE (line_buffer, char, dx);
+
+  in_pix_ref  = (unsigned char *) (layout[0].matrix.buffer) + DX*(int)MAX(Y,0) + (int)MAX(X,0);
+
+  /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/
+
+  Nchar = 255.0;
+  Npix = layout[0].Npixels;
+  frac = Nchar / Npix;
+
+  /**** fill in bottom area ****/
+  out_pix = line_buffer;
+  for (i = 0; i < dx; i++, out_pix++) {
+    *out_pix = WHITE;
+  }
+  for (j = 0; j < j_start; j++) {
+    for (i = 0; i < dx; i++) {
+      fprintf (f, "%02x", val);
+      if ((Npt % 40) == 0) {
+        fprintf (f, "\n");
+      }
+    }
+  }
+  
+  /*** fill in the image data region ***/
+  for (j = j_start; j < j_end; j+= expand_out, in_pix_ref += expand_in*DX) {
+    
+    /* create one output image line */
+    in_pix = in_pix_ref;
+    out_pix = line_buffer;
+
+    /**** fill in area to the left of the picture ****/
+    for (i = 0; i < i_start; i++, out_pix+=3) {
+      *out_pix = WHITE;
+    }
+    
+    /*** fill in the picture region ***/
+    for (i = i_start; i < i_end; i+=expand_out, in_pix+=expand_in) {
+      for (ii = 0; ii < expand_out; ii++, out_pix++) {
+        *out_pix = *in_pix*frac;
+      }
+    }
+    
+    /**** fill in area to the right of the picture ****/
+    for (i = i_end; i < dx; i++, out_pix++) {
+      *out_pix = WHITE;
+    }
+
+    /* write out the image line expand_out times */
+    for (j = 0; j < expand_out; j++) {
+      for (i = 0; i < dx; i++) {
+        fprintf (f, "%02x", val);
+        if ((Npt % 40) == 0) {
+          fprintf (f, "\n");
+        }
+      }
+    }
+  }
+
+  /**** fill in top area ****/
+  out_pix = line_buffer;
+  for (i = 0; i < dx; i++, out_pix++) { 
+    *out_pix = WHITE;
+  }
+  for (j = j_end; j < dy; j++) {
+    for (i = 0; i < dx; i++) {
+      fprintf (f, "%02x", val);
+      if ((Npt % 40) == 0) {
+        fprintf (f, "\n");
+      }
+    }
+  }
+}
+
 void ConvertPixmap8 (Layout *layout, FILE *f) {
 

trunk/Ohana/src/kii/colorbar/SetColormap.c

@@ -1 +1 @@
 # include "Ximage.h"
+
+/*** this function uses only private colormaps.  it should try the standard colormap
+     first to get better control over the smooth greyscales ***/
 
 int SetColormap (Graphic *graphic, Layout *layout, char *name) {
@@ -7 +10 @@
   /* greyscale */
   if ((!strcmp (name, "grayscale")) || (!strcmp (name, "greyscale"))) {
+    fprintf (stderr, "setting greyscale : %d\n", layout[0].Npixels);
     for (i = 0; i < layout[0].Npixels; i++) {  
       layout[0].cmap[i].red = 256*(255 - 255*i/layout[0].Npixels);
@@ -84 +88 @@
 
  store_colors:
+  if (!USE_XWINDOW) return (TRUE);
   if (graphic[0].visualclass) {
+    fprintf (stderr, "storing colors\n");
     XStoreColors(graphic[0].display, graphic[0].colormap, layout[0].cmap, layout[0].Npixels);
   } else {
     for (i = 0; i < layout[0].Npixels; i++) {
+      fprintf (stderr, "%04x %04x %04x  ->  ", layout[0].cmap[i].red, layout[0].cmap[i].green, layout[0].cmap[i].blue);
       if (XAllocColor (graphic[0].display, graphic[0].colormap, &layout[0].cmap[i]) == 0) {
         fprintf (stderr, "error on %d\n", i);
       }
+      fprintf (stderr, "%04x %04x %04x\n", layout[0].cmap[i].red, layout[0].cmap[i].green, layout[0].cmap[i].blue);
     }
   }

trunk/Ohana/src/kii/event/CheckPipe.c

@@ -89 +89 @@
 
   if (!strcmp (buffer, "PSIT")) {
+    /** this one needs work : ConvertPixmapN fails for !USE_XWINDOW */
     status = PSit (graphic, layout, 0);
     write (layout[0].Ximage, "DONE", 4);
@@ -95 +96 @@
 
   if (!strcmp (buffer, "PSRW")) {
+    /** this one needs work : ConvertPixmapN fails for !USE_XWINDOW */
     status = PSit (graphic, layout, 1);
     write (layout[0].Ximage, "DONE", 4);

trunk/Ohana/src/kii/include/constants.h

@@ -25 +25 @@
 int DECIMAL_DEG;
 int DEBUG;
+int USE_XWINDOW;
+int MAP_WINDOW;
 
 # define EVENT_MASK (long) \

trunk/Ohana/src/kii/include/structures.h

@@ -124 +124 @@
 } Layout;
 
+typedef struct {
+  int dx, dy, ascent;
+  unsigned char *bits;
+} RotFont;
+
+typedef struct {
+  RotFont *font;
+  char name[64];
+  int size;
+} FontSet;
 
 /* this routine is independent of the number of overlays */

trunk/Ohana/src/kii/overlay/EraseOverlay.c

@@ -24 +24 @@
   }
 
+  if (USE_XWINDOW) Refresh (graphic, layout, 0);
+
   fcntl (layout[0].Ximage, F_SETFL, O_NONBLOCK);  
-  Refresh (graphic, layout, 0);
   return (TRUE);
 }

trunk/Ohana/src/kii/overlay/LoadOverlay.c

@@ -88 +88 @@
   OVERLAY[N] = TRUE;
   /*  Refresh (graphic, layout, 0); */
-  for (i = 0; i < NOVERLAYS; i++) {
-    if (OVERLAY[i])
-      PaintOverlay (graphic, layout, i);
+  if (USE_XWINDOW) {
+    for (i = 0; i < NOVERLAYS; i++) {
+      if (OVERLAY[i])
+        PaintOverlay (graphic, layout, i);
+    }
+    PaintTickmarks (graphic, layout);
+    XFlush (graphic[0].display);
   }
-  PaintTickmarks (graphic, layout);
-  XFlush (graphic[0].display);
   fcntl (layout[0].Ximage, F_SETFL, O_NONBLOCK);  
   return (TRUE);

trunk/Ohana/src/kii/overlay/LoadTickmarks.c

@@ -55 +55 @@
   layout[0].tickmarks.Nobjects = Nobjects;
 
-  Refresh (graphic, layout, 0);
+  if (USE_XWINDOW) Refresh (graphic, layout, 0);
+
   fcntl (layout[0].Ximage, F_SETFL, O_NONBLOCK);  
   return (TRUE);

trunk/Ohana/src/kii/picture/Center.c

@@ -21 +21 @@
   }
 
-  Remap (graphic, layout, &layout[0].matrix);
-  Refresh (graphic, layout, 0);
+  if (USE_XWINDOW) {
+    Remap (graphic, layout, &layout[0].matrix);
+    Refresh (graphic, layout, 0);
+    XFlush (graphic[0].display);
+  }
 
   fcntl (layout[0].Ximage, F_SETFL, O_NONBLOCK);  
-  XFlush (graphic[0].display);
   return (TRUE);
 }

trunk/Ohana/src/kii/picture/JPEGit24.c

@@ -1 +1 @@
 # include "Ximage.h"
 # include "jpeglib.h"
-
-void JPEGit24 (Graphic *graphic, Layout *layout) {
+# include <png.h>
+# include "bDraw.h"
+
+# define WHITE_R 255
+# define WHITE_G 255
+# define WHITE_B 255
+
+int JPEGit24 (Graphic *graphic, Layout *layout) {
 
   struct jpeg_compress_struct cinfo;
@@ -8 +14 @@
   JSAMPROW row_pointer[1];      /* pointer to JSAMPLE row[s] */
   JSAMPLE *image_buffer;        /* Points to data for current line */
-
-  int i, j, ii, jj;
+  JSAMPLE *line_buffer;         /* Points to data for current line */
+
+  int ii, i, j;
   int i_start, i_end, j_start, j_end;
   int dropback, extra;  /* this is a bit of a kludge... */
   int dx, dy, DX, DY;
+  int status, Nbytes, quality;
+  int expand_in, expand_out;
   double expand, Rx, Ry, X, Y;
-  int expand_in, expand_out;
-  unsigned char *out_pix, *out_pix2, *data;
-  unsigned char *in_pix,  *in_pix2;
+  unsigned char *out_pix, *in_pix, *in_pix_ref;
   unsigned char pixel1[256], pixel2[256], pixel3[256];
-  unsigned char pixvalue1, pixvalue2, pixvalue3;
-  unsigned long white;
-  unsigned char white1, white2, white3;
+  char filename[1024];
   FILE *f;
 
@@ -36 +41 @@
   f = fopen (filename, "w");
   if (f == (FILE *) NULL) {
-    fprintf (stderr, "failed to open %s for output\n", filename);
+    fprintf (stderr, "Kii: failed to open %s for output\n", filename);
     return (TRUE);
   }
@@ -55 +60 @@
   jpeg_start_compress (&cinfo, TRUE);
 
-  /* output line buffer */
-  ALLOCATE (image_buffer, JSAMPLE, 3*layout[0].picture.dx);
-
   /** cmap[i].pixel must be defined even if X is not used **/
   for (i = 0; i < 256; i++) { /* set up pixel array */
-    pixel1[i] = 0x0000ff & (layout[0].cmap[i].pixel >> 0);
-    pixel2[i] = 0x0000ff & (layout[0].cmap[i].pixel >> 8);
-    pixel3[i] = 0x0000ff & (layout[0].cmap[i].pixel >> 16);
-  }
-  white = layout[0].white;
-  white1 = 0x0000ff & (white >> 0);
-  white2 = 0x0000ff & (white >> 8);
-  white3 = 0x0000ff & (white >> 16);
+    pixel1[i] = layout[0].cmap[i].red >> 8;
+    pixel2[i] = layout[0].cmap[i].green >> 8;
+    pixel3[i] = layout[0].cmap[i].blue >> 8;
+  }
 
   expand = expand_in = expand_out = 1.0;
@@ -85 +83 @@
   dx = layout[0].picture.dx;
   dy = layout[0].picture.dy;
-  DX = layout[0].matrix[0].Naxis[0];
-  DY = layout[0].matrix[0].Naxis[1];
-  extra = 4 - (dx * 3) % 4;  /* why is this needed?? */
+  DX = layout[0].matrix.Naxis[0];
+  DY = layout[0].matrix.Naxis[1];
 
   /* X,Y are the image coordinates of the first image pixel */
@@ -119 +116 @@
   if ((i_end - i_start) % expand_out == 0) dropback = 0;
 
-  out_pix = image_buffer;
-  in_pix  = (unsigned char *) (layout[0].matrix[0].buffer) + DX*(int)MAX(Y,0) + (int)MAX(X,0);
+  /* output line buffer */
+  ALLOCATE (image_buffer, JSAMPLE, 3*dx*dy);
+  ALLOCATE (line_buffer, JSAMPLE, 3*dx);
+
+  in_pix_ref  = (unsigned char *) (layout[0].matrix.buffer) + DX*(int)MAX(Y,0) + (int)MAX(X,0);
 
   /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/
 
-  /* we write the jpeg image data one row at a time */
-
   /**** fill in bottom area ****/
-  out_pix = image_buffer;
+  out_pix = line_buffer;
   for (i = 0; i < dx; i++, out_pix+=3) {
     out_pix[0] = WHITE_R;
@@ -134 +132 @@
   }
   for (j = 0; j < j_start; j++) {
-    row_pointer[0] = image_buffer;
-    (void) jpeg_write_scanlines (&cinfo, row_pointer, 1);
+    memcpy (&image_buffer[j*3*dx], line_buffer, 3*dx);
   }
   
   /*** fill in the image data region ***/
-  for (j = j_start; j < j_end; j+= expand_out, in_pix += expand_in*DX) {
+  for (j = j_start; j < j_end; j+= expand_out, in_pix_ref += expand_in*DX) {
     
     /* create one output image line */
-    out_pix = image_buffer;
+    in_pix = in_pix_ref;
+    out_pix = line_buffer;
 
     /**** fill in area to the left of the picture ****/
@@ -152 +150 @@
     
     /*** fill in the picture region ***/
-    for (i = i_start; i < i_end; i++, in_pix+=expand_in, out_pix+=3) {
-      out_pix[0] = pixel1[*in_pix];
-      out_pix[1] = pixel2[*in_pix];
-      out_pix[2] = pixel3[*in_pix];
+    for (i = i_start; i < i_end; i+=expand_out, in_pix+=expand_in) {
+      for (ii = 0; ii < expand_out; ii++, out_pix+=3) {
+        out_pix[0] = pixel1[*in_pix];
+        out_pix[1] = pixel2[*in_pix];
+        out_pix[2] = pixel3[*in_pix];
+      }
     }
     
@@ -167 +167 @@
     /* write out the image line expand_out times */
     for (i = 0; i < expand_out; i++) {
-      row_pointer[0] = image_buffer;
-      (void) jpeg_write_scanlines (&cinfo, row_pointer, 1);
+      memcpy (&image_buffer[(j + i)*3*dx], line_buffer, 3*dx);
     }
   }
 
   /**** fill in top area ****/
-  out_pix = image_buffer;
+  out_pix = line_buffer;
   for (i = 0; i < dx; i++, out_pix+=3) { 
     out_pix[0] = WHITE_R;
@@ -179 +178 @@
     out_pix[2] = WHITE_B;
   }
-  for (j = 0; j < (dy - j_end); j++) {
-    row_pointer[0] = image_buffer;
+  for (j = j_end; j < dy; j++) {
+    memcpy (&image_buffer[j*3*dx], line_buffer, 3*dx);
+  }
+
+
+  /* I need to write the overlay objects on the jpeg image.
+     if i can write / overwrite data in jpeg buffer, then do it here,
+     otherwise i need to create a temporary image buffer, then write the 
+     scanlines to that buffer */
+
+  {
+    int Npalette;
+    png_color *palette;
+    bDrawColor white, color;
+    bDrawBuffer *buffer;
+
+    palette = MakePNGPalette (&Npalette);
+
+    buffer = bDrawBufferCreate (dx, dy);
+    bDrawSetBuffer (buffer);
+    for (i = 0; i < NOVERLAYS; i++) {
+      if (OVERLAY[i]) bDrawOverlay (layout, i);
+    }
+
+    white = GetColorByName ("white");
+    for (j = 0; j < dy; j++) {
+      for (i = 0; i < dx; i++) {
+        color = buffer[0].pixels[j][i];
+        if (color == white) continue;
+        image_buffer[j*3*dx + 3*i + 0] = palette[color].red;
+        image_buffer[j*3*dx + 3*i + 1] = palette[color].green;
+        image_buffer[j*3*dx + 3*i + 2] = palette[color].blue;
+      }
+    }
+    bDrawBufferFree (buffer);
+  }
+
+  for (i = 0; i < dy; i++) {
+    row_pointer[0] = &image_buffer[i*3*dx];
     (void) jpeg_write_scanlines (&cinfo, row_pointer, 1);
   }
@@ -190 +226 @@
   return (TRUE);
 }
-

trunk/Ohana/src/kii/picture/NewPicture.c

@@ -66 +66 @@
   }
 
+  if (!USE_XWINDOW) return (TRUE);
+
   Remap (graphic, layout, &layout[0].matrix);
   (DEBUG) && fprintf (stderr, "remapped image\n");
   Refresh (graphic, layout, 0);
-  
   (DEBUG) && fprintf (stderr, "refreshed\n");
   XFlush (graphic[0].display);

trunk/Ohana/src/kii/picture/Resize.c

@@ -24 +24 @@
     return (TRUE);
 
-  /*  graphic[0].dx = MAX(NX,  MIN_WIDTH); 
-  graphic[0].dy = MAX(NY, MIN_HEIGHT); */
   graphic[0].dx = MAX(NX, 50); 
   graphic[0].dy = MAX(NY, 50); 
 
-  XResizeWindow (graphic[0].display, graphic[0].window, NX, NY);
+  if (USE_XWINDOW) XResizeWindow (graphic[0].display, graphic[0].window, NX, NY);
 
   PositionPictures (layout, graphic);
-  CreateColorbar (layout, graphic);
-  CreatePicture (layout, graphic);
-  Remap (graphic, layout, &layout[0].matrix); 
 
-  XClearWindow (graphic[0].display, graphic[0].window);
-  Refresh (graphic, layout, 1);
+  if (USE_XWINDOW) {
+    CreateColorbar (layout, graphic);
+    CreatePicture (layout, graphic);
+    Remap (graphic, layout, &layout[0].matrix); 
+    XClearWindow (graphic[0].display, graphic[0].window);
+    Refresh (graphic, layout, 1);
+  }
 
   return (TRUE);

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

@@ -1 +1 @@
 # include "Ximage.h"
 # define NPIXELS 64
-# define DEBUG 0
+# define DEBUG 1
 
 /* DirectColor doesn't seem to work, even though it is available:
@@ -143 +143 @@
 
   if (!def) {
+    if (DEBUG) fprintf (stderr, "allocated private colormap\n");
     graphic[0].colormap = XCreateColormap (graphic[0].display, RootWindow (graphic[0].display, graphic[0].screen), graphic[0].visual, AllocNone);
   }

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); 
+  }
 }
 

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

@@ -23 +23 @@
   NameWindow (graphic, "Ki'i");
 
-  if ((N = get_argument (*argc, argv, "-nomap"))) {
-    remove_argument(N, argc, argv);
-  } else {
-    MapWindow (graphic);
-  }  
+  if (MAP_WINDOW) MapWindow (graphic);
 }
 

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

@@ -12 +12 @@
 
   if (USE_XWINDOW) SetUpDisplay (&graphic, &argc, argv);
-  if (USE_XWINDOW) SetUpWindow (&graphic, &argc, argv);
+  if (USE_XWINDOW) {
+    SetUpWindow (&graphic, &argc, argv);
+  } else {
+    graphic.x = 10;
+    graphic.y = 10;
+    graphic.dx = 512 + 2*PAD1 + PAD1 + ZOOM_X;
+    graphic.dy = 512 + 2*PAD1 + PAD2 + COLORPAD;
+  }
 
   DefineLayout (&layout, &graphic, argc, argv);