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

gdk: remove the core_pointer field from GdkDisplay

Browse Source 
It is not used anymore, so no need to set it

https://bugzilla.gnome.org/show_bug.cgi?id=762820
This commit is contained in:
Paolo Borelli 2016-02-28 15:15:29 +01:00
parent 502744be85
commit 38ad57948c
7 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,9 +97,8 @@ gdk_broadway_display_init_input (GdkDisplay *display)
g_list_free (list); g_list_free (list);
/* Add the core pointer to the devices list */ /* Add the core pointer to the devices list */
display->core_pointer = GDK_BROADWAY_DEVICE_MANAGER (device_manager)->core_pointer;
broadway_display->input_devices = g_list_prepend (broadway_display->input_devices, broadway_display->input_devices = g_list_prepend (broadway_display->input_devices,
g_object_ref (display->core_pointer)); g_object_ref (GDK_BROADWAY_DEVICE_MANAGER (device_manager)->core_pointer));
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
} }

1
gdk/gdkdisplayprivate.h
View File

@ -102,7 +102,6 @@ struct _GdkDisplay
* is part of a double-click or triple-click * is part of a double-click or triple-click
*/ */
GHashTable *multiple_click_info; GHashTable *multiple_click_info;
GdkDevice *core_pointer; /* Core pointer device */
guint event_pause_count; /* How many times events are blocked */ guint event_pause_count; /* How many times events are blocked */

1
gdk/mir/gdkmirdevicemanager.c
View File

@ -107,7 +107,6 @@ gdk_mir_device_manager_constructed (GObject *object)
_gdk_device_set_associated_device (device_manager->pointer, device_manager->keyboard); _gdk_device_set_associated_device (device_manager->pointer, device_manager->keyboard);
display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (device_manager)); display = gdk_device_manager_get_display (GDK_DEVICE_MANAGER (device_manager));
display->core_pointer = device_manager->pointer;
seat = gdk_seat_default_new_for_master_pair (device_manager->pointer, device_manager->keyboard); seat = gdk_seat_default_new_for_master_pair (device_manager->pointer, device_manager->keyboard);
gdk_display_add_seat (display, seat); gdk_display_add_seat (display, seat);

3
gdk/quartz/gdkdisplay-quartz.c
View File

@ -87,9 +87,8 @@ gdk_quartz_display_init_input (GdkDisplay *display)
g_list_free (list); g_list_free (list);
/* Add the core pointer to the devices list */ /* Add the core pointer to the devices list */
display->core_pointer = GDK_QUARTZ_DEVICE_MANAGER_CORE (device_manager)->core_pointer;
display_quartz->input_devices = g_list_prepend (display_quartz->input_devices, display_quartz->input_devices = g_list_prepend (display_quartz->input_devices,
g_object_ref (display->core_pointer)); g_object_ref (GDK_QUARTZ_DEVICE_MANAGER_CORE (device_manager)->core_pointer));
} }
GdkDisplay * GdkDisplay *

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

@ -111,10 +111,10 @@ gdk_input_init (GdkDisplay *display)
GdkWaylandDisplay *display_wayland; GdkWaylandDisplay *display_wayland;
display_wayland = GDK_WAYLAND_DISPLAY (display); display_wayland = GDK_WAYLAND_DISPLAY (display);
display->core_pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
/* Add the core pointer to the devices list */ /* Add the core pointer to the devices list */
display_wayland->input_devices = g_list_prepend (display_wayland->input_devices, display->core_pointer); display_wayland->input_devices = g_list_prepend (display_wayland->input_devices,
gdk_seat_get_pointer (gdk_display_get_default_seat (display)));
} }
static void static void

6
gdk/win32/gdkdisplay-win32.c
View File

@ -50,10 +50,8 @@ _gdk_input_init (GdkDisplay *display)
NULL); NULL);
display->device_manager = GDK_DEVICE_MANAGER (device_manager); display->device_manager = GDK_DEVICE_MANAGER (device_manager);
display->core_pointer = device_manager->core_pointer; devices = g_list_copy (device_manager->wintab_devices);
devices = g_list_prepend (devices, device_manager->core_pointer);
devices = g_list_append (NULL, display->core_pointer);
devices = g_list_concat (devices, g_list_copy (device_manager->wintab_devices));
GDK_WIN32_DISPLAY (display)->input_devices = devices; GDK_WIN32_DISPLAY (display)->input_devices = devices;

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

@ -1369,9 +1369,8 @@ gdk_x11_display_init_input (GdkDisplay *display)
g_list_free (list); g_list_free (list);
display->core_pointer = gdk_seat_get_pointer (gdk_display_get_default_seat (display));
display_x11->input_devices = g_list_prepend (display_x11->input_devices, display_x11->input_devices = g_list_prepend (display_x11->input_devices,
g_object_ref (display->core_pointer)); g_object_ref (gdk_seat_get_pointer (gdk_display_get_default_seat (display))));
} }
static void static void