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

[William Hua]

Refresh mir backend.

Refresh mir backend.

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-11 12:58:39 +0000
+++ debian/changelog	2014-12-13 16:59:39 +0000
@@ -65,7 +65,13 @@
     - Add back changes from 3.12.2-0ubuntu14
     - Fix touch events not generating GDK events (LP: #1388875)
 
- -- Lars Uebernickel <[e-mail]>  Mon, 20 Oct 2014 13:44:53 -0400
+  [ William Hua ]
+  * debian/patches/mir-backend.patch:
+    - Backport more mir patches from master
+  * debian/patches/mir-backend-unmerged.patch:
+    - Backport unmerged mir patches from wip/mir2
+
+ -- William Hua <[e-mail]>  Thu, 11 Dec 2014 12:43:44 -0500
 
 gtk+3.0 (3.14.5-1) unstable; urgency=medium
 
 
=== added file 'debian/patches/mir-backend-unmerged.patch'
--- debian/patches/mir-backend-unmerged.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mir-backend-unmerged.patch	2014-12-13 16:59:39 +0000
@@ -0,0 +1,686 @@
+From 447c406a112e5dd6cc3b49f17bfa779d24e2ef3a Mon Sep 17 00:00:00 2001
+From: William Hua <[e-mail]>
+Date: Fri, 28 Nov 2014 08:33:03 -0500
+Subject: [PATCH 2/2] mir: unmerged commits from wip/mir2 branch
+
+Backported from:
+ce596da0d8eee33016bae8bda3d621860b45bccb
+af8cf6945cea6b4257b7ca8b589efc69a8f48129
+d8fc26da795d2b1730291879eac961441764c80a
+13eb820d7f37a7a4b7e9eb00dd897acfbe116c3c
+73002dca915da3834c6ccf4af422f9fb443637de
+c9c85e1d9f87120c2f43764c78263d216fe04585
+6db489dc399bfb1fb0fc206d0bd206ac3468c3c7
+731b01de1f18354be1da21eeaf6ed8066b622a74
+92dd2b7cb0a53f9d4480472d1a3756bcfae778c8
+292229fa415133cc6801121eedc460caee287618
+d2a0e3d013d5521f790aaf81cf68ff531adc7e3d
+7d3257af05e364a7efa250a692e8e0dd2af6280a
+f060bfbc338d109cc12f143761bf9d8d235171e7
+310faf6c914967c58fa944577cd2238658e9f22a
+62f25bef0f30350faf152b0d885ce01ad341ea70
[phone]c1aeda2b76c24ad701d44a79968f715c
+ada2ed8eca7f3e116a0e171dcbf6c13eda28c9c4
+cc0f748f4d883103b50cfa09acda5c239f1a80d1
+84119c20f297e4d02f4667a3d4d921e785fd77e9
+d4d6d519bc88c79bfca6902f8f9f17a2392ae4ba
+b9890b3d9ee8a8d3cbb31db6d4446910987f63ec
+---
+ gdk/mir/gdkmir-private.h    |   9 ++++
+ gdk/mir/gdkmirdisplay.c     |  17 +++++--
+ gdk/mir/gdkmireventsource.c | 109 ++++++++++++++++++++++++++++++--------------
+ gdk/mir/gdkmirkeymap.c      |  14 ++++++
+ gdk/mir/gdkmirpointer.c     |   6 +++
+ gdk/mir/gdkmirscreen.c      |  22 ++++-----
+ gdk/mir/gdkmirwindowimpl.c  |  86 ++++++++++++++++++++++++++--------
+ 7 files changed, 195 insertions(+), 68 deletions(-)
+
+diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
+index 8305096..a5802f7 100644
+--- a/gdk/mir/gdkmir-private.h
++++ b/gdk/mir/gdkmir-private.h
+@@ -45,6 +45,8 @@ GdkDevice *_gdk_mir_device_manager_get_keyboard (GdkDeviceManager *device_manage
+ 
+ GdkKeymap *_gdk_mir_keymap_new (void);
+ 
++gboolean _gdk_mir_keymap_key_is_modifier (GdkKeymap *keymap, guint keycode);
++
+ GdkDevice *_gdk_mir_keyboard_new (GdkDeviceManager *device_manager, const gchar *name);
+ 
+ GdkDevice *_gdk_mir_pointer_new (GdkDeviceManager *device_manager, const gchar *name);
+@@ -89,4 +91,11 @@ 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,
++                                                         gint       x,
++                                                         gint       y,
++                                                         gint      *out_x,
++                                                         gint      *out_y);
++
+ #endif /* __GDK_PRIVATE_MIR_H__ */
+diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c
+index 207342c..13793ec 100644
+--- a/gdk/mir/gdkmirdisplay.c
++++ b/gdk/mir/gdkmirdisplay.c
+@@ -391,9 +391,20 @@ gdk_mir_display_create_window_impl (GdkDisplay    *display,
+   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)
+-    return;
+-  window->impl = _gdk_mir_window_impl_new ();
++
++  if (attributes->wclass == GDK_INPUT_OUTPUT)
++    {
++      window->impl = _gdk_mir_window_impl_new ();
++      window->impl_window = window;
++    }
++  else /* attributes->wclass == GDK_INPUT_ONLY */
++    {
++      window->impl = g_object_ref (real_parent->impl);
++      window->impl_window = real_parent;
++
++      /* FIXME: this is called in gdk_window_new, which sets window->impl_window
++       * back to window after this function returns. */
++    }
+ }
+ 
+ static GdkKeymap *
+diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
+index cfe36e8..18364b0 100644
+--- a/gdk/mir/gdkmireventsource.c
++++ b/gdk/mir/gdkmireventsource.c
+@@ -22,6 +22,8 @@
+ #include "gdkmir.h"
+ #include "gdkmir-private.h"
+ 
++#define NANO_TO_MILLI(x) ((x) / 1000000)
++
+ struct _GdkMirWindowReference {
+   GdkMirEventSource *source;
+   GdkWindow         *window;
+@@ -39,6 +41,7 @@ struct _GdkMirEventSource
+ 
+   GMutex mir_event_lock;
+   GQueue mir_events;
++  gboolean log_events;
+ 
+   GdkDisplay *display;
+ };
+@@ -50,6 +53,7 @@ send_event (GdkWindow *window, GdkDevice *device, GdkEvent *event)
+   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);
+ 
+@@ -118,7 +122,7 @@ set_key_event_string (GdkEventKey *event)
+ }
+ 
+ static void
+-generate_key_event (GdkWindow *window, GdkEventType type, guint state, guint keyval, guint16 keycode, gboolean is_modifier)
++generate_key_event (GdkWindow *window, GdkEventType type, guint state, guint keyval, guint16 keycode, gboolean is_modifier, guint32 event_time)
+ {
+   GdkEvent *event;
+ 
+@@ -127,6 +131,7 @@ generate_key_event (GdkWindow *window, GdkEventType type, guint state, guint key
+   event->key.keyval = keyval;
+   event->key.hardware_keycode = keycode + 8;
+   event->key.is_modifier = is_modifier;
++  event->key.time = event_time;
+   set_key_event_string (&event->key);
+ 
+   send_event (window, _gdk_mir_device_manager_get_keyboard (gdk_display_get_device_manager (gdk_window_get_display (window))), event);
+@@ -139,7 +144,7 @@ get_pointer (GdkWindow *window)
+ }
+ 
+ static void
+-generate_button_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble y, guint button, guint state)
++generate_button_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble y, guint button, guint state, guint32 event_time)
+ {
+   GdkEvent *event;
+ 
+@@ -148,12 +153,13 @@ generate_button_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble
+   event->button.y = y;
+   event->button.state = state;
+   event->button.button = button;
++  event->button.time = event_time;
+ 
+   send_event (window, get_pointer (window), event);
+ }
+ 
+ static void
+-generate_scroll_event (GdkWindow *window, gdouble x, gdouble y, gdouble delta_x, gdouble delta_y, guint state)
++generate_scroll_event (GdkWindow *window, gdouble x, gdouble y, gdouble delta_x, gdouble delta_y, guint state, guint32 event_time)
+ {
+   GdkEvent *event;
+ 
+@@ -161,15 +167,28 @@ generate_scroll_event (GdkWindow *window, gdouble x, gdouble y, gdouble delta_x,
+   event->scroll.x = x;
+   event->scroll.y = y;
+   event->scroll.state = state;
+-  event->scroll.direction = GDK_SCROLL_SMOOTH;
+-  event->scroll.delta_x = -delta_x;
+-  event->scroll.delta_y = -delta_y;
++  event->scroll.time = event_time;
++
++  if (ABS (delta_x) == 1 && delta_y == 0)
++    {
++      event->scroll.direction = (delta_x < 0) ? GDK_SCROLL_LEFT : GDK_SCROLL_RIGHT;
++    }
++  else if (ABS (delta_y) == 1 && delta_x == 0)
++    {
++      event->scroll.direction = (delta_y < 0) ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
++    }
++  else
++    {
++      event->scroll.direction = GDK_SCROLL_SMOOTH;
++      event->scroll.delta_x = -delta_x;
++      event->scroll.delta_y = -delta_y;
++    }
+ 
+   send_event (window, get_pointer (window), event);
+ }
+ 
+ static void
+-generate_motion_event (GdkWindow *window, gdouble x, gdouble y, guint state)
++generate_motion_event (GdkWindow *window, gdouble x, gdouble y, guint state, guint32 event_time)
+ {
+   GdkEvent *event;
+ 
+@@ -178,12 +197,13 @@ generate_motion_event (GdkWindow *window, gdouble x, gdouble y, guint state)
+   event->motion.y = y;
+   event->motion.state = state;
+   event->motion.is_hint = FALSE;
++  event->motion.time = event_time;
+ 
+   send_event (window, get_pointer (window), event);
+ }
+ 
+ static void
+-generate_crossing_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble y)
++generate_crossing_event (GdkWindow *window, GdkEventType type, gdouble x, gdouble y, guint32 event_time)
+ {
+   GdkEvent *event;
+ 
+@@ -193,6 +213,7 @@ generate_crossing_event (GdkWindow *window, GdkEventType type, gdouble x, gdoubl
+   event->crossing.mode = GDK_CROSSING_NORMAL;
+   event->crossing.detail = GDK_NOTIFY_ANCESTOR;
+   event->crossing.focus = TRUE;
++  event->crossing.time = event_time;
+ 
+   send_event (window, get_pointer (window), event);
+ }
+@@ -239,35 +260,30 @@ get_modifier_state (unsigned int modifiers, unsigned int button_state)
+   return modifier_state;
+ }
+ 
+-/*
+-  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (event_data->window->impl);
+-  MirMotionButton changed_button_state;
+-  GdkEventType event_type;
+-  gdouble x, y;
+-  guint modifier_state;
+-  gboolean is_modifier = FALSE;
+-*/
+-
+ static void
+ handle_key_event (GdkWindow *window, const MirKeyEvent *event)
+ {
++  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
++  GdkKeymap *keymap;
+   guint modifier_state;
+-  gboolean is_modifier = FALSE;
+-
+-  modifier_state = get_modifier_state (event->modifiers, 0); // FIXME: Need to track button state
++  MirMotionButton button_state;
+ 
+   switch (event->action)
+     {
+     case mir_key_action_down:
+     case mir_key_action_up:
+       // FIXME: Convert keycode
+-      // FIXME: is_modifier
++      _gdk_mir_window_impl_get_cursor_state (impl, NULL, NULL, NULL, &button_state);
++      modifier_state = get_modifier_state (event->modifiers, button_state);
++      keymap = gdk_keymap_get_for_display (gdk_window_get_display (window));
++
+       generate_key_event (window,
+                           event->action == mir_key_action_down ? GDK_KEY_PRESS : GDK_KEY_RELEASE,
+                           modifier_state,
+                           event->key_code,
+                           event->scan_code,
+-                          is_modifier);
++                          _gdk_mir_keymap_key_is_modifier (keymap, event->key_code),
++                          NANO_TO_MILLI (event->event_time));
+       break;
+     default:
+     //case mir_key_action_multiple:
+@@ -284,6 +300,7 @@ handle_motion_event (GdkWindow *window, const MirMotionEvent *event)
+   gboolean cursor_inside;
+   MirMotionButton button_state;
+   guint modifier_state;
++  guint32 event_time;
+   GdkEventType event_type;
+   MirMotionButton changed_button_state;
+ 
+@@ -294,13 +311,14 @@ handle_motion_event (GdkWindow *window, const MirMotionEvent *event)
+       y = event->pointer_coordinates[0].y;
+     }
+   modifier_state = get_modifier_state (event->modifiers, event->button_state);
++  event_time = NANO_TO_MILLI (event->event_time);
+ 
+   /* The Mir events generate hover-exits even while inside the window so
+      counteract this by always generating an enter notify on all other events */
+   if (!cursor_inside && event->action != mir_motion_action_hover_exit)
+     {
+       cursor_inside = TRUE;
+-      generate_crossing_event (window, GDK_ENTER_NOTIFY, x, y);
++      generate_crossing_event (window, GDK_ENTER_NOTIFY, x, y, event_time);
+     }
+ 
+   /* Update which window has focus */
+@@ -312,23 +330,23 @@ handle_motion_event (GdkWindow *window, const MirMotionEvent *event)
+       event_type = event->action == mir_motion_action_down ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE;
+       changed_button_state = button_state ^ event->button_state;
+       if (changed_button_state == 0 || (changed_button_state & mir_motion_button_primary) != 0)
+-        generate_button_event (window, event_type, x, y, GDK_BUTTON_PRIMARY, modifier_state);
++        generate_button_event (window, event_type, x, y, GDK_BUTTON_PRIMARY, modifier_state, event_time);
+       if ((changed_button_state & mir_motion_button_secondary) != 0)
+-        generate_button_event (window, event_type, x, y, GDK_BUTTON_SECONDARY, modifier_state);
++        generate_button_event (window, event_type, x, y, GDK_BUTTON_SECONDARY, modifier_state, event_time);
+       if ((changed_button_state & mir_motion_button_tertiary) != 0)
+-        generate_button_event (window, event_type, x, y, GDK_BUTTON_MIDDLE, modifier_state);
++        generate_button_event (window, event_type, x, y, GDK_BUTTON_MIDDLE, modifier_state, event_time);
+       button_state = event->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);
++      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);
++      generate_motion_event (window, x, y, modifier_state, event_time);
+       break;
+     case mir_motion_action_hover_exit:
+       cursor_inside = FALSE;
+-      generate_crossing_event (window, GDK_LEAVE_NOTIFY, x, y);
++      generate_crossing_event (window, GDK_LEAVE_NOTIFY, x, y, event_time);
+       break;
+     }
+ 
+@@ -396,9 +414,6 @@ gdk_mir_event_source_queue_event (GdkDisplay     *display,
+                                   GdkWindow      *window,
+                                   const MirEvent *event)
+ {
+-  if (g_getenv ("GDK_MIR_LOG_EVENTS"))
+-    _gdk_mir_print_event (event);
+-
+   // FIXME: Only generate events if the window wanted them?
+   switch (event->type)
+     {
+@@ -459,7 +474,34 @@ gdk_mir_event_source_convert_events (GdkMirEventSource *source)
+        * event was being dispatched...
+        */
+       if (window != NULL)
+-        gdk_mir_event_source_queue_event (source->display, window, &event->event);
++        {
++          /* TODO: Remove once we have proper transient window support. */
++          if (event->event.type == mir_event_type_motion)
++            {
++              GdkWindow *child;
++              gint x;
++              gint y;
++
++              x = event->event.motion.pointer_coordinates[0].x;
++              y = event->event.motion.pointer_coordinates[0].y;
++
++              child = _gdk_mir_window_get_visible_transient_child (window, x, y, &x, &y);
++
++              if (child && child != window)
++                {
++                  window = child;
++
++                  event->event.motion.pointer_count = MAX (event->event.motion.pointer_count, 1);
++                  event->event.motion.pointer_coordinates[0].x = x;
++                  event->event.motion.pointer_coordinates[0].y = y;
++                }
++            }
++
++          if (source->log_events)
++            _gdk_mir_print_event (&event->event);
++
++          gdk_mir_event_source_queue_event (source->display, window, &event->event);
++        }
+       else
+         g_warning ("window was destroyed before event arrived...");
+ 
+@@ -554,6 +596,7 @@ _gdk_mir_event_source_new (GdkDisplay *display)
+   source = (GdkMirEventSource *) g_source;
+   g_mutex_init (&source->mir_event_lock);
+   source->display = display;
++  source->log_events = (g_getenv ("GDK_MIR_LOG_EVENTS") != NULL);
+ 
+   return source;
+ }
+diff --git a/gdk/mir/gdkmirkeymap.c b/gdk/mir/gdkmirkeymap.c
+index 3e8c829..82f0d2c 100644
+--- a/gdk/mir/gdkmirkeymap.c
++++ b/gdk/mir/gdkmirkeymap.c
+@@ -31,6 +31,12 @@ typedef struct GdkMirKeymapClass GdkMirKeymapClass;
+ #define GDK_IS_MIR_KEYMAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_MIR_KEYMAP))
+ #define GDK_MIR_KEYMAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_MIR_KEYMAP, GdkMirKeymapClass))
+ 
++#define IsModifierKey(keysym) \
++  (((keysym) >= XKB_KEY_Shift_L && (keysym) <= XKB_KEY_Hyper_R) || \
++   ((keysym) >= XKB_KEY_ISO_Lock && (keysym) <= XKB_KEY_ISO_Last_Group_Lock) || \
++   ((keysym) == XKB_KEY_Mode_switch) || \
++   ((keysym) == XKB_KEY_Num_Lock))
++
+ struct GdkMirKeymap
+ {
+   GdkKeymap parent_instance;
+@@ -342,6 +348,14 @@ gdk_mir_keymap_get_modifier_state (GdkKeymap *keymap)
+   return get_gdk_modifiers (mir_keymap->xkb_keymap, mods);
+ }
+ 
++gboolean
++_gdk_mir_keymap_key_is_modifier (GdkKeymap *keymap,
++                                 guint      keycode)
++{
++  // FIXME: use xkb_state
++  return IsModifierKey (keycode);
++}
++
+ static void
+ update_direction (GdkMirKeymap *keymap)
+ {
+diff --git a/gdk/mir/gdkmirpointer.c b/gdk/mir/gdkmirpointer.c
+index 96c7e74..3937361 100644
+--- a/gdk/mir/gdkmirpointer.c
++++ b/gdk/mir/gdkmirpointer.c
+@@ -17,6 +17,7 @@
+ 
+ #include "config.h"
+ 
++#include "gdkdisplayprivate.h"
+ #include "gdkdeviceprivate.h"
+ #include "gdkscreen.h"
+ #include "gdkwindow.h"
+@@ -183,6 +184,11 @@ gdk_mir_pointer_ungrab (GdkDevice *device,
+ {
+   //g_printerr ("gdk_mir_pointer_ungrab\n");
+   /* Mir doesn't do grabs */
++
++  GdkDeviceGrabInfo *grab = _gdk_display_get_last_device_grab (gdk_device_get_display (device), device);
++
++  if (grab)
++    grab->serial_end = grab->serial_start;
+ }
+ 
+ static GdkWindow *
+diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c
+index 2b53cef..e29ddb3 100644
+--- a/gdk/mir/gdkmirscreen.c
++++ b/gdk/mir/gdkmirscreen.c
+@@ -327,35 +327,31 @@ gdk_mir_screen_get_monitor_plug_name (GdkScreen *screen,
+       switch (output->type)
+         {
+           case mir_display_output_type_unknown:
+-            return g_strdup_printf ("UNKNOWN-%u", output->output_id);
++            return g_strdup_printf ("None-%u", output->output_id);
+           case mir_display_output_type_vga:
+             return g_strdup_printf ("VGA-%u", output->output_id);
+           case mir_display_output_type_dvii:
+-            return g_strdup_printf ("DVII-%u", output->output_id);
+           case mir_display_output_type_dvid:
+-            return g_strdup_printf ("DVID-%u", output->output_id);
+           case mir_display_output_type_dvia:
+-            return g_strdup_printf ("DVIA-%u", output->output_id);
++            return g_strdup_printf ("DVI-%u", output->output_id);
+           case mir_display_output_type_composite:
+-            return g_strdup_printf ("COMPOSITE-%u", output->output_id);
+-          case mir_display_output_type_svideo:
+-            return g_strdup_printf ("SVIDEO-%u", output->output_id);
++            return g_strdup_printf ("Composite-%u", output->output_id);
+           case mir_display_output_type_lvds:
+             return g_strdup_printf ("LVDS-%u", output->output_id);
+           case mir_display_output_type_component:
+-            return g_strdup_printf ("COMPONENT-%u", output->output_id);
++            return g_strdup_printf ("CTV-%u", output->output_id);
+           case mir_display_output_type_ninepindin:
+-            return g_strdup_printf ("NINEPINDIN-%u", output->output_id);
++            return g_strdup_printf ("DIN-%u", output->output_id);
+           case mir_display_output_type_displayport:
+-            return g_strdup_printf ("DISPLAYPORT-%u", output->output_id);
++            return g_strdup_printf ("DP-%u", output->output_id);
+           case mir_display_output_type_hdmia:
+-            return g_strdup_printf ("HDMIA-%u", output->output_id);
+           case mir_display_output_type_hdmib:
+-            return g_strdup_printf ("HDMIB-%u", output->output_id);
++            return g_strdup_printf ("HDMI-%u", output->output_id);
++          case mir_display_output_type_svideo:
+           case mir_display_output_type_tv:
+             return g_strdup_printf ("TV-%u", output->output_id);
+           case mir_display_output_type_edp:
+-            return g_strdup_printf ("EDP-%u", output->output_id);
++            return g_strdup_printf ("eDP-%u", output->output_id);
+         }
+     }
+ 
+diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
+index 418724b..92521c9 100644
+--- a/gdk/mir/gdkmirwindowimpl.c
++++ b/gdk/mir/gdkmirwindowimpl.c
+@@ -259,13 +259,22 @@ redraw_transient (GdkWindow *window)
+   gdk_window_invalidate_rect (GDK_MIR_WINDOW_IMPL (window->impl)->transient_for, &r, FALSE);
+ }
+ 
++/* 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
+ send_buffer (GdkWindow *window)
+ {
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+ 
+   /* Transient windows draw onto parent instead */
+-  if (impl->transient_for)
++  if (should_render_in_parent (window))
+     {
+       redraw_transient (window);
+       return;
+@@ -327,7 +336,7 @@ gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
+     }
+ 
+   /* Transient windows get rendered into a buffer and copied onto their parent */
+-  if (impl->transient_for)
++  if (should_render_in_parent (window))
+     {
+       cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, window->width, window->height);
+     }
+@@ -363,13 +372,13 @@ gdk_mir_window_impl_ref_cairo_surface (GdkWindow *window)
+   impl->cairo_surface = cairo_surface_reference (cairo_surface);
+ 
+   /* Draw background */
+-  c = cairo_create (impl->cairo_surface);
+   if (impl->background)
+-    cairo_set_source (c, impl->background);
+-  else
+-    cairo_set_source_rgb (c, 1.0, 0.0, 0.0);
+-  cairo_paint (c);
+-  cairo_destroy (c);
++    {
++      c = cairo_create (impl->cairo_surface);
++      cairo_set_source (c, impl->background);
++      cairo_paint (c);
++      cairo_destroy (c);
++    }
+ 
+   return cairo_surface;
+ }
+@@ -433,10 +442,11 @@ gdk_mir_window_impl_hide (GdkWindow *window)
+   //g_printerr ("gdk_mir_window_impl_hide window=%p\n", window);
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+ 
++  impl->cursor_inside = FALSE;
+   impl->visible = FALSE;
+   ensure_no_surface (window);
+ 
+-  if (impl->transient_for)
++  if (should_render_in_parent (window))
+     redraw_transient (window);
+ }
+ 
+@@ -446,10 +456,11 @@ gdk_mir_window_impl_withdraw (GdkWindow *window)
+   //g_printerr ("gdk_mir_window_impl_withdraw window=%p\n", window);
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+ 
++  impl->cursor_inside = FALSE;
+   impl->visible = FALSE;
+   ensure_no_surface (window);
+ 
+-  if (impl->transient_for)
++  if (should_render_in_parent (window))
+     redraw_transient (window);
+ }
+ 
+@@ -492,6 +503,7 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
+                                  gint       width,
+                                  gint       height)
+ {
++  /*
+   g_printerr ("gdk_mir_window_impl_move_resize");
+   g_printerr (" window=%p", window);
+   if (with_move)
+@@ -499,16 +511,17 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
+   if (width > 0)
+     g_printerr (" size=%dx%dpx", width, height);
+   g_printerr ("\n");
++  */
+   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
+ 
+   /* Redraw parent where we moved from */
+-  if (impl->transient_for)
++  if (should_render_in_parent (window))
+     redraw_transient (window);
+ 
+   /* Transient windows can move wherever they want */
+   if (with_move)
+     {
+-      if (impl->transient_for)
++      if (should_render_in_parent (window))
+         {
+           window->x = x;
+           window->y = y;
+@@ -535,7 +548,7 @@ gdk_mir_window_impl_move_resize (GdkWindow *window,
+   }
+ 
+   /* Redraw parent where we moved to */
+-  if (impl->transient_for)
++  if (should_render_in_parent (window))
+     redraw_transient (window);
+ }
+ 
+@@ -699,7 +712,7 @@ gdk_mir_window_impl_input_shape_combine_region (GdkWindow            *window,
+                                                 gint                  offset_x,
+                                                 gint                  offset_y)
+ {
+-  g_printerr ("gdk_mir_window_impl_input_shape_combine_region window=%p\n", window);
++  // g_printerr ("gdk_mir_window_impl_input_shape_combine_region window=%p\n", window);
+ }
+ 
+ static void
+@@ -713,7 +726,7 @@ gdk_mir_window_impl_destroy (GdkWindow *window,
+   impl->visible = FALSE;
+   ensure_no_surface (window);
+ 
+-  if (impl->transient_for)
++  if (should_render_in_parent (window))
+     {
+       /* Redraw parent */
+       redraw_transient (window);
+@@ -850,7 +863,7 @@ static void
+ gdk_mir_window_impl_set_title (GdkWindow   *window,
+                                const gchar *title)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_title window=%p\n", window);
++  // g_printerr ("gdk_mir_window_impl_set_title window=%p\n", window);
+ }
+ 
+ static void
+@@ -881,7 +894,7 @@ gdk_mir_window_impl_set_transient_for (GdkWindow *window,
+ 
+   /* Link this window to the parent */
+   impl->transient_for = parent;
+-  if (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);
+@@ -895,7 +908,42 @@ gdk_mir_window_impl_set_transient_for (GdkWindow *window,
+     }
+ 
+   /* Remove surface if we had made one before this was set */
+-  ensure_no_surface (window);
++  if (should_render_in_parent (window))
++    ensure_no_surface (window);
++}
++
++/* TODO: Remove once we have proper transient window support. */
++GdkWindow *
++_gdk_mir_window_get_visible_transient_child (GdkWindow *window,
++                                             gint       x,
++                                             gint       y,
++                                             gint      *out_x,
++                                             gint      *out_y)
++{
++  GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
++  GdkWindow *child = NULL;
++  GList *i;
++
++  if (x < window->x || x >= window->x + window->width ||
++      y < window->y || y >= window->y + window->height)
++    return NULL;
++
++  x -= window->x;
++  y -= window->y;
++
++  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;
+ }
+ 
+ static void
+@@ -1242,7 +1290,7 @@ gdk_mir_window_impl_set_shadow_width (GdkWindow *window,
+                                       gint       top,
+                                       gint       bottom)
+ {
+-  g_printerr ("gdk_mir_window_impl_set_shadow_width window=%p\n", window);
++  // g_printerr ("gdk_mir_window_impl_set_shadow_width window=%p\n", window);
+ }
+ 
+ static void
+-- 
+2.1.3
+
 
=== modified file 'debian/patches/mir-backend.patch'
--- debian/patches/mir-backend.patch	2014-12-12 10:51:15 +0000
+++ debian/patches/mir-backend.patch	2014-12-13 16:59:39 +0000
@@ -1,13 +1,15 @@
-From 5808594aaff557dfc9ddef82246ddd4ed902a8c5 Mon Sep 17 00:00:00 2001
+From 122076d4b6f37fa427ea592194f6fe5bacaa9e70 Mon Sep 17 00:00:00 2001
 From: Robert Ancell <[e-mail]>
 Date: Tue, 20 May 2014 10:03:30 +1200
-Subject: [PATCH] Gdk: add an experimental backend for mir
+Subject: [PATCH 1/2] Gdk: add an experimental backend for mir
 
 Backported from:
 0f26b26f1d93f002ccd5fe6b6fd636172bfbb24b
+887b7356c369e58a959b99d88246df8303e34531
 c41231cc0fdc791a7a69cdd77af51c8162f44aa4
 053b65a21af312b8b9361367939a221aa7f474a7
 2fdb266c0d0f038a74decda7440ebbb7bdb02e68
+063f79b5946198eb5efec0133627a12a75d154a7
 ec729d06491a2a5bb9ba3f287fbc102b5036bc8f
 92c2e99ddac668d729f42bff501f70fb56fbb76c
 c6de20496c4075a0f1daf8be450d8522aaaea82f
@@ -18,32 +20,46 @@
 4e4ccb76cd8b5b7dc4342f35fcf64ace30019641
 c7e7e350839b19732a2eea7a2151c0c3a76c2544
 c42146d88c324189a3a70189f1a60156697ad9ab
+8bc523ef5915d4ab7ced843929c8e3f1bf754016
+f5c5e9385e960a74ce38bc58a30fa36474d0cd6a
+5ff39b207b373754007a99be6286bb7b93ecb49d
+acfc4f891030d7339c221bdb57df9af8994fd6e0
+da8fdab87b4cc96b9614ccb6abb0682def324f30
+e0e46a4f6bf852d5ead8b8c015aa8eaf4e80599e
+60e185e496180dad0be322a970e4aa17be1c8809
+b8925253b66a63594f5d373dc10c564f0d184eb4
 ---
- Makefile.am                      |    6 +-
- configure.ac                     |   34 +-
- docs/reference/gtk/Makefile.am   |    1 +
- docs/reference/gtk/building.sgml |   11 +-
- docs/reference/gtk/gtk-docs.sgml |    1 +
- docs/reference/gtk/mir.xml       |   35 +
- docs/reference/gtk/running.sgml  |    5 +
- gdk/Makefile.am                  |    6 +-
- gdk/gdkdisplaymanager.c          |    7 +
- gdk/mir/Makefile.am              |   39 ++
- gdk/mir/gdkmir-debug.c           |  293 +++++++++
- gdk/mir/gdkmir-private.h         |   90 +++
- gdk/mir/gdkmir.h                 |   39 ++
- gdk/mir/gdkmircursor.c           |  177 +++++
- gdk/mir/gdkmirdevicemanager.c    |  120 ++++
- gdk/mir/gdkmirdisplay.c          |  565 ++++++++++++++++
- gdk/mir/gdkmireventsource.c      |  630 ++++++++++++++++++
- gdk/mir/gdkmirkeyboard.c         |  173 +++++
- gdk/mir/gdkmirkeymap.c           |  466 ++++++++++++++
- gdk/mir/gdkmirpointer.c          |  250 ++++++++
- gdk/mir/gdkmirscreen.c           |  801 +++++++++++++++++++++++
- gdk/mir/gdkmirwindow.c           |   52 ++
- gdk/mir/gdkmirwindowimpl.c       | 1320 ++++++++++++++++++++++++++++++++++++++
- gtk/gtktooltip.c                 |   16 +
- 24 files changed, 5130 insertions(+), 7 deletions(-)
+ Makefile.am                        |    6 +-
+ configure.ac                       |   35 +-
+ docs/reference/gtk/Makefile.am     |    1 +
+ docs/reference/gtk/building.sgml   |   11 +-
+ docs/reference/gtk/gtk-docs.sgml   |    1 +
+ docs/reference/gtk/mir.xml         |   35 +
+ docs/reference/gtk/running.sgml    |    5 +
+ gdk/Makefile.am                    |    6 +-
+ gdk/broadway/gdkdisplay-broadway.c |   15 -
+ gdk/gdkdisplay.c                   |   15 +
+ gdk/gdkdisplaymanager.c            |    7 +
+ gdk/mir/Makefile.am                |   39 ++
+ gdk/mir/gdkmir-debug.c             |  293 ++++++++
+ gdk/mir/gdkmir-private.h           |   92 +++
+ gdk/mir/gdkmir.h                   |   39 ++
+ gdk/mir/gdkmircursor.c             |  177 +++++
+ gdk/mir/gdkmirdevicemanager.c      |  120 ++++
+ gdk/mir/gdkmirdisplay.c            |  549 +++++++++++++++
+ gdk/mir/gdkmireventsource.c        |  631 +++++++++++++++++
+ gdk/mir/gdkmirkeyboard.c           |  173 +++++
+ gdk/mir/gdkmirkeymap.c             |  466 +++++++++++++
+ gdk/mir/gdkmirpointer.c            |  250 +++++++
+ gdk/mir/gdkmirscreen.c             |  804 ++++++++++++++++++++++
+ gdk/mir/gdkmirwindow.c             |   52 ++
+ gdk/mir/gdkmirwindowimpl.c         | 1336 ++++++++++++++++++++++++++++++++++++
+ gdk/wayland/gdkdisplay-wayland.c   |   15 -
+ gdk/win32/gdkdisplay-win32.c       |   15 -
+ gdk/x11/gdkdisplay-x11.c           |   15 -
+ gtk/gtktooltip.c                   |   16 +
+ gtk/gtkwindow.c                    |    9 +
+ 30 files changed, 5161 insertions(+), 67 deletions(-)
  create mode 100644 docs/reference/gtk/mir.xml
  create mode 100644 gdk/mir/Makefile.am
  create mode 100644 gdk/mir/gdkmir-debug.c
@@ -60,11 +76,11 @@
  create mode 100644 gdk/mir/gdkmirwindow.c
  create mode 100644 gdk/mir/gdkmirwindowimpl.c
 
-Index: b/Makefile.am
-===================================================================
+diff --git a/Makefile.am b/Makefile.am
+index 2cb7769..37bc9ff 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -33,11 +33,11 @@
+@@ -33,11 +33,11 @@ MAINTAINERCLEANFILES = \
  
  
  ## Copy .pc files to target-specific names
@@ -78,7 +94,7 @@
  	rm -f $@ && \
  	cp gdk-3.0.pc $@
  
-@@ -59,12 +59,14 @@
+@@ -59,12 +59,14 @@ DISTCLEANFILES = \
  	gtk+-quartz-3.0.pc		\
  	gtk+-broadway-3.0.pc		\
  	gtk+-wayland-3.0.pc		\
@@ -93,11 +109,19 @@
  	gail-3.0.pc			\
  	config.lt
  
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index cccdae9..43e6245 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -329,6 +329,10 @@
+@@ -48,6 +48,7 @@ m4_define([cairo_required_version], [1.12.0])
+ m4_define([gdk_pixbuf_required_version], [2.30.0])
+ m4_define([introspection_required_version], [1.39.0])
+ m4_define([wayland_required_version], [1.5.91])
++m4_define([mirclient_required_version], [0.9.0])
+ GLIB_REQUIRED_VERSION=glib_required_version
+ PANGO_REQUIRED_VERSION=pango_required_version
+ ATK_REQUIRED_VERSION=atk_required_version
+@@ -329,6 +330,10 @@ AC_ARG_ENABLE(wayland-backend,
                [AS_HELP_STRING([--enable-wayland-backend],
                                [enable the wayland gdk backend])],
  			      [backend_set=yes])
@@ -108,7 +132,7 @@
  
  if test -z "$backend_set"; then
    if test "$platform_win32" = yes; then
-@@ -336,6 +340,7 @@
+@@ -336,6 +341,7 @@ if test -z "$backend_set"; then
    else
      enable_x11_backend=yes
      enable_wayland_backend=maybe
@@ -116,11 +140,11 @@
    fi
  fi
  
-@@ -457,6 +462,30 @@
+@@ -457,6 +463,30 @@ else
    AM_CONDITIONAL(USE_WAYLAND, false)
  fi
  
-+MIR_DEPENDENCIES="mirclient"
++MIR_DEPENDENCIES="mirclient >= mirclient_required_version"
 +if test "$enable_mir_backend" = "maybe" ; then
 +  PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])
 +  AC_MSG_CHECKING([for MIR_DEPENDENCIES])
@@ -147,7 +171,7 @@
  # strip leading space
  GDK_BACKENDS=${GDK_BACKENDS#* }
  
-@@ -1326,7 +1355,7 @@
+@@ -1326,7 +1356,7 @@ CFLAGS="$saved_cflags"
  LDFLAGS="$saved_ldflags"
  
  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
@@ -156,7 +180,7 @@
  if test "x$enable_x11_backend" = xyes; then
    GDK_PRIVATE_PACKAGES="$GDK_PRIVATE_PACKAGES pangoft2"
  fi
-@@ -1363,7 +1392,7 @@
+@@ -1363,7 +1393,7 @@ fi
  PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
  
  GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
@@ -165,7 +189,7 @@
  if test "x$enable_x11_backend" = xyes; then
    GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
  fi
-@@ -1903,6 +1932,7 @@
+@@ -1903,6 +1933,7 @@ gdk/win32/rc/Makefile
  gdk/win32/rc/gdk.rc
  gdk/quartz/Makefile
  gdk/wayland/Makefile
@@ -173,11 +197,11 @@
  gdk/gdkversionmacros.h
  gtk/Makefile
  gtk/makefile.msc
-Index: b/docs/reference/gtk/Makefile.am
-===================================================================
+diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
+index 968384c..74ef369 100644
 --- a/docs/reference/gtk/Makefile.am
 +++ b/docs/reference/gtk/Makefile.am
-@@ -145,6 +145,7 @@
+@@ -145,6 +145,7 @@ content_files =					\
  	osx.sgml				\
  	broadway.xml				\
  	wayland.xml				\
@@ -185,11 +209,11 @@
  	question_index.sgml			\
  	resources.sgml				\
  	text_widget.sgml			\
-Index: b/docs/reference/gtk/building.sgml
-===================================================================
+diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
+index b7479e7..445e1fd 100644
 --- a/docs/reference/gtk/building.sgml
 +++ b/docs/reference/gtk/building.sgml
-@@ -395,6 +395,11 @@
+@@ -395,6 +395,11 @@ How to compile GTK+ itself
            </group>
            <sbr/>
            <group>
@@ -201,7 +225,7 @@
              <arg choice="plain">--enable-introspection=[no/auto/yes]</arg>
            </group>
            <sbr/>
-@@ -595,8 +600,10 @@
+@@ -595,8 +600,10 @@ How to compile GTK+ itself
            <systemitem>--disable-quartz-backend</systemitem>,
            <systemitem>--enable-broadway-backend</systemitem>,
            <systemitem>--disable-broadway-backend</systemitem>,
@@ -214,8 +238,8 @@
  
          <para>
            Enables specific backends for GDK.  If none of these options
-Index: b/docs/reference/gtk/gtk-docs.sgml
-===================================================================
+diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
+index 2e00bae..8f4a8d1 100644
 --- a/docs/reference/gtk/gtk-docs.sgml
 +++ b/docs/reference/gtk/gtk-docs.sgml
 @@ -413,6 +413,7 @@
@@ -226,8 +250,9 @@
    </part>
  
    <xi:include href="glossary.xml" />
-Index: b/docs/reference/gtk/mir.xml
-===================================================================
+diff --git a/docs/reference/gtk/mir.xml b/docs/reference/gtk/mir.xml
+new file mode 100644
+index 0000000..3a0a52e
 --- /dev/null
 +++ b/docs/reference/gtk/mir.xml
 @@ -0,0 +1,35 @@
@@ -266,11 +291,11 @@
 +</refsect1>
 +
 +</refentry>
-Index: b/docs/reference/gtk/running.sgml
-===================================================================
+diff --git a/docs/reference/gtk/running.sgml b/docs/reference/gtk/running.sgml
+index 321593a..1aa2291 100644
 --- a/docs/reference/gtk/running.sgml
 +++ b/docs/reference/gtk/running.sgml
-@@ -487,6 +487,11 @@
+@@ -487,6 +487,11 @@ nevertheless.
          <listitem><para>Selects the Wayland backend for connecting to Wayland display servers</para></listitem>
        </varlistentry>
  
@@ -282,11 +307,11 @@
      </variablelist>
      Since 3.10, this environment variable can contain a comma-separated list
      of backend names, which are tried in order. The list may also contain
-Index: b/gdk/Makefile.am
-===================================================================
+diff --git a/gdk/Makefile.am b/gdk/Makefile.am
+index 5f0c1e5..1e24b6e 100644
 --- a/gdk/Makefile.am
 +++ b/gdk/Makefile.am
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ INTROSPECTION_COMPILER_ARGS = \
  
  SUBDIRS = $(GDK_BACKENDS) .
  
@@ -295,7 +320,7 @@
  
  CLEANFILES =
  
-@@ -201,6 +201,10 @@
+@@ -201,6 +201,10 @@ if USE_WAYLAND
  libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
  endif
  
@@ -306,8 +331,74 @@
  if HAVE_INTROSPECTION
  
  introspection_files = 		\
-Index: b/gdk/gdkdisplaymanager.c
-===================================================================
+diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
+index 53c675d..307728f 100644
+--- a/gdk/broadway/gdkdisplay-broadway.c
++++ b/gdk/broadway/gdkdisplay-broadway.c
+@@ -330,19 +330,6 @@ gdk_broadway_display_get_next_serial (GdkDisplay *display)
+   return _gdk_broadway_server_get_next_serial (broadway_display->server);
+ }
+ 
+-static void
+-gdk_broadway_display_event_data_copy (GdkDisplay    *display,
+-				      const GdkEvent *src,
+-				      GdkEvent       *dst)
+-{
+-}
+-
+-static void
+-gdk_broadway_display_event_data_free (GdkDisplay    *display,
+-				      GdkEvent *event)
+-{
+-}
+-
+ void
+ gdk_broadway_display_show_keyboard (GdkBroadwayDisplay *display)
+ {
+@@ -398,8 +385,6 @@ gdk_broadway_display_class_init (GdkBroadwayDisplayClass * class)
+   display_class->after_process_all_updates = _gdk_broadway_display_after_process_all_updates;
+   display_class->get_next_serial = gdk_broadway_display_get_next_serial;
+   display_class->notify_startup_complete = gdk_broadway_display_notify_startup_complete;
+-  display_class->event_data_copy = gdk_broadway_display_event_data_copy;
+-  display_class->event_data_free = gdk_broadway_display_event_data_free;
+   display_class->create_window_impl = _gdk_broadway_display_create_window_impl;
+   display_class->get_keymap = _gdk_broadway_display_get_keymap;
+   display_class->get_selection_owner = _gdk_broadway_display_get_selection_owner;
+diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
+index 34b6cab..5ccfe01 100644
+--- a/gdk/gdkdisplay.c
++++ b/gdk/gdkdisplay.c
+@@ -111,6 +111,19 @@ gdk_display_real_opened (GdkDisplay *display)
+ }
+ 
+ static void
++gdk_display_real_event_data_copy (GdkDisplay     *display,
++                                  const GdkEvent *src,
++                                  GdkEvent       *dst)
++{
++}
++
++static void
++gdk_display_real_event_data_free (GdkDisplay     *display,
++                                  GdkEvent       *dst)
++{
++}
++
++static void
+ gdk_display_class_init (GdkDisplayClass *class)
+ {
+   GObjectClass *object_class = G_OBJECT_CLASS (class);
+@@ -123,6 +136,8 @@ gdk_display_class_init (GdkDisplayClass *class)
+ 
+   class->opened = gdk_display_real_opened;
+   class->make_default = gdk_display_real_make_default;
++  class->event_data_copy = gdk_display_real_event_data_copy;
++  class->event_data_free = gdk_display_real_event_data_free;
+ 
+   /**
+    * GdkDisplay::opened:
+diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
+index c6813d0..c9afbca 100644
 --- a/gdk/gdkdisplaymanager.c
 +++ b/gdk/gdkdisplaymanager.c
 @@ -60,6 +60,10 @@
@@ -321,7 +412,7 @@
  /**
   * SECTION:gdkdisplaymanager
   * @Short_description: Maintains a list of all open GdkDisplays
-@@ -272,6 +276,9 @@
+@@ -272,6 +276,9 @@ static GdkBackend gdk_backends[] = {
  #ifdef GDK_WINDOWING_WAYLAND
    { "wayland",  _gdk_wayland_display_open },
  #endif
@@ -331,8 +422,9 @@
  #ifdef GDK_WINDOWING_BROADWAY
    { "broadway", _gdk_broadway_display_open },
  #endif
-Index: b/gdk/mir/Makefile.am
-===================================================================
+diff --git a/gdk/mir/Makefile.am b/gdk/mir/Makefile.am
+new file mode 100644
+index 0000000..026ce79
 --- /dev/null
 +++ b/gdk/mir/Makefile.am
 @@ -0,0 +1,39 @@
@@ -375,8 +467,9 @@
 +	gdkmir.h
 +
 +-include $(top_srcdir)/git.mk
-Index: b/gdk/mir/gdkmir-debug.c
-===================================================================
+diff --git a/gdk/mir/gdkmir-debug.c b/gdk/mir/gdkmir-debug.c
+new file mode 100644
+index 0000000..ef57eff
 --- /dev/null
 +++ b/gdk/mir/gdkmir-debug.c
 @@ -0,0 +1,293 @@
@@ -673,8 +766,9 @@
 +      break;
 +    }
 +}
-Index: b/gdk/mir/gdkmir-private.h
-===================================================================
+diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
+new file mode 100644
+index 0000000..8305096
 --- /dev/null
 +++ b/gdk/mir/gdkmir-private.h
 @@ -0,0 +1,92 @@
@@ -770,8 +864,9 @@
 +void _gdk_mir_print_event (const MirEvent *event);
 +
 +#endif /* __GDK_PRIVATE_MIR_H__ */
-Index: b/gdk/mir/gdkmir.h
-===================================================================
+diff --git a/gdk/mir/gdkmir.h b/gdk/mir/gdkmir.h
+new file mode 100644
+index 0000000..00bbda1
 --- /dev/null
 +++ b/gdk/mir/gdkmir.h
 @@ -0,0 +1,39 @@
@@ -802,20 +897,21 @@
 +#define GDK_IS_MIR_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_DISPLAY))
 +
 +#define GDK_TYPE_MIR_WINDOW              (gdk_mir_window_get_type ())
-+#define GDK_IS_WINDOW_MIR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW_MIR))
++#define GDK_IS_WINDOW_MIR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_MIR_WINDOW))
 +
 +GDK_AVAILABLE_IN_3_10
 +GType gdk_mir_display_get_type (void);
 +
 +GDK_AVAILABLE_IN_3_10
-+struct MirConnection *gdk_mir_display_get_mir_connection (GdkDisplay *display);
++MirConnection *gdk_mir_display_get_mir_connection (GdkDisplay *display);
 +
 +GDK_AVAILABLE_IN_3_10
 +GType gdk_mir_window_get_type (void);
 +
 +#endif /* __GDK_MIR_H__ */
-Index: b/gdk/mir/gdkmircursor.c
-===================================================================
+diff --git a/gdk/mir/gdkmircursor.c b/gdk/mir/gdkmircursor.c
+new file mode 100644
+index 0000000..7ce158a
 --- /dev/null
 +++ b/gdk/mir/gdkmircursor.c
 @@ -0,0 +1,177 @@
@@ -996,8 +1092,9 @@
 +  cursor_class->get_surface = gdk_mir_cursor_get_surface;
 +  object_class->finalize = gdk_mir_cursor_finalize;
 +}
-Index: b/gdk/mir/gdkmirdevicemanager.c
-===================================================================
+diff --git a/gdk/mir/gdkmirdevicemanager.c b/gdk/mir/gdkmirdevicemanager.c
+new file mode 100644
+index 0000000..c94f8a3
 --- /dev/null
 +++ b/gdk/mir/gdkmirdevicemanager.c
 @@ -0,0 +1,120 @@
@@ -1121,11 +1218,12 @@
 +  device_manager_class->get_client_pointer = gdk_mir_device_manager_get_client_pointer;
 +  object_class->constructed = gdk_mir_device_manager_constructed;
 +}
