Attachment 95224 Details for Bug 75798 – 0001-x11-relax-XkbGetNames-requirements.patch

[patch] 0001-x11-relax-XkbGetNames-requirements.patch

0001-x11-relax-XkbGetNames-requirements.patch (text/plain), 2.32 KB, created by Ran Benita on 2014-03-06 11:54:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ran Benita

Created: 2014-03-06 11:54:34 UTC

Size: 2.32 KB

patch

obsolete

>From 3c14d233678154f4a62cb889e116525c2a4a82c9 Mon Sep 17 00:00:00 2001
>From: Ran Benita <ran234@gmail.com>
>Date: Thu, 6 Mar 2014 13:43:02 +0200
>Subject: [PATCH libxkbcommon] x11: relax XkbGetNames requirements
>
>It is valid for a keymap to not have key aliases, group names and
>various other things. But the current test requires all of them to be
>present in the reply, which causes us the fail on such keymaps (as the
>XQuartz one).
>
>Instead, require only what we really need. The virtual-mods names may
>not be strictly required, but it seems safer to leave it in for now.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=75798
>
>Reported-by: Gatis Paeglis <gatis.paeglis@digia.com>
>Signed-off-by: Ran Benita <ran234@gmail.com>
>---
> src/x11/keymap.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/src/x11/keymap.c b/src/x11/keymap.c
>index c68f67f..76adf74 100644
>--- a/src/x11/keymap.c
>+++ b/src/x11/keymap.c
>@@ -1033,7 +1033,7 @@ static bool
> get_names(struct xkb_keymap *keymap, xcb_connection_t *conn,
>           uint16_t device_id)
> {
>-    static const xcb_xkb_name_detail_t required_names =
>+    static const xcb_xkb_name_detail_t wanted =
>         (XCB_XKB_NAME_DETAIL_KEYCODES |
>          XCB_XKB_NAME_DETAIL_SYMBOLS |
>          XCB_XKB_NAME_DETAIL_TYPES |
>@@ -1045,17 +1045,21 @@ get_names(struct xkb_keymap *keymap, xcb_connection_t *conn,
>          XCB_XKB_NAME_DETAIL_KEY_ALIASES |
>          XCB_XKB_NAME_DETAIL_VIRTUAL_MOD_NAMES |
>          XCB_XKB_NAME_DETAIL_GROUP_NAMES);
>+    static const xcb_xkb_name_detail_t required =
>+        (XCB_XKB_NAME_DETAIL_KEY_TYPE_NAMES |
>+         XCB_XKB_NAME_DETAIL_KT_LEVEL_NAMES |
>+         XCB_XKB_NAME_DETAIL_KEY_NAMES |
>+         XCB_XKB_NAME_DETAIL_VIRTUAL_MOD_NAMES);
> 
>     xcb_xkb_get_names_cookie_t cookie =
>-        xcb_xkb_get_names(conn, device_id, required_names);
>+        xcb_xkb_get_names(conn, device_id, wanted);
>     xcb_xkb_get_names_reply_t *reply =
>         xcb_xkb_get_names_reply(conn, cookie, NULL);
>     xcb_xkb_get_names_value_list_t list;
> 
>     FAIL_IF_BAD_REPLY(reply, "XkbGetNames");
> 
>-    if ((reply->which & required_names) != required_names)
>-        goto fail;
>+    FAIL_UNLESS((reply->which & required) == required);
> 
>     xcb_xkb_get_names_value_list_unpack(xcb_xkb_get_names_value_list(reply),
>                                         reply->nTypes,
>-- 
>1.9.0
>

Actions: View | Splinter Review

Attachments on bug 75798: 95224

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.