[gtk+/gdk-backend-wayland: 10/10] Track 2.99.3 API changes

[Kristian Høgsberg <krh src gnome org>]

commit 541d5172dd7de2b3859430f0ad02a628f49a25e4
Author: Kristian Høgsberg <krh bitplanet net>
Date:   Tue Feb 8 08:12:59 2011 -0500

    Track 2.99.3 API changes

 gdk/wayland/gdkdisplay-wayland.c   |   43 +----------------------------------
 gdk/wayland/gdkdnd-wayland.c       |    8 +-----
 gdk/wayland/gdkprivate-wayland.h   |   11 ++++-----
 gdk/wayland/gdkselection-wayland.c |    4 +-
 gdk/wayland/gdkwindow-wayland.c    |   37 +++++++-----------------------
 5 files changed, 20 insertions(+), 83 deletions(-)
---
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 34740d1..cb99a38 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -306,7 +306,6 @@ _gdk_wayland_display_open (const gchar *display_name)
   struct wl_display *wl_display;
   GdkDisplay *display;
   GdkDisplayWayland *display_wayland;
-  GdkWindowAttr attr;
 
   gint i;
 
@@ -340,14 +339,6 @@ _gdk_wayland_display_open (const gchar *display_name)
 
   display_wayland->event_source = _gdk_wayland_display_event_source_new (display);
 
-  attr.window_type = GDK_WINDOW_TOPLEVEL;
-  attr.wclass = GDK_INPUT_OUTPUT;
-  attr.x = 10;
-  attr.y = 10;
-  attr.width = 10;
-  attr.height = 10;
-  attr.event_mask = 0;
-
   gdk_input_init (display);
 
   g_signal_emit_by_name (display, "opened");
@@ -566,33 +557,6 @@ gdk_wayland_display_list_devices (GdkDisplay *display)
   return GDK_DISPLAY_WAYLAND (display)->input_devices;
 }
 
-static gboolean
-gdk_wayland_display_send_client_message (GdkDisplay     *display,
-					 GdkEvent       *event,
-					 GdkNativeWindow winid)
-{
-  return 0;
-}
-
-static void
-gdk_wayland_display_add_client_message_filter (GdkDisplay   *display,
-					       GdkAtom       message_type,
-					       GdkFilterFunc func,
-					       gpointer      data)
-{
-  GdkClientFilter *filter;
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-  filter = g_new (GdkClientFilter, 1);
-
-  filter->type = message_type;
-  filter->function = func;
-  filter->data = data;
-
-  GDK_DISPLAY_WAYLAND(display)->client_filters =
-    g_list_append (GDK_DISPLAY_WAYLAND (display)->client_filters,
-		   filter);
-}
-
 static void
 gdk_wayland_display_before_process_all_updates (GdkDisplay *display)
 {
@@ -754,15 +718,12 @@ _gdk_display_wayland_class_init (GdkDisplayWaylandClass * class)
   display_class->supports_input_shapes = gdk_wayland_display_supports_input_shapes;
   display_class->supports_composite = gdk_wayland_display_supports_composite;
   display_class->list_devices = gdk_wayland_display_list_devices;
-  display_class->send_client_message = gdk_wayland_display_send_client_message;
-  display_class->add_client_message_filter = gdk_wayland_display_add_client_message_filter;
   display_class->get_app_launch_context = _gdk_wayland_display_get_app_launch_context;
-  display_class->get_drag_protocol = _gdk_wayland_display_get_drag_protocol;
+  display_class->get_default_cursor_size = _gdk_wayland_display_get_default_cursor_size;
+  display_class->get_maximal_cursor_size = _gdk_wayland_display_get_maximal_cursor_size;
   display_class->get_cursor_for_type = _gdk_wayland_display_get_cursor_for_type;
   display_class->get_cursor_for_name = _gdk_wayland_display_get_cursor_for_name;
   display_class->get_cursor_for_pixbuf = _gdk_wayland_display_get_cursor_for_pixbuf;
-  display_class->get_default_cursor_size = _gdk_wayland_display_get_default_cursor_size;
-  display_class->get_maximal_cursor_size = _gdk_wayland_display_get_maximal_cursor_size;
   display_class->supports_cursor_alpha = _gdk_wayland_display_supports_cursor_alpha;
   display_class->supports_cursor_color = _gdk_wayland_display_supports_cursor_color;
   display_class->before_process_all_updates = gdk_wayland_display_before_process_all_updates;
diff --git a/gdk/wayland/gdkdnd-wayland.c b/gdk/wayland/gdkdnd-wayland.c
index 1d36e95..293456f 100644
--- a/gdk/wayland/gdkdnd-wayland.c
+++ b/gdk/wayland/gdkdnd-wayland.c
@@ -160,12 +160,8 @@ gdk_wayland_drag_context_class_init (GdkWaylandDragContextClass *klass)
   context_class->get_selection = gdk_wayland_drag_context_get_selection;
 }
 
-GdkNativeWindow
-_gdk_wayland_display_get_drag_protocol (GdkDisplay      *display,
-					GdkNativeWindow  xid,
-					GdkDragProtocol *protocol,
-					guint           *version)
-
+GdkDragProtocol
+_gdk_wayland_window_get_drag_protocol (GdkWindow *window, GdkWindow **target)
 {
   return 0;
 }
diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index dcd9fa9..bc5c6ed 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -67,10 +67,9 @@ 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);
+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,
@@ -93,8 +92,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,
diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
index f2f4b2f..0faf822 100644
--- a/gdk/wayland/gdkselection-wayland.c
+++ b/gdk/wayland/gdkselection-wayland.c
@@ -43,8 +43,8 @@ _gdk_wayland_display_set_selection_owner (GdkDisplay *display,
 }
 
 void
