Merge lp:~attente/gtk/refresh-mir-2 into lp:~ubuntu-desktop/gtk/ubuntugtk3

[William Hua]

Backport mir patches from upstream master.

Backport mir patches from upstream master.

Supercedes https://code.launchpad.net/~attente/gtk/refresh-mir/+merge/262776.

[Iain Lane (laney)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-19 18:08:28 +0000
+++ debian/changelog	2015-07-04 03:42:40 +0000
@@ -1,3 +1,9 @@
+gtk+3.0 (3.16.4-2ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-backport-mir-patches-from-upstream-master.patch
+
+ -- William Hua <[e-mail]>  Fri, 03 Jul 2015 23:09:34 -0400
+
 gtk+3.0 (3.16.4-2ubuntu1) wily; urgency=low
 
   * Merge with Debian. Remaining changes:

=== renamed file 'debian/patches/0001-Stable-mir-patches-from-git-master.patch' => 'debian/patches/0001-backport-mir-patches-from-upstream-master.patch'
--- debian/patches/0001-Stable-mir-patches-from-git-master.patch	2015-06-02 11:18:47 +0000
+++ debian/patches/0001-backport-mir-patches-from-upstream-master.patch	2015-07-04 03:42:40 +0000
@@ -1,21 +1,41 @@
-From 7922450aa8d7d403fc3c0d0c347c3a1f013c0c70 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <[e-mail]>
-Date: Fri, 20 Mar 2015 20:18:44 +0100
-Subject: [PATCH 1/2] Stable mir patches from git master.
+From a4a3dbe3550c272187e3cb27dade41bc37e18d20 Mon Sep 17 00:00:00 2001
+From: William Hua <[e-mail]>
+Date: Tue, 7 Apr 2015 10:33:35 -0400
+Subject: [PATCH] backport mir patches from upstream master
 
+61f3399f980288a9a9e4b03b50dd147a8af55a8d
+ea190a339a9e61a52db9d307568f12e0a234f52b
+6a51ac59f05b01d2fd1def67a6df589de4b423a5
+d43f5258ffc4fc0ef22e47eb00b5a3742e3716da
+a43efc665576c0da58771931774f56d4faffb1b8
+e6b3bae7871df3d5b03dae0e36e4748c41971d1b
+aebac40d3819114d55bf33301d30ff5a2fd6ad1a
+a57636f057c6c9bc16a6b60a51b973c9dc8573ca
+e1c958e70df7227b598d6d16adf9770e95a9f998
+f1c11740c1e5c7d429a3d33c9847a52974aa5b3f
+d37f94a524c7109cf1990eb864006111150f20fe
+9800d83a721fd21b34df6dd36684d3e0e2a9fd7b
+be068607f68b185483154371548e0ea2123b0fcb
+19f66c781f41ab44c2ed4b33b7bf9b4943833acd
+2374a1b50b6b54b8818a37e70ecef4d0e06bebba
+8fac1f688e662de9fdbbcf370a32adfe7c78151a
+e083eb42e916dbd2f75e213956a4e513e892d165
+da14dbe4e5a40fccf9155f4cd87c97457f9439d6
+2d223facdc0bf7ed0342da3b40d6ddb658cd3cb4
+1e6c7e3af09c5ec0aed5297fc285d13cff76e720
 ---
- configure.ac                |   1 +
- gdk/mir/gdkmir-debug.c      | 245 ++++++++++++++------------------------------
- gdk/mir/gdkmir-private.h    |   8 +-
- gdk/mir/gdkmir.h            |   6 +-
- gdk/mir/gdkmireventsource.c | 203 +++++++++++++++++++++++-------------
- gdk/mir/gdkmirwindowimpl.c  |  17 +--
- 6 files changed, 226 insertions(+), 254 deletions(-)
+ gdk/mir/gdkmir-debug.c      | 263 +++++++++----------------
+ gdk/mir/gdkmir-private.h    |  20 +-
+ gdk/mir/gdkmirdisplay.c     |  72 +++----
+ gdk/mir/gdkmireventsource.c | 317 ++++++++++++++++--------------
+ gdk/mir/gdkmirscreen.c      |  42 ++--
+ gdk/mir/gdkmirwindowimpl.c  | 462 ++++++++++++++++++--------------------------
+ 6 files changed, 504 insertions(+), 672 deletions(-)
 
-Index: gtk+3.0-3.16.3/gdk/mir/gdkmir-debug.c
-===================================================================
---- gtk+3.0-3.16.3.orig/gdk/mir/gdkmir-debug.c
-+++ gtk+3.0-3.16.3/gdk/mir/gdkmir-debug.c
+diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
+index 4dd3ece..a135f1b 100644
+--- a/gdk/mir/gdkmir-debug.c
++++ b/gdk/mir/gdkmir-debug.c
 @@ -21,225 +21,132 @@ void
  _gdk_mir_print_modifiers (unsigned int modifiers)
  {
@@ -181,20 +201,20 @@
 -      break;
 -    case mir_motion_action_outside:
 -      g_printerr ("outside");
-+    case mir_pointer_action_enter:
-+      g_printerr ("enter");
-       break;
+-      break;
 -    case mir_motion_action_pointer_down:
 -      g_printerr ("pointer-down");
-+    case mir_pointer_action_leave:
-+      g_printerr ("leave");
-       break;
+-      break;
 -    case mir_motion_action_pointer_up:
 -      g_printerr ("pointer-up");
--      break;
++    case mir_pointer_action_enter:
++      g_printerr ("enter");
+       break;
 -    case mir_motion_action_hover_move:
 -      g_printerr ("hover-move");
--      break;
++    case mir_pointer_action_leave:
++      g_printerr ("leave");
+       break;
 -    case mir_motion_action_scroll:
 -      g_printerr ("scroll");
 -      break;
@@ -208,17 +228,17 @@
        break;
      default:
 -      g_printerr ("%u", event->action);
--    }
--  g_printerr ("\n");
++      g_printerr ("%u", mir_pointer_event_action (pointer_event));
+     }
+   g_printerr ("\n");
 -  g_printerr (" Flags");
 -  switch (event->flags)
 -    {
 -    case mir_motion_flag_window_is_obscured:
 -      g_printerr (" window-is-obscured");
 -      break;
-+      g_printerr ("%u", mir_pointer_event_action (pointer_event));
-     }
-   g_printerr ("\n");
+-    }
+-  g_printerr ("\n");
 -  _gdk_mir_print_modifiers (event->modifiers);
 -  g_printerr (" Edge Flags %i\n", event->edge_flags);
 +  _gdk_mir_print_modifiers (mir_pointer_event_modifiers (pointer_event));
@@ -241,7 +261,17 @@
 -      g_printerr (" forward");
 -      break;
 -    }
--  g_printerr ("\n");
++  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_primary))
++    g_printerr (" primary");
++  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_secondary))
++    g_printerr (" secondary");
++  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_tertiary))
++    g_printerr (" tertiary");
++  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_back))
++    g_printerr (" back");
++  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_forward))
++    g_printerr (" forward");
+   g_printerr ("\n");
 -  g_printerr (" Offset (%f, %f)\n", event->x_offset, event->y_offset);
 -  g_printerr (" Precision (%f, %f)\n", event->x_precision, event->y_precision);
 -  g_printerr (" Down Time %lli\n", (long long int) event->down_time);
@@ -281,17 +311,6 @@
 -        }
 -      g_printerr ("\n");
 -    }
-+  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_primary))
-+    g_printerr (" primary");
-+  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_secondary))
-+    g_printerr (" secondary");
-+  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_tertiary))
-+    g_printerr (" tertiary");
-+  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_back))
-+    g_printerr (" back");
-+  if (mir_pointer_event_button_state (pointer_event, mir_pointer_button_forward))
-+    g_printerr (" forward");
-+  g_printerr ("\n");
 +  g_printerr (" Offset (%f, %f)\n", mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_x),
 +                                    mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_y));
 +  g_printerr (" Event Time %lli\n", (long long int) mir_input_event_get_event_time (event));
