callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-4913-for-gtk3' into 'gtk-3-24'

Browse Source 
Treat XKB_MOD_NAME_LOGO as super key

See merge request GNOME/gtk!5387
This commit is contained in:
Emmanuele Bassi 2023-01-03 18:07:17 +00:00
commit f1471ea033
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/wayland/gdkkeys-wayland.c
View File

@ -296,7 +296,7 @@ get_gdk_modifiers (struct xkb_keymap *xkb_keymap,
if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3"))) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod3")))
state |= GDK_MOD3_MASK; state |= GDK_MOD3_MASK;
if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO))) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, XKB_MOD_NAME_LOGO)))
state |= GDK_MOD4_MASK; state |= GDK_MOD4_MASK | GDK_SUPER_MASK;
if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5"))) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Mod5")))
state |= GDK_MOD5_MASK; state |= GDK_MOD5_MASK;
if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Super"))) if (mods & (1 << xkb_keymap_mod_get_index (xkb_keymap, "Super")))
@ -384,7 +384,7 @@ gdk_wayland_keymap_add_virtual_modifiers (GdkKeymap *keymap,
xkb_mod_index_t idx; xkb_mod_index_t idx;
uint32_t mods, real; uint32_t mods, real;
struct { const char *name; GdkModifierType mask; } vmods[] = { struct { const char *name; GdkModifierType mask; } vmods[] = {
{ "Super", GDK_SUPER_MASK }, { "Super", GDK_SUPER_MASK | GDK_MOD4_MASK },
{ "Hyper", GDK_HYPER_MASK }, { "Hyper", GDK_HYPER_MASK },
{ "Meta", GDK_META_MASK }, { "Meta", GDK_META_MASK },
{ NULL, 0 } { NULL, 0 }

7
testsuite/gtk/accel.c
View File

@ -55,14 +55,13 @@ test_one_accel (const char *accel,
*keycodes, *keycodes,
mods); mods);
g_print ("accel %s, label %s\n", accel, label);
g_assert_cmpstr (label, ==, exp_label);
name = gtk_accelerator_name_with_keycode (NULL, name = gtk_accelerator_name_with_keycode (NULL,
accel_key, accel_key,
*keycodes, *keycodes,
mods); mods);
g_print ("accel %s, label %s, name %s, modes %d\n", accel, label, name, mods);
g_assert_cmpstr (label, ==, exp_label);
g_assert_cmpstr (name, ==, accel); g_assert_cmpstr (name, ==, accel);
g_free (keycodes); g_free (keycodes);