]> Pileus Git - ~andy/gtk/blobdiff - gdk/broadway/gdkwindow-broadway.c
Change FSF Address
[~andy/gtk] / gdk / broadway / gdkwindow-broadway.c
index ef69351683651bddb8388f6a9652465673a095bb..08e23afea5bba345b2fd0932d84fd844ab3a17f0 100644 (file)
@@ -13,9 +13,7 @@
  * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -49,7 +47,8 @@ static void     gdk_window_broadway_set_background     (GdkWindow      *window,
                                                    cairo_pattern_t *pattern);
 
 static void        gdk_window_impl_broadway_finalize   (GObject            *object);
-static void        gdk_window_impl_iface_init     (GdkWindowImplIface *iface);
+
+static const cairo_user_data_key_t gdk_broadway_cairo_key;
 
 #define WINDOW_IS_TOPLEVEL_OR_FOREIGN(window) \
   (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
@@ -60,28 +59,30 @@ static void        gdk_window_impl_iface_init     (GdkWindowImplIface *iface);
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN)
 
-/* Return whether time1 is considered later than time2 as far as xserver
- * time is concerned.  Accounts for wraparound.
- */
-#define XSERVER_TIME_IS_LATER(time1, time2)                        \
-  ( (( time1 > time2 ) && ( time1 - time2 < ((guint32)-1)/2 )) ||  \
-    (( time1 < time2 ) && ( time2 - time1 > ((guint32)-1)/2 ))     \
-  )
+struct _GdkBroadwayWindow {
+  GdkWindow parent;
+};
 
-G_DEFINE_TYPE_WITH_CODE (GdkWindowImplBroadway,
-                         gdk_window_impl_broadway,
-                         GDK_TYPE_DRAWABLE_IMPL_BROADWAY,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_WINDOW_IMPL,
-                                                gdk_window_impl_iface_init));
+struct _GdkBroadwayWindowClass {
+  GdkWindowClass parent_class;
+};
 
-static GList *all_windows;
+G_DEFINE_TYPE (GdkBroadwayWindow, gdk_broadway_window, GDK_TYPE_WINDOW)
 
-GType
-_gdk_window_impl_get_type (void)
+static void
+gdk_broadway_window_class_init (GdkBroadwayWindowClass *broadway_window_class)
 {
-  return gdk_window_impl_broadway_get_type ();
 }
 
+static void
+gdk_broadway_window_init (GdkBroadwayWindow *broadway_window)
+{
+}
+
+G_DEFINE_TYPE (GdkWindowImplBroadway,
+              gdk_window_impl_broadway,
+              GDK_TYPE_WINDOW_IMPL)
+
 static void
 diff_surfaces (cairo_surface_t *surface,
               cairo_surface_t *old_surface)
@@ -123,36 +124,37 @@ diff_surfaces (cairo_surface_t *surface,
 static guint dirty_flush_id = 0;
 
 static void
-window_data_send (BroadwayClient *client, GdkWindowImplBroadway *impl)
+window_data_send (BroadwayOutput *output, GdkWindowImplBroadway *impl)
 {
-  GdkDrawableImplBroadway *drawable_impl = GDK_DRAWABLE_IMPL_BROADWAY (impl);
   cairo_t *cr;
 
-  if (drawable_impl->surface == NULL)
+  if (impl->surface == NULL)
     return;
 
   if (impl->last_synced)
     {
-      diff_surfaces (drawable_impl->surface,
-                    drawable_impl->last_surface);
-      broadway_client_put_rgba (client, impl->id, 0, 0,
-                               cairo_image_surface_get_width (drawable_impl->last_surface),
-                               cairo_image_surface_get_height (drawable_impl->last_surface),
-                               cairo_image_surface_get_stride (drawable_impl->last_surface),
-                               cairo_image_surface_get_data (drawable_impl->last_surface));
+      diff_surfaces (impl->surface,
+                    impl->last_surface);
+      broadway_output_put_rgba (output, impl->id, 0, 0,
+                               cairo_image_surface_get_width (impl->last_surface),
+                               cairo_image_surface_get_height (impl->last_surface),
+                               cairo_image_surface_get_stride (impl->last_surface),
+                               cairo_image_surface_get_data (impl->last_surface));
     }
   else
     {
       impl->last_synced = TRUE;
-      broadway_client_put_rgb (client, impl->id, 0, 0,
-                              cairo_image_surface_get_width (drawable_impl->surface),
-                              cairo_image_surface_get_height (drawable_impl->surface),
-                              cairo_image_surface_get_stride (drawable_impl->surface),
-                              cairo_image_surface_get_data (drawable_impl->surface));
+      broadway_output_put_rgb (output, impl->id, 0, 0,
+                              cairo_image_surface_get_width (impl->surface),
+                              cairo_image_surface_get_height (impl->surface),
+                              cairo_image_surface_get_stride (impl->surface),
+                              cairo_image_surface_get_data (impl->surface));
     }
 
-  cr = cairo_create (drawable_impl->last_surface);
-  cairo_set_source_surface (cr, drawable_impl->surface, 0, 0);
+  broadway_output_surface_flush (output, impl->id);
+
+  cr = cairo_create (impl->last_surface);
+  cairo_set_source_surface (cr, impl->surface, 0, 0);
   cairo_paint (cr);
   cairo_destroy (cr);
 }
@@ -161,17 +163,17 @@ static gboolean
 dirty_flush_idle (gpointer data)
 {
   GList *l;
-  GdkDisplayBroadway *display;
-  BroadwayClient *client;
+  GdkBroadwayDisplay *display;
+  BroadwayOutput *output;
 
   dirty_flush_id = 0;
 
-  display = GDK_DISPLAY_BROADWAY (gdk_display_get_default ());
-  client = display->output;
-  if (client == NULL)
+  display = GDK_BROADWAY_DISPLAY (gdk_display_get_default ());
+  output = display->output;
+  if (output == NULL)
     return FALSE;
 
-  for (l = all_windows; l != NULL; l = l->next)
+  for (l = display->toplevels; l != NULL; l = l->next)
     {
       GdkWindowImplBroadway *impl = l->data;
 
@@ -182,13 +184,13 @@ dirty_flush_idle (gpointer data)
        }
     }
 
-  broadway_client_flush (client);
+  gdk_display_flush (GDK_DISPLAY (display));
 
   return FALSE;
 }
 
 static void
-queue_dirty_flush (GdkDisplayBroadway *display)
+queue_dirty_flush (GdkBroadwayDisplay *display)
 {
   if (dirty_flush_id == 0 && display->output != NULL)
     dirty_flush_id = gdk_threads_add_idle (dirty_flush_idle, NULL);
@@ -197,184 +199,264 @@ queue_dirty_flush (GdkDisplayBroadway *display)
 void
 _gdk_broadway_resync_windows (void)
 {
-  GdkDisplayBroadway *display;
+  GdkBroadwayDisplay *display;
   GList *l;
 
   dirty_flush_id = 0;
 
-  display = GDK_DISPLAY_BROADWAY (gdk_display_get_default ());
+  display = GDK_BROADWAY_DISPLAY (gdk_display_get_default ());
 
-  for (l = all_windows; l != NULL; l = l->next)
+  /* First create all windows */
+  for (l = display->toplevels; l != NULL; l = l->next)
     {
       GdkWindowImplBroadway *impl = l->data;
-      GdkWindowObject *private;
+      GdkWindow *window;
 
-      private = (GdkWindowObject*) GDK_DRAWABLE_IMPL_BROADWAY (impl)->wrapper;
+      window = impl->wrapper;
 
       if (impl->id == 0)
        continue; /* Skip root */
 
       impl->dirty = FALSE;
       impl->last_synced = FALSE;
-      broadway_client_new_surface (display->output,
+      broadway_output_new_surface (display->output,
                                   impl->id,
-                                  private->x,
-                                  private->y,
-                                  private->width,
-                                  private->height);
-      if (GDK_WINDOW_IS_MAPPED (private))
+                                  window->x,
+                                  window->y,
+                                  window->width,
+                                  window->height,
+                                  window->window_type == GDK_WINDOW_TEMP);
+    }
+
+  /* Then do everything that may reference other windows */
+  for (l = display->toplevels; l != NULL; l = l->next)
+    {
+      GdkWindowImplBroadway *impl = l->data;
+
+      if (impl->id == 0)
+       continue; /* Skip root */
+
+      if (impl->transient_for)
+       broadway_output_set_transient_for (display->output, impl->id, impl->transient_for);
+      /* Can't check GDK_WINDOW_IS_MAPPED here, because that doesn't correctly handle
+        withdrawn windows like menus */
+      if (impl->visible)
        {
-         broadway_client_show_surface (display->output, impl->id);
+         broadway_output_show_surface (display->output, impl->id);
          window_data_send (display->output, impl);
        }
     }
 
-  broadway_client_flush (display->output);
+  gdk_display_flush (GDK_DISPLAY (display));
 }
 
 static void
 gdk_window_impl_broadway_init (GdkWindowImplBroadway *impl)
 {
-  all_windows = g_list_prepend (all_windows, impl);
   impl->toplevel_window_type = -1;
   impl->device_cursor = g_hash_table_new_full (NULL, NULL, NULL,
-                                               (GDestroyNotify) gdk_cursor_unref);
-}
-
-static void
-gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = gdk_window_impl_broadway_finalize;
+                                               (GDestroyNotify) g_object_unref);
 }
 
 static void
 gdk_window_impl_broadway_finalize (GObject *object)
 {
-  GdkWindowObject *wrapper;
-  GdkDrawableImplBroadway *draw_impl;
-  GdkWindowImplBroadway *window_impl;
-  GdkDisplayBroadway *display_broadway;
+  GdkWindow *wrapper;
+  GdkWindowImplBroadway *impl;
+  GdkBroadwayDisplay *broadway_display;
 
   g_return_if_fail (GDK_IS_WINDOW_IMPL_BROADWAY (object));
 
-  draw_impl = GDK_DRAWABLE_IMPL_BROADWAY (object);
-  window_impl = GDK_WINDOW_IMPL_BROADWAY (object);
+  impl = GDK_WINDOW_IMPL_BROADWAY (object);
 
-  wrapper = (GdkWindowObject*) draw_impl->wrapper;
+  wrapper = impl->wrapper;
 
-  display_broadway = GDK_DISPLAY_BROADWAY (gdk_window_get_display (draw_impl->wrapper));
-  g_hash_table_remove (display_broadway->id_ht, GINT_TO_POINTER(window_impl->id));
+  _gdk_broadway_window_grab_check_destroy (wrapper);
 
-  if (window_impl->cursor)
-    gdk_cursor_unref (window_impl->cursor);
+  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (impl->wrapper));
 
