diff --git a/gdk/gdk-autocleanup.h b/gdk/gdk-autocleanup.h index 6d27549f66..5fae7c3690 100644 --- a/gdk/gdk-autocleanup.h +++ b/gdk/gdk-autocleanup.h @@ -24,7 +24,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkAppLaunchContext, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkCursor, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDevice, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDeviceManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplay, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplayManager, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDragContext, g_object_unref) diff --git a/gdk/gdk.h b/gdk/gdk.h index 296720ce41..4b9a5ada1a 100644 --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/gdk/gdkdevicemanager.c b/gdk/gdkdevicemanager.c deleted file mode 100644 index d60ac6f721..0000000000 --- a/gdk/gdkdevicemanager.c +++ /dev/null @@ -1,158 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2009 Carlos Garnacho - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#include "config.h" - -#include "gdkdevicemanagerprivate.h" -#include "gdkdisplay.h" -#include "gdkinternals.h" -#include "gdkintl.h" - - -/** - * SECTION:gdkdevicemanager - * @Short_description: Functions for handling input devices - * @Title: GdkDeviceManager - * @See_also: #GdkDevice, #GdkEvent - * - * In addition to a single pointer and keyboard for user interface input, - * GDK contains support for a variety of input devices, including graphics - * tablets, touchscreens and multiple pointers/keyboards interacting - * simultaneously with the user interface. Such input devices often have - * additional features, such as sub-pixel positioning information and - * additional device-dependent information. - * - * In order to query the device hierarchy and be aware of changes in the - * device hierarchy (such as virtual devices being created or removed, or - * physical devices being plugged or unplugged), GDK provides - * #GdkDeviceManager. - * - * By default, and if the platform supports it, GDK is aware of multiple - * keyboard/pointer pairs and multitouch devices. This behavior can be - * changed by calling gdk_disable_multidevice() before gdk_display_open(). - * There should rarely be a need to do that though, since GDK defaults - * to a compatibility mode in which it will emit just one enter/leave - * event pair for all devices on a window. To enable per-device - * enter/leave events and other multi-pointer interaction features, - * gdk_window_set_support_multidevice() must be called on - * #GdkWindows (or gtk_widget_set_support_multidevice() on widgets). - * window. See the gdk_window_set_support_multidevice() documentation - * for more information. - * - * On X11, multi-device support is implemented through XInput 2. - * Unless gdk_disable_multidevice() is called, the XInput 2 - * #GdkDeviceManager implementation will be used as the input source. - * Otherwise either the core or XInput 1 implementations will be used. - * - * For simple applications that don’t have any special interest in - * input devices, the so-called “client pointer” - * provides a reasonable approximation to a simple setup with a single - * pointer and keyboard. The device that has been set as the client - * pointer can be accessed via gdk_device_manager_get_client_pointer(). - * - * Conceptually, in multidevice mode there are 2 device types. Virtual - * devices (or master devices) are represented by the pointer cursors - * and keyboard foci that are seen on the screen. Physical devices (or - * slave devices) represent the hardware that is controlling the virtual - * devices, and thus have no visible cursor on the screen. - * - * Virtual devices are always paired, so there is a keyboard device for every - * pointer device. Associations between devices may be inspected through - * gdk_device_get_associated_device(). - * - * There may be several virtual devices, and several physical devices could - * be controlling each of these virtual devices. Physical devices may also - * be “floating”, which means they are not attached to any virtual device. - * - * # Master and slave devices - * - * |[ - * carlos@sacarino:~$ xinput list - * ⎡ Virtual core pointer id=2 [master pointer (3)] - * ⎜ ↳ Virtual core XTEST pointer id=4 [slave pointer (2)] - * ⎜ ↳ Wacom ISDv4 E6 Pen stylus id=10 [slave pointer (2)] - * ⎜ ↳ Wacom ISDv4 E6 Finger touch id=11 [slave pointer (2)] - * ⎜ ↳ SynPS/2 Synaptics TouchPad id=13 [slave pointer (2)] - * ⎜ ↳ TPPS/2 IBM TrackPoint id=14 [slave pointer (2)] - * ⎜ ↳ Wacom ISDv4 E6 Pen eraser id=16 [slave pointer (2)] - * ⎣ Virtual core keyboard id=3 [master keyboard (2)] - * ↳ Virtual core XTEST keyboard id=5 [slave keyboard (3)] - * ↳ Power Button id=6 [slave keyboard (3)] - * ↳ Video Bus id=7 [slave keyboard (3)] - * ↳ Sleep Button id=8 [slave keyboard (3)] - * ↳ Integrated Camera id=9 [slave keyboard (3)] - * ↳ AT Translated Set 2 keyboard id=12 [slave keyboard (3)] - * ↳ ThinkPad Extra Buttons id=15 [slave keyboard (3)] - * ]| - * - * By default, GDK will automatically listen for events coming from all - * master devices, setting the #GdkDevice for all events coming from input - * devices. Events containing device information are #GDK_MOTION_NOTIFY, - * #GDK_BUTTON_PRESS, #GDK_BUTTON_RELEASE, #GDK_SCROLL, #GDK_KEY_PRESS, #GDK_KEY_RELEASE, - * #GDK_ENTER_NOTIFY, #GDK_LEAVE_NOTIFY, #GDK_FOCUS_CHANGE, - * #GDK_PROXIMITY_IN, #GDK_PROXIMITY_OUT, #GDK_DRAG_ENTER, #GDK_DRAG_LEAVE, - * #GDK_DRAG_MOTION, #GDK_DRAG_STATUS, #GDK_DROP_START, #GDK_DROP_FINISHED - * and #GDK_GRAB_BROKEN. When dealing with an event on a master device, - * it is possible to get the source (slave) device that the event originated - * from via gdk_event_get_source_device(). - * - * On a standard session, all physical devices are connected by default to - * the "Virtual Core Pointer/Keyboard" master devices, hence routing all events - * through these. This behavior is only modified by device grabs, where the - * slave device is temporarily detached for as long as the grab is held, and - * more permanently by user modifications to the device hierarchy. - * - * On certain application specific setups, it may make sense - * to detach a physical device from its master pointer, and mapping it to - * an specific window. This can be achieved by the combination of - * gdk_device_grab() and gdk_device_set_mode(). - * - * In order to listen for events coming from devices - * other than a virtual device, gdk_window_set_device_events() must be - * called. Generally, this function can be used to modify the event mask - * for any given device. - * - * Input devices may also provide additional information besides X/Y. - * For example, graphics tablets may also provide pressure and X/Y tilt - * information. This information is device-dependent, and may be - * queried through gdk_device_get_axis(). In multidevice mode, virtual - * devices will change axes in order to always represent the physical - * device that is routing events through it. Whenever the physical device - * changes, the #GdkDevice:n-axes property will be notified, and - * gdk_device_list_axes() will return the new device axes. - * - * Devices may also have associated “keys” or - * macro buttons. Such keys can be globally set to map into normal X - * keyboard events. The mapping is set using gdk_device_set_key(). - * - * In GTK+ 3.20, a new #GdkSeat object has been introduced that - * supersedes #GdkDeviceManager and should be preferred in newly - * written code. - */ - -G_DEFINE_ABSTRACT_TYPE (GdkDeviceManager, gdk_device_manager, G_TYPE_OBJECT) - -static void -gdk_device_manager_class_init (GdkDeviceManagerClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); -} - -static void -gdk_device_manager_init (GdkDeviceManager *device_manager) -{ -} diff --git a/gdk/gdkdevicemanager.h b/gdk/gdkdevicemanager.h deleted file mode 100644 index dcc676ac79..0000000000 --- a/gdk/gdkdevicemanager.h +++ /dev/null @@ -1,40 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2009 Carlos Garnacho - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef __GDK_DEVICE_MANAGER_H__ -#define __GDK_DEVICE_MANAGER_H__ - -#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION) -#error "Only can be included directly." -#endif - -#include -#include - -G_BEGIN_DECLS - -#define GDK_TYPE_DEVICE_MANAGER (gdk_device_manager_get_type ()) -#define GDK_DEVICE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManager)) -#define GDK_IS_DEVICE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_MANAGER)) - - -GType gdk_device_manager_get_type (void) G_GNUC_CONST; - - -G_END_DECLS - -#endif /* __GDK_DEVICE_MANAGER_H__ */ diff --git a/gdk/gdkdevicemanagerprivate.h b/gdk/gdkdevicemanagerprivate.h deleted file mode 100644 index 2a1f2cd79c..0000000000 --- a/gdk/gdkdevicemanagerprivate.h +++ /dev/null @@ -1,45 +0,0 @@ -/* GDK - The GIMP Drawing Kit - * Copyright (C) 2010 Red Hat, Inc - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef __GDK_DEVICE_MANAGER_PRIVATE_H__ -#define __GDK_DEVICE_MANAGER_PRIVATE_H__ - -#include "gdkdevicemanager.h" - -G_BEGIN_DECLS - - -#define GDK_DEVICE_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass)) -#define GDK_IS_DEVICE_MANAGER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_DEVICE_MANAGER)) -#define GDK_DEVICE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_DEVICE_MANAGER, GdkDeviceManagerClass)) - - -typedef struct _GdkDeviceManagerClass GdkDeviceManagerClass; - -struct _GdkDeviceManager -{ - GObject parent_instance; -}; - -struct _GdkDeviceManagerClass -{ - GObjectClass parent_class; -}; - -G_END_DECLS - -#endif diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index 2105df51d3..0e6b78ca16 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -127,7 +127,6 @@ typedef struct _GdkDevice GdkDevice; typedef struct _GdkDragContext GdkDragContext; typedef struct _GdkDisplayManager GdkDisplayManager; -typedef struct _GdkDeviceManager GdkDeviceManager; typedef struct _GdkDisplay GdkDisplay; typedef struct _GdkScreen GdkScreen; typedef struct _GdkWindow GdkWindow; diff --git a/gdk/meson.build b/gdk/meson.build index 9b34ee4395..8792f34138 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -5,7 +5,6 @@ gdk_public_sources = files([ 'gdkcontentformats.c', 'gdkcursor.c', 'gdkdevice.c', - 'gdkdevicemanager.c', 'gdkdevicepad.c', 'gdkdevicetool.c', 'gdkdisplay.c', @@ -45,7 +44,6 @@ gdk_public_headers = files([ 'gdkcontentformats.h', 'gdkcursor.h', 'gdkdevice.h', - 'gdkdevicemanager.h', 'gdkdevicepad.h', 'gdkdevicetool.h', 'gdkdisplay.h',