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

broadway: Add a few ignore deprecations statements around GdkDeviceManager

Browse Source 
There's places where we still need to deal with floating devices, which are
unseen by seats. Ignore deprecations and keep using GdkDeviceManager until
we can forget about floating devices.
This commit is contained in:
Carlos Garnacho 2015-12-16 19:08:52 +01:00
parent 3e1e02c2bc
commit 598dedfe36
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/broadway/gdkdevice-broadway.c
View File

@ -219,12 +219,14 @@ _gdk_broadway_window_grab_check_unmap (GdkWindow *window,
GdkDeviceManager *device_manager; GdkDeviceManager *device_manager;
GList *devices, *d; GList *devices, *d;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
device_manager = gdk_display_get_device_manager (display); device_manager = gdk_display_get_device_manager (display);
/* Get all devices */ /* Get all devices */
devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER); devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE)); devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING)); devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
G_GNUC_END_IGNORE_DEPRECATIONS;
/* End all grabs on the newly hidden window */ /* End all grabs on the newly hidden window */
for (d = devices; d; d = d->next) for (d = devices; d; d = d->next)
@ -242,10 +244,12 @@ _gdk_broadway_window_grab_check_destroy (GdkWindow *window)
GdkDeviceGrabInfo *grab; GdkDeviceGrabInfo *grab;
GList *devices, *d; GList *devices, *d;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
device_manager = gdk_display_get_device_manager (display); device_manager = gdk_display_get_device_manager (display);
/* Get all devices */ /* Get all devices */
devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER); devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
G_GNUC_END_IGNORE_DEPRECATIONS;
for (d = devices; d; d = d->next) for (d = devices; d; d = d->next)
{ {

2
gdk/broadway/gdkdisplay-broadway.c
View File

@ -75,6 +75,7 @@ gdk_broadway_display_init_input (GdkDisplay *display)
GList *list, *l; GList *list, *l;
broadway_display = GDK_BROADWAY_DISPLAY (display); broadway_display = GDK_BROADWAY_DISPLAY (display);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
device_manager = gdk_display_get_device_manager (display); device_manager = gdk_display_get_device_manager (display);
/* For backwards compatibility, just add /* For backwards compatibility, just add
@ -110,6 +111,7 @@ gdk_broadway_display_init_input (GdkDisplay *display)
display->core_pointer = device; display->core_pointer = device;
break; break;
} }
G_GNUC_END_IGNORE_DEPRECATIONS;
/* Add the core pointer to the devices list */ /* Add the core pointer to the devices list */
broadway_display->input_devices = g_list_prepend (broadway_display->input_devices, broadway_display->input_devices = g_list_prepend (broadway_display->input_devices,

2
gdk/broadway/gdkeventsource.c
View File

@ -117,7 +117,9 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
g_assert (display != NULL); g_assert (display != NULL);
display_broadway = GDK_BROADWAY_DISPLAY (display); display_broadway = GDK_BROADWAY_DISPLAY (display);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
device_manager = GDK_BROADWAY_DEVICE_MANAGER (gdk_display_get_device_manager (display)); device_manager = GDK_BROADWAY_DEVICE_MANAGER (gdk_display_get_device_manager (display));
G_GNUC_END_IGNORE_DEPRECATIONS;
switch (message->base.type) { switch (message->base.type) {
case BROADWAY_EVENT_ENTER: case BROADWAY_EVENT_ENTER: