Stefan Dirsch
8e32ba6ef1
Replaces xorg-x11-libX11 OBS-URL: https://build.opensuse.org/request/show/104209 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libX11?expand=0&rev=1
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c
|
|
index cb30ac2..31e9150 100644
|
|
--- a/modules/im/ximcp/imDefIc.c
|
|
+++ b/modules/im/ximcp/imDefIc.c
|
|
@@ -908,6 +908,30 @@ _XimProtoDestroyIC(
|
|
return;
|
|
}
|
|
|
|
+/*
|
|
+ * Some functions require the request queue from the server to be flushed
|
|
+ * so that the ordering of client initiated status changes and those requested
|
|
+ * by the server is well defined.
|
|
+ * _XimSync() would be the function of choice here as it should get a
|
|
+ * XIM_SYNC_REPLY back from the server.
|
|
+ * This however isn't implemented in the piece of junk that is used by most
|
|
+ * input servers as the server side protocol if to XIM.
|
|
+ * Since this code is not shipped as a library together with the client side
|
|
+ * XIM code but is duplicated by every input server around the world there
|
|
+ * is no easy fix to this but this ugly hack below.
|
|
+ * Obtaining an IC value from the server sends a request and empties out the
|
|
+ * event/server request queue until the answer to this request is found.
|
|
+ * Thus it is guaranteed that any pending server side request gets processed.
|
|
+ * This is what the hack below is doing.
|
|
+ */
|
|
+
|
|
+Private void
|
|
+BrokenSyncWithServer(XIC xic)
|
|
+{
|
|
+ CARD32 dummy;
|
|
+ XGetICValues(xic, XNFilterEvents, &dummy, NULL);
|
|
+}
|
|
+
|
|
Private void
|
|
_XimProtoSetFocus(
|
|
XIC xic)
|
|
@@ -938,7 +962,8 @@ #else
|
|
}
|
|
}
|
|
#endif /* XIM_CONNECTABLE */
|
|
-
|
|
+ BrokenSyncWithServer(xic);
|
|
+
|
|
buf_s[0] = im->private.proto.imid; /* imid */
|
|
buf_s[1] = ic->private.proto.icid; /* icid */
|
|
|
|
@@ -984,6 +1009,8 @@ #else
|
|
}
|
|
#endif /* XIM_CONNECTABLE */
|
|
|
|
+ BrokenSyncWithServer(xic);
|
|
+
|
|
buf_s[0] = im->private.proto.imid; /* imid */
|
|
buf_s[1] = ic->private.proto.icid; /* icid */
|
|
|
|
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
|