Attachment "xim.patch" to
ticket [1924761f]
added by
dkf
2010-01-02 04:29:39.
Index: unix/tkUnixEvent.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/unix/tkUnixEvent.c,v
retrieving revision 1.32
diff -u -r1.32 tkUnixEvent.c
--- unix/tkUnixEvent.c 16 Dec 2009 21:12:25 -0000 1.32
+++ unix/tkUnixEvent.c 1 Jan 2010 21:27:54 -0000
@@ -282,6 +282,7 @@
xGenericEvent xge;
#endif
} event;
+ Window w;
/*
* Transfer events from the X event queue to the Tk event queue after XIM
@@ -298,11 +299,24 @@
event.xge.extension, event.xge.evtype);
}
#endif
- if (event.x.type != KeyPress && event.x.type != KeyRelease) {
- if (XFilterEvent(&event.x, None)) {
- continue;
+ w = None;
+ if (event.x.type == KeyPress || event.x.type == KeyRelease) {
+ TkDisplay *dispPtr;
+
+ for (dispPtr = TkGetDisplayList(); ; dispPtr = dispPtr->nextPtr) {
+ if (dispPtr == NULL) {
+ break;
+ } else if (dispPtr->display == event.x.xany.display) {
+ if (dispPtr->focusPtr != NULL) {
+ w = dispPtr->focusPtr->window;
+ }
+ break;
+ }
}
}
+ if (XFilterEvent(&event.x, w)) {
+ continue;
+ }
Tk_QueueWindowEvent(&event.x, TCL_QUEUE_TAIL);
}
}
Index: generic/tkEvent.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/generic/tkEvent.c,v
retrieving revision 1.39
diff -u -r1.39 tkEvent.c
--- generic/tkEvent.c 11 Jan 2009 19:05:17 -0000 1.39
+++ generic/tkEvent.c 1 Jan 2010 21:27:55 -0000
@@ -408,18 +408,8 @@
CreateXIC(winPtr);
}
}
- switch (eventPtr->type) {
- case FocusIn:
- if (winPtr->inputContext != NULL) {
- XSetICFocus(winPtr->inputContext);
- }
- break;
- case KeyPress:
- case KeyRelease:
- if (XFilterEvent(eventPtr, None)) {
- return 1;
- }
- break;
+ if (eventPtr->type == FocusIn && winPtr->inputContext != NULL) {
+ XSetICFocus(winPtr->inputContext);
}
}
return 0;