-  g_hash_table_destroy (window_impl->device_cursor);
+  if (broadway_display->mouse_in_toplevel == GDK_WINDOW (wrapper))
+    {
+      /* TODO: Send leave + enter event, update cursors, etc */
+      broadway_display->mouse_in_toplevel = NULL;
+    }
 
-  all_windows = g_list_remove (all_windows, window_impl);
+  g_hash_table_remove (broadway_display->id_ht, GINT_TO_POINTER(impl->id));
+
+  if (impl->cursor)
+    g_object_unref (impl->cursor);
+
+  g_hash_table_destroy (impl->device_cursor);
+
+  broadway_display->toplevels = g_list_remove (broadway_display->toplevels, impl);
 
   G_OBJECT_CLASS (gdk_window_impl_broadway_parent_class)->finalize (object);
 }
 
 void
-_gdk_windowing_window_init (GdkScreen * screen)
+_gdk_broadway_screen_init_root_window (GdkScreen * screen)
 {
-  GdkWindowObject *private;
-  GdkDrawableImplBroadway *draw_impl;
-  GdkScreenBroadway *screen_broadway;
+  GdkWindow *window;
+  GdkWindowImplBroadway *impl;
+  GdkBroadwayScreen *broadway_screen;
 
-  screen_broadway = GDK_SCREEN_BROADWAY (screen);
+  broadway_screen = GDK_BROADWAY_SCREEN (screen);
 
-  g_assert (screen_broadway->root_window == NULL);
+  g_assert (broadway_screen->root_window == NULL);
 
-  screen_broadway->root_window = g_object_new (GDK_TYPE_WINDOW, NULL);
+  broadway_screen->root_window = g_object_new (GDK_TYPE_BROADWAY_WINDOW, NULL);
 
-  private = (GdkWindowObject *) screen_broadway->root_window;
-  private->impl = g_object_new (_gdk_window_impl_get_type (), NULL);
-  private->impl_window = private;
-  private->visual = gdk_screen_get_system_visual (screen);
+  window = broadway_screen->root_window;
+  window->impl = g_object_new (GDK_TYPE_WINDOW_IMPL_BROADWAY, NULL);
+  window->impl_window = window;
+  window->visual = gdk_screen_get_system_visual (screen);
 
-  draw_impl = GDK_DRAWABLE_IMPL_BROADWAY (private->impl);
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
 
-  draw_impl->screen = screen;
-  draw_impl->wrapper = GDK_DRAWABLE (private);
+  impl->screen = screen;
+  impl->wrapper = window;
 
-  private->window_type = GDK_WINDOW_ROOT;
-  private->depth = 24;
+  window->window_type = GDK_WINDOW_ROOT;
+  window->depth = 24;
 
-  private->x = 0;
-  private->y = 0;
-  private->abs_x = 0;
-  private->abs_y = 0;
-  private->width = gdk_screen_get_width (screen);
-  private->height = gdk_screen_get_height (screen);
-  private->viewable = TRUE;
+  window->x = 0;
+  window->y = 0;
+  window->abs_x = 0;
+  window->abs_y = 0;
+  window->width = gdk_screen_get_width (screen);
+  window->height = gdk_screen_get_height (screen);
+  window->viewable = TRUE;
 
-  _gdk_window_update_size (screen_broadway->root_window);
+  _gdk_window_update_size (broadway_screen->root_window);
 }
 
 void
-_gdk_window_impl_new (GdkWindow     *window,
-                     GdkWindow     *real_parent,
-                     GdkScreen     *screen,
-                     GdkEventMask   event_mask,
-                     GdkWindowAttr *attributes,
-                     gint           attributes_mask)
-{
-  GdkWindowObject *private;
+_gdk_broadway_display_create_window_impl (GdkDisplay    *display,
+                                         GdkWindow     *window,
+                                         GdkWindow     *real_parent,
+                                         GdkScreen     *screen,
+                                         GdkEventMask   event_mask,
+                                         GdkWindowAttr *attributes,
+                                         gint           attributes_mask)
+{
   GdkWindowImplBroadway *impl;
-  GdkDrawableImplBroadway *draw_impl;
-  GdkScreenBroadway *screen_broadway;
-  GdkDisplayBroadway *display_broadway;
+  GdkBroadwayDisplay *broadway_display;
   static int current_id = 1; /* 0 is the root window */
 
-  private = (GdkWindowObject *) window;
-
-  screen_broadway = GDK_SCREEN_BROADWAY (screen);
-  display_broadway = GDK_DISPLAY_BROADWAY (GDK_SCREEN_DISPLAY (screen));
-
+  broadway_display = GDK_BROADWAY_DISPLAY (display);
 
-  impl = g_object_new (_gdk_window_impl_get_type (), NULL);
-  private->impl = (GdkDrawable *)impl;
+  impl = g_object_new (GDK_TYPE_WINDOW_IMPL_BROADWAY, NULL);
+  window->impl = (GdkWindowImpl *)impl;
   impl->id = current_id++;
-  g_hash_table_insert (display_broadway->id_ht, GINT_TO_POINTER(impl->id), window);
-  draw_impl = GDK_DRAWABLE_IMPL_BROADWAY (impl);
-  draw_impl->wrapper = GDK_DRAWABLE (window);
+  g_hash_table_insert (broadway_display->id_ht, GINT_TO_POINTER(impl->id), window);
+  impl->wrapper = window;
 
-  draw_impl->screen = screen;
+  impl->screen = screen;
 
-  g_assert (private->window_type == GDK_WINDOW_TOPLEVEL ||
-           private->window_type == GDK_WINDOW_TEMP);
-  g_assert (GDK_WINDOW_TYPE (private->parent) == GDK_WINDOW_ROOT);
+  g_assert (window->window_type == GDK_WINDOW_TOPLEVEL ||
+           window->window_type == GDK_WINDOW_TEMP);
+  g_assert (GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_ROOT);
 
-  if (display_broadway->output)
-    broadway_client_new_surface (display_broadway->output,
+  broadway_display->toplevels = g_list_prepend (broadway_display->toplevels, impl);
+
+  if (broadway_display->output)
+    broadway_output_new_surface (broadway_display->output,
                                 impl->id,
-                                private->x,
-                                private->y,
-                                private->width,
-                                private->height);
+                                window->x,
+                                window->y,
+                                window->width,
+                                window->height,
+                                window->window_type == GDK_WINDOW_TEMP);
 }
 
-
-GdkWindow *
-gdk_window_foreign_new_for_display (GdkDisplay     *display,
-                                   GdkNativeWindow anid)
+void
+_gdk_broadway_window_resize_surface (GdkWindow *window)
 {
-  return NULL;
+  GdkWindowImplBroadway *impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+  cairo_surface_t *old, *last_old;
+
+  if (impl->surface)
+    {
+      old = impl->surface;
+      last_old = impl->last_surface;
+
+      impl->surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
+                                                 gdk_window_get_width (impl->wrapper),
+                                                 gdk_window_get_height (impl->wrapper));
+      impl->last_surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24,
+                                                      gdk_window_get_width (impl->wrapper),
+                                                      gdk_window_get_height (impl->wrapper));
+
+      cairo_surface_destroy (old);
+      cairo_surface_destroy (last_old);
+    }
+
+  if (impl->ref_surface)
+    {
+      cairo_surface_set_user_data (impl->ref_surface, &gdk_broadway_cairo_key,
+                                  NULL, NULL);
+      impl->ref_surface = NULL;
+    }
+
+  gdk_window_invalidate_rect (window, NULL, TRUE);
 }
 
