Changeset 3695 for trunk/Ohana/src/kii/event/EventLoop.c

Timestamp:

Apr 11, 2005, 4:09:30 PM (21 years ago)

Author:

eugene

Message:

fix of EventLoop, which was not flushing some events

File:

• trunk/Ohana/src/kii/event/EventLoop.c (modified) (2 diffs)

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

@@ -1 +1 @@
 # include "Ximage.h"
+
+# define IgnoreMask (long) (ClientMessage | ButtonReleaseMask)
 
 int LastEvent (Display *display, int type, XEvent *event) {
@@ -33 +35 @@
     display = graphic[0].display;
 
-    /* only do the last entry for these events */
-    /* this ignores the return status from these functions */
+    /* grab the last entry for these events */
     if (LastEvent (display, ConfigureNotify, &event)) Reconfig (graphic, layout, &event);
+    if (LastEvent (display, CirculateNotify, &event)) Reconfig (graphic, layout, &event);
     if (LastEvent (display, Expose,          &event)) Refresh (graphic, layout, 1);
-    if (LastEvent (display, MappingNotify,   &event)) XRefreshKeyboardMapping ((XMappingEvent *) &event);
     if (LastEvent (display, MotionNotify,    &event)) UpdatePointer (graphic, layout, (XMotionEvent *) &event);
     if (LastEvent (display, ButtonPress,     &event)) InterpretPresses (graphic, layout, (XButtonEvent *) &event);
     if (LastEvent (display, KeyPress,        &event)) InterpretKeys (graphic, layout, &event);
+
+    if (LastEvent (display, MappingNotify,   &event)) XRefreshKeyboardMapping ((XMappingEvent *) &event);
+
+    /* drop and ignore the following StructureNotifyMask events */
+    LastEvent (display, GravityNotify, &event);
+    LastEvent (display, ReparentNotify, &event);
+    LastEvent (display, MapNotify, &event);
+    LastEvent (display, UnmapNotify, &event);
+
+    /* remove those events we will ignore */
+    while (XCheckMaskEvent (display, IgnoreMask, &event)) continue;
   }
   return (status);