diff options
| author | Uli Schlachter <psychon@znc.in> | 2021-03-07 08:46:19 +0100 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2021-03-09 11:00:13 +0200 |
| commit | 599064cf28d68dd19a1fa605c0c14e4ca4a9fbb4 (patch) | |
| tree | 3d9310d8e464a5865dccee1f9993875f2c566ee6 /src | |
| parent | 1b3a1c277a033083fee669e92c8cad862716ebd1 (diff) | |
| download | xorg-lib-libxkbcommon-599064cf28d68dd19a1fa605c0c14e4ca4a9fbb4.tar.gz | |
Also batch the XKB-GetMapMap request
This gets rid of one more round trip.
Signed-off-by: Uli Schlachter <psychon@znc.in>
Diffstat (limited to 'src')
| -rw-r--r-- | src/x11/keymap.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/x11/keymap.c b/src/x11/keymap.c index f3f179e..b930299 100644 --- a/src/x11/keymap.c +++ b/src/x11/keymap.c @@ -88,6 +88,14 @@ } \ } while (0) +static const xcb_xkb_map_part_t get_map_required_components = + (XCB_XKB_MAP_PART_KEY_TYPES | + XCB_XKB_MAP_PART_KEY_SYMS | + XCB_XKB_MAP_PART_MODIFIER_MAP | + XCB_XKB_MAP_PART_EXPLICIT_COMPONENTS | + XCB_XKB_MAP_PART_KEY_ACTIONS | + XCB_XKB_MAP_PART_VIRTUAL_MODS | + XCB_XKB_MAP_PART_VIRTUAL_MOD_MAP); static xkb_mod_mask_t translate_mods(uint8_t rmods, uint16_t vmods_low, uint16_t vmods_high) @@ -645,26 +653,15 @@ fail: } static bool -get_map(struct xkb_keymap *keymap, xcb_connection_t *conn, uint16_t device_id) +get_map(struct xkb_keymap *keymap, xcb_connection_t *conn, + xcb_xkb_get_map_cookie_t cookie) { - static const xcb_xkb_map_part_t required_components = - (XCB_XKB_MAP_PART_KEY_TYPES | - XCB_XKB_MAP_PART_KEY_SYMS | - XCB_XKB_MAP_PART_MODIFIER_MAP | - XCB_XKB_MAP_PART_EXPLICIT_COMPONENTS | - XCB_XKB_MAP_PART_KEY_ACTIONS | - XCB_XKB_MAP_PART_VIRTUAL_MODS | - XCB_XKB_MAP_PART_VIRTUAL_MOD_MAP); - - xcb_xkb_get_map_cookie_t cookie = - xcb_xkb_get_map(conn, device_id, required_components, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); xcb_xkb_get_map_reply_t *reply = xcb_xkb_get_map_reply(conn, cookie, NULL); xcb_xkb_get_map_map_t map; FAIL_IF_BAD_REPLY(reply, "XkbGetMap"); - if ((reply->present & required_components) != required_components) + if ((reply->present & get_map_required_components) != get_map_required_components) goto fail; xcb_xkb_get_map_map_unpack(xcb_xkb_get_map_map(reply), @@ -1174,6 +1171,9 @@ xkb_x11_keymap_new_from_device(struct xkb_context *ctx, struct x11_atom_interner interner; x11_atom_interner_init(&interner, ctx, conn); + xcb_xkb_get_map_cookie_t get_map_cookie = + xcb_xkb_get_map(conn, device_id, get_map_required_components, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); xcb_xkb_get_indicator_map_cookie_t indicator_map_cookie = xcb_xkb_get_indicator_map(conn, device_id, ALL_INDICATORS_MASK); xcb_xkb_get_compat_map_cookie_t compat_map_cookie = @@ -1182,7 +1182,7 @@ xkb_x11_keymap_new_from_device(struct xkb_context *ctx, xcb_xkb_get_controls(conn, device_id); bool had_error = false; - had_error |= !get_map(keymap, conn, device_id); + had_error |= !get_map(keymap, conn, get_map_cookie); had_error |= !get_indicator_map(keymap, conn, indicator_map_cookie); had_error |= !get_compat_map(keymap, conn, compat_map_cookie); had_error |= !get_names(keymap, &interner, device_id); |