-GdkWindow *
-gdk_window_lookup_for_display (GdkDisplay *display, GdkNativeWindow anid)
+static void
+ref_surface_destroyed (void *data)
 {
-  return NULL;
+  GdkWindowImplBroadway *impl = data;
+
+  impl->ref_surface = NULL;
 }
 
-GdkWindow *
-gdk_window_lookup (GdkNativeWindow anid)
+static cairo_surface_t *
+gdk_window_broadway_ref_cairo_surface (GdkWindow *window)
 {
-  return NULL;
+  GdkWindowImplBroadway *impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+  cairo_t *cr;
+  int w, h;
+
+  if (GDK_IS_WINDOW_IMPL_BROADWAY (window) &&
+      GDK_WINDOW_DESTROYED (impl->wrapper))
+    return NULL;
+
+  w = gdk_window_get_width (impl->wrapper);
+  h = gdk_window_get_height (impl->wrapper);
+
+  /* Create actual backing store if missing */
+  if (!impl->surface)
+    {
+      impl->surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, w, h);
+      impl->last_surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, w, h);
+
+      cr = cairo_create (impl->surface);
+      cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+      cairo_rectangle (cr, 0, 0, w, h);
+      cairo_fill (cr);
+      cairo_destroy (cr);
+
+      cr = cairo_create (impl->last_surface);
+      cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+      cairo_rectangle (cr, 0, 0, w, h);
+      cairo_fill (cr);
+      cairo_destroy (cr);
+    }
+
+  /* Create a destroyable surface referencing the real one */
+  if (!impl->ref_surface)
+    {
+      impl->ref_surface =
+       cairo_surface_create_for_rectangle (impl->surface,
+                                           0, 0,
+                                           w, h);
+      if (impl->ref_surface)
+       cairo_surface_set_user_data (impl->ref_surface, &gdk_broadway_cairo_key,
+                                    impl, ref_surface_destroyed);
+    }
+  else
+    cairo_surface_reference (impl->ref_surface);
+
+  return impl->ref_surface;
 }
 
 static void
@@ -382,22 +464,36 @@ _gdk_broadway_window_destroy (GdkWindow *window,
                              gboolean   recursing,
                              gboolean   foreign_destroy)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
   GdkWindowImplBroadway *impl;
-  GdkDisplayBroadway *display_broadway;
+  GdkBroadwayDisplay *broadway_display;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  private = (GdkWindowObject*) window;
-  impl = GDK_WINDOW_IMPL_BROADWAY (private->impl);
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
 
-  _gdk_selection_window_destroyed (window);
+  _gdk_broadway_selection_window_destroyed (window);
+  _gdk_broadway_window_grab_check_destroy (window);
 
-  _gdk_broadway_drawable_finish (private->impl);
+  if (impl->ref_surface)
+    {
+      cairo_surface_finish (impl->ref_surface);
+      cairo_surface_set_user_data (impl->ref_surface, &gdk_broadway_cairo_key,
+                                  NULL, NULL);
+    }
 
-  display_broadway = GDK_DISPLAY_BROADWAY (gdk_window_get_display (window));
-  if (display_broadway->output)
-    broadway_client_destroy_surface (display_broadway->output,
+  if (impl->surface)
+    {
+      cairo_surface_destroy (impl->surface);
+      impl->surface = NULL;
+      cairo_surface_destroy (impl->last_surface);
+      impl->last_surface = NULL;
+    }
+
+  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
+  g_hash_table_remove (broadway_display->id_ht, GINT_TO_POINTER(impl->id));
+
+  if (broadway_display->output)
+    broadway_output_destroy_surface (broadway_display->output,
                                     impl->id);
 }
 
@@ -413,20 +509,16 @@ gdk_window_broadway_resize_cairo_surface (GdkWindow       *window,
   return NULL;
 }
 
-void
-_gdk_windowing_window_destroy_foreign (GdkWindow *window)
+static void
+gdk_broadway_window_destroy_foreign (GdkWindow *window)
 {
 }
 
 /* This function is called when the XWindow is really gone.
  */
-void
-gdk_window_destroy_notify (GdkWindow *window)
+static void
+gdk_broadway_window_destroy_notify (GdkWindow *window)
 {
-  GdkWindowImplBroadway *window_impl;
-
-  window_impl = GDK_WINDOW_IMPL_BROADWAY (((GdkWindowObject *)window)->impl);
-
   if (!GDK_WINDOW_DESTROYED (window))
     {
       if (GDK_WINDOW_TYPE(window) != GDK_WINDOW_FOREIGN)
@@ -441,48 +533,52 @@ gdk_window_destroy_notify (GdkWindow *window)
 static void
 gdk_window_broadway_show (GdkWindow *window, gboolean already_mapped)
 {
-  GdkWindowObject *private;
   GdkWindowImplBroadway *impl;
-  GdkDisplayBroadway *display_broadway;
+  GdkBroadwayDisplay *broadway_display;
 
-  private = (GdkWindowObject*) window;
-  impl = GDK_WINDOW_IMPL_BROADWAY (private->impl);
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+  impl->visible = TRUE;
 
-  if (private->event_mask & GDK_STRUCTURE_MASK)
-    _gdk_make_event (GDK_WINDOW (private), GDK_MAP, NULL, FALSE);
+  if (window->event_mask & GDK_STRUCTURE_MASK)
+    _gdk_make_event (GDK_WINDOW (window), GDK_MAP, NULL, FALSE);
 
-  if (private->parent && private->parent->event_mask & GDK_SUBSTRUCTURE_MASK)
-    _gdk_make_event (GDK_WINDOW (private), GDK_MAP, NULL, FALSE);
+  if (window->parent && window->parent->event_mask & GDK_SUBSTRUCTURE_MASK)
+    _gdk_make_event (GDK_WINDOW (window), GDK_MAP, NULL, FALSE);
 
-  display_broadway = GDK_DISPLAY_BROADWAY (gdk_window_get_display (window));
-  if (display_broadway->output)
+  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
+  if (broadway_display->output)
     {
-      broadway_client_show_surface (display_broadway->output, impl->id);
-      queue_dirty_flush (display_broadway);
+      broadway_output_show_surface (broadway_display->output, impl->id);
+      queue_dirty_flush (broadway_display);
     }
 }
 
 static void
 gdk_window_broadway_hide (GdkWindow *window)
 {
-  GdkWindowObject *private;
   GdkWindowImplBroadway *impl;
-  GdkDisplayBroadway *display_broadway;
+  GdkBroadwayDisplay *broadway_display;
 
-  private = (GdkWindowObject*) window;
-  impl = GDK_WINDOW_IMPL_BROADWAY (private->impl);
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+  impl->visible = FALSE;
 
-  if (private->event_mask & GDK_STRUCTURE_MASK)
-    _gdk_make_event (GDK_WINDOW (private), GDK_UNMAP, NULL, FALSE);
+  if (window->event_mask & GDK_STRUCTURE_MASK)
+    _gdk_make_event (GDK_WINDOW (window), GDK_UNMAP, NULL, FALSE);
 
-  if (private->parent && private->parent->event_mask & GDK_SUBSTRUCTURE_MASK)
-    _gdk_make_event (GDK_WINDOW (private), GDK_UNMAP, NULL, FALSE);
+  if (window->parent && window->parent->event_mask & GDK_SUBSTRUCTURE_MASK)
+    _gdk_make_event (GDK_WINDOW (window), GDK_UNMAP, NULL, FALSE);
+
+  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
+  if (broadway_display->output)
+    {
+      broadway_output_hide_surface (broadway_display->output, impl->id);
+      queue_dirty_flush (broadway_display);
+    }
 
-  display_broadway = GDK_DISPLAY_BROADWAY (gdk_window_get_display (window));
-  if (display_broadway->output)
+  if (broadway_display->mouse_in_toplevel == window)
     {
-      broadway_client_hide_surface (display_broadway->output, impl->id);
-      queue_dirty_flush (display_broadway);
+      /* TODO: Send leave + enter event, update cursors, etc */
+      broadway_display->mouse_in_toplevel = NULL;
     }
 
   _gdk_window_clear_update_area (window);
@@ -502,54 +598,44 @@ gdk_window_broadway_move_resize (GdkWindow *window,
                                 gint       width,
                                 gint       height)
 {
-  GdkWindowObject *private = (GdkWindowObject *) window;;
-  GdkWindowImplBroadway *impl = GDK_WINDOW_IMPL_BROADWAY (private->impl);
-  GdkDrawableImplBroadway *drawable = GDK_DRAWABLE_IMPL_BROADWAY (impl);
-  GdkDisplayBroadway *display_broadway;
-  gboolean changed;
+  GdkWindowImplBroadway *impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+  GdkBroadwayDisplay *broadway_display;
+  gboolean changed, size_changed;;
+  gboolean with_resize;
 
-  changed = FALSE;
+  size_changed = changed = FALSE;
 
-  display_broadway = GDK_DISPLAY_BROADWAY (gdk_window_get_display (window));
+  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
   if (with_move)
     {
       changed = TRUE;
-      private->x = x;
-      private->y = y;
-      if (display_broadway->output != NULL)
-       {
-         broadway_client_move_surface (display_broadway->output,
-                                       impl->id, x, y);
-         queue_dirty_flush (display_broadway);
-       }
+      window->x = x;
+      window->y = y;
     }
 
-
+  with_resize = FALSE;
   if (width > 0 || height > 0)
     {
+      with_resize = TRUE;
       if (width < 1)
        width = 1;
 
       if (height < 1)
        height = 1;
 
-      if (width != private->width ||
-         height != private->height)
+      if (width != window->width ||
+         height != window->height)
        {
          changed = TRUE;
+         size_changed = TRUE;
 
          /* Resize clears the content */
          impl->dirty = TRUE;
          impl->last_synced = FALSE;
 
-         broadway_client_resize_surface (display_broadway->output,
-                                         impl->id, width, height);
-         queue_dirty_flush (display_broadway);
-
-         private->width = width;
-         private->height = height;
-         _gdk_broadway_drawable_update_size (private->impl);
-         gdk_window_invalidate_rect (window, NULL, TRUE);
+         window->width = width;
+         window->height = height;
+         _gdk_broadway_window_resize_surface (window);
        }
     }
 
@@ -558,25 +644,37 @@ gdk_window_broadway_move_resize (GdkWindow *window,
       GdkEvent *event;
       GList *node;
 
+      if (broadway_display->output != NULL)
+       {
+         broadway_output_move_resize_surface (broadway_display->output,
+                                              impl->id,
+                                              with_move, window->x, window->y,
+                                              with_resize, window->width, window->height);
+         queue_dirty_flush (broadway_display);
+         if (size_changed)
+           window->resize_count++;
+       }
+
       event = gdk_event_new (GDK_CONFIGURE);
       event->configure.window = g_object_ref (window);
-      event->configure.x = private->x;
-      event->configure.y = private->y;
-      event->configure.width = private->width;
-      event->configure.height = private->height;
+      event->configure.x = window->x;
+      event->configure.y = window->y;
+      event->configure.width = window->width;
+      event->configure.height = window->height;
 
-      gdk_event_set_device (event, GDK_DISPLAY_OBJECT (display_broadway)->core_pointer);
+      gdk_event_set_device (event, GDK_DISPLAY_OBJECT (broadway_display)->core_pointer);
 
-      node = _gdk_event_queue_append (GDK_DISPLAY_OBJECT (display_broadway), event);
-      _gdk_windowing_got_event (GDK_DISPLAY_OBJECT (display_broadway), node, event, 0);
+      node = _gdk_event_queue_append (GDK_DISPLAY_OBJECT (broadway_display), event);
+      _gdk_windowing_got_event (GDK_DISPLAY_OBJECT (broadway_display), node, event,
+                               _gdk_display_get_next_serial (GDK_DISPLAY (broadway_display)) - 1);
     }
 }
 
 static gboolean
 gdk_window_broadway_reparent (GdkWindow *window,
-                         GdkWindow *new_parent,
-                         gint       x,
-                         gint       y)
+                             GdkWindow *new_parent,
+                             gint       x,
+                             gint       y)
 {
   return FALSE;
 }
@@ -588,14 +686,14 @@ gdk_window_broadway_raise (GdkWindow *window)
 
 static void
 gdk_window_broadway_restack_under (GdkWindow *window,
-                             GList *native_siblings /* in requested order, first is bottom-most */)
+                                  GList *native_siblings /* in requested order, first is bottom-most */)
 {
 }
 
 static void
 gdk_window_broadway_restack_toplevel (GdkWindow *window,
-                                GdkWindow *sibling,
-                                gboolean   above)
+                                     GdkWindow *sibling,
+                                     gboolean   above)
 {
 }
 
