isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-09 11:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland/keyboard: Cleanup xkb state managing

Browse Source 
Initialize and cleanup properly in a _init()/_destroy() function pair.

https://bugzilla.gnome.org/show_bug.cgi?id=771646
This commit is contained in:
Jonas Ådahl 2016-09-21 11:24:47 +08:00
parent 35b8f8c072
commit 2783375f8f
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wayland/meta-wayland-keyboard.c
View File

@ -611,8 +611,6 @@ meta_wayland_keyboard_enable (MetaWaylandKeyboard *keyboard)
wl_list_init (&keyboard->resource_list); wl_list_init (&keyboard->resource_list);
wl_list_init (&keyboard->focus_resource_list); wl_list_init (&keyboard->focus_resource_list);
keyboard->xkb_info.keymap_fd = -1;
keyboard->grab = &keyboard->default_grab; keyboard->grab = &keyboard->default_grab;
keyboard->settings = g_settings_new ("org.gnome.desktop.peripherals.keyboard"); keyboard->settings = g_settings_new ("org.gnome.desktop.peripherals.keyboard");
@ -640,6 +638,12 @@ meta_wayland_keyboard_enable (MetaWaylandKeyboard *keyboard)
maybe_restore_numlock_state (keyboard); maybe_restore_numlock_state (keyboard);
} }
static void
meta_wayland_xkb_info_init (MetaWaylandXkbInfo *xkb_info)
{
xkb_info->keymap_fd = -1;
}
static void static void
meta_wayland_xkb_info_destroy (MetaWaylandXkbInfo *xkb_info) meta_wayland_xkb_info_destroy (MetaWaylandXkbInfo *xkb_info)
{ {
@ -652,7 +656,10 @@ meta_wayland_xkb_info_destroy (MetaWaylandXkbInfo *xkb_info)
xkb_info->keymap_area = NULL; xkb_info->keymap_area = NULL;
} }
if (xkb_info->keymap_fd >= 0) if (xkb_info->keymap_fd >= 0)
close (xkb_info->keymap_fd); {
close (xkb_info->keymap_fd);
xkb_info->keymap_fd = -1;
}
} }
void void
@ -957,6 +964,8 @@ meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard)
static void static void
meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard) meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard)
{ {
meta_wayland_xkb_info_init (&keyboard->xkb_info);
keyboard->default_grab.interface = &default_keyboard_grab_interface; keyboard->default_grab.interface = &default_keyboard_grab_interface;
keyboard->default_grab.keyboard = keyboard; keyboard->default_grab.keyboard = keyboard;