-Index: b/gdk/mir/gdkmirdisplay.c
-===================================================================
+diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c
+new file mode 100644
+index 0000000..207342c
 --- /dev/null
 +++ b/gdk/mir/gdkmirdisplay.c
-@@ -0,0 +1,565 @@
+@@ -0,0 +1,549 @@
 +/*
 + * Copyright © 2014 Canonical Ltd
 + *
@@ -1276,8 +1374,9 @@
 +{
 +  GdkMirDisplay *display = GDK_MIR_DISPLAY (object);
 +
-+  g_object_unref (display->screen);
-+  display->screen = NULL;
++  g_clear_object (&display->screen);
++  g_clear_object (&display->keymap);
++  g_clear_pointer (&display->event_source, g_source_unref);
 +
 +  G_OBJECT_CLASS (gdk_mir_display_parent_class)->dispose (object);
 +}
@@ -1505,21 +1604,6 @@
 +}
 +
 +static void
-+gdk_mir_display_event_data_copy (GdkDisplay     *display,
-+                                 const GdkEvent *src,
-+                                 GdkEvent       *dst)
-+{
-+  //g_printerr ("gdk_mir_display_event_data_copy\n");
-+}
-+
-+static void
-+gdk_mir_display_event_data_free (GdkDisplay *display,
-+                                 GdkEvent   *event)
-+{
-+  //g_printerr ("gdk_mir_display_event_data_free\n");
-+}
-+
-+static void
 +gdk_mir_display_create_window_impl (GdkDisplay    *display,
 +                                    GdkWindow     *window,
 +                                    GdkWindow     *real_parent,
@@ -1677,8 +1761,6 @@
 +  display_class->after_process_all_updates = gdk_mir_display_after_process_all_updates;
 +  display_class->get_next_serial = gdk_mir_display_get_next_serial;
 +  display_class->notify_startup_complete = gdk_mir_display_notify_startup_complete;
-+  display_class->event_data_copy = gdk_mir_display_event_data_copy;
-+  display_class->event_data_free = gdk_mir_display_event_data_free;
 +  display_class->create_window_impl = gdk_mir_display_create_window_impl;
 +  display_class->get_keymap = gdk_mir_display_get_keymap;
 +  display_class->push_error_trap = gdk_mir_display_push_error_trap;
@@ -1691,8 +1773,9 @@
 +  display_class->text_property_to_utf8_list = gdk_mir_display_text_property_to_utf8_list;
 +  display_class->utf8_to_string_target = gdk_mir_display_utf8_to_string_target;
 +}
-Index: b/gdk/mir/gdkmireventsource.c
-===================================================================
+diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
+new file mode 100644
+index 0000000..cfe36e8
 --- /dev/null
 +++ b/gdk/mir/gdkmireventsource.c
 @@ -0,0 +1,631 @@
@@ -1860,8 +1943,8 @@
 +  event->scroll.y = y;
 +  event->scroll.state = state;
 +  event->scroll.direction = GDK_SCROLL_SMOOTH;
-+  event->scroll.delta_x = delta_x;
-+  event->scroll.delta_y = delta_y;
++  event->scroll.delta_x = -delta_x;
++  event->scroll.delta_y = -delta_y;
 +
 +  send_event (window, get_pointer (window), event);
 +}
@@ -2327,8 +2410,9 @@
 +
 +  g_main_context_wakeup (NULL);
 +}
-Index: b/gdk/mir/gdkmirkeyboard.c
-===================================================================
+diff --git a/gdk/mir/gdkmirkeyboard.c b/gdk/mir/gdkmirkeyboard.c
+new file mode 100644
+index 0000000..86c0d9f
 --- /dev/null
 +++ b/gdk/mir/gdkmirkeyboard.c
 @@ -0,0 +1,173 @@
@@ -2505,8 +2589,9 @@
 +  device_class->window_at_position = gdk_mir_keyboard_window_at_position;
 +  device_class->select_window_events = gdk_mir_keyboard_select_window_events;
 +}
-Index: b/gdk/mir/gdkmirkeymap.c
-===================================================================
+diff --git a/gdk/mir/gdkmirkeymap.c b/gdk/mir/gdkmirkeymap.c
+new file mode 100644
+index 0000000..3e8c829
 --- /dev/null
 +++ b/gdk/mir/gdkmirkeymap.c
 @@ -0,0 +1,466 @@
@@ -2976,8 +3061,9 @@
 +  keymap_class->map_virtual_modifiers = gdk_mir_keymap_map_virtual_modifiers;
 +  keymap_class->get_modifier_state = gdk_mir_keymap_get_modifier_state;
 +}
-Index: b/gdk/mir/gdkmirpointer.c
-===================================================================
+diff --git a/gdk/mir/gdkmirpointer.c b/gdk/mir/gdkmirpointer.c
+new file mode 100644
+index 0000000..96c7e74
 --- /dev/null
 +++ b/gdk/mir/gdkmirpointer.c
 @@ -0,0 +1,250 @@
@@ -3231,8 +3317,9 @@
 +  device_class->window_at_position = gdk_mir_pointer_window_at_position;
 +  device_class->select_window_events = gdk_mir_pointer_select_window_events;
 +}
-Index: b/gdk/mir/gdkmirscreen.c
-===================================================================
+diff --git a/gdk/mir/gdkmirscreen.c b/gdk/mir/gdkmirscreen.c
+new file mode 100644
+index 0000000..2b53cef
 --- /dev/null
 +++ b/gdk/mir/gdkmirscreen.c
 @@ -0,0 +1,804 @@
@@ -4040,8 +4127,9 @@
 +  screen_class->query_visual_types = gdk_mir_screen_query_visual_types;
 +  screen_class->get_monitor_scale_factor = gdk_mir_screen_get_monitor_scale_factor;
 +}
-Index: b/gdk/mir/gdkmirwindow.c
-===================================================================
+diff --git a/gdk/mir/gdkmirwindow.c b/gdk/mir/gdkmirwindow.c
+new file mode 100644
+index 0000000..03da7e0
 --- /dev/null
 +++ b/gdk/mir/gdkmirwindow.c
 @@ -0,0 +1,52 @@
@@ -4097,8 +4185,9 @@
 +gdk_mir_window_class_init (GdkMirWindowClass *klass)
 +{
 +}
-Index: b/gdk/mir/gdkmirwindowimpl.c
-===================================================================
+diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
+new file mode 100644
+index 0000000..418724b
 --- /dev/null
 +++ b/gdk/mir/gdkmirwindowimpl.c
 @@ -0,0 +1,1336 @@
@@ -5438,8 +5527,107 @@
 +  impl_class->set_opaque_region = gdk_mir_window_impl_set_opaque_region;
 +  impl_class->set_shadow_width = gdk_mir_window_impl_set_shadow_width;
 +}
-Index: b/gtk/gtktooltip.c
-===================================================================
+diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
+index 5438a51..82c6ee1 100644
+--- a/gdk/wayland/gdkdisplay-wayland.c
++++ b/gdk/wayland/gdkdisplay-wayland.c
+@@ -431,19 +431,6 @@ gdk_wayland_display_notify_startup_complete (GdkDisplay  *display,
+ {
+ }
+ 
+-static void
+-gdk_wayland_display_event_data_copy (GdkDisplay     *display,
+-				     const GdkEvent *src,
+-				     GdkEvent       *dst)
+-{
+-}
+-
+-static void
+-gdk_wayland_display_event_data_free (GdkDisplay *display,
+-				     GdkEvent   *event)
+-{
+-}
+-
+ static GdkKeymap *
+ _gdk_wayland_display_get_keymap (GdkDisplay *display)
+ {
+@@ -534,8 +521,6 @@ gdk_wayland_display_class_init (GdkWaylandDisplayClass * class)
+   display_class->after_process_all_updates = gdk_wayland_display_after_process_all_updates;
+   display_class->get_next_serial = gdk_wayland_display_get_next_serial;
+   display_class->notify_startup_complete = gdk_wayland_display_notify_startup_complete;
+-  display_class->event_data_copy = gdk_wayland_display_event_data_copy;
+-  display_class->event_data_free = gdk_wayland_display_event_data_free;
+   display_class->create_window_impl = _gdk_wayland_display_create_window_impl;
+   display_class->get_keymap = _gdk_wayland_display_get_keymap;
+   display_class->push_error_trap = gdk_wayland_display_push_error_trap;
+diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
+index 2d73c30..97d0e3e 100644
+--- a/gdk/win32/gdkdisplay-win32.c
++++ b/gdk/win32/gdkdisplay-win32.c
+@@ -600,19 +600,6 @@ gdk_win32_display_notify_startup_complete (GdkDisplay  *display,
+   /* nothing */
+ }
+ static void
+-gdk_win32_display_event_data_copy (GdkDisplay    *display,
+-                                   const GdkEvent *src,
+-                                   GdkEvent       *dst)
+-{
+-  /* nothing */
+-}
+-static void
+-gdk_win32_display_event_data_free (GdkDisplay *display,
+-                                   GdkEvent *event)
+-{
+-  /* nothing */
+-}
+-static void
+ gdk_win32_display_push_error_trap (GdkDisplay *display)
+ {
+   /* nothing */
+@@ -665,8 +652,6 @@ gdk_win32_display_class_init (GdkWin32DisplayClass *klass)
+   display_class->after_process_all_updates = gdk_win32_display_after_process_all_updates;
+   display_class->get_next_serial = gdk_win32_display_get_next_serial;
+   display_class->notify_startup_complete = gdk_win32_display_notify_startup_complete;
+-  display_class->event_data_copy = gdk_win32_display_event_data_copy;
+-  display_class->event_data_free = gdk_win32_display_event_data_free;
+   display_class->create_window_impl = _gdk_win32_display_create_window_impl;
+ 
+   display_class->get_keymap = _gdk_win32_display_get_keymap;
+diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
+index 1db4742..ca9eb33 100644
+--- a/gdk/x11/gdkdisplay-x11.c
++++ b/gdk/x11/gdkdisplay-x11.c
+@@ -2805,19 +2805,6 @@ gdk_x11_set_sm_client_id (const gchar *sm_client_id)
+   g_slist_free (displays);
+ }
+ 
+-static void
+-gdk_x11_display_event_data_copy (GdkDisplay    *display,
+-                                const GdkEvent *src,
+-                                GdkEvent       *dst)
+-{
+-}
+-
+-static void
+-gdk_x11_display_event_data_free (GdkDisplay *display,
+-                                 GdkEvent *event)
+-{
+-}
+-
+ static gint
+ pop_error_trap (GdkDisplay *display,
+                 gboolean    ignored)
+@@ -2889,8 +2876,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
+   display_class->after_process_all_updates = _gdk_x11_display_after_process_all_updates;
+   display_class->get_next_serial = gdk_x11_display_get_next_serial;
+   display_class->notify_startup_complete = gdk_x11_display_notify_startup_complete;
+-  display_class->event_data_copy = gdk_x11_display_event_data_copy;
+-  display_class->event_data_free = gdk_x11_display_event_data_free;
+   display_class->create_window_impl = _gdk_x11_display_create_window_impl;
+   display_class->get_keymap = gdk_x11_display_get_keymap;
+   display_class->push_error_trap = gdk_x11_display_error_trap_push;
+diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
+index 103944f..cedddaa 100644
 --- a/gtk/gtktooltip.c
 +++ b/gtk/gtktooltip.c
 @@ -39,6 +39,9 @@