@@ -605,99 +703,115 @@ gdk_window_broadway_lower (GdkWindow *window)
 }
 
 
-void
-gdk_window_focus (GdkWindow *window,
-                  guint32    timestamp)
+static void
+gdk_broadway_window_focus (GdkWindow *window,
+                          guint32    timestamp)
 {
 }
 
-void
-gdk_window_set_type_hint (GdkWindow        *window,
-                         GdkWindowTypeHint hint)
+static void
+gdk_broadway_window_set_type_hint (GdkWindow        *window,
+                                  GdkWindowTypeHint hint)
 {
 }
 
-GdkWindowTypeHint
-gdk_window_get_type_hint (GdkWindow *window)
+static GdkWindowTypeHint
+gdk_broadway_window_get_type_hint (GdkWindow *window)
 {
   return GDK_WINDOW_TYPE_HINT_NORMAL;
 }
 
-void
-gdk_window_set_modal_hint (GdkWindow *window,
-                          gboolean   modal)
+static void
+gdk_broadway_window_set_modal_hint (GdkWindow *window,
+                                   gboolean   modal)
 {
 }
 
-void
-gdk_window_set_skip_taskbar_hint (GdkWindow *window,
-                                  gboolean   skips_taskbar)
+static void
+gdk_broadway_window_set_skip_taskbar_hint (GdkWindow *window,
+                                          gboolean   skips_taskbar)
 {
 }
 
-void
-gdk_window_set_skip_pager_hint (GdkWindow *window,
-                                gboolean   skips_pager)
+static void
+gdk_broadway_window_set_skip_pager_hint (GdkWindow *window,
+                                        gboolean   skips_pager)
 {
 }
 
-void
-gdk_window_set_urgency_hint (GdkWindow *window,
-                            gboolean   urgent)
+static void
+gdk_broadway_window_set_urgency_hint (GdkWindow *window,
+                                     gboolean   urgent)
 {
 }
 
-void
-gdk_window_set_geometry_hints (GdkWindow         *window,
-                              const GdkGeometry *geometry,
-                              GdkWindowHints     geom_mask)
+static void
+gdk_broadway_window_set_geometry_hints (GdkWindow         *window,
+                                       const GdkGeometry *geometry,
+                                       GdkWindowHints     geom_mask)
 {
 }
 
-void
-gdk_window_set_title (GdkWindow   *window,
-                     const gchar *title)
+static void
+gdk_broadway_window_set_title (GdkWindow   *window,
+                              const gchar *title)
 {
 }
 
-void
-gdk_window_set_role (GdkWindow   *window,
-                    const gchar *role)
+static void
+gdk_broadway_window_set_role (GdkWindow   *window,
+                             const gchar *role)
 {
 }
 
-void
-gdk_window_set_startup_id (GdkWindow   *window,
-                          const gchar *startup_id)
+static void
+gdk_broadway_window_set_startup_id (GdkWindow   *window,
+                                   const gchar *startup_id)
 {
 }
 
-void
-gdk_window_set_transient_for (GdkWindow *window,
-                             GdkWindow *parent)
+static void
+gdk_broadway_window_set_transient_for (GdkWindow *window,
+                                      GdkWindow *parent)
 {
+  GdkBroadwayDisplay *display;
+  GdkWindowImplBroadway *impl;
+  int parent_id;
+
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+
+  parent_id = 0;
+  if (parent)
+    parent_id = GDK_WINDOW_IMPL_BROADWAY (parent->impl)->id;
+
+  impl->transient_for = parent_id;
+
+  display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (impl->wrapper));
+  if (display->output)
+    {
+      broadway_output_set_transient_for (display->output, impl->id, impl->transient_for);
+      gdk_display_flush (GDK_DISPLAY (display));
+    }
 }
 
 static void
 gdk_window_broadway_set_background (GdkWindow      *window,
-                               cairo_pattern_t *pattern)
+                                   cairo_pattern_t *pattern)
 {
   return;
 }
 
 static void
 gdk_window_broadway_set_device_cursor (GdkWindow *window,
-                                  GdkDevice *device,
-                                  GdkCursor *cursor)
+                                      GdkDevice *device,
+                                      GdkCursor *cursor)
 {
-  GdkWindowObject *private;
   GdkWindowImplBroadway *impl;
 
   g_return_if_fail (GDK_IS_WINDOW (window));
   g_return_if_fail (GDK_IS_DEVICE (device));
 
-  private = (GdkWindowObject *) window;
-  impl = GDK_WINDOW_IMPL_BROADWAY (private->impl);
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
 
   if (!cursor)
     g_hash_table_remove (impl->device_cursor, device);
@@ -715,150 +829,111 @@ gdk_window_broadway_set_device_cursor (GdkWindow *window,
 GdkCursor *
 _gdk_broadway_window_get_cursor (GdkWindow *window)
 {
-  GdkWindowObject *private;
   GdkWindowImplBroadway *impl;
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
 
-  private = (GdkWindowObject *)window;
-  impl = GDK_WINDOW_IMPL_BROADWAY (private->impl);
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
 
   return impl->cursor;
 }
 
 static void
 gdk_window_broadway_get_geometry (GdkWindow *window,
-                             gint      *x,
-                             gint      *y,
-                             gint      *width,
-                             gint      *height,
-                             gint      *depth)
+                                 gint      *x,
+                                 gint      *y,
+                                 gint      *width,
+                                 gint      *height)
 {
+  GdkWindowImplBroadway *impl;
+
+  g_return_if_fail (GDK_IS_WINDOW (window));
+
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+
+  /* TODO: These should really roundtrip to the client to get the current data */
+
+  if (x)
+    *x = impl->wrapper->x;
+  if (y)
+    *y = impl->wrapper->y;
+  if (width)
+    *width = impl->wrapper->width;
+  if (height)
+    *height = impl->wrapper->height;
+
 }
 
 static gint
 gdk_window_broadway_get_root_coords (GdkWindow *window,
-                               gint       x,
-                               gint       y,
-                               gint      *root_x,
-                               gint      *root_y)
+                                    gint       x,
+                                    gint       y,
+                                    gint      *root_x,
+                                    gint      *root_y)
 {
+  GdkWindowImplBroadway *impl;
+
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+
   if (root_x)
-    *root_x = x;
+    *root_x = x + impl->wrapper->x;
   if (root_y)
-    *root_y = y;
+    *root_y = y + impl->wrapper->y;
 
   return 1;
 }
 
