File insight-6.8-1-update_Bug2010422.patch of Package cross-avr-insight

Overview Repositories Revisions Requests Users Attributes Meta

File insight-6.8-1-update_Bug2010422.patch of Package cross-avr-insight (Revision 63ca2be44a7c297487b2568d02f7d4bf)

Currently displaying revision 63ca2be44a7c297487b2568d02f7d4bf , Show latest

diff -Nurb insight-6.8/tk/ChangeLog insight-6.8-1/tk/ChangeLog
--- insight-6.8/tk/ChangeLog	2006-12-01 04:49:09.000000000 +0100
+++ insight-6.8-1/tk/ChangeLog	2009-07-18 22:20:36.000000000 +0200
@@ -1,3 +1,9 @@
+2008-08-05  Joe English	 <jenglish@users.sourceforge.net>
+
+	* generic/tk.h, generic/tkEvent.c: Fix for [Bug 2010422] "no event
+	type or button # or keysym while executing " bind Listbox
+	<MouseWheel> [...].
+
 2006-11-30  Christopher Faylor  <cgf@timesys.com>
 
 	* tk/win/tcl.m4 (LIB_AC_PROG_CC): Upgrade to avoid use of obsolete
diff -Nurb insight-6.8/tk/generic/tk.h insight-6.8-1/tk/generic/tk.h
--- insight-6.8/tk/generic/tk.h	2003-01-21 21:24:42.000000000 +0100
+++ insight-6.8-1/tk/generic/tk.h	2009-07-18 22:20:36.000000000 +0200
@@ -650,17 +650,15 @@
  *
  *---------------------------------------------------------------------------
  */
-#define VirtualEvent	    (LASTEvent)
-#define ActivateNotify	    (LASTEvent + 1)
-#define DeactivateNotify    (LASTEvent + 2)
-#define MouseWheelEvent     (LASTEvent + 3)
-#define TK_LASTEVENT	    (LASTEvent + 4)
+#define VirtualEvent	    (MappingNotify + 1)
+#define ActivateNotify	    (MappingNotify + 2)
+#define DeactivateNotify    (MappingNotify + 3)
+#define MouseWheelEvent     (MappingNotify + 4)
+#define TK_LASTEVENT	    (MappingNotify + 5)
 
 #define MouseWheelMask	    (1L << 28)
-
 #define ActivateMask	    (1L << 29)
 #define VirtualEventMask    (1L << 30)
-#define TK_LASTEVENT	    (LASTEvent + 4)
 
 
 /*
diff -Nurb insight-6.8/tk/generic/tkEvent.c insight-6.8-1/tk/generic/tkEvent.c
--- insight-6.8/tk/generic/tkEvent.c	2003-01-21 21:24:43.000000000 +0100
+++ insight-6.8-1/tk/generic/tkEvent.c	2009-07-18 22:20:36.000000000 +0200
@@ -77,7 +77,7 @@
  * 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 @@
     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 @@
      */
 
     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;

Places

File insight-6.8-1-update_Bug2010422.patch of Package cross-avr-insight (Revision 63ca2be44a7c297487b2568d02f7d4bf)

Places