AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Handle the keymap being needed before we know about seats

Browse Source 
In the Wayland backend implementation for gdk_display_get_keymap we enumerate
the known devices and look for an core keyboard device. These device objects
are created when we receive the capabilities for the seat. The seat
capabilities may be received after a request for the keymap so we handle this
by creating a temporary keymap which we then free later when we have the real
one.
This commit is contained in:
Rob Bradford 2013-01-22 19:08:56 +00:00
parent c752cfe6a5
commit 2d676f32b1
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdk/wayland/gdkdisplay-wayland.c
View File

@ -475,6 +475,7 @@ _gdk_wayland_display_get_keymap (GdkDisplay *display)
GdkDeviceManager *device_manager;
GList *list, *l;
GdkDevice *core_keyboard = NULL;
static GdkKeymap *tmp_keymap = NULL;
device_manager = gdk_display_get_device_manager (display);
list = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
@ -491,7 +492,18 @@ _gdk_wayland_display_get_keymap (GdkDisplay *display)
break;
}
return core_keyboard?_gdk_wayland_device_get_keymap (core_keyboard):NULL;
if (core_keyboard && tmp_keymap)
{
g_object_unref (tmp_keymap);
tmp_keymap = NULL;
}
if (core_keyboard)
return _gdk_wayland_device_get_keymap (core_keyboard);
tmp_keymap = _gdk_wayland_keymap_new ();
return tmp_keymap;
}
static void