summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2006-01-20 18:58:55 (GMT)
committerjenglish <jenglish@flightlab.com>2006-01-20 18:58:55 (GMT)
commit4ea1e3209f9603dd431f9fb3abee8f4098ae27f1 (patch)
treec33f09cc9873b7afe89e2226c42e852abf3a4d69 /generic
parent81f1e32f9fc5bd5badc575ff2410440382e87181 (diff)
downloadtk-4ea1e3209f9603dd431f9fb3abee8f4098ae27f1.zip
tk-4ea1e3209f9603dd431f9fb3abee8f4098ae27f1.tar.gz
tk-4ea1e3209f9603dd431f9fb3abee8f4098ae27f1.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 b9527f3..80609bd 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -12,7 +12,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.31 2005/11/04 11:52:50 dkf Exp $
+ * RCS: @(#) $Id: tkEvent.c,v 1.32 2006/01/20 18:58:55 jenglish Exp $
*/
#include "tkPort.h"
@@ -449,8 +449,10 @@ InvokeInputMethods(
XSetICFocus(winPtr->inputContext);
}
}
- if (XFilterEvent(eventPtr, None)) {
- return 1;
+ if (eventPtr->type == KeyPress || eventPtr->type == KeyRelease) {
+ if (XFilterEvent(eventPtr, None)) {
+ return 1;
+ }
}
}
return 0;