feat: update xcb-imdkit to 1.0.9-1

deepin-community-bot[bot] · deepin-community-bot[bot] · commit c3a626582988 · 2026-03-09T08:24:09.000Z
diff --git a/.gitignore b/.gitignore
@@ -1 +1,6 @@
-.pc/
+*.kdev4
+build*/
+*~
+*.swp
+cscope.*
+i18nIMProto.c
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.8)
-project(xcb-imdkit VERSION 1.0.5)
+project(xcb-imdkit VERSION 1.0.9)
 
 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,28 @@
+xcb-imdkit (1.0.9-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Boyuan Yang <byang@debian.org>  Thu, 06 Jun 2024 22:07:59 -0400
+
+xcb-imdkit (1.0.8-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/libxcb-imdkit1.symbols: Refresh symbols file.
+
+ -- Boyuan Yang <byang@debian.org>  Wed, 24 Apr 2024 14:28:21 -0400
+
+xcb-imdkit (1.0.7-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Boyuan Yang <byang@debian.org>  Mon, 18 Mar 2024 22:54:31 -0400
+
+xcb-imdkit (1.0.6-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Boyuan Yang <byang@debian.org>  Thu, 04 Jan 2024 15:29:15 -0500
+
 xcb-imdkit (1.0.5-1) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/libxcb-imdkit1.symbols b/debian/libxcb-imdkit1.symbols
@@ -8,6 +8,7 @@ libxcb-imdkit.so.1 libxcb-imdkit1 #MINVER#
  xcb_im_destroy@Base 1.0.1
  xcb_im_filter_event@Base 1.0.1
  xcb_im_forward_event@Base 1.0.1
+ xcb_im_forward_event_full@Base 1.0.8
  xcb_im_geometry_callback@Base 1.0.1
  xcb_im_input_context_get_client_window@Base 1.0.1
  xcb_im_input_context_get_data@Base 1.0.1
@@ -47,6 +48,7 @@ libxcb-imdkit.so.1 libxcb-imdkit1 #MINVER#
  xcb_xim_ext_move@Base 1.0.1
  xcb_xim_filter_event@Base 1.0.1
  xcb_xim_forward_event@Base 1.0.1
+ xcb_xim_forward_event_full@Base 1.0.8
  xcb_xim_get_encoding@Base 1.0.3
  xcb_xim_get_ic_values@Base 1.0.1
  xcb_xim_get_im_values@Base 1.0.1
diff --git a/src/common.h b/src/common.h
@@ -23,7 +23,7 @@
 
 #define ARRAY_SIZE(X) (sizeof(X) / sizeof(X[0]))
 
-#define XIM_MESSAGE_BYTES(hdr) ((hdr)->length * 4)
+#define XIM_MESSAGE_BYTES(hdr) ((hdr)->length * 4u)
 
 /*
  * categories in XIM_SERVERS
diff --git a/src/imclient.c b/src/imclient.c
@@ -792,6 +792,7 @@ bool _xcb_xim_filter_property_changed(xcb_xim_t *im,
 
 bool xcb_xim_filter_event(xcb_xim_t *im, xcb_generic_event_t *event) {
     im->yield_recheck = false;
+    im->event_sequence = event->full_sequence;
     bool result = _xcb_xim_preconnect_im(im, event) ||
                   _xcb_xim_filter_event(im, event) ||
                   _xcb_xim_filter_destroy_window(im, event) ||
@@ -1487,6 +1488,12 @@ bool xcb_xim_unset_ic_focus(xcb_xim_t *im, xcb_xic_t ic) {
 
 bool xcb_xim_forward_event(xcb_xim_t *im, xcb_xic_t ic,
                            xcb_key_press_event_t *event) {
+    return xcb_xim_forward_event_full(im, ic, (im->event_sequence >> 16),
+                                      event);
+}
+
+bool xcb_xim_forward_event_full(xcb_xim_t *im, xcb_xic_t ic, uint16_t sequence,
+                                xcb_key_press_event_t *event) {
     xcb_xim_request_queue_t *queue =
         _xcb_xim_new_request(im, XCB_XIM_FORWARD_EVENT, 0, NULL, NULL);
     if (!queue) {
@@ -1496,7 +1503,7 @@ bool xcb_xim_forward_event(xcb_xim_t *im, xcb_xic_t ic,
     frame.input_method_ID = im->connect_id;
     frame.input_context_ID = ic;
     frame.flag = XCB_XIM_SYNCHRONOUS;
-    frame.sequence_number = event->sequence;
+    frame.sequence_number = sequence;
 
     const size_t length =
         xcb_im_forward_event_fr_size(&frame) + sizeof(xcb_key_press_event_t);
diff --git a/src/imclient.h b/src/imclient.h
@@ -162,6 +162,9 @@ XCBIMDKIT_EXPORT bool xcb_xim_set_ic_focus(xcb_xim_t *im, xcb_xic_t ic);
 XCBIMDKIT_EXPORT bool xcb_xim_unset_ic_focus(xcb_xim_t *im, xcb_xic_t ic);
 XCBIMDKIT_EXPORT bool xcb_xim_forward_event(xcb_xim_t *im, xcb_xic_t ic,
                                             xcb_key_press_event_t *event);
+XCBIMDKIT_EXPORT bool xcb_xim_forward_event_full(xcb_xim_t *im, xcb_xic_t ic,
+                                                 uint16_t sequence,
+                                                 xcb_key_press_event_t *event);
 XCBIMDKIT_EXPORT bool xcb_xim_reset_ic(xcb_xim_t *im, xcb_xic_t ic,
                                        xcb_xim_reset_ic_callback callback,
                                        void *user_data);
diff --git a/src/imclient_p.h b/src/imclient_p.h
@@ -171,13 +171,15 @@ struct _xcb_xim_t {
     bool use_compound_text;
     bool use_utf8_string;
     xcb_xim_encoding_t encoding;
+
+    uint32_t event_sequence;
 };
 
 #define _xcb_xim_read_frame(FRAME, DATA, LEN, FAIL)                            \
     do {                                                                       \
         FAIL = false;                                                          \
         uint8_t *_data = DATA;                                                 \
-        size_t len = (LEN);                                                    \
+        size_t len = (size_t)(LEN);                                            \
         frame_read_func(FRAME)(&FRAME, &_data, &len, false);                   \
         if (!_data) {                                                          \
             frame_free_func(FRAME)(&FRAME);                                    \
diff --git a/src/imdkit.c b/src/imdkit.c
@@ -836,11 +836,17 @@ void xcb_im_destroy(xcb_im_t *im) {
 
 void xcb_im_forward_event(xcb_im_t *im, xcb_im_input_context_t *ic,
                           xcb_key_press_event_t *event) {
+    xcb_im_forward_event_full(im, ic, ic->forward_event_sequence, event);
+}
+
+void xcb_im_forward_event_full(xcb_im_t *im, xcb_im_input_context_t *ic,
+                               uint16_t sequence,
+                               xcb_key_press_event_t *event) {
     xcb_im_client_t *client = ic->client;
     xcb_im_forward_event_fr_t frame;
     frame.input_method_ID = ic->client->connect_id;
     frame.input_context_ID = ic->id;
-    frame.sequence_number = event->sequence;
+    frame.sequence_number = sequence;
     if (im->use_sync_mode) {
         frame.flag = XCB_XIM_SYNCHRONOUS;
         client->sync = true;
@@ -891,22 +897,19 @@ void xcb_im_commit_string(xcb_im_t *im, xcb_im_input_context_t *ic,
 }
 
 void xcb_im_preedit_start(xcb_im_t *im, xcb_im_input_context_t *ic) {
-    if (im->onKeys.nKeys == 0 && im->offKeys.nKeys == 0) {
+    if (!_xcb_im_has_trigger_key(im)) {
         return;
     }
 
-    uint32_t sync_event_mask = im->use_sync_event ? 0 : im->event_mask;
-    sync_event_mask = ~sync_event_mask;
-    _xcb_im_set_event_mask(im, ic->client, ic->id, im->event_mask,
-                           sync_event_mask);
+    _xcb_im_set_ic_event_mask(im, ic);
 }
 
 void xcb_im_preedit_end(xcb_im_t *im, xcb_im_input_context_t *ic) {
-    if (im->onKeys.nKeys == 0 && im->offKeys.nKeys == 0) {
+    if (!_xcb_im_has_trigger_key(im)) {
         return;
     }
 
-    _xcb_im_set_event_mask(im, ic->client, ic->id, 0, 0);
+    _xcb_im_send_set_event_mask(im, ic->client, ic->id, 0, 0);
 }
 
 void xcb_im_sync_xlib(xcb_im_t *im, xcb_im_input_context_t *ic) {
@@ -1019,9 +1022,9 @@ void _xcb_im_destroy_client(xcb_im_t *im, xcb_im_client_t *client) {
     im->free_list = client;
 }
 
-void _xcb_im_set_event_mask(xcb_im_t *im, xcb_im_client_t *client,
-                            uint32_t icid, uint32_t forward_event_mask,
-                            uint32_t sync_mask) {
+void _xcb_im_send_set_event_mask(xcb_im_t *im, xcb_im_client_t *client,
+                                 uint32_t icid, uint32_t forward_event_mask,
+                                 uint32_t sync_mask) {
     xcb_im_set_event_mask_fr_t frame;
     frame.forward_event_mask = forward_event_mask;
     frame.synchronous_event_mask = sync_mask;
@@ -1169,6 +1172,22 @@ bool xcb_im_support_extension(xcb_im_t *im, uint16_t major_code,
     return false;
 }
 
+void _xcb_im_set_ic_event_mask(xcb_im_t *im, xcb_im_input_context_t *ic) {
+    DebugLog("xcb_im_set_ic_event_mask");
+    uint32_t sync_event_mask = im->use_sync_event ? 0 : im->event_mask;
+    sync_event_mask = ~sync_event_mask;
+    _xcb_im_send_set_event_mask(im, ic->client, ic->id, im->event_mask,
+                                sync_event_mask);
+}
+
+void _xcb_im_set_im_event_mask(xcb_im_t *im, xcb_im_client_t *client) {
+    DebugLog("xcb_im_set_im_event_mask");
+    uint32_t sync_event_mask = im->use_sync_event ? 0 : im->event_mask;
+    sync_event_mask = ~sync_event_mask;
+    // Zero id means set im forward mask.
+    _xcb_im_send_set_event_mask(im, client, 0, im->event_mask, sync_event_mask);
+}
+
 void xcb_im_input_context_set_data(xcb_im_input_context_t *ic, void *data,
                                    xcb_im_free_function free_data_function) {
     if (ic->free_data_function) {
diff --git a/src/imdkit.h b/src/imdkit.h
@@ -7,6 +7,7 @@
 #ifndef _XCB_IMDKIT_IMDKIT_H_
 #define _XCB_IMDKIT_IMDKIT_H_
 
+#include "xcbimdkit_export.h"
 #include "ximcommon.h"
 #include "ximproto.h"
 #include <stdbool.h>
@@ -196,6 +197,21 @@ XCBIMDKIT_EXPORT void xcb_im_forward_event(xcb_im_t *im,
                                            xcb_im_input_context_t *ic,
                                            xcb_key_press_event_t *event);
 
+/**
+ * Send a key event to the client.
+ *
+ * @param im XIM server
+ * @param ic Input context.
+ * @param sequence sequence number, when re-inject, should be the value from
+ * forward_event
+ * @param event key event.
+ * @see xcb_im_forward_event_fr_t.
+ */
+XCBIMDKIT_EXPORT void xcb_im_forward_event_full(xcb_im_t *im,
+                                                xcb_im_input_context_t *ic,
+                                                uint16_t sequence,
+                                                xcb_key_press_event_t *event);
+
 /**
  * Commit a string to the client.
  *
diff --git a/src/imdkit_p.h b/src/imdkit_p.h
@@ -134,6 +134,7 @@ struct _xcb_im_input_context_t {
     UT_hash_handle hh;
     void *data;
     xcb_im_free_function free_data_function;
+    uint16_t forward_event_sequence;
 };
 
 struct _xcb_im_client_t {
@@ -197,7 +198,6 @@ static const xcb_im_default_ic_attr_t Default_ICattr[] = {
 
 struct _xcb_im_t {
     xcb_connection_t *conn;
-    char byte_order;
     xcb_im_ximattr_fr_t imattr[ARRAY_SIZE(Default_IMattr)];
     xcb_im_xicattr_fr_t icattr[ARRAY_SIZE(Default_ICattr)];
     xcb_im_ext_fr_t extension[ARRAY_SIZE(Default_Extension)];
@@ -236,11 +236,13 @@ struct _xcb_im_t {
     xcb_screen_t *screen;
     xcb_screen_t *default_screen;
     uint32_t sequence;
-    bool init;
     xcb_im_callback callback;
     void *user_data;
-    bool sync;
     void (*logger)(const char *, ...);
+
+    uint8_t byte_order;
+    bool init;
+    bool sync;
     bool use_sync_mode;
     bool use_sync_event;
 };
@@ -275,11 +277,16 @@ void _xcb_im_send_error_message(xcb_im_t *im, xcb_im_client_t *client);
 
 void _xcb_im_destroy_client(xcb_im_t *im, xcb_im_client_t *client);
 void _xcb_im_destroy_ic(xcb_im_t *im, xcb_im_input_context_t *ic);
-void _xcb_im_set_event_mask(xcb_im_t *im, xcb_im_client_t *client,
-                            uint32_t icid, uint32_t forward_event_mask,
-                            uint32_t sync_mask);
+void _xcb_im_send_set_event_mask(xcb_im_t *im, xcb_im_client_t *client,
+                                 uint32_t icid, uint32_t forward_event_mask,
+                                 uint32_t sync_mask);
+void _xcb_im_set_ic_event_mask(xcb_im_t *im, xcb_im_input_context_t *client);
+void _xcb_im_set_im_event_mask(xcb_im_t *im, xcb_im_client_t *ic);
 void _xcb_im_add_queue(xcb_im_t *im, xcb_im_client_t *client, uint16_t icid,
                        const xcb_im_packet_header_fr_t *hdr,
                        xcb_im_forward_event_fr_t *frame, uint8_t *data);
 void _xcb_im_process_queue(xcb_im_t *im, xcb_im_client_t *client);
+static inline bool _xcb_im_has_trigger_key(xcb_im_t *im) {
+    return im->onKeys.nKeys || im->offKeys.nKeys;
+}
 #endif // _XCB_IMDKIT_IMDKIT_P_H_
diff --git a/src/message.c b/src/message.c
@@ -188,34 +188,32 @@ uint8_t *_xcb_read_xim_message(xcb_connection_t *conn, xcb_window_t window,
             xcb_get_property_reply(conn, cookie, NULL);
         uint8_t *rec;
 
-        do {
-            if (!reply || reply->format == 0 || reply->length == 0) {
-                free(reply);
-                return (unsigned char *)NULL;
-            }
-
-            rec = xcb_get_property_value(reply) + (offset % 4);
-
-            if (reply->bytes_after) {
-                set_offset(offsets, atom, offset + length);
-            } else {
-                set_offset(offsets, atom, 0);
-            }
-
-            uint8_t_read(&hdr->major_opcode, &rec, &length, swap);
-            uint8_t_read(&hdr->minor_opcode, &rec, &length, swap);
-            uint16_t_read(&hdr->length, &rec, &length, swap);
-
-            size_t buffer_size = ((size_t)hdr->length) * 4;
-            // check message is well formed
-            if (buffer_size <= length) {
-                /* if hit, it might be an error */
-                p = malloc(buffer_size);
-            }
-        } while (0);
+        if (!reply || reply->format == 0 || reply->length == 0) {
+            free(reply);
+            return (unsigned char *)NULL;
+        }
+
+        rec = xcb_get_property_value(reply) + (offset % 4);
+
+        if (reply->bytes_after) {
+            set_offset(offsets, atom, offset + length);
+        } else {
+            set_offset(offsets, atom, 0);
+        }
+
+        uint8_t_read(&hdr->major_opcode, &rec, &length, swap);
+        uint8_t_read(&hdr->minor_opcode, &rec, &length, swap);
+        uint16_t_read(&hdr->length, &rec, &length, swap);
+
+        size_t buffer_size = ((size_t)hdr->length) * 4;
+        // check message is well formed
+        if (buffer_size <= length) {
+            /* if hit, it might be an error */
+            p = malloc(buffer_size);
+        }
 
         if (p) {
-            memcpy(p, rec, hdr->length * 4);
+            memcpy(p, rec, buffer_size);
         }
         free(reply);
     }
diff --git a/src/protocolhandler.c b/src/protocolhandler.c
diff --git a/src/ximproto_p.h b/src/ximproto_p.h
diff --git a/uthash/.clang-format b/uthash/.clang-format

-Original file line number
+Diff line change
@@ @@ -1 +1,6 @@ @@
 -.pc/
 +*.kdev4
 +build*/
 +*~
 +*.swp
 +cscope.*
 +i18nIMProto.c