@@ -5452,23 +5640,53 @@
  
  
  /**
-@@ -1162,6 +1165,19 @@
-         {
-           GtkWidget *toplevel;
- 
+@@ -1168,6 +1171,19 @@ found:
+                                           GTK_WINDOW (toplevel));
+         }
+ #endif
++#ifdef GDK_WINDOWING_MIR
++      /* Set the transient parent on the tooltip when running with the Mir
++       * backend to allow correct positioning of the tooltip windows */
++      if (GDK_IS_MIR_DISPLAY (display))
++        {
++          GtkWidget *toplevel;
++
 +          toplevel = gtk_widget_get_toplevel (tooltip->tooltip_widget);
 +          if (GTK_IS_WINDOW (toplevel))
 +            gtk_window_set_transient_for (GTK_WINDOW (tooltip->current_window),
 +                                          GTK_WINDOW (toplevel));
 +        }
 +#endif
-+#ifdef GDK_WINDOWING_MIR
-+      /* Set the transient parent on the tooltip when running with the Mir
-+       * backend to allow correct positioning of the tooltip windows */
-+      if (GDK_IS_MIR_DISPLAY (display))
-+        {
-+          GtkWidget *toplevel;
-+
-           toplevel = gtk_widget_get_toplevel (tooltip->tooltip_widget);
-           if (GTK_IS_WINDOW (toplevel))
-             gtk_window_set_transient_for (GTK_WINDOW (tooltip->current_window),
+ 
+       x -= border.left;
+       y -= border.top;
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index e846c41..be5ae38 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -79,6 +79,10 @@
+ #include "broadway/gdkbroadway.h"
+ #endif
+ 
++#ifdef GDK_WINDOWING_MIR
++#include "mir/gdkmir.h"
++#endif
++
+ /**
+  * SECTION:gtkwindow
+  * @title: GtkWindow
+@@ -5683,6 +5687,11 @@ gtk_window_should_use_csd (GtkWindow *window)
+     return TRUE;
+ #endif
+ 
++#ifdef GDK_WINDOWING_MIR
++  if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
++    return TRUE;
++#endif
++
+   csd_env = g_getenv ("GTK_CSD");
+ 
+   return (g_strcmp0 (csd_env, "1") == 0);
+-- 
+2.1.3
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-12-11 09:57:23 +0000
+++ debian/patches/series	2014-12-13 16:59:39 +0000
@@ -19,5 +19,6 @@
 x-canonical-accel.patch
 message-dialog-restore-traditional-look-on-unity.patch
 mir-backend.patch
+mir-backend-unmerged.patch
 0001-gtkmodelmenuitem-force-icon-scaling.patch
 0002-gtkimagemenuitem-force-icon-scaling.patch