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

wayland: Process the keymap that is sent over from the compositor

Browse Source 
Load the keymap from the file descriptor that the compositor has sent us and
then save that into our internal object for future use.
This commit is contained in:
Rob Bradford
2012-07-16 12:33:35 +01:00
parent 19d16f8b80
commit 1d080a01c1
5 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,11 @@ struct _GdkWaylandKeymap
GdkKeymap parent_instance;
GdkModifierType modmap[8];
struct xkb_desc *xkb;
struct xkb_keymap *keymap;
struct xkb_state *state;
xkb_mod_mask_t control_mask;
xkb_mod_mask_t alt_mask;
xkb_mod_mask_t shift_mask;
};
struct _GdkWaylandKeymapClass
@ -661,6 +666,32 @@ _gdk_wayland_keymap_new (GdkDisplay *display)
return GDK_KEYMAP (keymap);
}
void
_gdk_wayland_keymap_update_keymap (GdkKeymap *gdk_keymap,
struct xkb_keymap *xkb_keymap)
{
GdkWaylandKeymap *keymap;
keymap = GDK_WAYLAND_KEYMAP (gdk_keymap);
if (keymap->keymap)
xkb_map_unref (keymap->keymap);
keymap->keymap = xkb_keymap;
if (keymap->state)
xkb_state_unref (keymap->state);
keymap->state = xkb_state_new (keymap->keymap);
keymap->control_mask =
1 << xkb_map_mod_get_index(keymap->keymap, "Control");
keymap->alt_mask =
1 << xkb_map_mod_get_index(keymap->keymap, "Mod1");
keymap->shift_mask =
1 << xkb_map_mod_get_index(keymap->keymap, "Shift");
}
struct xkb_desc *_gdk_wayland_keymap_get_xkb_desc (GdkKeymap *keymap)
{
return GDK_WAYLAND_KEYMAP (keymap)->xkb;