-void
-gdk_window_get_root_origin (GdkWindow *window,
-                           gint      *x,
-                           gint      *y)
+static void
+gdk_broadway_window_get_root_origin (GdkWindow *window,
+                                    gint      *x,
+                                    gint      *y)
 {
+  GdkWindowImplBroadway *impl;
+
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
+
+  /* TODO: This should take wm frame into account */
+
   if (x)
-    *x = 0;
+    *x = impl->wrapper->x;
 
   if (y)
-    *y = 0;
+    *y = impl->wrapper->x;
 }
 
-void
-gdk_window_get_frame_extents (GdkWindow    *window,
-                              GdkRectangle *rect)
+static void
+gdk_broadway_window_get_frame_extents (GdkWindow    *window,
+                                      GdkRectangle *rect)
 {
-  GdkWindowObject *private;
-
   g_return_if_fail (rect != NULL);
 
-  private = (GdkWindowObject*) window;
-
-  rect->x = private->x;
-  rect->y = private->y;
-  rect->width = private->width;
-  rect->height = private->height;
-}
-
-void
-_gdk_windowing_get_device_state (GdkDisplay       *display,
-                                 GdkDevice        *device,
-                                 GdkScreen       **screen,
-                                 gint             *x,
-                                 gint             *y,
-                                 GdkModifierType  *mask)
-{
-  if (display->closed)
-    return;
+  /* TODO: This should take wm frame into account */
 
+  rect->x = window->x;
+  rect->y = window->y;
+  rect->width = window->width;
+  rect->height = window->height;
 }
 
 static gboolean
 gdk_window_broadway_get_device_state (GdkWindow       *window,
-                                 GdkDevice       *device,
-                                 gint            *x,
-                                 gint            *y,
-                                 GdkModifierType *mask)
-{
-  return FALSE;
-}
-
-void
-gdk_display_warp_pointer (GdkDisplay *display,
-                         GdkScreen  *screen,
-                         gint        x,
-                         gint        y)
+                                     GdkDevice       *device,
+                                     gint            *x,
+                                     gint            *y,
+                                     GdkModifierType *mask)
 {
-  GdkDevice *device;
+  GdkWindow *child;
 
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-  g_return_if_fail (GDK_IS_SCREEN (screen));
+  g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), FALSE);
 
-  device = display->core_pointer;
-  GDK_DEVICE_GET_CLASS (device)->warp (device, screen, x, y);
-}
-
-void
-gdk_display_warp_device (GdkDisplay *display,
-                         GdkDevice  *device,
-                         GdkScreen  *screen,
-                         gint        x,
-                         gint        y)
-{
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-  g_return_if_fail (GDK_IS_DEVICE (device));
-  g_return_if_fail (GDK_IS_SCREEN (screen));
-  g_return_if_fail (display == gdk_device_get_display (device));
-
-  GDK_DEVICE_GET_CLASS (device)->warp (device, screen, x, y);
-}
-
-GdkWindow*
-_gdk_windowing_window_at_device_position (GdkDisplay      *display,
-                                          GdkDevice       *device,
-                                          gint            *win_x,
-                                          gint            *win_y,
-                                          GdkModifierType *mask,
-                                          gboolean         get_toplevel)
-{
-  GdkWindow *window;
-  GdkWindowObject *private;
-  GdkDisplayBroadway *display_broadway;
-  GdkScreen *screen;
-
-  display_broadway = GDK_DISPLAY_BROADWAY (display);
-  screen = gdk_display_get_screen (display, 0);
-  window = _gdk_window_find_child_at (gdk_screen_get_root_window (screen),
-                                     display_broadway->last_x,
-                                     display_broadway->last_y);
-
-  if (window != NULL)
-    {
-      private = (GdkWindowObject *)window;
-      *win_x = display_broadway->last_x - private->x;
-      *win_y = display_broadway->last_y - private->y;
-    }
+  if (GDK_WINDOW_DESTROYED (window))
+    return FALSE;
 
-  return window;
+  GDK_DEVICE_GET_CLASS (device)->query_state (device, window,
+                                              NULL, &child,
+                                              NULL, NULL,
+                                              x, y, mask);
+  return child != NULL;
 }
 
 static GdkEventMask
@@ -869,9 +944,10 @@ gdk_window_broadway_get_events (GdkWindow *window)
 
   return 0;
 }
+
 static void
 gdk_window_broadway_set_events (GdkWindow    *window,
-                           GdkEventMask  event_mask)
+                               GdkEventMask  event_mask)
 {
   if (!GDK_WINDOW_DESTROYED (window))
     {
@@ -880,100 +956,88 @@ gdk_window_broadway_set_events (GdkWindow    *window,
 
 static void
 gdk_window_broadway_shape_combine_region (GdkWindow       *window,
-                                     const cairo_region_t *shape_region,
-                                     gint             offset_x,
-                                     gint             offset_y)
+                                         const cairo_region_t *shape_region,
+                                         gint             offset_x,
+                                         gint             offset_y)
 {
 }
 
 static void
 gdk_window_broadway_input_shape_combine_region (GdkWindow       *window,
-                                          const cairo_region_t *shape_region,
-                                          gint             offset_x,
-                                          gint             offset_y)
+                                               const cairo_region_t *shape_region,
+                                               gint             offset_x,
+                                               gint             offset_y)
 {
 }
 
 
-void
-gdk_window_set_override_redirect (GdkWindow *window,
-                                 gboolean override_redirect)
+static void
+gdk_broadway_window_set_override_redirect (GdkWindow *window,
+                                          gboolean override_redirect)
 {
 }
 
-void
-gdk_window_set_accept_focus (GdkWindow *window,
-                            gboolean accept_focus)
+static void
+gdk_broadway_window_set_accept_focus (GdkWindow *window,
+                                     gboolean accept_focus)
 {
-  GdkWindowObject *private;
-
-  private = (GdkWindowObject *)window;
-
   accept_focus = accept_focus != FALSE;
 
-  if (private->accept_focus != accept_focus)
+  if (window->accept_focus != accept_focus)
     {
-      private->accept_focus = accept_focus;
+      window->accept_focus = accept_focus;
     }
 }
 
-void
-gdk_window_set_focus_on_map (GdkWindow *window,
-                            gboolean focus_on_map)
+static void
+gdk_broadway_window_set_focus_on_map (GdkWindow *window,
+                                     gboolean focus_on_map)
 {
-  GdkWindowObject *private;
-
-  private = (GdkWindowObject *)window;
-
   focus_on_map = focus_on_map != FALSE;
 
-  if (private->focus_on_map != focus_on_map)
+  if (window->focus_on_map != focus_on_map)
     {
-      private->focus_on_map = focus_on_map;
+      window->focus_on_map = focus_on_map;
     }
 }
 
 
-void
-gdk_window_set_icon_list (GdkWindow *window,
-                         GList     *pixbufs)
+static void
+gdk_broadway_window_set_icon_list (GdkWindow *window,
+                                  GList     *pixbufs)
 {
 }
 
-void
-gdk_window_set_icon_name (GdkWindow   *window, 
-                         const gchar *name)
+static void
+gdk_broadway_window_set_icon_name (GdkWindow   *window,
+                                  const gchar *name)
 {
-  GdkDisplay *display;
-
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
-  display = gdk_window_get_display (window);
-
   g_object_set_qdata (G_OBJECT (window), g_quark_from_static_string ("gdk-icon-name-set"),
-                      GUINT_TO_POINTER (name != NULL));
+                     GUINT_TO_POINTER (name != NULL));
 }
 
-void
-gdk_window_iconify (GdkWindow *window)
+static void
+gdk_broadway_window_iconify (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 }
 
-void
-gdk_window_deiconify (GdkWindow *window)
+static void
+gdk_broadway_window_deiconify (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 }
 
-void
-gdk_window_stick (GdkWindow *window)
+static void
+gdk_broadway_window_stick (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -981,8 +1045,8 @@ gdk_window_stick (GdkWindow *window)
 
 }
 
-void
-gdk_window_unstick (GdkWindow *window)
+static void
+gdk_broadway_window_unstick (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -990,8 +1054,8 @@ gdk_window_unstick (GdkWindow *window)
 
 }
 
-void
-gdk_window_maximize (GdkWindow *window)
+static void
+gdk_broadway_window_maximize (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -999,8 +1063,8 @@ gdk_window_maximize (GdkWindow *window)
 
 }
 
