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

x11: Add some ignore deprecation statements

Browse Source 
In those places we still need access to floating devices, or we need to
use the GdkDeviceManager as its GdkEventTranslator interface.
This commit is contained in:
Carlos Garnacho
2015-12-16 19:20:28 +01:00
parent c3f1565c18
commit 7ead57be8c
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/x11/gdkdevice-xi2.c
View File

@ -425,7 +425,9 @@ gdk_x11_device_xi2_grab (GdkDevice *device,
gint status; gint status;
display = gdk_device_get_display (device); display = gdk_device_get_display (device);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (gdk_display_get_device_manager (display)); device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (gdk_display_get_device_manager (display));
G_GNUC_END_IGNORE_DEPRECATIONS;
/* FIXME: confine_to is actually unused */ /* FIXME: confine_to is actually unused */
@ -676,7 +678,9 @@ gdk_x11_device_xi2_select_window_events (GdkDevice *device,
XIEventMask evmask; XIEventMask evmask;
display = gdk_device_get_display (device); display = gdk_device_get_display (device);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (gdk_display_get_device_manager (display)); device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (gdk_display_get_device_manager (display));
G_GNUC_END_IGNORE_DEPRECATIONS;
evmask.deviceid = device_xi2->device_id; evmask.deviceid = device_xi2->device_id;
evmask.mask = _gdk_x11_device_xi2_translate_event_mask (device_manager_xi2, evmask.mask = _gdk_x11_device_xi2_translate_event_mask (device_manager_xi2,

5
gdk/x11/gdkdisplay-x11.c
View File

@ -1330,9 +1330,11 @@ gdk_event_init (GdkDisplay *display)
gdk_x11_event_source_add_translator ((GdkEventSource *) display_x11->event_source, gdk_x11_event_source_add_translator ((GdkEventSource *) display_x11->event_source,
GDK_EVENT_TRANSLATOR (display)); GDK_EVENT_TRANSLATOR (display));
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
device_manager = gdk_display_get_device_manager (display); device_manager = gdk_display_get_device_manager (display);
gdk_x11_event_source_add_translator ((GdkEventSource *) display_x11->event_source, gdk_x11_event_source_add_translator ((GdkEventSource *) display_x11->event_source,
GDK_EVENT_TRANSLATOR (device_manager)); GDK_EVENT_TRANSLATOR (device_manager));
G_GNUC_END_IGNORE_DEPRECATIONS;
} }
static void static void
@ -1344,12 +1346,15 @@ gdk_x11_display_init_input (GdkDisplay *display)
GList *list, *l; GList *list, *l;
display_x11 = GDK_X11_DISPLAY (display); display_x11 = GDK_X11_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
* floating devices that are not keyboards. * floating devices that are not keyboards.
*/ */
list = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING); list = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING);
G_GNUC_END_IGNORE_DEPRECATIONS;
for (l = list; l; l = l->next) for (l = list; l; l = l->next)
{ {

4
gdk/x11/gdkmain-x11.c
View File

@ -155,12 +155,14 @@ _gdk_x11_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)
@ -184,12 +186,14 @@ _gdk_x11_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);
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;
for (d = devices; d; d = d->next) for (d = devices; d; d = d->next)
{ {