diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-07-29 21:47:56 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-07-29 21:47:56 (GMT) |
| commit | 41dd502e4fc3fc967e562bfe50f70d7e87a71c13 (patch) | |
| tree | 075a8d8e58e8767c1f271bac381b1d3c94246a33 /generic | |
| parent | 05404c9f8c086384d48880c8e4e07243443b4f23 (diff) | |
| download | tk-41dd502e4fc3fc967e562bfe50f70d7e87a71c13.zip tk-41dd502e4fc3fc967e562bfe50f70d7e87a71c13.tar.gz tk-41dd502e4fc3fc967e562bfe50f70d7e87a71c13.tar.bz2 | |
* changes:
* generic/tkEvent.c (Tk_HandleEvent): revert the 2004-07-20 commit.
That commit created a new Bug 1000051 - a broken Compose Key.
This revert restores Bug 905830 until a cleaner fix can be provided.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkEvent.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c index ec5a23b..20fbb74 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.4 2004/07/21 04:27:55 wolfsuit Exp $ + * RCS: @(#) $Id: tkEvent.c,v 1.17.2.5 2004/07/29 21:47:57 dgp Exp $ */ #include "tkPort.h" @@ -883,7 +883,6 @@ Tk_HandleEvent(eventPtr) dispPtr = winPtr->dispPtr; if ((dispPtr->flags & TK_DISPLAY_USE_IM)) { if (!(winPtr->flags & (TK_CHECKED_IC|TK_ALREADY_DEAD))) { - long im_event_mask = 0L; winPtr->flags |= TK_CHECKED_IC; if (dispPtr->inputMethod != NULL) { #if TK_XIM_SPOT @@ -937,15 +936,6 @@ Tk_HandleEvent(eventPtr) NULL); #endif } - if (winPtr->inputContext != NULL) { - XGetICValues(winPtr->inputContext, - XNFilterEvents, &im_event_mask, NULL); - if (im_event_mask != 0L) { - XSelectInput(winPtr->display, winPtr->window, - winPtr->atts.event_mask | im_event_mask); - XSetICFocus(winPtr->inputContext); - } - } } if (XFilterEvent(eventPtr, None)) { goto done; |