Index: trunk/Ohana/src/kapa2/include/constants.h
===================================================================
--- trunk/Ohana/src/kapa2/include/constants.h	(revision 13479)
+++ trunk/Ohana/src/kapa2/include/constants.h	(revision 16011)
@@ -9,4 +9,10 @@
  | StructureNotifyMask \
  | PointerMotionMask)
+
+# define NCHANNELS 3
+# define NPIXELS_DYNAMIC 128
+
+// XXX for the moment, this is set to match the values in SetColorScale3D_CC
+# define NPIXELS_STATIC 4600
 
 # define PAD1  3
@@ -27,13 +33,34 @@
 # define LABEL_MAXLEN 128
 
+typedef enum {
+    KAPA_SCALE_1D,
+    KAPA_SCALE_3D_RUFF,
+    KAPA_SCALE_3D_FULL
+} KapaColorScaleMode;
+
 /* label names */
-# define LABELX0 0
-# define LABELY0 1
-# define LABELX1 2
-# define LABELY1 3
-# define LABELUL 4
-# define LABELUR 5
-# define LABELLL 6
-# define LABELLR 7
+typedef enum {
+  LABELX0,
+  LABELY0,
+  LABELX1,
+  LABELY1,
+  LABELUL,
+  LABELUR,
+  LABELLL,
+  LABELLR
+} KapaLabelMode;
+
+typedef enum {
+  KAPA_CHANNEL_RED,
+  KAPA_CHANNEL_GREEN,
+  KAPA_CHANNEL_BLUE,
+} KapaChannels;
+
+// use an enum to identify the 3 dimensions:
+typedef enum {
+  CC_X,
+  CC_Y,
+  CC_Z,
+} CCDimen;
 
 /* EVENT_MASK consists of: