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

gdk: Deprecate GdkDeviceManager and gdk_device_grab/ungrab()

Browse Source 
GdkSeat is now the preferred way to deal with input devices and grabs.

https://bugzilla.gnome.org/show_bug.cgi?id=759309
This commit is contained in:
Carlos Garnacho 2015-12-09 12:29:52 +01:00
parent 3009eac85e
commit 4065bd1e96
6 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/gdkdevice.c
View File

@ -1360,6 +1360,8 @@ get_native_grab_event_mask (GdkEventMask grab_mask)
* Returns: %GDK_GRAB_SUCCESS if the grab was successful. * Returns: %GDK_GRAB_SUCCESS if the grab was successful.
* *
* Since: 3.0 * Since: 3.0
*
* Deprecated: 3.20. Use gdk_seat_grab() instead.
**/ **/
GdkGrabStatus GdkGrabStatus
gdk_device_grab (GdkDevice *device, gdk_device_grab (GdkDevice *device,
@ -1433,6 +1435,8 @@ gdk_device_grab (GdkDevice *device,
* Release any grab on @device. * Release any grab on @device.
* *
* Since: 3.0 * Since: 3.0
*
* Deprecated: 3.20. Use gdk_seat_ungrab() instead.
*/ */
void void
gdk_device_ungrab (GdkDevice *device, gdk_device_ungrab (GdkDevice *device,

4
gdk/gdkdevice.h
View File

@ -246,7 +246,7 @@ GList * gdk_device_list_slave_devices (GdkDevice *device);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GdkDeviceType gdk_device_get_device_type (GdkDevice *device); GdkDeviceType gdk_device_get_device_type (GdkDevice *device);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_3_20_FOR(gdk_seat_grab)
GdkGrabStatus gdk_device_grab (GdkDevice *device, GdkGrabStatus gdk_device_grab (GdkDevice *device,
GdkWindow *window, GdkWindow *window,
GdkGrabOwnership grab_ownership, GdkGrabOwnership grab_ownership,
@ -255,7 +255,7 @@ GdkGrabStatus gdk_device_grab (GdkDevice *device,
GdkCursor *cursor, GdkCursor *cursor,
guint32 time_); guint32 time_);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_3_20_FOR(gdk_seat_ungrab)
void gdk_device_ungrab (GdkDevice *device, void gdk_device_ungrab (GdkDevice *device,
guint32 time_); guint32 time_);

5
gdk/gdkdevicemanager.c
View File

@ -323,6 +323,9 @@ gdk_device_manager_get_display (GdkDeviceManager *device_manager)
* GTK+ and must not be freed or unreffed. * GTK+ and must not be freed or unreffed.
* *
* Since: 3.0 * Since: 3.0
*
* Deprecated: 3.20, use gdk_seat_get_pointer(), gdk_seat_get_keyboard()
* and gdk_seat_list_slaves() instead.
**/ **/
GList * GList *
gdk_device_manager_list_devices (GdkDeviceManager *device_manager, gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
@ -348,6 +351,8 @@ gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
* owned by GDK and must not be freed or unreferenced. * owned by GDK and must not be freed or unreferenced.
* *
* Since: 3.0 * Since: 3.0
*
* Deprecated: 3.20.
**/ **/
GdkDevice * GdkDevice *
gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager) gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager)

4
gdk/gdkdevicemanager.h
View File

@ -37,10 +37,10 @@ GType gdk_device_manager_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
GdkDisplay * gdk_device_manager_get_display (GdkDeviceManager *device_manager); GdkDisplay * gdk_device_manager_get_display (GdkDeviceManager *device_manager);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_3_20
GList * gdk_device_manager_list_devices (GdkDeviceManager *device_manager, GList * gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
GdkDeviceType type); GdkDeviceType type);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_3_20
GdkDevice * gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager); GdkDevice * gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager);
G_END_DECLS G_END_DECLS

2
gdk/gdkdisplay.c
View File

@ -1491,6 +1491,8 @@ gdk_display_device_is_grabbed (GdkDisplay *display,
* or unreferenced. * or unreferenced.
* *
* Since: 3.0 * Since: 3.0
*
* Deprecated: 3.20. Use gdk_display_get_default_seat() and #GdkSeat operations.
**/ **/
GdkDeviceManager * GdkDeviceManager *
gdk_display_get_device_manager (GdkDisplay *display) gdk_display_get_device_manager (GdkDisplay *display)

2
gdk/gdkdisplay.h
View File

@ -166,7 +166,7 @@ GDK_AVAILABLE_IN_ALL
void gdk_display_notify_startup_complete (GdkDisplay *display, void gdk_display_notify_startup_complete (GdkDisplay *display,
const gchar *startup_id); const gchar *startup_id);
GDK_AVAILABLE_IN_ALL GDK_DEPRECATED_IN_3_20_FOR(gdk_display_get_default_seat)
GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display); GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL