diff options
Diffstat (limited to 'gdk/x11/gdkinputprivate.h')
| -rw-r--r-- | gdk/x11/gdkinputprivate.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gdk/x11/gdkinputprivate.h b/gdk/x11/gdkinputprivate.h index cb19db41e..8ed7a97f4 100644 --- a/gdk/x11/gdkinputprivate.h +++ b/gdk/x11/gdkinputprivate.h @@ -67,6 +67,8 @@ struct _GdkDevicePrivate GdkDevice info; guint32 deviceid; + + GdkDisplay *display; #ifndef XINPUT_NONE @@ -126,14 +128,6 @@ struct _GdkInputWindow #define GDK_IS_CORE(d) (((GdkDevice *)(d)) == _gdk_core_pointer) -extern GList *_gdk_input_devices; -extern GList *_gdk_input_windows; - -/* information about network port and host for gxid daemon */ -extern gchar *_gdk_input_gxid_host; -extern gint _gdk_input_gxid_port; -extern gint _gdk_input_ignore_core; - /* Function declarations */ GdkInputWindow *gdk_input_window_find (GdkWindow *window); @@ -163,7 +157,8 @@ gint _gdk_input_grab_pointer (GdkWindow *window, GdkEventMask event_mask, GdkWindow *confine_to, guint32 time); -void _gdk_input_ungrab_pointer (guint32 time); +void _gdk_input_ungrab_pointer (GdkDisplay *display, + guint32 time); gboolean _gdk_device_get_history (GdkDevice *device, GdkWindow *window, guint32 start, @@ -175,9 +170,11 @@ gboolean _gdk_device_get_history (GdkDevice *device, #define GDK_MAX_DEVICE_CLASSES 13 -gint gdk_input_common_init (gint include_core); -GdkDevicePrivate * gdk_input_find_device (guint32 id); -void gdk_input_get_root_relative_geometry (Display *dpy, +gint gdk_input_common_init (GdkDisplay *display, + gint include_core); +GdkDevicePrivate * gdk_input_find_device (GdkDisplay *display, + guint32 id); +void gdk_input_get_root_relative_geometry (Display *display, Window w, int *x_ret, int *y_ret, |