wayland: Get the data device during input device setup

[~andy/gtk] / gdk / wayland / gdkprivate-wayland.h

diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index ef13fea1baf66c519be2580172603d0e1d940c5d..e8764940178c3541d5c6c8ba5440eb34f0fa247f 100644 (file)
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -33,7 +33,6 @@
 
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkprivate.h>
-#include <gdk/wayland/gdkwindow-wayland.h>
 #include <gdk/wayland/gdkdisplay-wayland.h>
 
 #include "gdkinternals.h"
@@ -45,8 +44,14 @@
 #define GDK_WINDOW_DISPLAY(win)       (GDK_SCREEN_WAYLAND (GDK_WINDOW_SCREEN (win))->display)
 #define GDK_WINDOW_IS_WAYLAND(win)    (GDK_IS_WINDOW_IMPL_WAYLAND (((GdkWindow *)win)->impl))
 
-GType      _gdk_wayland_window_get_type            (void);
-GType      _gdk_wayland_keymap_get_type            (void);
+GType _gdk_wayland_window_get_type    (void);
+void  _gdk_wayland_window_update_size (GdkWindow *window,
+                                      int32_t width,
+                                      int32_t height,
+                                      uint32_t edges);
+
+GdkKeymap *_gdk_wayland_keymap_new (GdkDisplay *display);
+struct xkb_desc *_gdk_wayland_keymap_get_xkb_desc (GdkKeymap *keymap);
 
 GdkCursor *_gdk_wayland_display_get_cursor_for_type (GdkDisplay    *display,
                                                     GdkCursorType  cursor_type);
@@ -65,10 +70,13 @@ void       _gdk_wayland_display_get_maximal_cursor_size (GdkDisplay *display,
 gboolean   _gdk_wayland_display_supports_cursor_alpha (GdkDisplay *display);
 gboolean   _gdk_wayland_display_supports_cursor_color (GdkDisplay *display);
 
-GdkNativeWindow _gdk_wayland_display_get_drag_protocol (GdkDisplay      *display,
-                                                       GdkNativeWindow  xid,
-                                                       GdkDragProtocol *protocol,
-                                                       guint           *version);
+struct wl_buffer *_gdk_wayland_cursor_get_buffer (GdkCursor *cursor,
+                                                 int       *x,
+                                                 int       *y);
+
+GdkDragProtocol _gdk_wayland_window_get_drag_protocol (GdkWindow *window,
+                                                      GdkWindow **target);
+
 void            _gdk_wayland_window_register_dnd (GdkWindow *window);
 GdkDragContext *_gdk_wayland_window_drag_begin (GdkWindow *window,
                                                GdkDevice *device,
@@ -91,8 +99,8 @@ gboolean   _gdk_wayland_display_set_selection_owner (GdkDisplay *display,
                                                     GdkAtom     selection,
                                                     guint32     time,
                                                     gboolean    send_event);
-void       _gdk_wayland_display_send_selection_notify (GdkDisplay       *display,
-                                                      GdkNativeWindow  requestor,
+void       _gdk_wayland_display_send_selection_notify (GdkDisplay *dispay,
+                                                      GdkWindow        *requestor,
                                                       GdkAtom          selection,
                                                       GdkAtom          target,
                                                       GdkAtom          property,
@@ -116,7 +124,10 @@ gint        _gdk_wayland_display_text_property_to_utf8_list (GdkDisplay    *disp
 gchar *     _gdk_wayland_display_utf8_to_string_target (GdkDisplay  *display,
                                                        const gchar *str);
 
-GdkDeviceManager *_gdk_device_manager_new (GdkDisplay *display);
+GdkDeviceManager *_gdk_wayland_device_manager_new (GdkDisplay *display);
+void              _gdk_wayland_device_manager_add_device (GdkDeviceManager *device_manager,
+                                                         struct wl_input_device *device);
+struct wl_input_device *_gdk_wayland_device_get_device (GdkDevice *device);
 
 void     _gdk_wayland_display_deliver_event (GdkDisplay *display, GdkEvent *event);
 GSource *_gdk_wayland_display_event_source_new (GdkDisplay *display);