Backport upstream fix for "no event type or button # or keysym"

[pf3gnuchains/sourceware.git] / tk / generic / tkEvent.c

diff --git a/tk/generic/tkEvent.c b/tk/generic/tkEvent.c
index 602b044..614dc24 100644 (file)
--- a/tk/generic/tkEvent.c
+++ b/tk/generic/tkEvent.c
@@ -77,7 +77,7 @@ typedef struct TkWindowEvent {
  * Array of event masks corresponding to each X event:
  */
 
-static unsigned long eventMasks[TK_LASTEVENT] = {
+static unsigned long realEventMasks[MappingNotify+1] = {
     0,
     0,
     KeyPressMask,                      /* KeyPress */
@@ -115,7 +115,10 @@ static unsigned long eventMasks[TK_LASTEVENT] = {
     0,                                 /* SelectionNotify */
     ColormapChangeMask,                        /* ColormapNotify */
     0,                                 /* ClientMessage */
-    0,                                 /* Mapping Notify */
+    0                                  /* Mapping Notify */
+};
+
+static unsigned long virtualEventMasks[TK_LASTEVENT-VirtualEvent] = {
     VirtualEventMask,                  /* VirtualEvents */
     ActivateMask,                      /* ActivateNotify */
     ActivateMask,                      /* DeactivateNotify */
@@ -734,7 +737,21 @@ Tk_HandleEvent(eventPtr)
      */
 
     handlerWindow = eventPtr->xany.window;
-    mask = eventMasks[eventPtr->xany.type];
+
+    /*
+     * Get the event mask from the correct table. Note that there are two
+     * tables here because that means we no longer need this code to rely on
+     * the exact value of VirtualEvent, which has caused us problems in the
+     * past when X11 changed the value of LASTEvent. [Bug ???]
+     */
+
+    if (eventPtr->xany.type <= MappingNotify) {
+       mask = realEventMasks[eventPtr->xany.type];
+    } else if (eventPtr->xany.type >= VirtualEvent
+           && eventPtr->xany.type<TK_LASTEVENT) {
+       mask = virtualEventMasks[eventPtr->xany.type - VirtualEvent];
+    }
+
     if (mask == StructureNotifyMask) {
        if (eventPtr->xmap.event != eventPtr->xmap.window) {
            mask = SubstructureNotifyMask;