-_gdk_wayland_display_send_selection_notify (GdkDisplay       *display,
-					    GdkNativeWindow  requestor,
+_gdk_wayland_display_send_selection_notify (GdkDisplay *dispay,
+					    GdkWindow        *requestor,
 					    GdkAtom          selection,
 					    GdkAtom          target,
 					    GdkAtom          property,
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 3d796cd..7859e3f 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -154,8 +154,6 @@ void
 _gdk_wayland_window_update_size (GdkWindow *window)
 {
   GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-  GdkDisplayWayland *display_wayland =
-    GDK_DISPLAY_WAYLAND (gdk_window_get_display (impl->wrapper));
   GdkRectangle area;
   cairo_region_t *region;
 
@@ -234,11 +232,8 @@ _gdk_wayland_display_create_window_impl (GdkDisplay    *display,
 					 gint           attributes_mask)
 {
   GdkWindowImplWayland *impl;
-  GdkDisplayWayland *display_wayland;
   const char *title;
 
-  display_wayland = GDK_DISPLAY_WAYLAND (display);
-
   impl = g_object_new (GDK_TYPE_WINDOW_IMPL_WAYLAND, NULL);
   window->impl = GDK_WINDOW_IMPL (impl);
   impl->wrapper = GDK_WINDOW (window);
@@ -356,15 +351,12 @@ gdk_wayland_window_attach_image (GdkWindow *window)
 static void
 gdk_window_impl_wayland_finalize (GObject *object)
 {
-  GdkWindow *wrapper;
   GdkWindowImplWayland *impl;
 
   g_return_if_fail (GDK_IS_WINDOW_IMPL_WAYLAND (object));
 
   impl = GDK_WINDOW_IMPL_WAYLAND (object);
 
-  wrapper = impl->wrapper;
-
   g_free (impl->toplevel);
 
   if (impl->cursor)
@@ -575,10 +567,6 @@ gdk_window_wayland_move_resize (GdkWindow *window,
 				gint       width,
 				gint       height)
 {
-  GdkWindowImplWayland *impl;
-
-  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-
   window->x = x;
   window->y = y;
   if (width > 0)
@@ -1131,35 +1119,35 @@ gdk_wayland_window_begin_resize_drag (GdkWindow     *window,
   switch (edge)
     {
     case GDK_WINDOW_EDGE_NORTH_WEST:
-      grab_type = WL_GRAB_RESIZE_TOP_LEFT;
+      grab_type = WL_SHELL_RESIZE_TOP_LEFT;
       break;
 
     case GDK_WINDOW_EDGE_NORTH:
-      grab_type = WL_GRAB_RESIZE_TOP;
+      grab_type = WL_SHELL_RESIZE_TOP;
       break;
 
     case GDK_WINDOW_EDGE_NORTH_EAST:
-      grab_type = WL_GRAB_RESIZE_RIGHT;
+      grab_type = WL_SHELL_RESIZE_RIGHT;
       break;
 
     case GDK_WINDOW_EDGE_WEST:
-      grab_type = WL_GRAB_RESIZE_LEFT;
+      grab_type = WL_SHELL_RESIZE_LEFT;
       break;
 
     case GDK_WINDOW_EDGE_EAST:
-      grab_type = WL_GRAB_RESIZE_RIGHT;
+      grab_type = WL_SHELL_RESIZE_RIGHT;
       break;
 
     case GDK_WINDOW_EDGE_SOUTH_WEST:
-      grab_type = WL_GRAB_RESIZE_BOTTOM_LEFT;
+      grab_type = WL_SHELL_RESIZE_BOTTOM_LEFT;
       break;
 
     case GDK_WINDOW_EDGE_SOUTH:
-      grab_type = WL_GRAB_RESIZE_BOTTOM;
+      grab_type = WL_SHELL_RESIZE_BOTTOM;
       break;
 
     case GDK_WINDOW_EDGE_SOUTH_EAST:
-      grab_type = WL_GRAB_RESIZE_BOTTOM_RIGHT;
+      grab_type = WL_SHELL_RESIZE_BOTTOM_RIGHT;
       break;
 
     default:
@@ -1210,16 +1198,12 @@ gdk_wayland_window_enable_synchronized_configure (GdkWindow *window)
 static void
 gdk_wayland_window_configure_finished (GdkWindow *window)
 {
-  GdkWindowImplWayland *impl;
-
   if (!WINDOW_IS_TOPLEVEL (window))
     return;
 
   if (!GDK_IS_WINDOW_IMPL_WAYLAND (window->impl))
     return;
 
-  impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-
   fprintf(stderr, "configure %p finished\n", window);
 }
 
@@ -1238,10 +1222,6 @@ gdk_wayland_window_set_composited (GdkWindow *window,
 static void
 gdk_wayland_window_destroy_notify (GdkWindow *window)
 {
-  GdkWindowImplWayland *window_impl;
-
-  window_impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-
   if (!GDK_WINDOW_DESTROYED (window))
     {
       if (GDK_WINDOW_TYPE(window) != GDK_WINDOW_FOREIGN)
@@ -1416,6 +1396,7 @@ _gdk_window_impl_wayland_class_init (GdkWindowImplWaylandClass *klass)
   impl_class->set_opacity = gdk_wayland_window_set_opacity;
   impl_class->set_composited = gdk_wayland_window_set_composited;
   impl_class->destroy_notify = gdk_wayland_window_destroy_notify;
+  impl_class->get_drag_protocol = _gdk_wayland_window_get_drag_protocol;
   impl_class->register_dnd = _gdk_wayland_window_register_dnd;
   impl_class->drag_begin = _gdk_wayland_window_drag_begin;
   impl_class->process_updates_recurse = gdk_wayland_window_process_updates_recurse;