@@ -308,7 +327,7 @@
      {
      case mir_surface_attrib_type:
        g_printerr ("type");
-@@ -254,50 +161,48 @@ _gdk_mir_print_surface_event (const MirS
+@@ -254,50 +161,66 @@ _gdk_mir_print_surface_event (const MirSurfaceEvent *event)
        g_printerr ("focus");
        break;
      default:
@@ -341,8 +360,26 @@
  _gdk_mir_print_event (const MirEvent *event)
  {
 -  switch (event->type)
++  const MirInputEvent *input_event;
++
 +  switch (mir_event_get_type (event))
      {
++    case mir_event_type_input:
++      input_event = mir_event_get_input_event (event);
++
++      switch (mir_input_event_get_type (input_event))
++        {
++          case mir_input_event_type_key:
++            _gdk_mir_print_key_event (mir_event_get_input_event (event));
++            break;
++          case mir_input_event_type_touch:
++            _gdk_mir_print_motion_event (mir_event_get_input_event (event));
++            break;
++          case mir_input_event_type_pointer:
++            _gdk_mir_print_motion_event (mir_event_get_input_event (event));
++            break;
++        }
++      break;
      case mir_event_type_key:
 -      _gdk_mir_print_key_event (&event->key);
 +      _gdk_mir_print_key_event (mir_event_get_input_event (event));
@@ -369,11 +406,11 @@
        break;
      }
  }
-Index: gtk+3.0-3.16.3/gdk/mir/gdkmir-private.h
-===================================================================
---- gtk+3.0-3.16.3.orig/gdk/mir/gdkmir-private.h
-+++ gtk+3.0-3.16.3/gdk/mir/gdkmir-private.h
-@@ -89,9 +89,9 @@ void _gdk_mir_window_impl_set_surface_st
+diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
+index 6f0b6c3..2464434 100644
+--- a/gdk/mir/gdkmir-private.h
++++ b/gdk/mir/gdkmir-private.h
+@@ -89,9 +89,9 @@ void _gdk_mir_window_impl_set_surface_state (GdkMirWindowImpl *impl, MirSurfaceS
  
  void _gdk_mir_window_impl_set_surface_type (GdkMirWindowImpl *impl, MirSurfaceType type);
  
@@ -385,7 +422,7 @@
  
  GdkMirEventSource *_gdk_mir_display_get_event_source (GdkDisplay *display);
  
-@@ -123,9 +123,9 @@ EGLSurface _gdk_mir_window_get_dummy_egl
+@@ -123,9 +123,9 @@ EGLSurface _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window, EGLConfig c
  
  void _gdk_mir_print_modifiers (unsigned int modifiers);
  
@@ -397,10 +434,311 @@
  
  void _gdk_mir_print_surface_event (const MirSurfaceEvent *event);
  
-Index: gtk+3.0-3.16.3/gdk/mir/gdkmireventsource.c
-===================================================================
---- gtk+3.0-3.16.3.orig/gdk/mir/gdkmireventsource.c
-+++ gtk+3.0-3.16.3/gdk/mir/gdkmireventsource.c
+@@ -133,16 +133,4 @@ void _gdk_mir_print_resize_event (const MirResizeEvent *event);
+ 
+ void _gdk_mir_print_event (const MirEvent *event);
+ 
+-/* TODO: Remove once we have proper transient window support. */
+-GdkWindow * _gdk_mir_window_get_visible_transient_child (GdkWindow *window,
+-                                                         gdouble    x,
+-                                                         gdouble    y,
+-                                                         gdouble   *out_x,
+-                                                         gdouble   *out_y);
+-
+-/* TODO: Remove once we have proper transient window support. */
+-void _gdk_mir_window_transient_children_foreach (GdkWindow  *window,
+-                                                 void      (*func) (GdkWindow *, gpointer),
+-                                                 gpointer    user_data);
+-
+ #endif /* __GDK_PRIVATE_MIR_H__ */
+diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c
+index cc92a53..6eda352 100644
+--- a/gdk/mir/gdkmirdisplay.c
++++ b/gdk/mir/gdkmirdisplay.c
+@@ -107,7 +107,7 @@ _gdk_mir_display_open (const gchar *display_name)
+   MirPixelFormat sw_pixel_format, hw_pixel_format;
+   GdkMirDisplay *display;
+ 
+-  g_printerr ("gdk_mir_display_open\n");
++  //g_printerr ("gdk_mir_display_open\n");
+ 
+   connection = mir_connect_sync (NULL, "GDK-Mir");
+   if (!connection)
+@@ -207,26 +207,26 @@ gdk_mir_display_get_default_screen (GdkDisplay *display)
+ static void
+ gdk_mir_display_beep (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_beep\n");
++  //g_printerr ("gdk_mir_display_beep\n");
+   /* No system level beep... */
+ }
+ 
+ static void
+ gdk_mir_display_sync (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_sync\n");
++  //g_printerr ("gdk_mir_display_sync\n");
+ }
+ 
+ static void
+ gdk_mir_display_flush (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_flush\n");
++  //g_printerr ("gdk_mir_display_flush\n");
+ }
+ 
+ static gboolean
+ gdk_mir_display_has_pending (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_has_pending\n");
++  //g_printerr ("gdk_mir_display_has_pending\n");
+   /* We don't need to poll for events - so nothing pending */
+   return FALSE;
+ }
+@@ -247,14 +247,14 @@ gdk_mir_display_make_default (GdkDisplay *display)
+ static GdkWindow *
+ gdk_mir_display_get_default_group (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_get_default_group\n");
++  //g_printerr ("gdk_mir_display_get_default_group\n");
+   return NULL;
+ }
+ 
+ static gboolean
+ gdk_mir_display_supports_shapes (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_supports_shapes\n");
++  //g_printerr ("gdk_mir_display_supports_shapes\n");
+   /* Mir doesn't support shaped windows */
+   return FALSE;
+ }
+@@ -262,42 +262,42 @@ gdk_mir_display_supports_shapes (GdkDisplay *display)
+ static gboolean
+ gdk_mir_display_supports_input_shapes (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_supports_input_shapes\n");
++  //g_printerr ("gdk_mir_display_supports_input_shapes\n");
+   return FALSE;
+ }
+ 
+ static gboolean
+ gdk_mir_display_supports_composite (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_supports_composite\n");
++  //g_printerr ("gdk_mir_display_supports_composite\n");
+   return FALSE;
+ }
+ 
+ static gboolean
+ gdk_mir_display_supports_clipboard_persistence (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_supports_clipboard_persistence\n");
++  //g_printerr ("gdk_mir_display_supports_clipboard_persistence\n");
+   return FALSE;
+ }
+ 
+ static gboolean
+ gdk_mir_display_supports_cursor_alpha (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_supports_cursor_alpha\n");
++  //g_printerr ("gdk_mir_display_supports_cursor_alpha\n");
+   return FALSE;
+ }
+ 
+ static gboolean
+ gdk_mir_display_supports_cursor_color (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_supports_cursor_color\n");
++  //g_printerr ("gdk_mir_display_supports_cursor_color\n");
+   return FALSE;
+ }
+ 
+ static gboolean
+ gdk_mir_display_supports_selection_notification (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_supports_selection_notification\n");
++  //g_printerr ("gdk_mir_display_supports_selection_notification\n");
+   return FALSE;
+ }
+ 
+@@ -305,7 +305,7 @@ static gboolean
+ gdk_mir_display_request_selection_notification (GdkDisplay *display,
+                                                 GdkAtom     selection)
+ {
+-  g_printerr ("gdk_mir_display_request_selection_notification\n");
++  //g_printerr ("gdk_mir_display_request_selection_notification\n");
+   return FALSE;
+ }
+ 
+@@ -316,7 +316,7 @@ gdk_mir_display_store_clipboard (GdkDisplay    *display,
+                                  const GdkAtom *targets,
+                                  gint           n_targets)
+ {
+-  g_printerr ("gdk_mir_display_store_clipboard\n");
++  //g_printerr ("gdk_mir_display_store_clipboard\n");
+ }
+ 
+ static void
+@@ -324,7 +324,7 @@ gdk_mir_display_get_default_cursor_size (GdkDisplay *display,
+                                          guint      *width,
+                                          guint      *height)
+ {
+-  g_printerr ("gdk_mir_display_get_default_cursor_size\n");
++  //g_printerr ("gdk_mir_display_get_default_cursor_size\n");
+   *width = *height = 32; // FIXME: Random value
+ }
+ 
+@@ -333,7 +333,7 @@ gdk_mir_display_get_maximal_cursor_size (GdkDisplay *display,
+                                          guint      *width,
+                                          guint      *height)
+ {
+-  g_printerr ("gdk_mir_display_get_maximal_cursor_size\n");
++  //g_printerr ("gdk_mir_display_get_maximal_cursor_size\n");
+   *width = *height = 32; // FIXME: Random value
+ }
+ 
+@@ -357,14 +357,14 @@ gdk_mir_display_get_cursor_for_surface (GdkDisplay      *display,
+                                         gdouble          x,
+                                         gdouble          y)
+ {
+-  g_printerr ("gdk_mir_display_get_cursor_for_surface (%f, %f)\n", x, y);
++  //g_printerr ("gdk_mir_display_get_cursor_for_surface (%f, %f)\n", x, y);
+   return NULL;
+ }
+ 
+ static GList *
+ gdk_mir_display_list_devices (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_list_devices\n");
++  //g_printerr ("gdk_mir_display_list_devices\n");
+   // FIXME: Should this access the device manager?
+   return NULL;
+ }
+@@ -372,20 +372,20 @@ gdk_mir_display_list_devices (GdkDisplay *display)
+ static GdkAppLaunchContext *
+ gdk_mir_display_get_app_launch_context (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_get_app_launch_context\n");
++  //g_printerr ("gdk_mir_display_get_app_launch_context\n");
+   return NULL;
+ }
+ 
+ static void
+ gdk_mir_display_before_process_all_updates (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_before_process_all_updates\n");
++  //g_printerr ("gdk_mir_display_before_process_all_updates\n");
+ }
+ 
+ static void
+ gdk_mir_display_after_process_all_updates (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_after_process_all_updates\n");
++  //g_printerr ("gdk_mir_display_after_process_all_updates\n");
+ }
+ 
+ static gulong
+@@ -411,11 +411,11 @@ gdk_mir_display_create_window_impl (GdkDisplay    *display,
+                                     GdkWindowAttr *attributes,
+                                     gint           attributes_mask)
+ {
+-  g_printerr ("gdk_mir_display_create_window_impl");
+-  g_printerr (" window=%p", window);
+-  g_printerr (" location=(%d, %d)", window->x, window->y);
+-  g_printerr (" size=(%d, %d)", window->width, window->height);
+-  g_printerr ("\n");
++  //g_printerr ("gdk_mir_display_create_window_impl");
++  //g_printerr (" window=%p", window);
++  //g_printerr (" location=(%d, %d)", window->x, window->y);
++  //g_printerr (" size=(%d, %d)", window->width, window->height);
++  //g_printerr ("\n");
+ 
+   if (attributes->wclass == GDK_INPUT_OUTPUT)
+     {
+@@ -442,14 +442,14 @@ gdk_mir_display_get_keymap (GdkDisplay *display)
+ static void
+ gdk_mir_display_push_error_trap (GdkDisplay *display)
+ {
+-  g_printerr ("gdk_mir_display_push_error_trap\n");
++  //g_printerr ("gdk_mir_display_push_error_trap\n");
+ }
+ 
+ static gint
+ gdk_mir_display_pop_error_trap (GdkDisplay *display,
+                                 gboolean    ignored)
+ {
+-  g_printerr ("gdk_mir_display_pop_error_trap\n");
++  //g_printerr ("gdk_mir_display_pop_error_trap\n");
+   return 0;
+ }
+ 
+@@ -457,7 +457,7 @@ static GdkWindow *
+ gdk_mir_display_get_selection_owner (GdkDisplay *display,
+                                      GdkAtom     selection)
+ {
+-  g_printerr ("gdk_mir_display_get_selection_owner\n");
++  //g_printerr ("gdk_mir_display_get_selection_owner\n");
+   return NULL;
+ }
+ 
+@@ -468,7 +468,7 @@ gdk_mir_display_set_selection_owner (GdkDisplay *display,
+                                      guint32     time,
+                                      gboolean    send_event)
+ {
+-  g_printerr ("gdk_mir_display_set_selection_owner\n");
++  //g_printerr ("gdk_mir_display_set_selection_owner\n");
+   return FALSE;
+ }
+ 
+@@ -480,7 +480,7 @@ gdk_mir_display_send_selection_notify (GdkDisplay *display,
+                                        GdkAtom     property,
+                                        guint32     time)
+ {
+-  g_printerr ("gdk_mir_display_send_selection_notify\n");
++  //g_printerr ("gdk_mir_display_send_selection_notify\n");
+ }
+ 
+ static gint
+@@ -490,7 +490,7 @@ gdk_mir_display_get_selection_property (GdkDisplay  *display,
+                                         GdkAtom     *ret_type,
+                                         gint        *ret_format)
+ {
+-  g_printerr ("gdk_mir_display_get_selection_property\n");
++  //g_printerr ("gdk_mir_display_get_selection_property\n");
+   return 0;
+ }
+ 
+@@ -501,7 +501,7 @@ gdk_mir_display_convert_selection (GdkDisplay *display,
+                                    GdkAtom     target,
+                                    guint32     time)
+ {
+-  g_printerr ("gdk_mir_display_convert_selection\n");
++  //g_printerr ("gdk_mir_display_convert_selection\n");
+ }
+ 
+ static gint
+@@ -512,7 +512,7 @@ gdk_mir_display_text_property_to_utf8_list (GdkDisplay    *display,
+                                             gint           length,
+                                             gchar       ***list)
+ {
+-  g_printerr ("gdk_mir_display_text_property_to_utf8_list\n");
++  //g_printerr ("gdk_mir_display_text_property_to_utf8_list\n");
+   return 0;
+ }
+ 
+@@ -520,7 +520,7 @@ static gchar *
+ gdk_mir_display_utf8_to_string_target (GdkDisplay  *display,
+                                        const gchar *str)
+ {
+-  g_printerr ("gdk_mir_display_utf8_to_string_target\n");
++  //g_printerr ("gdk_mir_display_utf8_to_string_target\n");
+   return NULL;
+ }
+ 
+diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
+index b908366..5732f2b 100644
+--- a/gdk/mir/gdkmireventsource.c
++++ b/gdk/mir/gdkmireventsource.c
 @@ -32,7 +32,7 @@ struct _GdkMirWindowReference {
  
  typedef struct {
@@ -410,9 +748,15 @@
  } GdkMirQueuedEvent;
  
  struct _GdkMirEventSource
-@@ -240,50 +240,66 @@ get_modifier_state (unsigned int modifie
+@@ -236,54 +236,60 @@ generate_focus_event (GdkWindow *window, gboolean focused)
+ }
+ 
+ static guint
+-get_modifier_state (unsigned int modifiers, unsigned int button_state)
++get_modifier_state (unsigned int modifiers, guint button_state)
  {
-   guint modifier_state = 0;
+-  guint modifier_state = 0;
++  guint modifier_state = button_state;
  
 -  if ((modifiers & mir_key_modifier_alt) != 0)
 +  if ((modifiers & (mir_input_event_modifier_alt |
@@ -439,19 +783,11 @@
 +  if ((modifiers & mir_input_event_modifier_caps_lock) != 0)
      modifier_state |= GDK_LOCK_MASK;
 -  if ((button_state & mir_motion_button_primary) != 0)
-+  if ((button_state & mir_pointer_button_primary) != 0)
-     modifier_state |= GDK_BUTTON1_MASK;
+-    modifier_state |= GDK_BUTTON1_MASK;
 -  if ((button_state & mir_motion_button_secondary) != 0)
 -    modifier_state |= GDK_BUTTON3_MASK;
 -  if ((button_state & mir_motion_button_tertiary) != 0)
-+  if ((button_state & mir_pointer_button_secondary) != 0)
-     modifier_state |= GDK_BUTTON2_MASK;
-+  if ((button_state & mir_pointer_button_tertiary) != 0)
-+    modifier_state |= GDK_BUTTON3_MASK;
-+  if ((button_state & mir_pointer_button_back) != 0)
-+    modifier_state |= GDK_BUTTON4_MASK;
-+  if ((button_state & mir_pointer_button_forward) != 0)
-+    modifier_state |= GDK_BUTTON5_MASK;
+-    modifier_state |= GDK_BUTTON2_MASK;
  
    return modifier_state;
  }
@@ -498,38 +834,61 @@
        break;
      default:
      //case mir_key_action_multiple:
-@@ -322,7 +338,7 @@ leave_windows_except (GdkWindow *window,
-     {
-       GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-       gboolean cursor_inside;
+@@ -292,143 +298,98 @@ handle_key_event (GdkWindow *window, const MirKeyEvent *event)
+     }
+ }
+ 
+-/* TODO: Remove once we have proper transient window support. */
+-typedef struct
+-{
+-  GdkWindow *except;
+-  gdouble    x;
+-  gdouble    y;
+-  guint32    time;
+-} LeaveInfo;
+-
+-/* TODO: Remove once we have proper transient window support. */
+-/*
+- * leave_windows_except:
+- *
+- * Generate a leave event for every window except the one the cursor is in.
+- */
+-static void
+-leave_windows_except (GdkWindow *window,
+-                      gpointer   user_data)
++static guint
++get_button_state (const MirPointerEvent *event)
+ {
+-  LeaveInfo info = *((LeaveInfo *) user_data);
++  guint state = 0;
+ 
+-  info.x -= window->x;
+-  info.y -= window->y;
++  if (mir_pointer_event_button_state (event, mir_pointer_button_primary)) /* left */
++    state |= GDK_BUTTON1_MASK;
++  if (mir_pointer_event_button_state (event, mir_pointer_button_secondary)) /* right */
++    state |= GDK_BUTTON3_MASK;
++  if (mir_pointer_event_button_state (event, mir_pointer_button_tertiary)) /* middle */
++    state |= GDK_BUTTON2_MASK;
+ 
+-  _gdk_mir_window_transient_children_foreach (window, leave_windows_except, &info);
+-
+-  if (window != info.except)
+-    {
+-      GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+-      gboolean cursor_inside;
 -      MirMotionButton button_state;
-+      guint button_state;
- 
-       _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, &cursor_inside, &button_state);
- 
-@@ -333,29 +349,47 @@ leave_windows_except (GdkWindow *window,
-     }
+-
+-      _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, &cursor_inside, &button_state);
+-
+-      if (cursor_inside)
+-        generate_crossing_event (window, GDK_LEAVE_NOTIFY, info.x, info.y, info.time);
+-
+-      _gdk_mir_window_impl_set_cursor_state (impl, info.x, info.y, FALSE, button_state);
+-    }
++  return state;
  }
  
-+static guint
-+mir_pointer_event_get_button_state (const MirPointerEvent *event)
-+{
-+  guint button_state = 0;
-+
-+  if (mir_pointer_event_button_state (event, mir_pointer_button_primary))
-+    button_state |= mir_pointer_button_primary;
-+  if (mir_pointer_event_button_state (event, mir_pointer_button_secondary))
-+    button_state |= mir_pointer_button_secondary;
-+  if (mir_pointer_event_button_state (event, mir_pointer_button_tertiary))
-+    button_state |= mir_pointer_button_tertiary;
-+  if (mir_pointer_event_button_state (event, mir_pointer_button_back))
-+    button_state |= mir_pointer_button_back;
-+  if (mir_pointer_event_button_state (event, mir_pointer_button_forward))
-+    button_state |= mir_pointer_button_forward;
-+
-+  return button_state;
-+}
-+
  static void
 -handle_motion_event (GdkWindow *window, const MirMotionEvent *event)
 +handle_motion_event (GdkWindow *window, const MirInputEvent *event)
@@ -540,16 +899,14 @@
    gboolean cursor_inside;
 -  MirMotionButton button_state;
 +  guint button_state;
++  guint new_button_state;
    guint modifier_state;
    guint32 event_time;
    GdkEventType event_type;
 -  MirMotionButton changed_button_state;
 +  guint changed_button_state;
-+
-+  if (!pointer_event)
-+    return;
  
-   _gdk_mir_window_impl_get_cursor_state (impl, &x, &y, &cursor_inside, &button_state);
+-  _gdk_mir_window_impl_get_cursor_state (impl, &x, &y, &cursor_inside, &button_state);
 -  if (event->pointer_count > 0)
 -    {
 -      x = event->pointer_coordinates[0].x;
@@ -557,24 +914,55 @@
 -    }
 -  modifier_state = get_modifier_state (event->modifiers, event->button_state);
 -  event_time = NANO_TO_MILLI (event->event_time);
-+  modifier_state = get_modifier_state (mir_pointer_event_modifiers (pointer_event), mir_pointer_event_get_button_state (pointer_event));
-+  event_time = NANO_TO_MILLI (mir_input_event_get_event_time (event));
- 
-   /* TODO: Remove once we have proper transient window support. */
+-
+-  /* TODO: Remove once we have proper transient window support. */
 -  if (event->action == mir_motion_action_hover_exit)
-+  if (mir_pointer_event_action (pointer_event) == mir_pointer_action_leave)
-     {
-       LeaveInfo info;
+-    {
+-      LeaveInfo info;
+-
+-      info.x = x;
+-      info.y = y;
+-      info.time = event_time;
+-      info.except = window;
+-
+-      /* Leave all transient children from leaf to root, except the root since we do it later. */
+-      _gdk_mir_window_transient_children_foreach (window, leave_windows_except, &info);
+-    }
+-  else
+-    {
+-      LeaveInfo info;
++  if (!pointer_event)
++    return;
  
-@@ -392,43 +426,55 @@ handle_motion_event (GdkWindow *window,
-           if (!cursor_inside_pointer_window)
-             {
-               generate_crossing_event (window, GDK_ENTER_NOTIFY, x, y, event_time);
+-      info.x = x;
+-      info.y = y;
+-      info.time = event_time;
+-      info.except = _gdk_mir_window_get_visible_transient_child (window, x, y, &x, &y);
+-
+-      /* Leave all transient children from leaf to root, except the pointer window since we enter it. */
+-      _gdk_mir_window_transient_children_foreach (window, leave_windows_except, &info);
+-
+-      window = info.except;
+-
+-      if (window)
+-        {
+-          /* Enter the pointer window. */
+-          gboolean cursor_inside_pointer_window;
+-
+-          impl = GDK_MIR_WINDOW_IMPL (window->impl);
+-          _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, &cursor_inside_pointer_window, NULL);
+-
+-          if (!cursor_inside_pointer_window)
+-            {
+-              generate_crossing_event (window, GDK_ENTER_NOTIFY, x, y, event_time);
 -              _gdk_mir_window_impl_set_cursor_state (impl, x, y, TRUE, event->button_state);
-+              _gdk_mir_window_impl_set_cursor_state (impl, x, y, TRUE, mir_pointer_event_get_button_state (pointer_event));
-             }
-         }
-     }
+-            }
+-        }
+-    }
++  _gdk_mir_window_impl_get_cursor_state (impl, &x, &y, &cursor_inside, &button_state);
++  new_button_state = get_button_state (pointer_event);
++  modifier_state = get_modifier_state (mir_pointer_event_modifiers (pointer_event), new_button_state);
++  event_time = NANO_TO_MILLI (mir_input_event_get_event_time (event));
  
    if (window)
      {
@@ -596,36 +984,47 @@
 +        case mir_pointer_action_button_up:
 +        case mir_pointer_action_button_down:
 +          event_type = mir_pointer_event_action (pointer_event) == mir_pointer_action_button_down ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE;
-+          changed_button_state = button_state ^ mir_pointer_event_get_button_state (pointer_event);
-+          if (changed_button_state == 0 || (changed_button_state & mir_pointer_button_primary) != 0)
++          changed_button_state = button_state ^ new_button_state;
++          if (changed_button_state == 0 || (changed_button_state & GDK_BUTTON1_MASK) != 0)
              generate_button_event (window, event_type, x, y, GDK_BUTTON_PRIMARY, modifier_state, event_time);
 -          if ((changed_button_state & mir_motion_button_secondary) != 0)
-+          if ((changed_button_state & mir_pointer_button_secondary) != 0)
-             generate_button_event (window, event_type, x, y, GDK_BUTTON_SECONDARY, modifier_state, event_time);
+-            generate_button_event (window, event_type, x, y, GDK_BUTTON_SECONDARY, modifier_state, event_time);
 -          if ((changed_button_state & mir_motion_button_tertiary) != 0)
-+          if ((changed_button_state & mir_pointer_button_tertiary) != 0)
++          if ((changed_button_state & GDK_BUTTON2_MASK) != 0)
              generate_button_event (window, event_type, x, y, GDK_BUTTON_MIDDLE, modifier_state, event_time);
 -          button_state = event->button_state;
-+          button_state = mir_pointer_event_get_button_state (pointer_event);
++          if ((changed_button_state & GDK_BUTTON3_MASK) != 0)
++            generate_button_event (window, event_type, x, y, GDK_BUTTON_SECONDARY, modifier_state, event_time);
++          button_state = new_button_state;
            break;
 -        case mir_motion_action_scroll:
 -          generate_scroll_event (window, x, y, event->pointer_coordinates[0].hscroll, event->pointer_coordinates[0].vscroll, modifier_state, event_time);
--          break;
--        case mir_motion_action_move: // move with button
--        case mir_motion_action_hover_move: // move without button
--          generate_motion_event (window, x, y, modifier_state, event_time);
 +        case mir_pointer_action_motion:
 +          new_x = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_x);
 +          new_y = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_y);
 +          hscroll = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_hscroll);
 +          vscroll = mir_pointer_event_axis_value (pointer_event, mir_pointer_axis_vscroll);
 +
-+          if (hscroll > 0.5 || vscroll > 0.5)
++          if (ABS (hscroll) > 0.5 || ABS (vscroll) > 0.5)
 +            generate_scroll_event (window, x, y, hscroll, vscroll, modifier_state, event_time);
 +          if (ABS (new_x - x) > 0.5 || ABS (new_y - y) > 0.5)
-+            generate_motion_event (window, new_x, new_y, modifier_state, event_time);
++            {
++              generate_motion_event (window, new_x, new_y, modifier_state, event_time);
++              x = new_x;
++              y = new_y;
++            }
 +
            break;
+-        case mir_motion_action_move: // move with button
+-        case mir_motion_action_hover_move: // move without button
+-          generate_motion_event (window, x, y, modifier_state, event_time);
++        case mir_pointer_action_enter:
++          if (!cursor_inside)
++            {
++              cursor_inside = TRUE;
++              generate_crossing_event (window, GDK_ENTER_NOTIFY, x, y, event_time);
++            }
+           break;
 -        case mir_motion_action_hover_exit:
 +        case mir_pointer_action_leave:
            if (cursor_inside)
@@ -639,9 +1038,11 @@
          }
  
        _gdk_mir_window_impl_set_cursor_state (impl, x, y, cursor_inside, button_state);
-@@ -440,19 +486,19 @@ handle_surface_event (GdkWindow *window,
+@@ -439,20 +400,56 @@ static void
+ handle_surface_event (GdkWindow *window, const MirSurfaceEvent *event)
  {
    GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
++  MirSurfaceState state;
  
 -  switch (event->attrib)
 +  switch (mir_surface_event_get_attribute (event))
@@ -652,8 +1053,44 @@
        break;
      case mir_surface_attrib_state:
 -      _gdk_mir_window_impl_set_surface_state (impl, event->value);
-+      _gdk_mir_window_impl_set_surface_state (impl, mir_surface_event_get_attribute_value (event));
-       // FIXME: notify
+-      // FIXME: notify
++      state = mir_surface_event_get_attribute_value (event);
++      _gdk_mir_window_impl_set_surface_state (impl, state);
++
++      switch (state)
++        {
++        case mir_surface_state_restored:
++        case mir_surface_state_hidden:
++          gdk_synthesize_window_state (window,
++                                       GDK_WINDOW_STATE_ICONIFIED |
++                                       GDK_WINDOW_STATE_MAXIMIZED |
++                                       GDK_WINDOW_STATE_FULLSCREEN,
++                                       0);
++          break;
++        case mir_surface_state_minimized:
++          gdk_synthesize_window_state (window,
++                                       GDK_WINDOW_STATE_MAXIMIZED |
++                                       GDK_WINDOW_STATE_FULLSCREEN,
++                                       GDK_WINDOW_STATE_ICONIFIED);
++          break;
++        case mir_surface_state_maximized:
++        case mir_surface_state_vertmaximized:
++        case mir_surface_state_horizmaximized:
++          gdk_synthesize_window_state (window,
++                                       GDK_WINDOW_STATE_ICONIFIED |
++                                       GDK_WINDOW_STATE_FULLSCREEN,
++                                       GDK_WINDOW_STATE_MAXIMIZED);
++          break;
++        case mir_surface_state_fullscreen:
++          gdk_synthesize_window_state (window,
++                                       GDK_WINDOW_STATE_ICONIFIED |
++                                       GDK_WINDOW_STATE_MAXIMIZED,
++                                       GDK_WINDOW_STATE_FULLSCREEN);
++          break;
++        default:
++          break;
++        }
++
        break;
      case mir_surface_attrib_swapinterval:
        break;
@@ -663,7 +1100,7 @@
        break;
      default:
        break;
-@@ -478,11 +524,11 @@ static void
+@@ -478,11 +475,11 @@ static void
  handle_resize_event (GdkWindow            *window,
                       const MirResizeEvent *event)
  {
@@ -678,7 +1115,7 @@
  }
  
  static void
-@@ -496,7 +542,7 @@ handle_close_event (GdkWindow
+@@ -496,7 +493,7 @@ handle_close_event (GdkWindow                  *window,
  typedef struct
  {
    GdkWindow *window;
@@ -687,7 +1124,7 @@
  } EventData;
  
  static void
-@@ -504,20 +550,39 @@ gdk_mir_event_source_queue_event (GdkDis
+@@ -504,20 +501,39 @@ gdk_mir_event_source_queue_event (GdkDisplay     *display,
                                    GdkWindow      *window,
                                    const MirEvent *event)
  {
@@ -732,7 +1169,7 @@
        break;
      case mir_event_type_prompt_session_state_change:
        // FIXME?
-@@ -526,10 +591,10 @@ gdk_mir_event_source_queue_event (GdkDis
+@@ -526,10 +542,10 @@ gdk_mir_event_source_queue_event (GdkDisplay     *display,
        // FIXME?
        break;
      case mir_event_type_close_surface:
@@ -745,7 +1182,15 @@
        // FIXME?
        break;
      }
-@@ -569,9 +634,9 @@ gdk_mir_event_source_convert_events (Gdk
+@@ -551,6 +567,7 @@ static void
+ gdk_mir_queued_event_free (GdkMirQueuedEvent *event)
+ {
+   _gdk_mir_window_reference_unref (event->window_ref);
++  mir_event_unref (event->event);
+   g_slice_free (GdkMirQueuedEvent, event);
+ }
+ 
+@@ -569,9 +586,9 @@ gdk_mir_event_source_convert_events (GdkMirEventSource *source)
        if (window != NULL)
          {
            if (source->log_events)
@@ -757,20 +1202,222 @@
          }
        else
          g_warning ("window was destroyed before event arrived...");
-@@ -735,7 +800,7 @@ _gdk_mir_event_source_queue (GdkMirWindo
+@@ -735,7 +752,7 @@ _gdk_mir_event_source_queue (GdkMirWindowReference *window_ref,
    queued_event = g_slice_new (GdkMirQueuedEvent);
    g_atomic_int_inc (&window_ref->ref_count);
    queued_event->window_ref = window_ref;
 -  queued_event->event = *event;
-+  queued_event->event = event;
++  queued_event->event = mir_event_ref (event);
  
    g_mutex_lock (&source->mir_event_lock);
    g_queue_push_tail (&source->mir_events, queued_event);
-Index: gtk+3.0-3.16.3/gdk/mir/gdkmirwindowimpl.c
-===================================================================
---- gtk+3.0-3.16.3.orig/gdk/mir/gdkmirwindowimpl.c
-+++ gtk+3.0-3.16.3/gdk/mir/gdkmirwindowimpl.c
-@@ -59,7 +59,7 @@ struct _GdkMirWindowImpl
+diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c
+index e29ddb3..d31c5a4 100644
+--- a/gdk/mir/gdkmirscreen.c
++++ b/gdk/mir/gdkmirscreen.c
+@@ -203,7 +203,7 @@ get_output (GdkScreen *screen, gint monitor_num)
+ static gint
+ gdk_mir_screen_get_width (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_get_width\n");
++  //g_printerr ("gdk_mir_screen_get_width\n");
+   gint width, height;
+   get_screen_size (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
+   return width;
+@@ -212,7 +212,7 @@ gdk_mir_screen_get_width (GdkScreen *screen)
+ static gint
+ gdk_mir_screen_get_height (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_get_height\n");
++  //g_printerr ("gdk_mir_screen_get_height\n");
+   gint width, height;
+   get_screen_size (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
+   return height;
+@@ -221,7 +221,7 @@ gdk_mir_screen_get_height (GdkScreen *screen)
+ static gint
+ gdk_mir_screen_get_width_mm (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_get_width_mm\n");
++  //g_printerr ("gdk_mir_screen_get_width_mm\n");
+   gint width, height;
+   get_screen_size_mm (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
+   return width;
+@@ -230,7 +230,7 @@ gdk_mir_screen_get_width_mm (GdkScreen *screen)
+ static gint
+ gdk_mir_screen_get_height_mm (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_get_height_mm\n");
++  //g_printerr ("gdk_mir_screen_get_height_mm\n");
+   gint width, height;
+   get_screen_size_mm (GDK_MIR_SCREEN (screen)->display_config, &width, &height);
+   return height;
+@@ -293,7 +293,7 @@ gdk_mir_screen_get_n_monitors (GdkScreen *screen)
+ static gint
+ gdk_mir_screen_get_primary_monitor (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_get_primary_monitor\n");
++  //g_printerr ("gdk_mir_screen_get_primary_monitor\n");
+   return 0; //?
+ }
+ 
+@@ -301,7 +301,7 @@ static gint
+ gdk_mir_screen_get_monitor_width_mm	(GdkScreen *screen,
+                                      gint       monitor_num)
+ {
+-  g_printerr ("gdk_mir_screen_get_monitor_width_mm (%d)\n", monitor_num);
++  //g_printerr ("gdk_mir_screen_get_monitor_width_mm (%d)\n", monitor_num);
+   MirDisplayOutput *output = get_output (screen, monitor_num);
+   return output ? output->physical_width_mm : 0;
+ }
+@@ -310,7 +310,7 @@ static gint
+ gdk_mir_screen_get_monitor_height_mm (GdkScreen *screen,
+                                       gint       monitor_num)
+ {
+-  g_printerr ("gdk_mir_screen_get_monitor_height_mm (%d)\n", monitor_num);
++  //g_printerr ("gdk_mir_screen_get_monitor_height_mm (%d)\n", monitor_num);
+   MirDisplayOutput *output = get_output (screen, monitor_num);
+   return output ? output->physical_height_mm : 0;
+ }
+@@ -319,7 +319,7 @@ static gchar *
+ gdk_mir_screen_get_monitor_plug_name (GdkScreen *screen,
+                                       gint       monitor_num)
+ {
+-  g_printerr ("gdk_mir_screen_get_monitor_plug_name (%d)\n", monitor_num);
++  //g_printerr ("gdk_mir_screen_get_monitor_plug_name (%d)\n", monitor_num);
+   MirDisplayOutput *output = get_output (screen, monitor_num);
+ 
+   if (output)
+@@ -399,7 +399,7 @@ gdk_mir_screen_get_monitor_workarea (GdkScreen    *screen,
+ static GList *
+ gdk_mir_screen_list_visuals (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_list_visuals\n");
++  //g_printerr ("gdk_mir_screen_list_visuals\n");
+   return g_list_append (NULL, GDK_MIR_SCREEN (screen)->visual);
+ }
+ 
+@@ -428,21 +428,21 @@ gdk_mir_screen_is_composited (GdkScreen *screen)
+ static gchar *
+ gdk_mir_screen_make_display_name (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_make_display_name\n");
++  //g_printerr ("gdk_mir_screen_make_display_name\n");
+   return NULL; // FIXME
+ }
+ 
+ static GdkWindow *
+ gdk_mir_screen_get_active_window (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_get_active_window\n");
++  //g_printerr ("gdk_mir_screen_get_active_window\n");
+   return NULL; // FIXME
+ }
+ 
+ static GList *
+ gdk_mir_screen_get_window_stack (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_get_window_stack\n");
++  //g_printerr ("gdk_mir_screen_get_window_stack\n");
+   return NULL; // FIXME
+ }
+ 
+@@ -450,7 +450,7 @@ static void
+ gdk_mir_screen_broadcast_client_message (GdkScreen *screen,
+                                          GdkEvent  *event)
+ {
+-  g_printerr ("gdk_mir_screen_broadcast_client_message\n");
++  //g_printerr ("gdk_mir_screen_broadcast_client_message\n");
+   // FIXME
+ }
+ 
+@@ -673,21 +673,21 @@ gdk_mir_screen_get_setting (GdkScreen   *screen,
+ static gint
+ gdk_mir_screen_visual_get_best_depth (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_visual_get_best_depth\n");
++  //g_printerr ("gdk_mir_screen_visual_get_best_depth\n");
+   return VISUAL_DEPTH;
+ }
+ 
+ static GdkVisualType
+ gdk_mir_screen_visual_get_best_type (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_visual_get_best_type\n");
++  //g_printerr ("gdk_mir_screen_visual_get_best_type\n");
+   return VISUAL_TYPE;
+ }
+ 
+ static GdkVisual*
+ gdk_mir_screen_visual_get_best (GdkScreen *screen)
+ {
+-  g_printerr ("gdk_mir_screen_visual_get_best\n");
++  //g_printerr ("gdk_mir_screen_visual_get_best\n");
+   return GDK_MIR_SCREEN (screen)->visual;
+ }
+ 
+@@ -695,7 +695,7 @@ static GdkVisual*
+ gdk_mir_screen_visual_get_best_with_depth (GdkScreen *screen,
+                                            gint       depth)
+ {
+-  g_printerr ("gdk_mir_screen_visual_get_best_with_depth (%d)\n", depth);
++  //g_printerr ("gdk_mir_screen_visual_get_best_with_depth (%d)\n", depth);
+   return GDK_MIR_SCREEN (screen)->visual;
+ }
+ 
+@@ -703,7 +703,7 @@ static GdkVisual*
+ gdk_mir_screen_visual_get_best_with_type (GdkScreen     *screen,
+                                           GdkVisualType  visual_type)
+ {
+-  g_printerr ("gdk_mir_screen_visual_get_best_with_type (%d)\n", visual_type);
++  //g_printerr ("gdk_mir_screen_visual_get_best_with_type (%d)\n", visual_type);
+   return GDK_MIR_SCREEN (screen)->visual;
+ }
+ 
+@@ -712,7 +712,7 @@ gdk_mir_screen_visual_get_best_with_both (GdkScreen     *screen,
+                                           gint           depth,
+                                           GdkVisualType  visual_type)
+ {
+-  g_printerr ("gdk_mir_screen_visual_get_best_with_both\n");
++  //g_printerr ("gdk_mir_screen_visual_get_best_with_both\n");
+   return GDK_MIR_SCREEN (screen)->visual;
+ }
+ 
+@@ -721,7 +721,7 @@ gdk_mir_screen_query_depths (GdkScreen  *screen,
+                              gint      **depths,
+                              gint       *count)
+ {
+-  g_printerr ("gdk_mir_screen_query_depths\n");
++  //g_printerr ("gdk_mir_screen_query_depths\n");
+   static gint supported_depths[] = { VISUAL_DEPTH };
+   *depths = supported_depths;
+   *count = 1;
+@@ -732,7 +732,7 @@ gdk_mir_screen_query_visual_types (GdkScreen      *screen,
+                                    GdkVisualType **visual_types,
+                                    gint           *count)
+ {
+-  g_printerr ("gdk_mir_screen_query_visual_types\n");
++  //g_printerr ("gdk_mir_screen_query_visual_types\n");
+   static GdkVisualType supported_visual_types[] = { VISUAL_TYPE };
+   *visual_types = supported_visual_types;
+   *count = 1;
+diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
+index 666a1d0..16035a0 100644
+--- a/gdk/mir/gdkmirwindowimpl.c
++++ b/gdk/mir/gdkmirwindowimpl.c
+@@ -46,11 +46,8 @@ struct _GdkMirWindowImpl
+   gint transient_x;
+   gint transient_y;
+ 
+-  /* Child windows (e.g. tooltips) */
+-  GList *transient_children;
+-
+   /* Desired surface attributes */
+-  MirSurfaceType surface_type;
++  GdkWindowTypeHint type_hint;
+   MirSurfaceState surface_state;
+ 
+   /* Pattern for background */
+@@ -59,7 +56,7 @@ struct _GdkMirWindowImpl
    /* Current button state for checking which buttons are being pressed / released */
    gdouble x;
    gdouble y;
@@ -779,7 +1426,27 @@
  
    /* Surface being rendered to (only exists when window visible) */
    MirSurface *surface;
-@@ -113,7 +113,7 @@ _gdk_mir_window_impl_set_cursor_state (G
+@@ -71,7 +68,6 @@ struct _GdkMirWindowImpl
+   EGLSurface egl_surface;
+ 
+   /* Dummy MIR and EGL surfaces */
+-  MirSurface *dummy_surface;
+   EGLSurface dummy_egl_surface;
+ 
+   /* TRUE if the window can be seen */
+@@ -103,9 +99,9 @@ _gdk_mir_window_impl_set_surface_state (GdkMirWindowImpl *impl, MirSurfaceState
+ }
+ 
+ void
+-_gdk_mir_window_impl_set_surface_type (GdkMirWindowImpl *impl, MirSurfaceType type)
++_gdk_mir_window_impl_set_surface_type (GdkMirWindowImpl *impl,
++                                       MirSurfaceType    type)
+ {
+-  impl->surface_type = type;
+ }
+ 
+ void
+@@ -113,7 +109,7 @@ _gdk_mir_window_impl_set_cursor_state (GdkMirWindowImpl *impl,
                                         gdouble x,
                                         gdouble y,
                                         gboolean cursor_inside,
@@ -788,7 +1455,7 @@
  {
    impl->x = x;
    impl->y = y;
-@@ -126,7 +126,7 @@ _gdk_mir_window_impl_get_cursor_state (G
+@@ -126,7 +122,7 @@ _gdk_mir_window_impl_get_cursor_state (GdkMirWindowImpl *impl,
                                         gdouble *x,
                                         gdouble *y,
                                         gboolean *cursor_inside,
@@ -797,22 +1464,211 @@
  {
    if (x)
      *x = impl->x;
-@@ -213,7 +213,6 @@ ensure_surface_full (GdkWindow *window,
+@@ -141,7 +137,7 @@ _gdk_mir_window_impl_get_cursor_state (GdkMirWindowImpl *impl,
+ static void
+ gdk_mir_window_impl_init (GdkMirWindowImpl *impl)
+ {
+-  impl->surface_type = mir_surface_type_normal;
++  impl->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
+   impl->surface_state = mir_surface_state_unknown;
+ }
+ 
+@@ -158,18 +154,6 @@ set_surface_state (GdkMirWindowImpl *impl,
+ }
+ 
+ static void
+-set_surface_type (GdkMirWindowImpl *impl,
+-                  MirSurfaceType type)
+-{
+-  if (impl->surface_type == type)
+-    return;
+-
+-  impl->surface_type = type;
+-  if (impl->surface)
+-    mir_surface_set_type (impl->surface, type);
+-}
+-
+-static void
+ event_cb (MirSurface     *surface,
+           const MirEvent *event,
+           void           *context)
+@@ -177,20 +161,105 @@ event_cb (MirSurface     *surface,
+   _gdk_mir_event_source_queue (context, event);
+ }
+ 
++static void ensure_surface (GdkWindow *window);
++
+ static MirSurface *
+ create_mir_surface (GdkDisplay *display,
++                    GdkWindow *parent,
++                    gint x,
++                    gint y,
+                     gint width,
+                     gint height,
++                    GdkWindowTypeHint type,
+                     MirBufferUsage buffer_usage)
+ {
++  MirSurface *parent_surface = NULL;
+   MirSurfaceSpec *spec;
+   MirConnection *connection;
+   MirPixelFormat format;
+   MirSurface *surface;
++  MirRectangle rect;
+ 
+   connection = gdk_mir_display_get_mir_connection (display);
+   format = _gdk_mir_display_get_pixel_format (display, buffer_usage);
+-  spec = mir_connection_create_spec_for_normal_surface (connection, width, height, format);
++
++  if (parent && parent->impl)
++    {
++      ensure_surface (parent);
++      parent_surface = GDK_MIR_WINDOW_IMPL (parent->impl)->surface;
++    }
++
++  if (!parent_surface)
++    {
++      switch (type)
++        {
++          case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
++          case GDK_WINDOW_TYPE_HINT_UTILITY:
++            type = GDK_WINDOW_TYPE_HINT_DIALOG;
++            break;
++          default:
++            break;
++        }
++    }
++
++  switch (type)
++    {
++      case GDK_WINDOW_TYPE_HINT_DIALOG:
++      case GDK_WINDOW_TYPE_HINT_DOCK:
++        spec = mir_connection_create_spec_for_dialog (connection,
++                                                      width,
++                                                      height,
++                                                      format);
++        break;
++      case GDK_WINDOW_TYPE_HINT_MENU:
++      case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
++      case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
++      case GDK_WINDOW_TYPE_HINT_TOOLBAR:
++      case GDK_WINDOW_TYPE_HINT_COMBO:
++        rect.left = x;
++        rect.top = y;
++        rect.width = 1;
++        rect.height = 1;
++        spec = mir_connection_create_spec_for_menu (connection,
++                                                    width,
++                                                    height,
++                                                    format,
++                                                    parent_surface,
++                                                    &rect,
++                                                    mir_edge_attachment_any);
++        break;
++      case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
++      case GDK_WINDOW_TYPE_HINT_UTILITY:
++        spec = mir_connection_create_spec_for_modal_dialog (connection,
++                                                            width,
++                                                            height,
++                                                            format,
++                                                            parent_surface);
++        break;
++      case GDK_WINDOW_TYPE_HINT_DND:
++      case GDK_WINDOW_TYPE_HINT_TOOLTIP:
++      case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
++        rect.left = x;
++        rect.top = y;
++        rect.width = 1;
++        rect.height = 1;
++        spec = mir_connection_create_spec_for_tooltip (connection,
++                                                       width,
++                                                       height,
++                                                       format,
++                                                       parent_surface,
++                                                       &rect);
++        break;
++      case GDK_WINDOW_TYPE_HINT_NORMAL:
++      case GDK_WINDOW_TYPE_HINT_DESKTOP:
++      default:
++        spec = mir_connection_create_spec_for_normal_surface (connection,
++                                                              width,
++                                                              height,
++                                                              format);
++        break;
++    }
++
+   mir_surface_spec_set_name (spec, g_get_prgname ());
+   mir_surface_spec_set_buffer_usage (spec, buffer_usage);
+   surface = mir_surface_create_sync (spec);
+@@ -199,13 +268,41 @@ create_mir_surface (GdkDisplay *display,
+   return surface;
+ }
+ 
+-/* TODO: Remove once we have proper transient window support. */
+-static gboolean
+-should_render_in_parent (GdkWindow *window)
++static GdkDevice *
++get_pointer (GdkWindow *window)
+ {
+-  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
++  return gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gdk_window_get_display (window)));
++}
++
++static void
++send_event (GdkWindow *window, GdkDevice *device, GdkEvent *event)
++{
++  GdkDisplay *display;
++  GList *node;
++
++  gdk_event_set_device (event, device);
++  gdk_event_set_source_device (event, device);
++  gdk_event_set_screen (event, gdk_display_get_screen (gdk_window_get_display (window), 0));
++  event->any.window = g_object_ref (window);
+ 
+-  return impl->transient_for && gdk_window_get_window_type (window) != GDK_WINDOW_TOPLEVEL;
++  display = gdk_window_get_display (window);
++  node = _gdk_event_queue_append (display, event);
++  _gdk_windowing_got_event (display, node, event, _gdk_display_get_next_serial (display));
++}
++
++static void
++generate_configure_event (GdkWindow *window,
++                          gint       width,
++                          gint       height)
++{
++  GdkEvent *event;
++
++  event = gdk_event_new (GDK_CONFIGURE);
++  event->configure.send_event = FALSE;
++  event->configure.width = width;
++  event->configure.height = height;
++
++  send_event (window, get_pointer (window), event);
+ }
+ 
+ static void
+@@ -213,10 +310,9 @@ ensure_surface_full (GdkWindow *window,
                       MirBufferUsage buffer_usage)
  {
    GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
 -  MirEventDelegate event_delegate = { event_cb, NULL };
    GdkMirWindowReference *window_ref;
  
-   if (impl->surface || should_render_in_parent (window))
-@@ -224,23 +223,25 @@ ensure_surface_full (GdkWindow *window,
+-  if (impl->surface || should_render_in_parent (window))
++  if (impl->surface)
+     return;
+ 
+   /* no destroy notify -- we must leak for now
+@@ -224,25 +320,29 @@ ensure_surface_full (GdkWindow *window,
     */
    window_ref = _gdk_mir_event_source_get_window_reference (window);
  
 -  event_delegate.context = window_ref;
 -
-   impl->surface = create_mir_surface (gdk_window_get_display (window),
+-  impl->surface = create_mir_surface (gdk_window_get_display (window),
++  impl->surface = create_mir_surface (gdk_window_get_display (window), impl->transient_for,
++                                      impl->transient_x, impl->transient_y,
                                        window->width, window->height,
++                                      impl->type_hint,
                                        buffer_usage);
  
 -  MirEvent resize_event;
@@ -831,7 +1687,640 @@
 +  */
  
 -  mir_surface_set_event_handler (impl->surface, &event_delegate); // FIXME: Ignore some events until shown
+-  set_surface_type (impl, impl->surface_type);
+-  set_surface_state (impl, impl->surface_state);
++  generate_configure_event (window, window->width, window->height);
++
 +  mir_surface_set_event_handler (impl->surface, event_cb, window_ref); // FIXME: Ignore some events until shown
-   set_surface_type (impl, impl->surface_type);
-   set_surface_state (impl, impl->surface_state);
- }
+ }
+ 
+ static void
+@@ -280,66 +380,18 @@ ensure_no_surface (GdkWindow *window)
+           eglDestroySurface (egl_display, impl->dummy_egl_surface);
+           impl->dummy_egl_surface = NULL;
+         }
+-
+-      g_clear_pointer (&impl->dummy_surface, mir_surface_release_sync);
+     }
+ 
+   g_clear_pointer(&impl->surface, mir_surface_release_sync);
+ }
+ 
+ static void
+-redraw_transient (GdkWindow *window)
+-{
+-  GdkRectangle r;
+-  r.x = window->x;
+-  r.y = window->y;
+-  r.width = window->width;
+-  r.height = window->height;
+-  gdk_window_invalidate_rect (GDK_MIR_WINDOW_IMPL (window->impl)->transient_for, &r, FALSE);
+-}
+-
+-static void
+ send_buffer (GdkWindow *window)
+ {
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+ 
+-  /* Transient windows draw onto parent instead */
+-  if (should_render_in_parent (window))
+-    {
+-      redraw_transient (window);
+-      return;
+-    }
+-
+-  /* Composite transient windows over this one */
+-  if (impl->transient_children)
+-    {
+-      cairo_surface_t *surface;
+-      cairo_t *c;
+-      GList *link;
+-
+-      surface = gdk_mir_window_impl_ref_cairo_surface (window);
+-      c = cairo_create (surface);
+-
+-      for (link = impl->transient_children; link; link = link->next)
+-        {
+-          GdkWindow *child_window = link->data;
+-          GdkMirWindowImpl *child_impl = GDK_MIR_WINDOW_IMPL (child_window->impl);
+-
+-          /* Skip children not yet drawn to */
+-          if (!child_impl->cairo_surface)
+-            continue;
+-
+-          cairo_set_source_surface (c, child_impl->cairo_surface, child_window->x, child_window->y);
+-          cairo_rectangle (c, child_window->x, child_window->y, child_window->width, child_window->height);
+-          cairo_fill (c);
+-        }
+-
+-      cairo_destroy (c);
+-      cairo_surface_destroy (surface);
+-    }
+-
+   /* Send the completed buffer to Mir */
+-  mir_surface_swap_buffers_sync (impl->surface);
++  mir_buffer_stream_swap_buffers_sync (mir_surface_get_buffer_stream (impl->surface));
+ 
+   /* The Cairo context is no longer valid */
+   g_clear_pointer (&impl->cairo_surface, cairo_surface_destroy);
+@@ -362,7 +414,7 @@ gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
+     }
+ 
+   /* Transient windows get rendered into a buffer and copied onto their parent */
+-  if (should_render_in_parent (window) || window->gl_paint_context)
++  if (window->gl_paint_context)
+     {
+       cairo_surface = cairo_image_surface_create (pixel_format, window->width, window->height);
+     }
+@@ -370,7 +422,7 @@ gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
+     {
+       ensure_surface (window);
+ 
+-      mir_surface_get_graphics_region (impl->surface, &region);
++      mir_buffer_stream_get_graphics_region (mir_surface_get_buffer_stream (impl->surface), &region);
+       g_assert (region.pixel_format == mir_pixel_format_argb_8888);
+ 
+       cairo_surface = cairo_image_surface_create_for_data ((unsigned char *) region.vaddr,
+@@ -408,13 +460,6 @@ static void
+ gdk_mir_window_impl_finalize (GObject *object)
+ {
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (object);
+-  GList *link;
+-
+-  for (link = impl->transient_children; link; link = link->next)
+-    {
+-      GdkWindow *window = link->data;
+-      gdk_window_destroy (window);
+-    }
+ 
+   if (impl->background)
+     cairo_pattern_destroy (impl->background);
+@@ -422,7 +467,6 @@ gdk_mir_window_impl_finalize (GObject *object)
+     mir_surface_release_sync (impl->surface);
+   if (impl->cairo_surface)
+     cairo_surface_destroy (impl->cairo_surface);
+-  g_list_free (impl->transient_children);
+ 
+   G_OBJECT_CLASS (gdk_mir_window_impl_parent_class)->finalize (object);
+ }
+@@ -459,9 +503,6 @@ gdk_mir_window_impl_hide (GdkWindow *window)
+   impl->cursor_inside = FALSE;
+   impl->visible = FALSE;
+   ensure_no_surface (window);
+-
+-  if (should_render_in_parent (window))
+-    redraw_transient (window);
+ }
+ 
+ static void
+@@ -473,9 +514,6 @@ gdk_mir_window_impl_withdraw (GdkWindow *window)
+   impl->cursor_inside = FALSE;
+   impl->visible = FALSE;
+   ensure_no_surface (window);
+-
+-  if (should_render_in_parent (window))
+-    redraw_transient (window);
+ }
+ 
+ static void
+@@ -529,19 +567,10 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+   gboolean recreate_surface = FALSE;
+ 
+-  /* Redraw parent where we moved from */
+-  if (should_render_in_parent (window))
+-    redraw_transient (window);
+-
+   /* Transient windows can move wherever they want */
+   if (with_move)
+     {
+-      if (should_render_in_parent (window))
+-        {
+-          window->x = x;
+-          window->y = y;
+-        }
+-      else if (x != impl->transient_x || y != impl->transient_y)
++      if (x != impl->transient_x || y != impl->transient_y)
+         {
+           impl->transient_x = x;
+           impl->transient_y = y;
+@@ -563,10 +592,6 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
+       ensure_no_surface (window);
+       ensure_surface (window);
+     }
+-
+-  /* Redraw parent where we moved to */
+-  if (should_render_in_parent (window))
+-    redraw_transient (window);
+ }
+ 
+ static void
+@@ -602,7 +627,7 @@ gdk_mir_window_impl_reparent (GdkWindow *window,
+                               gint       x,
+                               gint       y)
+ {
+-  g_printerr ("gdk_mir_window_impl_reparent window=%p new-parent=%p\n", window, new_parent);
++  //g_printerr ("gdk_mir_window_impl_reparent window=%p new-parent=%p\n", window, new_parent);
+   return FALSE;
+ }
+ 
+@@ -702,14 +727,14 @@ gdk_mir_window_impl_end_paint (GdkWindow *window)
+ static cairo_region_t *
+ gdk_mir_window_impl_get_shape (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_get_shape window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_get_shape window=%p\n", window);
+   return NULL;
+ }
+ 
+ static cairo_region_t *
+ gdk_mir_window_impl_get_input_shape (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_get_input_shape window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_get_input_shape window=%p\n", window);
+   return NULL;
+ }
+ 
+@@ -719,7 +744,7 @@ gdk_mir_window_impl_shape_combine_region (GdkWindow            *window,
+                                           gint                  offset_x,
+                                           gint                  offset_y)
+ {
+-  g_printerr ("gdk_mir_window_impl_shape_combine_region window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_shape_combine_region window=%p\n", window);
+ }
+ 
+ static void
+@@ -741,70 +766,32 @@ gdk_mir_window_impl_destroy (GdkWindow *window,
+ 
+   impl->visible = FALSE;
+   ensure_no_surface (window);
+-
+-  if (should_render_in_parent (window))
+-    {
+-      /* Redraw parent */
+-      redraw_transient (window);
+-
+-      /* Remove from transient list */
+-      GdkMirWindowImpl *parent_impl = GDK_MIR_WINDOW_IMPL (impl->transient_for->impl);
+-      parent_impl->transient_children = g_list_remove (parent_impl->transient_children, window);
+-    }
+ }
+ 
+ static void
+ gdk_mir_window_impl_destroy_foreign (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_destroy_foreign window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_destroy_foreign window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_focus (GdkWindow *window,
+                       guint32    timestamp)
+ {
+-  g_printerr ("gdk_mir_window_impl_focus window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_focus window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_set_type_hint (GdkWindow         *window,
+                                    GdkWindowTypeHint  hint)
+ {
+-  MirSurfaceType mir_type = mir_surface_type_normal;
++  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+ 
+-  switch (hint)
++  if (hint != impl->type_hint)
+     {
+-      case GDK_WINDOW_TYPE_HINT_NORMAL:
+-      case GDK_WINDOW_TYPE_HINT_DOCK:
+-      case GDK_WINDOW_TYPE_HINT_DESKTOP:
+-        mir_type = mir_surface_type_normal;
+-        break;
+-      case GDK_WINDOW_TYPE_HINT_DIALOG:
+-        mir_type = mir_surface_type_dialog;
+-        break;
+-      case GDK_WINDOW_TYPE_HINT_UTILITY:
+-        mir_type = mir_surface_type_utility;
+-        break;
+-      case GDK_WINDOW_TYPE_HINT_MENU:
+-      case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
+-      case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
+-      case GDK_WINDOW_TYPE_HINT_COMBO:
+-        mir_type = mir_surface_type_menu;
+-        break;
+-      case GDK_WINDOW_TYPE_HINT_TOOLTIP:
+-        mir_type = mir_surface_type_tip;
+-        break;
+-      case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
+-      case GDK_WINDOW_TYPE_HINT_DND:
+-      case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
+-        mir_type = mir_surface_type_overlay;
+-        break;
+-      case GDK_WINDOW_TYPE_HINT_TOOLBAR:
+-        mir_type = mir_surface_type_satellite;
+-        break;
++      impl->type_hint = hint;
++      ensure_no_surface (window);
+     }
+-
+-  set_surface_type (GDK_MIR_WINDOW_IMPL (window->impl), mir_type);
+ }
+ 
+ static GdkWindowTypeHint
+@@ -812,29 +799,7 @@ gdk_mir_window_impl_get_type_hint (GdkWindow *window)
+ {
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+ 
+-  switch (impl->surface_type)
+-    {
+-      case mir_surface_type_normal:
+-      case mir_surface_type_freestyle:
+-      case mir_surface_type_inputmethod:
+-        return GDK_WINDOW_TYPE_HINT_NORMAL;
+-      case mir_surface_type_utility:
+-        return GDK_WINDOW_TYPE_HINT_UTILITY;
+-      case mir_surface_type_dialog:
+-        return GDK_WINDOW_TYPE_HINT_DIALOG;
+-      case mir_surface_type_tip:
+-        return GDK_WINDOW_TYPE_HINT_TOOLTIP;
+-      case mir_surface_type_menu:
+-        return GDK_WINDOW_TYPE_HINT_MENU;
+-      case mir_surface_type_overlay:
+-        return GDK_WINDOW_TYPE_HINT_NOTIFICATION;
+-      case mir_surface_type_satellite:
+-        return GDK_WINDOW_TYPE_HINT_TOOLBAR;
+-      case mir_surface_types:
+-        break;
+-    }
+-
+-  return GDK_WINDOW_TYPE_HINT_NORMAL;
++  return impl->type_hint;
+ }
+ 
+ void
+@@ -849,21 +814,21 @@ static void
+ gdk_mir_window_impl_set_skip_taskbar_hint (GdkWindow *window,
+                                            gboolean   skips_taskbar)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_skip_taskbar_hint window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_skip_taskbar_hint window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_set_skip_pager_hint (GdkWindow *window,
+                                          gboolean   skips_pager)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_skip_pager_hint window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_skip_pager_hint window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_set_urgency_hint (GdkWindow *window,
+                                       gboolean   urgent)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_urgency_hint window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_urgency_hint window=%p\n", window);
+ }
+ 
+ static void
+@@ -886,21 +851,21 @@ static void
+ gdk_mir_window_impl_set_role (GdkWindow   *window,
+                               const gchar *role)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_role window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_role window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_set_startup_id (GdkWindow   *window,
+                                     const gchar *startup_id)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_startup_id window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_startup_id window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_set_transient_for (GdkWindow *window,
+                                        GdkWindow *parent)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_transient_for window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_transient_for window=%p\n", window);
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+ 
+   if (impl->transient_for == parent)
+@@ -910,78 +875,20 @@ gdk_mir_window_impl_set_transient_for (GdkWindow *window,
+ 
+   /* Link this window to the parent */
+   impl->transient_for = parent;
+-  if (should_render_in_parent (window))
+-    {
+-      GdkMirWindowImpl *parent_impl = GDK_MIR_WINDOW_IMPL (parent->impl);
+-      parent_impl->transient_children = g_list_append (parent_impl->transient_children, window);
+-
+-      /* Move to where the client requested */
+-      window->x = impl->transient_x;
+-      window->y = impl->transient_y;
+-
+-      /* Remove surface if we had made one before this was set */
+-      ensure_no_surface (window);
+-
+-      /* Redraw onto parent */
+-      redraw_transient (window);
+-    }
+-}
+-
+-/* TODO: Remove once we have proper transient window support. */
+-GdkWindow *
+-_gdk_mir_window_get_visible_transient_child (GdkWindow *window,
+-                                             gdouble    x,
+-                                             gdouble    y,
+-                                             gdouble   *out_x,
+-                                             gdouble   *out_y)
+-{
+-  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+-  GdkWindow *child = NULL;
+-  GList *i;
+-
+-  x -= window->x;
+-  y -= window->y;
+-
+-  if (x < 0 || x >= window->width || y < 0 || y >= window->height)
+-    return NULL;
+-
+-  for (i = impl->transient_children; i && !child; i = i->next)
+-    {
+-      if (GDK_MIR_WINDOW_IMPL (GDK_WINDOW (i->data)->impl)->visible)
+-        child = _gdk_mir_window_get_visible_transient_child (i->data, x, y, out_x, out_y);
+-    }
+-
+-  if (child)
+-    return child;
+-
+-  *out_x = x;
+-  *out_y = y;
+-
+-  return window;
+-}
+-
+-/* TODO: Remove once we have proper transient window support. */
+-void
+-_gdk_mir_window_transient_children_foreach (GdkWindow  *window,
+-                                            void      (*func) (GdkWindow *, gpointer),
+-                                            gpointer    user_data)
+-{
+-  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+-  g_list_foreach (impl->transient_children, (GFunc) func, user_data);
+ }
+ 
+ static void
+ gdk_mir_window_impl_get_frame_extents (GdkWindow    *window,
+                                        GdkRectangle *rect)
+ {
+-  g_printerr ("gdk_mir_window_impl_get_frame_extents window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_get_frame_extents window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_set_override_redirect (GdkWindow *window,
+                                            gboolean   override_redirect)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_override_redirect window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_override_redirect window=%p\n", window);
+ }
+ 
+ static void
+@@ -1012,7 +919,7 @@ static void
+ gdk_mir_window_impl_set_icon_name (GdkWindow   *window,
+                                    const gchar *name)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_icon_name window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_icon_name window=%p\n", window);
+ }
+ 
+ static void
+@@ -1096,7 +1003,7 @@ gdk_mir_window_impl_set_keep_below (GdkWindow *window,
+ static GdkWindow *
+ gdk_mir_window_impl_get_group (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_get_group window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_get_group window=%p\n", window);
+   return NULL;
+ }
+ 
+@@ -1104,21 +1011,21 @@ static void
+ gdk_mir_window_impl_set_group (GdkWindow *window,
+                                GdkWindow *leader)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_group window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_group window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_set_decorations (GdkWindow       *window,
+                                      GdkWMDecoration  decorations)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_decorations window=%p decorations=%d\n", window, decorations);
++  //g_printerr ("gdk_mir_window_impl_set_decorations window=%p decorations=%d\n", window, decorations);
+ }
+ 
+ static gboolean
+ gdk_mir_window_impl_get_decorations (GdkWindow       *window,
+                                      GdkWMDecoration *decorations)
+ {
+-  g_printerr ("gdk_mir_window_impl_get_decorations window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_get_decorations window=%p\n", window);
+   return FALSE;
+ }
+ 
+@@ -1126,7 +1033,7 @@ static void
+ gdk_mir_window_impl_set_functions (GdkWindow     *window,
+                                    GdkWMFunction  functions)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_functions window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_functions window=%p\n", window);
+ }
+ 
+ static void
+@@ -1138,7 +1045,7 @@ gdk_mir_window_impl_begin_resize_drag (GdkWindow     *window,
+                                        gint           root_y,
+                                        guint32        timestamp)
+ {
+-  g_printerr ("gdk_mir_window_impl_begin_resize_drag window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_begin_resize_drag window=%p\n", window);
+ }
+ 
+ static void
+@@ -1149,19 +1056,19 @@ gdk_mir_window_impl_begin_move_drag (GdkWindow *window,
+                                      gint       root_y,
+                                      guint32    timestamp)
+ {
+-  g_printerr ("gdk_mir_window_impl_begin_move_drag window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_begin_move_drag window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_enable_synchronized_configure (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_enable_synchronized_configure window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_enable_synchronized_configure window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_configure_finished (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_configure_finished window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_configure_finished window=%p\n", window);
+ }
+ 
+ static void
+@@ -1176,27 +1083,27 @@ static void
+ gdk_mir_window_impl_set_composited (GdkWindow *window,
+                                     gboolean   composited)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_composited window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_set_composited window=%p\n", window);
+ }
+ 
+ static void
+ gdk_mir_window_impl_destroy_notify (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_destroy_notify window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_destroy_notify window=%p\n", window);
+ }
+ 
+ static GdkDragProtocol
+ gdk_mir_window_impl_get_drag_protocol (GdkWindow *window,
+                                        GdkWindow **target)
+ {
+-  g_printerr ("gdk_mir_window_impl_get_drag_protocol window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_get_drag_protocol window=%p\n", window);
+   return 0;
+ }
+ 
+ static void
+ gdk_mir_window_impl_register_dnd (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_register_dnd window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_register_dnd window=%p\n", window);
+ }
+ 
+ static GdkDragContext *
+@@ -1204,7 +1111,7 @@ gdk_mir_window_impl_drag_begin (GdkWindow *window,
+                                 GdkDevice *device,
+                                 GList     *targets)
+ {
+-  g_printerr ("gdk_mir_window_impl_drag_begin window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_drag_begin window=%p\n", window);
+   return NULL;
+ }
+ 
+@@ -1228,7 +1135,7 @@ gdk_mir_window_impl_process_updates_recurse (GdkWindow      *window,
+ static void
+ gdk_mir_window_impl_sync_rendering (GdkWindow *window)
+ {
+-  g_printerr ("gdk_mir_window_impl_sync_rendering window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_sync_rendering window=%p\n", window);
+   // FIXME: Only used for benchmarking
+ }
+ 
+@@ -1240,7 +1147,7 @@ gdk_mir_window_impl_simulate_key (GdkWindow       *window,
+                                   GdkModifierType  modifiers,
+                                   GdkEventType     key_pressrelease)
+ {
+-  g_printerr ("gdk_mir_window_impl_simulate_key window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_simulate_key window=%p\n", window);
+   return FALSE;
+ }
+ 
+@@ -1252,7 +1159,7 @@ gdk_mir_window_impl_simulate_button (GdkWindow       *window,
+                                      GdkModifierType  modifiers,
+                                      GdkEventType     button_pressrelease)
+ {
+-  g_printerr ("gdk_mir_window_impl_simulate_button window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_simulate_button window=%p\n", window);
+   return FALSE;
+ }
+ 
+@@ -1268,7 +1175,7 @@ gdk_mir_window_impl_get_property (GdkWindow   *window,
+                                   gint        *actual_length,
+                                   guchar     **data)
+ {
+-  g_printerr ("gdk_mir_window_impl_get_property window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_get_property window=%p\n", window);
+   return FALSE;
+ }
+ 
+@@ -1281,7 +1188,7 @@ gdk_mir_window_impl_change_property (GdkWindow    *window,
+                                      const guchar *data,
+                                      gint          nelements)
+ {
+-  g_printerr ("gdk_mir_window_impl_change_property window=%p\n", window);
++  //g_printerr ("gdk_mir_window_impl_change_property window=%p\n", window);
+ }
+ 
+ static void
+@@ -1508,7 +1415,7 @@ _gdk_mir_window_get_egl_surface (GdkWindow *window,
+       ensure_surface_full (window, mir_buffer_usage_hardware);
+ 
+       egl_display = _gdk_mir_display_get_egl_display (gdk_window_get_display (window));
+-      egl_window = (EGLNativeWindowType) mir_surface_get_egl_native_window (impl->surface);
++      egl_window = (EGLNativeWindowType) mir_buffer_stream_get_egl_native_window (mir_surface_get_buffer_stream (impl->surface));
+ 
+       impl->egl_surface =
+         eglCreateWindowSurface (egl_display, config, egl_window, NULL);
+@@ -1532,11 +1439,8 @@ _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window,
+       EGLNativeWindowType egl_window;
+ 
+       display = gdk_window_get_display (window);
+-      impl->dummy_surface = create_mir_surface (display, 1, 1,
+-                                                mir_buffer_usage_hardware);
+-
+       egl_display = _gdk_mir_display_get_egl_display (display);
+-      egl_window = (EGLNativeWindowType) mir_surface_get_egl_native_window (impl->surface);
++      egl_window = (EGLNativeWindowType) mir_buffer_stream_get_egl_native_window (mir_surface_get_buffer_stream (impl->surface));
+ 
+       impl->dummy_egl_surface =
+         eglCreateWindowSurface (egl_display, config, egl_window, NULL);
+-- 
+2.1.4
+

=== removed file 'debian/patches/0002-Unstable-mir-patches-from-git-wip-mir-unstable.patch'
--- debian/patches/0002-Unstable-mir-patches-from-git-wip-mir-unstable.patch	2015-06-02 11:18:47 +0000
+++ debian/patches/0002-Unstable-mir-patches-from-git-wip-mir-unstable.patch	1970-01-01 00:00:00 +0000
@@ -1,718 +0,0 @@
-From 70ffd98af2e290ebda8043f0fa9b0817e99ced2f Mon Sep 17 00:00:00 2001
-From: William Hua <[e-mail]>
-Date: Tue, 19 May 2015 17:58:38 -0500
-Subject: [PATCH 2/2] Unstable mir patches from git wip/mir-unstable.
-
----
- gdk/mir/gdkmir-debug.c      |  18 +++
- gdk/mir/gdkmir-private.h    |  12 --
- gdk/mir/gdkmireventsource.c |  97 ++------------
- gdk/mir/gdkmirwindowimpl.c  | 319 ++++++++++++--------------------------------
- 4 files changed, 116 insertions(+), 330 deletions(-)
-
-diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
-index 9bfdfe7..a135f1b 100644
---- a/gdk/mir/gdkmir-debug.c
-+++ b/gdk/mir/gdkmir-debug.c
-@@ -184,8 +184,26 @@ _gdk_mir_print_close_event (const MirCloseSurfaceEvent *event)
- void
- _gdk_mir_print_event (const MirEvent *event)
- {
-+  const MirInputEvent *input_event;
-+
-   switch (mir_event_get_type (event))
-     {
-+    case mir_event_type_input:
-+      input_event = mir_event_get_input_event (event);
-+
-+      switch (mir_input_event_get_type (input_event))
-+        {
-+          case mir_input_event_type_key:
-+            _gdk_mir_print_key_event (mir_event_get_input_event (event));
-+            break;
-+          case mir_input_event_type_touch:
-+            _gdk_mir_print_motion_event (mir_event_get_input_event (event));
-+            break;
-+          case mir_input_event_type_pointer:
-+            _gdk_mir_print_motion_event (mir_event_get_input_event (event));
-+            break;
-+        }
-+      break;
-     case mir_event_type_key:
-       _gdk_mir_print_key_event (mir_event_get_input_event (event));
-       break;
-diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
-index 847720b..2464434 100644
---- a/gdk/mir/gdkmir-private.h
-+++ b/gdk/mir/gdkmir-private.h
-@@ -133,16 +133,4 @@ void _gdk_mir_print_resize_event (const MirResizeEvent *event);
- 
- void _gdk_mir_print_event (const MirEvent *event);
- 
--/* TODO: Remove once we have proper transient window support. */
--GdkWindow * _gdk_mir_window_get_visible_transient_child (GdkWindow *window,
--                                                         gdouble    x,
--                                                         gdouble    y,
--                                                         gdouble   *out_x,
--                                                         gdouble   *out_y);
--
--/* TODO: Remove once we have proper transient window support. */
--void _gdk_mir_window_transient_children_foreach (GdkWindow  *window,
--                                                 void      (*func) (GdkWindow *, gpointer),
--                                                 gpointer    user_data);
--
- #endif /* __GDK_PRIVATE_MIR_H__ */
-diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
-index aed881c..41a4422 100644
---- a/gdk/mir/gdkmireventsource.c
-+++ b/gdk/mir/gdkmireventsource.c
-@@ -148,6 +148,8 @@ generate_button_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble
- {
-   GdkEvent *event;
- 
-+  g_print ("%s %lf %lf\n", G_STRFUNC, x, y);
-+
-   event = gdk_event_new (type);
-   event->button.x = x;
-   event->button.y = y;
-@@ -308,47 +310,6 @@ handle_key_event (GdkWindow *window, const MirInputEvent *event)
-     }
- }
- 
--/* TODO: Remove once we have proper transient window support. */
--typedef struct
--{
--  GdkWindow *except;
--  gdouble    x;
--  gdouble    y;
--  guint32    time;
--} LeaveInfo;
--
--/* TODO: Remove once we have proper transient window support. */
--/*
-- * leave_windows_except:
-- *
-- * Generate a leave event for every window except the one the cursor is in.
-- */
--static void
--leave_windows_except (GdkWindow *window,
--                      gpointer   user_data)
--{
--  LeaveInfo info = *((LeaveInfo *) user_data);
--
--  info.x -= window->x;
--  info.y -= window->y;
--
--  _gdk_mir_window_transient_children_foreach (window, leave_windows_except, &info);
--
--  if (window != info.except)
--    {
--      GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
--      gboolean cursor_inside;
--      guint button_state;
--
--      _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, &cursor_inside, &button_state);
--
--      if (cursor_inside)
--        generate_crossing_event (window, GDK_LEAVE_NOTIFY, info.x, info.y, info.time);
--
--      _gdk_mir_window_impl_set_cursor_state (impl, info.x, info.y, FALSE, button_state);
--    }
--}
--
- static guint
- mir_pointer_event_get_button_state (const MirPointerEvent *event)
- {
-@@ -388,49 +349,6 @@ handle_motion_event (GdkWindow *window, const MirInputEvent *event)
-   modifier_state = get_modifier_state (mir_pointer_event_modifiers (pointer_event), mir_pointer_event_get_button_state (pointer_event));
-   event_time = NANO_TO_MILLI (mir_input_event_get_event_time (event));
- 
--  /* TODO: Remove once we have proper transient window support. */
--  if (mir_pointer_event_action (pointer_event) == mir_pointer_action_leave)
--    {
--      LeaveInfo info;
--
--      info.x = x;
--      info.y = y;
--      info.time = event_time;
--      info.except = window;
--
--      /* Leave all transient children from leaf to root, except the root since we do it later. */
--      _gdk_mir_window_transient_children_foreach (window, leave_windows_except, &info);
--    }
--  else
--    {
--      LeaveInfo info;
--
--      info.x = x;
--      info.y = y;
--      info.time = event_time;
--      info.except = _gdk_mir_window_get_visible_transient_child (window, x, y, &x, &y);
--
--      /* Leave all transient children from leaf to root, except the pointer window since we enter it. */
--      _gdk_mir_window_transient_children_foreach (window, leave_windows_except, &info);
--
--      window = info.except;
--
--      if (window)
--        {
--          /* Enter the pointer window. */
--          gboolean cursor_inside_pointer_window;
--
--          impl = GDK_MIR_WINDOW_IMPL (window->impl);
--          _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, &cursor_inside_pointer_window, NULL);
--
--          if (!cursor_inside_pointer_window)
--            {
--              generate_crossing_event (window, GDK_ENTER_NOTIFY, x, y, event_time);
--              _gdk_mir_window_impl_set_cursor_state (impl, x, y, TRUE, mir_pointer_event_get_button_state (pointer_event));
--            }
--        }
--    }
--
-   if (window)
-     {
-       gdouble new_x;
-@@ -444,6 +362,8 @@ handle_motion_event (GdkWindow *window, const MirInputEvent *event)
-         {
-         case mir_pointer_action_button_up:
-         case mir_pointer_action_button_down:
-+          g_print ("%s button up/down\n", G_STRFUNC);
-+
-           event_type = mir_pointer_event_action (pointer_event) == mir_pointer_action_button_down ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE;
-           changed_button_state = button_state ^ mir_pointer_event_get_button_state (pointer_event);
-           if (changed_button_state == 0 || (changed_button_state & mir_pointer_button_primary) != 0)
-@@ -463,7 +383,11 @@ handle_motion_event (GdkWindow *window, const MirInputEvent *event)
-           if (hscroll > 0.5 || vscroll > 0.5)
-             generate_scroll_event (window, x, y, hscroll, vscroll, modifier_state, event_time);
-           if (ABS (new_x - x) > 0.5 || ABS (new_y - y) > 0.5)
--            generate_motion_event (window, new_x, new_y, modifier_state, event_time);
-+            {
-+              generate_motion_event (window, new_x, new_y, modifier_state, event_time);
-+              x = new_x;
-+              y = new_y;
-+            }
- 
-           break;
-         case mir_pointer_action_leave:
-@@ -616,6 +540,7 @@ static void
- gdk_mir_queued_event_free (GdkMirQueuedEvent *event)
- {
-   _gdk_mir_window_reference_unref (event->window_ref);
-+  mir_event_unref (event->event);
-   g_slice_free (GdkMirQueuedEvent, event);
- }
- 
-@@ -800,7 +725,7 @@ _gdk_mir_event_source_queue (GdkMirWindowReference *window_ref,
-   queued_event = g_slice_new (GdkMirQueuedEvent);
-   g_atomic_int_inc (&window_ref->ref_count);
-   queued_event->window_ref = window_ref;
--  queued_event->event = event;
-+  queued_event->event = mir_event_ref (event);
- 
-   g_mutex_lock (&source->mir_event_lock);
-   g_queue_push_tail (&source->mir_events, queued_event);
-diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
-index 9cafcc9..d150d3e 100644
---- a/gdk/mir/gdkmirwindowimpl.c
-+++ b/gdk/mir/gdkmirwindowimpl.c
-@@ -46,11 +46,8 @@ struct _GdkMirWindowImpl
-   gint transient_x;
-   gint transient_y;
- 
--  /* Child windows (e.g. tooltips) */
--  GList *transient_children;
--
-   /* Desired surface attributes */
--  MirSurfaceType surface_type;
-+  GdkWindowTypeHint type_hint;
-   MirSurfaceState surface_state;
- 
-   /* Pattern for background */
-@@ -103,9 +100,9 @@ _gdk_mir_window_impl_set_surface_state (GdkMirWindowImpl *impl, MirSurfaceState
- }
- 
- void
--_gdk_mir_window_impl_set_surface_type (GdkMirWindowImpl *impl, MirSurfaceType type)
-+_gdk_mir_window_impl_set_surface_type (GdkMirWindowImpl *impl,
-+                                       MirSurfaceType    type)
- {
--  impl->surface_type = type;
- }
- 
- void
-@@ -141,7 +138,7 @@ _gdk_mir_window_impl_get_cursor_state (GdkMirWindowImpl *impl,
- static void
- gdk_mir_window_impl_init (GdkMirWindowImpl *impl)
- {
--  impl->surface_type = mir_surface_type_normal;
-+  impl->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
-   impl->surface_state = mir_surface_state_unknown;
- }
- 
-@@ -158,18 +155,6 @@ set_surface_state (GdkMirWindowImpl *impl,
- }
- 
- static void
--set_surface_type (GdkMirWindowImpl *impl,
--                  MirSurfaceType type)
--{
--  if (impl->surface_type == type)
--    return;
--
--  impl->surface_type = type;
--  if (impl->surface)
--    mir_surface_set_type (impl->surface, type);
--}
--
--static void
- event_cb (MirSurface     *surface,
-           const MirEvent *event,
-           void           *context)
-@@ -179,18 +164,87 @@ event_cb (MirSurface     *surface,
- 
- static MirSurface *
- create_mir_surface (GdkDisplay *display,
-+                    GdkWindow *parent,
-+                    gint x,
-+                    gint y,
-                     gint width,
-                     gint height,
-+                    GdkWindowTypeHint type,
-                     MirBufferUsage buffer_usage)
- {
-+  GdkMirWindowImpl *parent_impl;
-   MirSurfaceSpec *spec;
-   MirConnection *connection;
-   MirPixelFormat format;
-   MirSurface *surface;
-+  MirRectangle rect;
- 
-   connection = gdk_mir_display_get_mir_connection (display);
-   format = _gdk_mir_display_get_pixel_format (display, buffer_usage);
--  spec = mir_connection_create_spec_for_normal_surface (connection, width, height, format);
-+
-+  if (parent)
-+    parent_impl = GDK_MIR_WINDOW_IMPL (parent->impl);
-+  else
-+    parent_impl = NULL;
-+
-+  switch (type)
-+    {
-+      case GDK_WINDOW_TYPE_HINT_DIALOG:
-+      case GDK_WINDOW_TYPE_HINT_DOCK:
-+        spec = mir_connection_create_spec_for_dialog (connection,
-+                                                      width,
-+                                                      height,
-+                                                      format);
-+        break;
-+      case GDK_WINDOW_TYPE_HINT_MENU:
-+      case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
-+      case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
-+      case GDK_WINDOW_TYPE_HINT_TOOLBAR:
-+      case GDK_WINDOW_TYPE_HINT_COMBO:
-+        rect.left = x;
-+        rect.top = y;
-+        rect.width = 1;
-+        rect.height = 1;
-+        spec = mir_connection_create_spec_for_menu (connection,
-+                                                    width,
-+                                                    height,
-+                                                    format,
-+                                                    parent_impl ? parent_impl->surface : NULL,
-+                                                    &rect,
-+                                                    mir_edge_attachment_any);
-+        break;
-+      case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
-+      case GDK_WINDOW_TYPE_HINT_UTILITY:
-+        spec = mir_connection_create_spec_for_modal_dialog (connection,
-+                                                            width,
-+                                                            height,
-+                                                            format,
-+                                                            parent_impl ? parent_impl->surface : NULL);
-+        break;
-+      case GDK_WINDOW_TYPE_HINT_DND:
-+      case GDK_WINDOW_TYPE_HINT_TOOLTIP:
-+      case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
-+        rect.left = x;
-+        rect.top = y;
-+        rect.width = 1;
-+        rect.height = 1;
-+        spec = mir_connection_create_spec_for_tooltip (connection,
-+                                                       width,
-+                                                       height,
-+                                                       format,
-+                                                       parent_impl ? parent_impl->surface : NULL,
-+                                                       &rect);
-+        break;
-+      case GDK_WINDOW_TYPE_HINT_NORMAL:
-+      case GDK_WINDOW_TYPE_HINT_DESKTOP:
-+      default:
-+        spec = mir_connection_create_spec_for_normal_surface (connection,
-+                                                              width,
-+                                                              height,
-+                                                              format);
-+        break;
-+    }
-+
-   mir_surface_spec_set_name (spec, g_get_prgname ());
-   mir_surface_spec_set_buffer_usage (spec, buffer_usage);
-   surface = mir_surface_create_sync (spec);
-@@ -199,15 +253,6 @@ create_mir_surface (GdkDisplay *display,
-   return surface;
- }
- 
--/* TODO: Remove once we have proper transient window support. */
--static gboolean
--should_render_in_parent (GdkWindow *window)
--{
--  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
--
--  return impl->transient_for && gdk_window_get_window_type (window) != GDK_WINDOW_TOPLEVEL;
--}
--
- static void
- ensure_surface_full (GdkWindow *window,
-                      MirBufferUsage buffer_usage)
-@@ -215,7 +260,7 @@ ensure_surface_full (GdkWindow *window,
-   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-   GdkMirWindowReference *window_ref;
- 
--  if (impl->surface || should_render_in_parent (window))
-+  if (impl->surface)
-     return;
- 
-   /* no destroy notify -- we must leak for now
-@@ -223,8 +268,10 @@ ensure_surface_full (GdkWindow *window,
-    */
-   window_ref = _gdk_mir_event_source_get_window_reference (window);
- 
--  impl->surface = create_mir_surface (gdk_window_get_display (window),
-+  impl->surface = create_mir_surface (gdk_window_get_display (window), impl->transient_for,
-+                                      impl->transient_x, impl->transient_y,
-                                       window->width, window->height,
-+                                      impl->type_hint,
-                                       buffer_usage);
- 
-   /* FIXME: can't make an initial resize event */
-@@ -242,8 +289,6 @@ ensure_surface_full (GdkWindow *window,
-   */
- 
-   mir_surface_set_event_handler (impl->surface, event_cb, window_ref); // FIXME: Ignore some events until shown
--  set_surface_type (impl, impl->surface_type);
--  set_surface_state (impl, impl->surface_state);
- }
- 
- static void
-@@ -289,56 +334,10 @@ ensure_no_surface (GdkWindow *window)
- }
- 
- static void
--redraw_transient (GdkWindow *window)
--{
--  GdkRectangle r;
--  r.x = window->x;
--  r.y = window->y;
--  r.width = window->width;
--  r.height = window->height;
--  gdk_window_invalidate_rect (GDK_MIR_WINDOW_IMPL (window->impl)->transient_for, &r, FALSE);
--}
--
--static void
- send_buffer (GdkWindow *window)
- {
-   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- 
--  /* Transient windows draw onto parent instead */
--  if (should_render_in_parent (window))
--    {
--      redraw_transient (window);
--      return;
--    }
--
--  /* Composite transient windows over this one */
--  if (impl->transient_children)
--    {
--      cairo_surface_t *surface;
--      cairo_t *c;
--      GList *link;
--
--      surface = gdk_mir_window_impl_ref_cairo_surface (window);
--      c = cairo_create (surface);
--
--      for (link = impl->transient_children; link; link = link->next)
--        {
--          GdkWindow *child_window = link->data;
--          GdkMirWindowImpl *child_impl = GDK_MIR_WINDOW_IMPL (child_window->impl);
--
--          /* Skip children not yet drawn to */
--          if (!child_impl->cairo_surface)
--            continue;
--
--          cairo_set_source_surface (c, child_impl->cairo_surface, child_window->x, child_window->y);
--          cairo_rectangle (c, child_window->x, child_window->y, child_window->width, child_window->height);
--          cairo_fill (c);
--        }
--
--      cairo_destroy (c);
--      cairo_surface_destroy (surface);
--    }
--
-   /* Send the completed buffer to Mir */
-   mir_surface_swap_buffers_sync (impl->surface);
- 
-@@ -363,7 +362,7 @@ gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
-     }
- 
-   /* Transient windows get rendered into a buffer and copied onto their parent */
--  if (should_render_in_parent (window) || window->gl_paint_context)
-+  if (window->gl_paint_context)
-     {
-       cairo_surface = cairo_image_surface_create (pixel_format, window->width, window->height);
-     }
-@@ -409,13 +408,6 @@ static void
- gdk_mir_window_impl_finalize (GObject *object)
- {
-   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (object);
--  GList *link;
--
--  for (link = impl->transient_children; link; link = link->next)
--    {
--      GdkWindow *window = link->data;
--      gdk_window_destroy (window);
--    }
- 
-   if (impl->background)
-     cairo_pattern_destroy (impl->background);
-@@ -423,7 +415,6 @@ gdk_mir_window_impl_finalize (GObject *object)
-     mir_surface_release_sync (impl->surface);
-   if (impl->cairo_surface)
-     cairo_surface_destroy (impl->cairo_surface);
--  g_list_free (impl->transient_children);
- 
-   G_OBJECT_CLASS (gdk_mir_window_impl_parent_class)->finalize (object);
- }
-@@ -460,9 +451,6 @@ gdk_mir_window_impl_hide (GdkWindow *window)
-   impl->cursor_inside = FALSE;
-   impl->visible = FALSE;
-   ensure_no_surface (window);
--
--  if (should_render_in_parent (window))
--    redraw_transient (window);
- }
- 
- static void
-@@ -474,9 +462,6 @@ gdk_mir_window_impl_withdraw (GdkWindow *window)
-   impl->cursor_inside = FALSE;
-   impl->visible = FALSE;
-   ensure_no_surface (window);
--
--  if (should_render_in_parent (window))
--    redraw_transient (window);
- }
- 
- static void
-@@ -530,19 +515,10 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
-   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-   gboolean recreate_surface = FALSE;
- 
--  /* Redraw parent where we moved from */
--  if (should_render_in_parent (window))
--    redraw_transient (window);
--
-   /* Transient windows can move wherever they want */
-   if (with_move)
-     {
--      if (should_render_in_parent (window))
--        {
--          window->x = x;
--          window->y = y;
--        }
--      else if (x != impl->transient_x || y != impl->transient_y)
-+      if (x != impl->transient_x || y != impl->transient_y)
-         {
-           impl->transient_x = x;
-           impl->transient_y = y;
-@@ -564,10 +540,6 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
-       ensure_no_surface (window);
-       ensure_surface (window);
-     }
--
--  /* Redraw parent where we moved to */
--  if (should_render_in_parent (window))
--    redraw_transient (window);
- }
- 
- static void
-@@ -742,16 +714,6 @@ gdk_mir_window_impl_destroy (GdkWindow *window,
- 
-   impl->visible = FALSE;
-   ensure_no_surface (window);
--
--  if (should_render_in_parent (window))
--    {
--      /* Redraw parent */
--      redraw_transient (window);
--
--      /* Remove from transient list */
--      GdkMirWindowImpl *parent_impl = GDK_MIR_WINDOW_IMPL (impl->transient_for->impl);
--      parent_impl->transient_children = g_list_remove (parent_impl->transient_children, window);
--    }
- }
- 
- static void
-@@ -771,41 +733,13 @@ static void
- gdk_mir_window_impl_set_type_hint (GdkWindow         *window,
-                                    GdkWindowTypeHint  hint)
- {
--  MirSurfaceType mir_type = mir_surface_type_normal;
-+  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- 
--  switch (hint)
-+  if (hint != impl->type_hint)
-     {
--      case GDK_WINDOW_TYPE_HINT_NORMAL:
--      case GDK_WINDOW_TYPE_HINT_DOCK:
--      case GDK_WINDOW_TYPE_HINT_DESKTOP:
--        mir_type = mir_surface_type_normal;
--        break;
--      case GDK_WINDOW_TYPE_HINT_DIALOG:
--        mir_type = mir_surface_type_dialog;
--        break;
--      case GDK_WINDOW_TYPE_HINT_UTILITY:
--        mir_type = mir_surface_type_utility;
--        break;
--      case GDK_WINDOW_TYPE_HINT_MENU:
--      case GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU:
--      case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
--      case GDK_WINDOW_TYPE_HINT_COMBO:
--        mir_type = mir_surface_type_menu;
--        break;
--      case GDK_WINDOW_TYPE_HINT_TOOLTIP:
--        mir_type = mir_surface_type_tip;
--        break;
--      case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
--      case GDK_WINDOW_TYPE_HINT_DND:
--      case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
--        mir_type = mir_surface_type_overlay;
--        break;
--      case GDK_WINDOW_TYPE_HINT_TOOLBAR:
--        mir_type = mir_surface_type_satellite;
--        break;
-+      impl->type_hint = hint;
-+      ensure_no_surface (window);
-     }
--
--  set_surface_type (GDK_MIR_WINDOW_IMPL (window->impl), mir_type);
- }
- 
- static GdkWindowTypeHint
-@@ -813,29 +747,7 @@ gdk_mir_window_impl_get_type_hint (GdkWindow *window)
- {
-   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
- 
--  switch (impl->surface_type)
--    {
--      case mir_surface_type_normal:
--      case mir_surface_type_freestyle:
--      case mir_surface_type_inputmethod:
--        return GDK_WINDOW_TYPE_HINT_NORMAL;
--      case mir_surface_type_utility:
--        return GDK_WINDOW_TYPE_HINT_UTILITY;
--      case mir_surface_type_dialog:
--        return GDK_WINDOW_TYPE_HINT_DIALOG;
--      case mir_surface_type_tip:
--        return GDK_WINDOW_TYPE_HINT_TOOLTIP;
--      case mir_surface_type_menu:
--        return GDK_WINDOW_TYPE_HINT_MENU;
--      case mir_surface_type_overlay:
--        return GDK_WINDOW_TYPE_HINT_NOTIFICATION;
--      case mir_surface_type_satellite:
--        return GDK_WINDOW_TYPE_HINT_TOOLBAR;
--      case mir_surface_types:
--        break;
--    }
--
--  return GDK_WINDOW_TYPE_HINT_NORMAL;
-+  return impl->type_hint;
- }
- 
- void
-@@ -911,64 +823,6 @@ gdk_mir_window_impl_set_transient_for (GdkWindow *window,
- 
-   /* Link this window to the parent */
-   impl->transient_for = parent;
--  if (should_render_in_parent (window))
--    {
--      GdkMirWindowImpl *parent_impl = GDK_MIR_WINDOW_IMPL (parent->impl);
--      parent_impl->transient_children = g_list_append (parent_impl->transient_children, window);
--
--      /* Move to where the client requested */
--      window->x = impl->transient_x;
--      window->y = impl->transient_y;
--
--      /* Remove surface if we had made one before this was set */
--      ensure_no_surface (window);
--
--      /* Redraw onto parent */
--      redraw_transient (window);
--    }
--}
--
--/* TODO: Remove once we have proper transient window support. */
--GdkWindow *
--_gdk_mir_window_get_visible_transient_child (GdkWindow *window,
--                                             gdouble    x,
--                                             gdouble    y,
--                                             gdouble   *out_x,
--                                             gdouble   *out_y)
--{
--  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
--  GdkWindow *child = NULL;
--  GList *i;
--
--  x -= window->x;
--  y -= window->y;
--
--  if (x < 0 || x >= window->width || y < 0 || y >= window->height)
--    return NULL;
--
--  for (i = impl->transient_children; i && !child; i = i->next)
--    {
--      if (GDK_MIR_WINDOW_IMPL (GDK_WINDOW (i->data)->impl)->visible)
--        child = _gdk_mir_window_get_visible_transient_child (i->data, x, y, out_x, out_y);
--    }
--
--  if (child)
--    return child;
--
--  *out_x = x;
--  *out_y = y;
--
--  return window;
--}
--
--/* TODO: Remove once we have proper transient window support. */
--void
--_gdk_mir_window_transient_children_foreach (GdkWindow  *window,
--                                            void      (*func) (GdkWindow *, gpointer),
--                                            gpointer    user_data)
--{
--  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
--  g_list_foreach (impl->transient_children, (GFunc) func, user_data);
- }
- 
- static void
-@@ -1533,7 +1387,8 @@ _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window,
-       EGLNativeWindowType egl_window;
- 
-       display = gdk_window_get_display (window);
--      impl->dummy_surface = create_mir_surface (display, 1, 1,
-+      impl->dummy_surface = create_mir_surface (display, NULL, 0, 0, 1, 1,
-+                                                GDK_WINDOW_TYPE_HINT_NORMAL,
-                                                 mir_buffer_usage_hardware);
- 
-       egl_display = _gdk_mir_display_get_egl_display (display);
--- 
-2.1.4
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-06-15 16:56:54 +0000
+++ debian/patches/series	2015-07-04 03:42:40 +0000
@@ -18,6 +18,5 @@
 x-canonical-accel.patch
 message-dialog-restore-traditional-look-on-unity.patch
 0001-gtk-reftest-Force-icon-theme-to-Adwaita.patch
-0001-Stable-mir-patches-from-git-master.patch
-0002-Unstable-mir-patches-from-git-wip-mir-unstable.patch
 restore_filechooser_typeaheadfind
+0001-backport-mir-patches-from-upstream-master.patch