summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-02-28 09:10:39 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-02-28 09:10:39 (GMT)
commitbf80f6ef08005e8ed3da3a8ece7fefa373fc8dd8 (patch)
treec786446314f395efd2d48d54d8b78d9af080715e /unix
parent2b76c49e30421aa22968c63e57c49bfaa6238e2f (diff)
parentd633ff9ebc49787402b8ec2e2e47899b5d8107cc (diff)
downloadtk-bf80f6ef08005e8ed3da3a8ece7fefa373fc8dd8.zip
tk-bf80f6ef08005e8ed3da3a8ece7fefa373fc8dd8.tar.gz
tk-bf80f6ef08005e8ed3da3a8ece7fefa373fc8dd8.tar.bz2
[Bug 3599312]: Apply fix for Alt key problems.
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixKey.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index a59d94e..5ea90f4 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -281,6 +281,15 @@ TkpGetKeySym(
int index;
TkKeyEvent* kePtr = (TkKeyEvent*) eventPtr;
+ /*
+ * Refresh the mapping information if it's stale. This must happen before
+ * we do any input method processing. [Bug 3599312]
+ */
+
+ if (dispPtr->bindInfoStale) {
+ TkpInitKeymapInfo(dispPtr);
+ }
+
#ifdef TK_USE_INPUT_METHODS
/*
* If input methods are active, we may already have determined a keysym.
@@ -293,6 +302,7 @@ TkpGetKeySym(
Tcl_DString ds;
TkWindow *winPtr = (TkWindow *)
Tk_IdToWindow(eventPtr->xany.display, eventPtr->xany.window);
+
Tcl_DStringInit(&ds);
(void) TkpGetString(winPtr, eventPtr, &ds);
Tcl_DStringFree(&ds);
@@ -304,14 +314,6 @@ TkpGetKeySym(
#endif
/*
- * Refresh the mapping information if it's stale
- */
-
- if (dispPtr->bindInfoStale) {
- TkpInitKeymapInfo(dispPtr);
- }
-
- /*
* Figure out which of the four slots in the keymap vector to use for this
* key. Refer to Xlib documentation for more info on how this computation
* works.