diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | generic/tkInt.h | 2 | ||||
| -rw-r--r-- | unix/tkUnixEvent.c | 1 | ||||
| -rw-r--r-- | unix/tkUnixKey.c | 35 |
4 files changed, 42 insertions, 6 deletions
@@ -1,3 +1,13 @@ +2011-10-01 Kevin B. Kenny <kennykb@acm.org> + + * generic/tkInt.h: [Bug 3410609] Change the event mechanism + * unix/tkUnixEvent.c: for <KeyPress> events to use the keysym + * unix/tkUnixKey.c: returned by XLookupString in preference to + the one that appears in the raw X event at any level. This change + allows binding to ISO_Level3_Shift-ed characters, composed characters, + and similar beasts. KeyRelease events still work as they did before, + as does Tk with input methods disabled. + 2011-09-01 Donal K. Fellows <dkf@users.sf.net> * doc/photo.n: Correctly documented what the [$ph data] command diff --git a/generic/tkInt.h b/generic/tkInt.h index aa27243..bd40a88 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -864,6 +864,8 @@ typedef struct { * allocated with ckalloc(). */ int charValueLen; /* Length of string in charValuePtr when that * is non-NULL. */ + KeySym keysym; /* Key symbol computed after input methods + * have been invoked */ } TkKeyEvent; /* diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 67cff2d..09dde72 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -316,6 +316,7 @@ TransferXEventsToTcl( if (event.type == KeyPress || event.type == KeyRelease) { event.k.charValuePtr = NULL; event.k.charValueLen = 0; + event.k.keysym = NoSymbol; /* * Force the calling of the input method engine now. The results diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index 9c38891..030e472 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -123,13 +123,13 @@ TkpGetString( Tcl_DStringSetLength(dsPtr, TCL_DSTRING_STATIC_SIZE-1); len = Xutf8LookupString(winPtr->inputContext, &eventPtr->xkey, Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr), - NULL, &status); + &kePtr->keysym, &status); if (status == XBufferOverflow) { /* Expand buffer and try again */ Tcl_DStringSetLength(dsPtr, len); len = Xutf8LookupString(winPtr->inputContext, &eventPtr->xkey, Tcl_DStringValue(dsPtr), Tcl_DStringLength(dsPtr), - NULL, &status); + &kePtr->keysym, &status); } if ((status != XLookupChars) && (status != XLookupBoth)) { len = 0; @@ -144,8 +144,8 @@ TkpGetString( Tcl_DStringSetLength(&buf, TCL_DSTRING_STATIC_SIZE-1); len = XmbLookupString(winPtr->inputContext, &eventPtr->xkey, - Tcl_DStringValue(&buf), Tcl_DStringLength(&buf), NULL, - &status); + Tcl_DStringValue(&buf), Tcl_DStringLength(&buf), + &kePtr->keysym, &status); /* * If the buffer wasn't big enough, grow the buffer and try again. @@ -154,7 +154,7 @@ TkpGetString( if (status == XBufferOverflow) { Tcl_DStringSetLength(&buf, len); len = XmbLookupString(winPtr->inputContext, &eventPtr->xkey, - Tcl_DStringValue(&buf), len, NULL, &status); + Tcl_DStringValue(&buf), len, &kePtr->keysym, &status); } if ((status != XLookupChars) && (status != XLookupBoth)) { len = 0; @@ -179,7 +179,7 @@ TkpGetString( Tcl_DStringInit(&buf); Tcl_DStringSetLength(&buf, TCL_DSTRING_STATIC_SIZE-1); len = XLookupString(&eventPtr->xkey, Tcl_DStringValue(&buf), - TCL_DSTRING_STATIC_SIZE, 0, 0); + TCL_DSTRING_STATIC_SIZE, &kePtr->keysym, 0); Tcl_DStringValue(&buf)[len] = '\0'; if (len == 1) { @@ -277,6 +277,29 @@ TkpGetKeySym( { KeySym sym; int index; + TkKeyEvent* kePtr = (TkKeyEvent*) eventPtr; + +#ifdef TK_USE_INPUT_METHODS + /* + * If input methods are active, we may already have determined a keysym. + * Return it. + */ + + if (eventPtr->type == KeyPress && dispPtr + && (dispPtr->flags & TK_DISPLAY_USE_IM)) { + if (kePtr->charValuePtr == NULL) { + 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); + } + if (kePtr->charValuePtr != NULL) { + return kePtr->keysym; + } + } +#endif /* * Refresh the mapping information if it's stale |