summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2006-01-20 18:42:04 (GMT)
committerjenglish <jenglish@flightlab.com>2006-01-20 18:42:04 (GMT)
commita609d7ecc60150ddfed58bbe7cf088bda8cf1771 (patch)
treef606837b2bd183120d27bef7e42d23b8b04d6116 /generic
parent08fd2c394aa28db50746b3516997c7a42ee43baf (diff)
downloadtk-a609d7ecc60150ddfed58bbe7cf088bda8cf1771.zip
tk-a609d7ecc60150ddfed58bbe7cf088bda8cf1771.tar.gz
tk-a609d7ecc60150ddfed58bbe7cf088bda8cf1771.tar.bz2
XIM fixes [See #905830, patch tk84-xim-fixes.patch]:
+ Revert 2005-12-05 patch disabling XIM when SCIM in use; + Make sure all X events get passed to XFilterEvent, including those without a corresponding Tk window.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkEvent.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 145d5d7..1eb7944 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkEvent.c,v 1.17.2.7 2005/11/30 21:13:12 hobbs Exp $
+ * RCS: @(#) $Id: tkEvent.c,v 1.17.2.8 2006/01/20 18:42:04 jenglish Exp $
*/
#include "tkPort.h"
@@ -948,8 +948,10 @@ Tk_HandleEvent(eventPtr)
XSetICFocus(winPtr->inputContext);
}
}
- if (XFilterEvent(eventPtr, None)) {
- goto done;
+ if (eventPtr->type == KeyPress || eventPtr->type == KeyRelease) {
+ if (XFilterEvent(eventPtr, None)) {
+ goto done;
+ }
}
}
#endif /* TK_USE_INPUT_METHODS */