-void
-gdk_window_unmaximize (GdkWindow *window)
+static void
+gdk_broadway_window_unmaximize (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -1008,8 +1072,8 @@ gdk_window_unmaximize (GdkWindow *window)
 
 }
 
-void
-gdk_window_fullscreen (GdkWindow *window)
+static void
+gdk_broadway_window_fullscreen (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -1017,8 +1081,8 @@ gdk_window_fullscreen (GdkWindow *window)
 
 }
 
-void
-gdk_window_unfullscreen (GdkWindow *window)
+static void
+gdk_broadway_window_unfullscreen (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -1026,9 +1090,9 @@ gdk_window_unfullscreen (GdkWindow *window)
 
 }
 
-void
-gdk_window_set_keep_above (GdkWindow *window,
-                           gboolean   setting)
+static void
+gdk_broadway_window_set_keep_above (GdkWindow *window,
+                                   gboolean   setting)
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -1038,8 +1102,8 @@ gdk_window_set_keep_above (GdkWindow *window,
 
 }
 
-void
-gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
+static void
+gdk_broadway_window_set_keep_below (GdkWindow *window, gboolean setting)
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -1049,8 +1113,8 @@ gdk_window_set_keep_below (GdkWindow *window, gboolean setting)
 
 }
 
-GdkWindow *
-gdk_window_get_group (GdkWindow *window)
+static GdkWindow *
+gdk_broadway_window_get_group (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL (window))
@@ -1059,15 +1123,15 @@ gdk_window_get_group (GdkWindow *window)
   return window;
 }
 
-void
-gdk_window_set_group (GdkWindow *window,
-                     GdkWindow *leader)
+static void
+gdk_broadway_window_set_group (GdkWindow *window,
+                              GdkWindow *leader)
 {
 }
 
-void
-gdk_window_set_decorations (GdkWindow      *window,
-                           GdkWMDecoration decorations)
+static void
+gdk_broadway_window_set_decorations (GdkWindow      *window,
+                                    GdkWMDecoration decorations)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
@@ -1075,9 +1139,9 @@ gdk_window_set_decorations (GdkWindow      *window,
 
 }
 
