Attachment 13398 Details for Bug 7869 – a patch for xim sync problem

[patch] a patch for xim sync problem

libx11-xim-sync.patch (text/plain), 4.18 KB, created by Choe Hwanjin on 2007-12-28 11:03:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Choe Hwanjin

Created: 2007-12-28 11:03:15 UTC

Size: 4.18 KB

patch

obsolete

>diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c
>index ccf3ba3..eb3bdc1 100644
>--- a/modules/im/ximcp/imDefFlt.c
>+++ b/modules/im/ximcp/imDefFlt.c
>@@ -131,9 +131,9 @@ _XimPendingFilter(
> {
>     Xim          im = (Xim)ic->core.im;
> 
>-    if (IS_NEED_SYNC_REPLY(ic)) {
>+    if (IS_NEED_SYNC_REPLY(im)) {
> 	(void)_XimProcSyncReply(im, ic);
>-	UNMARK_NEED_SYNC_REPLY(ic);
>+	UNMARK_NEED_SYNC_REPLY(im);
>     }
>     return;
> }
>@@ -147,9 +147,9 @@ _XimProtoKeypressFilter(
>     Xim		im = (Xim)ic->core.im;
> #endif
> 
>-    if (IS_FABLICATED(ic)) {
>+    if (IS_FABRICATED(ic->core.im)) {
> 	_XimPendingFilter(ic);
>-	UNMARK_FABLICATED(ic);
>+	UNMARK_FABRICATED(ic->core.im);
> 	return NOTFILTERD;
>     }
> 
>@@ -210,9 +210,9 @@ _XimProtoKeyreleaseFilter(
>     Xim		im = (Xim)ic->core.im;
> #endif
> 
>-    if (IS_FABLICATED(ic)) {
>+    if (IS_FABRICATED(ic->core.im)) {
> 	_XimPendingFilter(ic);
>-	UNMARK_FABLICATED(ic);
>+	UNMARK_FABRICATED(ic->core.im);
> 	return NOTFILTERD;
>     }
> 
>diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
>index aa1aaaf..c9910af 100644
>--- a/modules/im/ximcp/imDefLkup.c
>+++ b/modules/im/ximcp/imDefLkup.c
>@@ -217,7 +217,7 @@ _XimRespSyncReply(
>     BITMASK16	 mode)
> {
>     if (mode & XimSYNCHRONUS) /* SYNC Request */
>-	MARK_NEED_SYNC_REPLY(ic);
>+	MARK_NEED_SYNC_REPLY(ic->core.im);
>     return True;
> }
> 
>@@ -354,7 +354,7 @@ _XimProcEvent(
>     ev->xany.serial |= serial << 16;
>     ev->xany.send_event = False;
>     ev->xany.display = d;
>-    MARK_FABLICATED(ic);
>+    MARK_FABRICATED(ic->core.im);
>     return;
> }
> 
>@@ -704,7 +704,7 @@ _XimCommitRecv(
> 
>     (void)_XimRespSyncReply(ic, flag);
> 
>-    MARK_FABLICATED(ic);
>+    MARK_FABRICATED(im);
> 
>     ev.type = KeyPress;
>     ev.send_event = False;
>diff --git a/modules/im/ximcp/imExten.c b/modules/im/ximcp/imExten.c
>index 782d1c3..7ce8ea0 100644
>--- a/modules/im/ximcp/imExten.c
>+++ b/modules/im/ximcp/imExten.c
>@@ -162,7 +162,7 @@ _XimProcExtForwardKeyEvent(
>     XPutBackEvent(im->core.display, &ev);
> 
>     _XimRespSyncReply(ic, buf_s[0]);
>-    MARK_FABLICATED(ic);
>+    MARK_FABRICATED(im);
> 
>     return True;
> }
>diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h
>index f10d9ba..081fbc9 100644
>--- a/src/xlibi18n/XimintP.h
>+++ b/src/xlibi18n/XimintP.h
>@@ -144,6 +144,8 @@ typedef struct _XimProtoPrivateRec {
> #define DELAYBINDABLE		(1L << 3)
> #define RECONNECTABLE		(1L << 4)
> #endif /* XIM_CONNECTABLE */
>+#define FABRICATED		(1L << 5)
>+#define	NEED_SYNC_REPLY		(1L << 6)
> 
> /*
>  * macro for the flag of XIMPrivateRec
>@@ -182,6 +184,20 @@ typedef struct _XimProtoPrivateRec {
>     (((Xim)im)->private.proto.flag &= ~(DELAYBINDABLE|RECONNECTABLE))
> #endif /* XIM_CONNECTABLE */
> 
>+#define IS_FABRICATED(im) \
>+		(((Xim)im)->private.proto.flag & FABRICATED)
>+#define MARK_FABRICATED(im) \
>+		(((Xim)im)->private.proto.flag |= FABRICATED)
>+#define UNMARK_FABRICATED(im) \
>+		(((Xim)im)->private.proto.flag &= ~FABRICATED)
>+
>+#define	IS_NEED_SYNC_REPLY(im) \
>+		(((Xim)im)->private.proto.flag & NEED_SYNC_REPLY)
>+#define	MARK_NEED_SYNC_REPLY(im) \
>+		(((Xim)im)->private.proto.flag |= NEED_SYNC_REPLY)
>+#define	UNMARK_NEED_SYNC_REPLY(im) \
>+		(((Xim)im)->private.proto.flag &= ~NEED_SYNC_REPLY)
>+
> /*
>  * bit mask for the register_filter_event of XIMPrivateRec/XICPrivateRec
>  */
>@@ -242,8 +258,6 @@ typedef struct _XicProtoPrivateRec {
>  * bit mask for the flag of XICPrivateRec
>  */
> #define IC_CONNECTED		(1L)
>-#define FABLICATED		(1L << 1)
>-#define	NEED_SYNC_REPLY		(1L << 2)
> 
> /*
>  * macro for the flag of XICPrivateRec
>@@ -255,20 +269,6 @@ typedef struct _XicProtoPrivateRec {
> #define	UNMARK_IC_CONNECTED(ic) \
> 		(((Xic)ic)->private.proto.flag &= ~IC_CONNECTED)
> 
>-#define IS_FABLICATED(ic) \
>-		(((Xic)ic)->private.proto.flag & FABLICATED)
>-#define MARK_FABLICATED(ic) \
>-		(((Xic)ic)->private.proto.flag |= FABLICATED)
>-#define UNMARK_FABLICATED(ic) \
>-		(((Xic)ic)->private.proto.flag &= ~FABLICATED)
>-
>-#define	IS_NEED_SYNC_REPLY(ic) \
>-		(((Xic)ic)->private.proto.flag & NEED_SYNC_REPLY)
>-#define	MARK_NEED_SYNC_REPLY(ic) \
>-		(((Xic)ic)->private.proto.flag |= NEED_SYNC_REPLY)
>-#define	UNMARK_NEED_SYNC_REPLY(ic) \
>-		(((Xic)ic)->private.proto.flag &= ~NEED_SYNC_REPLY)
>-
> /*
>  * macro for the filter_event_mask of XICPrivateRec
>  */

Actions: View | Splinter Review

Attachments on bug 7869: 7606 | 13363 | 13398 | 13405 | 21093

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.