Attachment 6734 Details for Bug 8059 – libX11-LTC24382.patch

[patch] libX11-LTC24382.patch

libX11-LTC24382.patch (text/plain), 1.64 KB, created by Jens Petersen on 2006-08-29 05:47:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2006-08-29 05:47:05 UTC

Size: 1.64 KB

patch

obsolete

>--- libX11-1.0.0.orig/modules/im/ximcp/imDefFlt.c	2006-06-16 18:06:33.000000000 +0900
>+++ libX11-1.0.0/modules/im/ximcp/imDefFlt.c	2006-06-16 18:15:48.000000000 +0900
>@@ -147,7 +147,7 @@
>     Xim		im = (Xim)ic->core.im;
> #endif
> 
>-    if (IS_FABLICATED(ic)) {
>+    if ((ev->keycode == 0) || IS_FABLICATED(ic)) {
> 	_XimPendingFilter(ic);
> 	UNMARK_FABLICATED(ic);
> 	return NOTFILTERD;
>--- libX11-1.0.0.orig/modules/im/ximcp/imDefLkup.c	2006-06-16 18:06:33.000000000 +0900
>+++ libX11-1.0.0/modules/im/ximcp/imDefLkup.c	2006-06-16 18:28:16.000000000 +0900
>@@ -332,6 +332,17 @@
>     XEvent	*ev,
>     Bool	 sync)
> {
>+    /*
>+     * Don't forward a key event which has keycode=0.
>+     * keycode=0 is reserved for special purpose to let Xmb/wcLookupString()
>+     * functions know that there is a commited string available from IM.
>+     */
>+    if (((ev->type == KeyPress) || (ev->type == KeyRelease))) {
>+        if (((XKeyEvent *)ev)->keycode == 0) {
>+            return True;
>+        }
>+    }
>+
> #ifdef EXT_FORWARD
>     if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
> 	if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
>@@ -605,6 +616,19 @@
> 	Xfree(info->keysym);
>     ic->private.proto.commit_info = info->next;
>     Xfree(info);
>+
>+    /*
>+     * "Commit" uses fabricated flag to process a commited string
>+     * from IM engine.  
>+     * Turn off the fabricated flag here (unregister the commited
>+     * information function). Otherwise, next regular key press
>+     * event will be ignored at _XimProtoKeypressFilter() and it
>+     * will not be passed to IM engine.
>+     */
>+    if (IS_FABLICATED(ic)) {
>+        UNMARK_FABLICATED(ic);
>+    }
>+
>     return;
> }
>

Actions: View | Splinter Review

Attachments on bug 8059: 6734

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.