-gboolean
-gdk_window_get_decorations(GdkWindow       *window,
-                          GdkWMDecoration *decorations)
+static gboolean
+gdk_broadway_window_get_decorations (GdkWindow       *window,
+                                    GdkWMDecoration *decorations)
 {
   gboolean result = FALSE;
 
@@ -1088,9 +1152,9 @@ gdk_window_get_decorations(GdkWindow       *window,
   return result;
 }
 
-void
-gdk_window_set_functions (GdkWindow    *window,
-                         GdkWMFunction functions)
+static void
+gdk_broadway_window_set_functions (GdkWindow    *window,
+                                  GdkWMFunction functions)
 {
   g_return_if_fail (GDK_IS_WINDOW (window));
 
@@ -1099,14 +1163,14 @@ gdk_window_set_functions (GdkWindow    *window,
     return;
 }
 
-cairo_region_t *
-_gdk_windowing_window_get_shape (GdkWindow *window)
+static cairo_region_t *
+gdk_broadway_window_get_shape (GdkWindow *window)
 {
   return NULL;
 }
 
-cairo_region_t *
-_gdk_windowing_window_get_input_shape (GdkWindow *window)
+static cairo_region_t *
+gdk_broadway_window_get_input_shape (GdkWindow *window)
 {
   return NULL;
 }
@@ -1114,31 +1178,336 @@ _gdk_windowing_window_get_input_shape (GdkWindow *window)
 
 static gboolean
 gdk_window_broadway_set_static_gravities (GdkWindow *window,
-                                     gboolean   use_static)
+                                         gboolean   use_static)
 {
   return TRUE;
 }
 
-void
-gdk_window_begin_resize_drag (GdkWindow     *window,
-                              GdkWindowEdge  edge,
-                              gint           button,
-                              gint           root_x,
-                              gint           root_y,
-                              guint32        timestamp)
+typedef struct _MoveResizeData MoveResizeData;
+
+struct _MoveResizeData
+{
+  GdkDisplay *display;
+
+  GdkWindow *moveresize_window;
+  GdkWindow *moveresize_emulation_window;
+  gboolean is_resize;
+  GdkWindowEdge resize_edge;
+  gint moveresize_button;
+  gint moveresize_x;
+  gint moveresize_y;
+  gint moveresize_orig_x;
+  gint moveresize_orig_y;
+  gint moveresize_orig_width;
+  gint moveresize_orig_height;
+  long moveresize_process_time;
+  BroadwayInputMsg *moveresize_pending_event;
+};
+
+static MoveResizeData *
+get_move_resize_data (GdkDisplay *display,
+                     gboolean    create)
+{
+  MoveResizeData *mv_resize;
+  static GQuark move_resize_quark = 0;
+
+  if (!move_resize_quark)
+    move_resize_quark = g_quark_from_static_string ("gdk-window-moveresize");
+
+  mv_resize = g_object_get_qdata (G_OBJECT (display), move_resize_quark);
+
+  if (!mv_resize && create)
+    {
+      mv_resize = g_new0 (MoveResizeData, 1);
+      mv_resize->display = display;
+
+      g_object_set_qdata (G_OBJECT (display), move_resize_quark, mv_resize);
+    }
+
+  return mv_resize;
+}
+
+static void
+update_pos (MoveResizeData *mv_resize,
+           gint            new_root_x,
+           gint            new_root_y)
+{
+  gint dx, dy;
+
+  dx = new_root_x - mv_resize->moveresize_x;
+  dy = new_root_y - mv_resize->moveresize_y;
+
+  if (mv_resize->is_resize)
+    {
+      gint x, y, w, h;
+
+      x = mv_resize->moveresize_orig_x;
+      y = mv_resize->moveresize_orig_y;
+
+      w = mv_resize->moveresize_orig_width;
+      h = mv_resize->moveresize_orig_height;
+
+      switch (mv_resize->resize_edge)
+       {
+       case GDK_WINDOW_EDGE_NORTH_WEST:
+         x += dx;
+         y += dy;
+         w -= dx;
+         h -= dy;
+         break;
+       case GDK_WINDOW_EDGE_NORTH:
+         y += dy;
+         h -= dy;
+         break;
+       case GDK_WINDOW_EDGE_NORTH_EAST:
+         y += dy;
+         h -= dy;
+         w += dx;
+         break;
+       case GDK_WINDOW_EDGE_SOUTH_WEST:
+         h += dy;
+         x += dx;
+         w -= dx;
+         break;
+       case GDK_WINDOW_EDGE_SOUTH_EAST:
+         w += dx;
+         h += dy;
+         break;
+       case GDK_WINDOW_EDGE_SOUTH:
+         h += dy;
+         break;
+       case GDK_WINDOW_EDGE_EAST:
+         w += dx;
+         break;
+       case GDK_WINDOW_EDGE_WEST:
+         x += dx;
+         w -= dx;
+         break;
+       }
+
+      x = MAX (x, 0);
+      y = MAX (y, 0);
+      w = MAX (w, 1);
+      h = MAX (h, 1);
+
+      gdk_window_move_resize (mv_resize->moveresize_window, x, y, w, h);
+    }
+  else
+    {
+      gint x, y;
+
+      x = mv_resize->moveresize_orig_x + dx;
+      y = mv_resize->moveresize_orig_y + dy;
+
+      gdk_window_move (mv_resize->moveresize_window, x, y);
+    }
+}
+
+static void
+finish_drag (MoveResizeData *mv_resize)
 {
+  gdk_window_destroy (mv_resize->moveresize_emulation_window);
+  mv_resize->moveresize_emulation_window = NULL;
+  g_object_unref (mv_resize->moveresize_window);
+  mv_resize->moveresize_window = NULL;
+
+  if (mv_resize->moveresize_pending_event)
+    {
+      g_free (mv_resize->moveresize_pending_event);
+      mv_resize->moveresize_pending_event = NULL;
+    }
+}
+
+static gboolean
+moveresize_lookahead (GdkDisplay *display,
+                     MoveResizeData *mv_resize,
+                     BroadwayInputMsg *event)
+{
+  GdkBroadwayDisplay *broadway_display;
+  BroadwayInputMsg *message;
+  GList *l;
+
+  broadway_display = GDK_BROADWAY_DISPLAY (display);
+  for (l = broadway_display->input_messages; l != NULL; l = l->next)
+    {
+      message = l->data;
+      if (message->base.type == 'm')
+       return FALSE;
+      if (message->base.type == 'b')
+       return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+_gdk_broadway_moveresize_handle_event (GdkDisplay *display,
+                                      BroadwayInputMsg *event)
+{
+  guint button_mask = 0;
+  MoveResizeData *mv_resize = get_move_resize_data (display, FALSE);
+
+  if (!mv_resize || !mv_resize->moveresize_window)
+    return FALSE;
+
+  button_mask = GDK_BUTTON1_MASK << (mv_resize->moveresize_button - 1);
+
+  switch (event->base.type)
+    {
+    case 'm':
+      if (mv_resize->moveresize_window->resize_count > 0)
+       {
+         if (mv_resize->moveresize_pending_event)
+           *mv_resize->moveresize_pending_event = *event;
+         else
+           mv_resize->moveresize_pending_event =
+             g_memdup (event, sizeof (BroadwayInputMsg));
+
+         break;
+       }
+      if (!moveresize_lookahead (display, mv_resize, event))
+       break;
+
+      update_pos (mv_resize,
+                 event->pointer.root_x,
+                 event->pointer.root_y);
+
+      /* This should never be triggered in normal cases, but in the
+       * case where the drag started without an implicit grab being
+       * in effect, we could miss the release if it occurs before
+       * we grab the pointer; this ensures that we will never
+       * get a permanently stuck grab.
+       */
+      if ((event->pointer.state & button_mask) == 0)
+       finish_drag (mv_resize);
+      break;
+
+    case 'B':
+      update_pos (mv_resize,
+                 event->pointer.root_x,
+                 event->pointer.root_y);
+
+      if (event->button.button == mv_resize->moveresize_button)
+       finish_drag (mv_resize);
+      break;
+    }
+  return TRUE;
+}
+
+gboolean
+_gdk_broadway_moveresize_configure_done (GdkDisplay *display,
+                                        GdkWindow  *window)
+{
+  BroadwayInputMsg *tmp_event;
+  MoveResizeData *mv_resize = get_move_resize_data (display, FALSE);
+
+  if (!mv_resize || window != mv_resize->moveresize_window)
+    return FALSE;
+
+  if (mv_resize->moveresize_pending_event)
+    {
+      tmp_event = mv_resize->moveresize_pending_event;
+      mv_resize->moveresize_pending_event = NULL;
+      _gdk_broadway_moveresize_handle_event (display, tmp_event);
+      g_free (tmp_event);
+    }
+
+  return TRUE;
+}
+
+static void
+create_moveresize_window (MoveResizeData *mv_resize,
+                         guint32         timestamp)
+{
+  GdkWindowAttr attributes;
+  gint attributes_mask;
+  GdkGrabStatus status;
+
+  g_assert (mv_resize->moveresize_emulation_window == NULL);
+
+  attributes.x = -100;
+  attributes.y = -100;
+  attributes.width = 10;
+  attributes.height = 10;
+  attributes.window_type = GDK_WINDOW_TEMP;
+  attributes.wclass = GDK_INPUT_ONLY;
+  attributes.override_redirect = TRUE;
+  attributes.event_mask = 0;
+
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
+
+  mv_resize->moveresize_emulation_window =
+    gdk_window_new (gdk_screen_get_root_window (gdk_display_get_default_screen (mv_resize->display)),
+                   &attributes,
+                   attributes_mask);
+
+  gdk_window_show (mv_resize->moveresize_emulation_window);
+
+  status = gdk_pointer_grab (mv_resize->moveresize_emulation_window,
+                            FALSE,
+                            GDK_BUTTON_RELEASE_MASK |
+                            GDK_POINTER_MOTION_MASK,
+                            NULL,
+                            NULL,
+                            timestamp);
+
+  if (status != GDK_GRAB_SUCCESS)
+    {
+      /* If this fails, some other client has grabbed the window
+       * already.
+       */
+      finish_drag (mv_resize);
+    }
+
+  mv_resize->moveresize_process_time = 0;
+}
+
+static void
+gdk_broadway_window_begin_resize_drag (GdkWindow     *window,
+                                      GdkWindowEdge  edge,
+                                       GdkDevice     *device,
+                                      gint           button,
+                                      gint           root_x,
+                                      gint           root_y,
+                                      guint32        timestamp)
+{
+  GdkBroadwayDisplay *broadway_display;
+  MoveResizeData *mv_resize;
+
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
     return;
 
+  /* We need a connection to be able to get mouse events, if not, punt */
+  broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
+  if (!broadway_display->output)
+    return;
+
+  mv_resize = get_move_resize_data (GDK_WINDOW_DISPLAY (window), TRUE);
+
+  mv_resize->is_resize = TRUE;
+  mv_resize->moveresize_button = button;
+  mv_resize->resize_edge = edge;
+  mv_resize->moveresize_x = root_x;
+  mv_resize->moveresize_y = root_y;
+  mv_resize->moveresize_window = g_object_ref (window);
+
+  gdk_window_get_origin (mv_resize->moveresize_window,
+                        &mv_resize->moveresize_orig_x,
+                        &mv_resize->moveresize_orig_y);
+  mv_resize->moveresize_orig_width = gdk_window_get_width (window);
+  mv_resize->moveresize_orig_height = gdk_window_get_height (window);
+
+  create_moveresize_window (mv_resize, timestamp);
 }
 
-void
-gdk_window_begin_move_drag (GdkWindow *window,
-                            gint       button,
-                            gint       root_x,
-                            gint       root_y,
-                            guint32    timestamp)
+static void
+gdk_broadway_window_begin_move_drag (GdkWindow *window,
+                                     GdkDevice *device,
+                                    gint       button,
+                                    gint       root_x,
+                                    gint       root_y,
+                                    guint32    timestamp)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL (window))
@@ -1146,89 +1515,74 @@ gdk_window_begin_move_drag (GdkWindow *window,
 
 }
 
-void
-gdk_window_enable_synchronized_configure (GdkWindow *window)
+static void
+gdk_broadway_window_enable_synchronized_configure (GdkWindow *window)
 {
-  GdkWindowObject *private = (GdkWindowObject *)window;
-
-  if (!GDK_IS_WINDOW_IMPL_BROADWAY (private->impl))
+  if (!GDK_IS_WINDOW_IMPL_BROADWAY (window->impl))
     return;
 }
 
-void
-gdk_window_configure_finished (GdkWindow *window)
+static void
+gdk_broadway_window_configure_finished (GdkWindow *window)
 {
   if (!WINDOW_IS_TOPLEVEL (window))
     return;
 }
 
-void
-_gdk_windowing_window_beep (GdkWindow *window)
+static gboolean
+gdk_broadway_window_beep (GdkWindow *window)
 {
-  GdkDisplay *display;
-
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  display = GDK_WINDOW_DISPLAY (window);
-
-  gdk_display_beep (display);
+  return FALSE;
 }
 
-void
-gdk_window_set_opacity (GdkWindow *window,
-                       gdouble    opacity)
+static void
+gdk_broadway_window_set_opacity (GdkWindow *window,
+                                gdouble    opacity)
 {
-  GdkDisplay *display;
-
   g_return_if_fail (GDK_IS_WINDOW (window));
 
   if (GDK_WINDOW_DESTROYED (window) ||
       !WINDOW_IS_TOPLEVEL (window))
     return;
 
-  display = gdk_window_get_display (window);
-
   if (opacity < 0)
     opacity = 0;
   else if (opacity > 1)
     opacity = 1;
-
 }
 
-void
-_gdk_windowing_window_set_composited (GdkWindow *window,
-                                      gboolean   composited)
+static void
+gdk_broadway_window_set_composited (GdkWindow *window,
+                                   gboolean   composited)
 {
 }
 
-void
-_gdk_windowing_window_process_updates_recurse (GdkWindow *window,
-                                               cairo_region_t *region)
+static void
+gdk_broadway_window_process_updates_recurse (GdkWindow *window,
+                                            cairo_region_t *region)
 {
-  GdkWindowObject *private;
   GdkWindowImplBroadway *impl;
 
   _gdk_window_process_updates_recurse (window, region);
 
-  private = (GdkWindowObject *)window;
-  impl = GDK_WINDOW_IMPL_BROADWAY (private->impl);
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
   impl->dirty = TRUE;
-  queue_dirty_flush (GDK_DISPLAY_BROADWAY (gdk_window_get_display (window)));
+  queue_dirty_flush (GDK_BROADWAY_DISPLAY (gdk_window_get_display (window)));
 }
 
 void
-_gdk_windowing_before_process_all_updates (void)
+_gdk_broadway_display_before_process_all_updates (GdkDisplay *display)
 {
 }
 
 void
-_gdk_windowing_after_process_all_updates (void)
+_gdk_broadway_display_after_process_all_updates (GdkDisplay *display)
 {
 }
 
 gboolean
 _gdk_broadway_window_queue_antiexpose (GdkWindow *window,
-                                 cairo_region_t *area)
+                                      cairo_region_t *area)
 {
   return TRUE;
 }
@@ -1266,20 +1620,20 @@ _gdk_broadway_window_translate (GdkWindow      *window,
                                gint            dx,
                                gint            dy)
 {
-  GdkWindowObject *private;
-  GdkDrawableImplBroadway *impl;
-  GdkDisplayBroadway *display_broadway;
+  GdkWindowImplBroadway *impl;
+  GdkBroadwayDisplay *broadway_display;
   int n_rects, i;
   BroadwayRect *rects;
   cairo_rectangle_int_t rect;
 
-  private = (GdkWindowObject *)window;
-  impl = GDK_DRAWABLE_IMPL_BROADWAY (private->impl);
+  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
 
   if (impl->surface)
     {
       copy_region (impl->surface, area, dx, dy);
-      if (GDK_WINDOW_IMPL_BROADWAY (impl)->last_synced)
+      broadway_display = GDK_BROADWAY_DISPLAY (gdk_window_get_display (window));
+      if (GDK_WINDOW_IMPL_BROADWAY (impl)->last_synced &&
+         broadway_display->output)
        {
          copy_region (impl->last_surface, area, dx, dy);
          n_rects = cairo_region_num_rectangles (area);
@@ -1292,40 +1646,112 @@ _gdk_broadway_window_translate (GdkWindow      *window,
              rects[i].width = rect.width;
              rects[i].height = rect.height;
            }
-         display_broadway = GDK_DISPLAY_BROADWAY (gdk_window_get_display (window));
-         broadway_client_copy_rectangles (display_broadway->output,
+         broadway_output_copy_rectangles (broadway_display->output,
                                           GDK_WINDOW_IMPL_BROADWAY (impl)->id,
                                           rects, n_rects, dx, dy);
-         queue_dirty_flush (display_broadway);
+         queue_dirty_flush (broadway_display);
          g_free (rects);
        }
     }
 }
 
+guint32
+gdk_broadway_get_last_seen_time (GdkWindow  *window)
+{
+  GdkDisplay *display;
+
+  display = gdk_window_get_display (window);
+  _gdk_broadway_display_consume_all_input (display);
+  return (guint32) GDK_BROADWAY_DISPLAY (display)->last_seen_time;
+}
+
 static void
-gdk_window_impl_iface_init (GdkWindowImplIface *iface)
-{
-  iface->show = gdk_window_broadway_show;
-  iface->hide = gdk_window_broadway_hide;
-  iface->withdraw = gdk_window_broadway_withdraw;
-  iface->set_events = gdk_window_broadway_set_events;
-  iface->get_events = gdk_window_broadway_get_events;
-  iface->raise = gdk_window_broadway_raise;
-  iface->lower = gdk_window_broadway_lower;
-  iface->restack_under = gdk_window_broadway_restack_under;
-  iface->restack_toplevel = gdk_window_broadway_restack_toplevel;
-  iface->move_resize = gdk_window_broadway_move_resize;
-  iface->set_background = gdk_window_broadway_set_background;
-  iface->reparent = gdk_window_broadway_reparent;
-  iface->set_device_cursor = gdk_window_broadway_set_device_cursor;
-  iface->get_geometry = gdk_window_broadway_get_geometry;
-  iface->get_root_coords = gdk_window_broadway_get_root_coords;
-  iface->get_device_state = gdk_window_broadway_get_device_state;
-  iface->shape_combine_region = gdk_window_broadway_shape_combine_region;
-  iface->input_shape_combine_region = gdk_window_broadway_input_shape_combine_region;
-  iface->set_static_gravities = gdk_window_broadway_set_static_gravities;
-  iface->queue_antiexpose = _gdk_broadway_window_queue_antiexpose;
-  iface->translate = _gdk_broadway_window_translate;
-  iface->destroy = _gdk_broadway_window_destroy;
-  iface->resize_cairo_surface = gdk_window_broadway_resize_cairo_surface;
+gdk_window_impl_broadway_class_init (GdkWindowImplBroadwayClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GdkWindowImplClass *impl_class = GDK_WINDOW_IMPL_CLASS (klass);
+
+  object_class->finalize = gdk_window_impl_broadway_finalize;
+
+  impl_class->ref_cairo_surface = gdk_window_broadway_ref_cairo_surface;
+  impl_class->show = gdk_window_broadway_show;
+  impl_class->hide = gdk_window_broadway_hide;
+  impl_class->withdraw = gdk_window_broadway_withdraw;
+  impl_class->set_events = gdk_window_broadway_set_events;
+  impl_class->get_events = gdk_window_broadway_get_events;
+  impl_class->raise = gdk_window_broadway_raise;
+  impl_class->lower = gdk_window_broadway_lower;
+  impl_class->restack_under = gdk_window_broadway_restack_under;
+  impl_class->restack_toplevel = gdk_window_broadway_restack_toplevel;
+  impl_class->move_resize = gdk_window_broadway_move_resize;
+  impl_class->set_background = gdk_window_broadway_set_background;
+  impl_class->reparent = gdk_window_broadway_reparent;
+  impl_class->set_device_cursor = gdk_window_broadway_set_device_cursor;
+  impl_class->get_geometry = gdk_window_broadway_get_geometry;
+  impl_class->get_root_coords = gdk_window_broadway_get_root_coords;
+  impl_class->get_device_state = gdk_window_broadway_get_device_state;
+  impl_class->shape_combine_region = gdk_window_broadway_shape_combine_region;
+  impl_class->input_shape_combine_region = gdk_window_broadway_input_shape_combine_region;
+  impl_class->set_static_gravities = gdk_window_broadway_set_static_gravities;
+  impl_class->queue_antiexpose = _gdk_broadway_window_queue_antiexpose;
+  impl_class->translate = _gdk_broadway_window_translate;
+  impl_class->destroy = _gdk_broadway_window_destroy;
+  impl_class->destroy_foreign = gdk_broadway_window_destroy_foreign;
+  impl_class->resize_cairo_surface = gdk_window_broadway_resize_cairo_surface;
+  impl_class->get_shape = gdk_broadway_window_get_shape;
+  impl_class->get_input_shape = gdk_broadway_window_get_input_shape;
+  impl_class->beep = gdk_broadway_window_beep;
+
+  impl_class->focus = gdk_broadway_window_focus;
+  impl_class->set_type_hint = gdk_broadway_window_set_type_hint;
+  impl_class->get_type_hint = gdk_broadway_window_get_type_hint;
+  impl_class->set_modal_hint = gdk_broadway_window_set_modal_hint;
+  impl_class->set_skip_taskbar_hint = gdk_broadway_window_set_skip_taskbar_hint;
+  impl_class->set_skip_pager_hint = gdk_broadway_window_set_skip_pager_hint;
+  impl_class->set_urgency_hint = gdk_broadway_window_set_urgency_hint;
+  impl_class->set_geometry_hints = gdk_broadway_window_set_geometry_hints;
+  impl_class->set_title = gdk_broadway_window_set_title;
+  impl_class->set_role = gdk_broadway_window_set_role;
+  impl_class->set_startup_id = gdk_broadway_window_set_startup_id;
+  impl_class->set_transient_for = gdk_broadway_window_set_transient_for;
+  impl_class->get_root_origin = gdk_broadway_window_get_root_origin;
+  impl_class->get_frame_extents = gdk_broadway_window_get_frame_extents;
+  impl_class->set_override_redirect = gdk_broadway_window_set_override_redirect;
+  impl_class->set_accept_focus = gdk_broadway_window_set_accept_focus;
+  impl_class->set_focus_on_map = gdk_broadway_window_set_focus_on_map;
+  impl_class->set_icon_list = gdk_broadway_window_set_icon_list;
+  impl_class->set_icon_name = gdk_broadway_window_set_icon_name;
+  impl_class->iconify = gdk_broadway_window_iconify;
+  impl_class->deiconify = gdk_broadway_window_deiconify;
+  impl_class->stick = gdk_broadway_window_stick;
+  impl_class->unstick = gdk_broadway_window_unstick;
+  impl_class->maximize = gdk_broadway_window_maximize;
+  impl_class->unmaximize = gdk_broadway_window_unmaximize;
+  impl_class->fullscreen = gdk_broadway_window_fullscreen;
+  impl_class->unfullscreen = gdk_broadway_window_unfullscreen;
+  impl_class->set_keep_above = gdk_broadway_window_set_keep_above;
+  impl_class->set_keep_below = gdk_broadway_window_set_keep_below;
+  impl_class->get_group = gdk_broadway_window_get_group;
+  impl_class->set_group = gdk_broadway_window_set_group;
+  impl_class->set_decorations = gdk_broadway_window_set_decorations;
+  impl_class->get_decorations = gdk_broadway_window_get_decorations;
+  impl_class->set_functions = gdk_broadway_window_set_functions;
+  impl_class->set_functions = gdk_broadway_window_set_functions;
+  impl_class->begin_resize_drag = gdk_broadway_window_begin_resize_drag;
+  impl_class->begin_move_drag = gdk_broadway_window_begin_move_drag;
+  impl_class->enable_synchronized_configure = gdk_broadway_window_enable_synchronized_configure;
+  impl_class->configure_finished = gdk_broadway_window_configure_finished;
+  impl_class->set_opacity = gdk_broadway_window_set_opacity;
+  impl_class->set_composited = gdk_broadway_window_set_composited;
+  impl_class->destroy_notify = gdk_broadway_window_destroy_notify;
+  impl_class->register_dnd = _gdk_broadway_window_register_dnd;
+  impl_class->drag_begin = _gdk_broadway_window_drag_begin;
+  impl_class->process_updates_recurse = gdk_broadway_window_process_updates_recurse;
+  impl_class->sync_rendering = _gdk_broadway_window_sync_rendering;
+  impl_class->simulate_key = _gdk_broadway_window_simulate_key;
+  impl_class->simulate_button = _gdk_broadway_window_simulate_button;
+  impl_class->get_property = _gdk_broadway_window_get_property;
+  impl_class->change_property = _gdk_broadway_window_change_property;
+  impl_class->delete_property = _gdk_broadway_window_delete_property;
+  impl_class->get_drag_protocol = _gdk_broadway_window_get_drag_protocol;
 }