Index: /trunk/Ohana/src/kapa/Makefile
===================================================================
--- /trunk/Ohana/src/kapa/Makefile	(revision 3464)
+++ /trunk/Ohana/src/kapa/Makefile	(revision 3465)
@@ -4,5 +4,5 @@
 
 default: $(PROGRAM)
-CC      =       gcc -g
+CC      =       gcc -g -Wall
 
 INC	=	$(HOME)/include
Index: /trunk/Ohana/src/kapa/event/CheckPipe.c
===================================================================
--- /trunk/Ohana/src/kapa/event/CheckPipe.c	(revision 3464)
+++ /trunk/Ohana/src/kapa/event/CheckPipe.c	(revision 3465)
@@ -73,5 +73,5 @@
   
   if (!strcmp (buffer, "LIMS")) {
-    sprintf (buffer, "LIMS: %8.1f %8.1f \0", 
+    sprintf (buffer, "LIMS: %8.1f %8.1f ", 
 	     section[TheSection].axis[0].dfx, section[TheSection].axis[1].dfy);
     write (sock, buffer, 30);
Index: /trunk/Ohana/src/kapa/event/EventLoop.c
===================================================================
--- /trunk/Ohana/src/kapa/event/EventLoop.c	(revision 3464)
+++ /trunk/Ohana/src/kapa/event/EventLoop.c	(revision 3465)
@@ -1,62 +1,41 @@
 # include "Ximage.h"
-# define EventMask (long) (KeyPressMask | ExposureMask | StructureNotifyMask)
-# define EMask (long) (KeyPressMask | ExposureMask | StructureNotifyMask | PointerMotionMask)
+
+int LastEvent (Display *display, int type, XEvent *event) {
+
+  int found;
+
+  found = FALSE;
+  while (XCheckTypedEvent (display, type, event)) {
+    found = TRUE;
+  }
+  return (found);
+}
 
 int EventLoop () {
   
-  XEvent          event, reconfig_event;
-  int             status, Ne;
-  int  NeedRefresh, NeedReconfig;
+  XEvent          event;
+  int             status;
+  Display        *display;
   
   Refresh (1);
 
-  NeedReconfig = FALSE;
-  NeedRefresh = FALSE;
   status = TRUE;
   while (status) {
-
+    
     if (!CheckPipe ()) return (FALSE);
-
+    
     if (XEventsQueued (graphic.display, QueuedAfterFlush) < 1) {
-      if (NeedReconfig) status = Reconfig (&reconfig_event);
-      if (NeedRefresh && !NeedReconfig) Refresh (1);
-      NeedRefresh = FALSE;
-      NeedReconfig = FALSE;
       usleep (10000);
       continue;
     }
 
-    if (XCheckMaskEvent (graphic.display, EVENT_MASK, &event)) {
+    display = graphic.display;
 
-      switch (event.type)  {
-
-      case MotionNotify:
-	break;
-
-      case Expose:
-	if (HAVE_BACKING) continue;
-	NeedRefresh = TRUE;
-	break;
-	
-      case ConfigureNotify:
-	/* Ne = XEventsQueued (graphic.display, QueuedAlready); */
-	reconfig_event = event;
-	NeedReconfig = TRUE;
-	break;
-	
-      case KeyPress:
-	status = InterpretKeys (&event);
-	break;
-
-      case MappingNotify:
-	if (XEventsQueued (graphic.display, QueuedAlready) < 2) {
-	  XRefreshKeyboardMapping ((XMappingEvent *) &event);
-	}
-	break;
-	
-      }
-    }
+    /* only do the last entry for these events */
+    /* this ignores the return status from these functions */
+    if (LastEvent (display, ConfigureNotify, &event)) Reconfig (&event);
+    if (LastEvent (display, Expose,          &event)) Refresh (1);
+    if (LastEvent (display, MappingNotify,   &event)) XRefreshKeyboardMapping ((XMappingEvent *) &event);
   }
   return (status);
 }
-
Index: /trunk/Ohana/src/kapa/include/structures.h
===================================================================
--- /trunk/Ohana/src/kapa/include/structures.h	(revision 3464)
+++ /trunk/Ohana/src/kapa/include/structures.h	(revision 3465)
@@ -2,27 +2,27 @@
 # define NGRAPHCOLORS 23
 static char GRAPHCOLORS[NGRAPHCOLORS][2][15] = {
-"black",    "0.00 0.00 0.00", 
-"white",    "1.00 1.00 1.00", 
-"red",      "1.00 0.00 0.00", 
-"pink",     "1.00 0.75 0.80", 
-"orange",   "1.00 0.65 0.00", 
-"yellow",   "1.00 1.00 0.00", 
-"wheat",    "0.96 0.87 0.70", 
-"gold",     "1.00 0.84 0.00", 
-"green",    "0.00 1.00 0.00", 
-"darkgreen","0.00 0.40 0.00", 
-"blue",     "0.00 0.00 1.00", 
-"skyblue",  "0.53 0.81 0.92", 
-"indigo",   "0.56 0.16 0.87", 
-"violet",   "1.00 0.00 0.00",
-"grey10",   "0.10 0.10 0.10",
-"grey20",   "0.20 0.20 0.20",
-"grey30",   "0.30 0.30 0.30",
-"grey40",   "0.40 0.40 0.40",
-"grey50",   "0.50 0.50 0.50",
-"grey60",   "0.60 0.60 0.60",
-"grey70",   "0.70 0.70 0.70",
-"grey80",   "0.80 0.80 0.80",
-"grey90",   "0.90 0.90 0.90"};
+{"black",    "0.00 0.00 0.00"}, 
+{"white",    "1.00 1.00 1.00"}, 
+{"red",      "1.00 0.00 0.00"}, 
+{"pink",     "1.00 0.75 0.80"}, 
+{"orange",   "1.00 0.65 0.00"}, 
+{"yellow",   "1.00 1.00 0.00"}, 
+{"wheat",    "0.96 0.87 0.70"}, 
+{"gold",     "1.00 0.84 0.00"}, 
+{"green",    "0.00 1.00 0.00"}, 
+{"darkgreen","0.00 0.40 0.00"}, 
+{"blue",     "0.00 0.00 1.00"}, 
+{"skyblue",  "0.53 0.81 0.92"}, 
+{"indigo",   "0.56 0.16 0.87"}, 
+{"violet",   "1.00 0.00 0.00"},
+{"grey10",   "0.10 0.10 0.10"},
+{"grey20",   "0.20 0.20 0.20"},
+{"grey30",   "0.30 0.30 0.30"},
+{"grey40",   "0.40 0.40 0.40"},
+{"grey50",   "0.50 0.50 0.50"},
+{"grey60",   "0.60 0.60 0.60"},
+{"grey70",   "0.70 0.70 0.70"},
+{"grey80",   "0.80 0.80 0.80"},
+{"grey90",   "0.90 0.90 0.90"}};
 
 /**************** Graphic carries X info around ****************/