diff options
| author | hobbs <hobbs@noemail.net> | 1999-12-16 21:57:35 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 1999-12-16 21:57:35 (GMT) |
| commit | feb635bda0bb3be090722f31e2886cc52bdad153 (patch) | |
| tree | a359295061e8e63458411176f65e6bc6517f9dec /generic/tkEvent.c | |
| parent | bb0b1ed89ded5088cb9310c0d4bf22b08931f5fb (diff) | |
| download | tk-feb635bda0bb3be090722f31e2886cc52bdad153.zip tk-feb635bda0bb3be090722f31e2886cc52bdad153.tar.gz tk-feb635bda0bb3be090722f31e2886cc52bdad153.tar.bz2 | |
* generic/tkCmds.c:
* generic/tkEvent.c:
* generic/tkWindow.c:
* generic/tkInt.h: add 'tk useinputmethods ?-display win? ?bool?'
call to provide support for disabling/enabling the use of XIM on
X. This was previously all done at compile time, and always on.
Now it
* generic/tkCanvUtil.c: fixed bug in Tk_CanvasPsOutline that freed
mem it shouldn't.
* generic/tkFont.c: added "bitstream cyberbit" (popular Windows
CJK font) to list of font fallbacks. (kenny) [Bug: 2407]
FossilOrigin-Name: 3f23335ddf3083f408deedfb90188f6c2fe8a533
Diffstat (limited to 'generic/tkEvent.c')
| -rw-r--r-- | generic/tkEvent.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c index cd3615f..abb2b14 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.6 1999/12/14 06:52:27 hobbs Exp $ + * RCS: @(#) $Id: tkEvent.c,v 1.7 1999/12/16 21:57:36 hobbs Exp $ */ #include "tkPort.h" @@ -669,19 +669,20 @@ Tk_HandleEvent(eventPtr) * input context for the window if it hasn't already been done * (XFilterEvent needs this context). */ - - if (!(winPtr->flags & TK_CHECKED_IC)) { - if (winPtr->dispPtr->inputMethod != NULL) { - winPtr->inputContext = XCreateIC( + if (winPtr->dispPtr->useInputMethods) { + if (!(winPtr->flags & TK_CHECKED_IC)) { + if (winPtr->dispPtr->inputMethod != NULL) { + winPtr->inputContext = XCreateIC( winPtr->dispPtr->inputMethod, XNInputStyle, XIMPreeditNothing|XIMStatusNothing, XNClientWindow, winPtr->window, XNFocusWindow, winPtr->window, NULL); + } + winPtr->flags |= TK_CHECKED_IC; + } + if (XFilterEvent(eventPtr, None)) { + goto done; } - winPtr->flags |= TK_CHECKED_IC; - } - if (XFilterEvent(eventPtr, None)) { - goto done; } #endif /* TK_USE_INPUT_METHODS */ |