Index: trunk/Ohana/src/kapa2/include/structures.h
===================================================================
--- trunk/Ohana/src/kapa2/include/structures.h	(revision 16011)
+++ trunk/Ohana/src/kapa2/include/structures.h	(revision 16039)
@@ -1,68 +1,2 @@
-
-/**************** Graphic carries X info around ****************/
-typedef struct {
-  Display       *display;     // X display pointer
-  int            screen;      // X screen number
-  int            depth;
-  Window         window;
-  Visual        *visual;
-  int            visualclass; // is visual dynamic? (XXX change name?)
-  int            Nbits;	      // pixel depth in bits (8, 16, 24, 32)
-  GC             gc;
-  XFontStruct   *font;
-  Cursor         cursor;
-  int            x,  y;
-  unsigned int   dx, dy;
-  XColor        *cmap;
-  Colormap       colormap;
-  unsigned long *color;      // graph plotting colors
-  int            Ncolors;
-
-  unsigned long *pixels;      // image pixel colors
-  int Npixels;		      // number of pixels
-
-  int            ColorScaleMode; // single colormap for all images??
-  int nRed;
-  int nBlue;
-  int nGreen;
-
-  unsigned long  fore;	      // basic foreground color 
-  unsigned long  back;	      // basic background color
-
-  unsigned long  overlay_color[NOVERLAYS]; // image plotting colors 
-} Graphic;
-
-/**************** X related "widget" structures ****************/
-typedef struct {
-  int      x, y, dx, dy;      /* position and size */
-  int      width, height;     /* size of the bitmap */
-  char    *bitmap;            /* picture on button */
-  int    (*function_1) ();    /* mouse_button 1 function */
-  int    (*function_2) ();    /* mouse_button 2 function */
-  int    (*function_3) ();    /* mouse_button 3 function */
-} Button;
-
-typedef struct {
-  int      x, y, dx, dy;   /* position and size */
-  char    *label;          /* label on TextLine */
-  char     text[1024];     /* words of TextLine */
-  char     old_text[1024]; /* words of TextLine */
-  int      outline;        /* draw an outline?  */ 
-  int      cursor;         /* location of cursor (if selected) */
-  int    (*function) ();   /* textline function */
-} TextLine;
-
-typedef char STRING[1024];
-
-typedef struct {
-  int      x, y, dx, dy;   /* position and size */
-  STRING  *text;           /* words of TextLine */
-  int      Nlines;
-  int      outline;        /* draw an outline?  */ 
-  int      cursor_line;    /* cursor line */
-  int      cursor_x;       /* location of cursor (if selected) */
-  int      cursor_y;       /* location of cursor (if selected) */
-  int    (*function) ();   /* textline function */
-} TextBox;
 
 /*** 3C color cube histogram tree thingy ***/
@@ -80,4 +14,71 @@
 } CCNode;
 
+/**************** Graphic carries X info around ****************/
+typedef struct {
+  Display       *display;     // X display pointer
+  int            screen;      // X screen number
+  int            depth;
+  Window         window;
+  Visual        *visual;
+  int            visualclass; // is visual dynamic? (XXX change name?)
+  int            Nbits;	      // pixel depth in bits (8, 16, 24, 32)
+  GC             gc;
+  XFontStruct   *font;
+  Cursor         cursor;
+  int            x,  y;
+  unsigned int   dx, dy;
+  CCNode        *cube;
+  XColor        *cmap;
+  Colormap       colormap;
+  unsigned long *color;      // graph plotting colors
+  int            Ncolors;
+
+  unsigned long *pixels;      // image pixel colors
+  int Npixels;		      // number of pixels
+
+  int            ColorScaleMode; // single colormap for all images??
+  int nRed;
+  int nBlue;
+  int nGreen;
+
+  unsigned long  fore;	      // basic foreground color 
+  unsigned long  back;	      // basic background color
+
+  unsigned long  overlay_color[NOVERLAYS]; // image plotting colors 
+} Graphic;
+
+/**************** X related "widget" structures ****************/
+typedef struct {
+  int      x, y, dx, dy;      /* position and size */
+  int      width, height;     /* size of the bitmap */
+  char    *bitmap;            /* picture on button */
+  int    (*function_1) ();    /* mouse_button 1 function */
+  int    (*function_2) ();    /* mouse_button 2 function */
+  int    (*function_3) ();    /* mouse_button 3 function */
+} Button;
+
+typedef struct {
+  int      x, y, dx, dy;   /* position and size */
+  char    *label;          /* label on TextLine */
+  char     text[1024];     /* words of TextLine */
+  char     old_text[1024]; /* words of TextLine */
+  int      outline;        /* draw an outline?  */ 
+  int      cursor;         /* location of cursor (if selected) */
+  int    (*function) ();   /* textline function */
+} TextLine;
+
+typedef char STRING[1024];
+
+typedef struct {
+  int      x, y, dx, dy;   /* position and size */
+  STRING  *text;           /* words of TextLine */
+  int      Nlines;
+  int      outline;        /* draw an outline?  */ 
+  int      cursor_line;    /* cursor line */
+  int      cursor_x;       /* location of cursor (if selected) */
+  int      cursor_y;       /* location of cursor (if selected) */
+  int    (*function) ();   /* textline function */
+} TextBox;
+
 /**************** general structures ****************/
 typedef struct {