wayland: Implement wl_pointer.axis_source/axis_stop/axis_frame emission

As per the spec. wl_pointer.axis_source determines the current source of
scroll events, wl_pointer.axis_stop determines when there's no further
scroll events on any axis (Which Clutter sends as dx/dy=0 events).
wl_pointer.axis_frame marks the end of a series of axis_* events.

v2: Updated to v4 of the protocol spec by
    Peter Hutterer <peter.hutterer@who-t.net>
v3: Update to use Clutter API

.gitignore

@@ -64,10 +64,12 @@ src/meta-dbus-idle-monitor.[ch]
 src/meta-dbus-login1.[ch]
 src/gtk-shell-protocol.c
 src/gtk-shell-server-protocol.h
-src/xdg-shell-unstable-v*-protocol.c
-src/xdg-shell-unstable-v*-server-protocol.h
-src/pointer-gestures-unstable-v*-protocol.c
-src/pointer-gestures-unstable-v*-server-protocol.h
+src/xdg-shell-protocol.c
+src/xdg-shell-server-protocol.h
+src/pointer-gestures-protocol.c
+src/pointer-gestures-server-protocol.h
+src/xserver-protocol.c
+src/xserver-server-protocol.h
 src/meta/meta-version.h
 doc/reference/*.args
 doc/reference/*.bak

NEWS

@@ -1,47 +1,3 @@
-3.19.3
-======
-* Correct refresh rate units on KMS/Wayland [Daniel; #758653]
-* Fix crash when initial cursor position is not on a monitor [Marek; #756698]
-* Fix crash when more CRTs are enabled than outputs connected [Rui; #751638]
-* Fix touch pointer emulation on wayland [Carlos; #756754]
-* Allow minimizing windows that don't advertise supporting it [Jasper; #758186]
-* Force 2-finger scroll by default if available [Bastien; #759304]
-* Fix crash during XWayland initialization [Marek; #751845]
-* Ensure to send a ConfigureNotify to just mapped windows [Rui; #759492]
-* Misc. bug fixes and cleanups [Carlos, Jonas, Lionel; #758239, #758633,
-  #755503, #759374]
-
-Contributors:
-  Jonas Ådahl, Marek Chalupa, Carlos Garnacho, Lionel Landwerlin, Rui Matos,
-  Bastien Nocera, Daniel Stone, Jasper St. Pierre
-
-3.19.2
-======
-* Fix crash on monitor unplug [Rui; #756796]
-* Exit cleanly on initialization errors [Owen; #757311]
-* Allow to determine backend setting from session type [Ray; #741666]
-* Fix DRM device detection for non-PCI devices [Alban; #754911]
-* Don't force placement of windows without buffer on wayland [Marek; #751887]
-* Fix initialization of bypass compositor hint [Rui; #758544]
-
-Contributors:
-  Alban Browaeys, Marek Chalupa, Rui Matos, Florian Müllner, Ray Strode,
-  Owen W. Taylor
-
-3.19.1
-======
-* wayland: Allow to trigger popups through keyboard/touch [Carlos; #756296]
-* Fix modifiers-only input source switching on Ubuntu [Alberts; #756543]
-* Misc. bug fixes [Jonas, Rui, Giovanni, Florian; #756675, #756660, #746420,
-  #756548, #756796, #757101, #757148]
-
-Contributors:
-  Jonas Ådahl, Giovanni Campagna, Carlos Garnacho, Rui Matos,
-  Alberts Muktupāvels, Florian Müllner
-
-Translations:
-  Daniel Șerbănescu [ro]
-
 3.18.1
 ======
 * Misc. crash fixes [Jonas, Rui, Carlos, Owen, Florian; #755096, #754979,

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ(2.62)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [19])
-m4_define([mutter_micro_version], [3])
+m4_define([mutter_minor_version], [18])
+m4_define([mutter_micro_version], [1])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -46,7 +46,6 @@ IT_PROG_INTLTOOL([0.41])
 AC_PROG_CC
 AC_PROG_CC_C_O
 AC_PROG_INSTALL
-AC_PROG_SED
 AC_HEADER_STDC
 PKG_PROG_PKG_CONFIG([0.21])
 
@@ -59,12 +58,12 @@ CANBERRA_GTK_VERSION=0.26
 CLUTTER_PACKAGE=clutter-1.0
 
 MUTTER_PC_MODULES="
-   gtk+-3.0 >= 3.19.1
+   gtk+-3.0 >= 3.9.11
    gio-unix-2.0 >= 2.35.1
    pango >= 1.2.0
    cairo >= 1.10.0
-   gsettings-desktop-schemas >= 3.19.3
-   $CLUTTER_PACKAGE >= 1.25.1
+   gsettings-desktop-schemas >= 3.15.92
+   $CLUTTER_PACKAGE >= 1.23.4
    cogl-1.0 >= 1.17.1
    upower-glib >= 0.99.0
    gnome-desktop-3.0
@@ -220,10 +219,6 @@ AS_IF([test "$have_wayland" = "yes"], [
     [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
   AC_SUBST([WAYLAND_SCANNER])
   AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])
-
-  PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.0],
-		    [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
-  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
 ])
 AM_CONDITIONAL([HAVE_WAYLAND],[test "$have_wayland" = "yes"])
 

data/Makefile.am

@@ -1,5 +1,6 @@
 desktopfiles_in_files = \
-	mutter.desktop.in
+	mutter.desktop.in \
+	mutter-wayland.desktop.in
 desktopfilesdir = $(datadir)/applications
 desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop)
 

data/mutter-wayland.desktop.in

@@ -0,0 +1,17 @@
+[Desktop Entry]
+Type=Application
+_Name=Mutter (wayland compositor)
+Exec=mutter --wayland --display-server
+NoDisplay=true
+# name of loadable control center module
+X-GNOME-WMSettingsModule=metacity
+# name we put on the WM spec check window
+X-GNOME-WMName=Mutter
+# back compat only 
+X-GnomeWMSettingsLibrary=metacity
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=mutter
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true

po/POTFILES.skip

@@ -1,2 +1 @@
-# List of source files that should NOT be translated.
-# Please keep this file sorted alphabetically.
+data/mutter-wayland.desktop.in

src/Makefile.am

@@ -45,17 +45,19 @@ mutter_built_sources = \
 
 if HAVE_WAYLAND
 mutter_built_sources += \
-	pointer-gestures-unstable-v1-protocol.c				\
-	pointer-gestures-unstable-v1-server-protocol.h			\
+	pointer-gestures-protocol.c		\
+	pointer-gestures-server-protocol.h	\
 	gtk-shell-protocol.c			\
 	gtk-shell-server-protocol.h		\
-	xdg-shell-unstable-v5-protocol.c				\
-	xdg-shell-unstable-v5-server-protocol.h				\
+	xdg-shell-protocol.c			\
+	xdg-shell-server-protocol.h		\
 	$(NULL)
 endif
 
 wayland_protocols =				\
+	wayland/protocol/pointer-gestures.xml	\
 	wayland/protocol/gtk-shell.xml		\
+	wayland/protocol/xdg-shell.xml		\
 	$(NULL)
 
 libmutter_la_SOURCES =				\
@@ -479,20 +481,6 @@ $(dbus_login1_built_sources) : Makefile.am org.freedesktop.login1.xml
 		--generate-c-code meta-dbus-login1					\
 		$(srcdir)/org.freedesktop.login1.xml
 
-.SECONDEXPANSION:
-
-define protostability
-$(shell echo $1 | sed 's/.*\(\<unstable\>\|\<stable\>\).*/\1/')
-endef
-
-define protoname
-$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
-endef
-
-%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-%-server-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
 %-protocol.c : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
 %-server-protocol.h : $(srcdir)/wayland/protocol/%.xml

src/backends/meta-backend.c

@@ -24,8 +24,6 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-
 #include <meta/meta-backend.h>
 #include "meta-backend-private.h"
 #include "meta-input-settings-private.h"
@@ -628,10 +626,7 @@ meta_clutter_init (void)
   meta_create_backend ();
 
   if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
-    {
-      g_warning ("Unable to initialize Clutter.\n");
-      exit (1);
-    }
+    g_error ("Unable to initialize Clutter.\n");
 
   /*
    * XXX: We cannot handle high dpi scaling yet, so fix the scale to 1

src/backends/meta-cursor-renderer.c

@@ -27,8 +27,6 @@
 #include "meta-cursor-renderer.h"
 
 #include <meta/meta-backend.h>
-#include <backends/meta-backend-private.h>
-#include <backends/meta-monitor-manager-private.h>
 #include <meta/util.h>
 
 #include <cogl/cogl.h>
@@ -118,14 +116,6 @@ meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
   };
 }
 
-static gboolean
-is_cursor_in_monitors_area (int x, int y)
-{
-  MetaMonitorManager *monitor_manager = meta_backend_get_monitor_manager (meta_get_backend ());
-  return meta_monitor_manager_get_monitor_at_point (monitor_manager,
-                                                    (gfloat) x, (gfloat) y) >= 0;
-}
-
 static void
 update_cursor (MetaCursorRenderer *renderer,
                MetaCursorSprite   *cursor_sprite)
@@ -134,11 +124,6 @@ update_cursor (MetaCursorRenderer *renderer,
   gboolean handled_by_backend;
   gboolean should_redraw = FALSE;
 
-  /* do not render cursor if it is not on any monitor. Such situation
-   * can occur e. g. after monitor hot-plug */
-  if (!is_cursor_in_monitors_area (priv->current_x, priv->current_y))
-    return;
-
   if (cursor_sprite)
     meta_cursor_sprite_prepare_at (cursor_sprite,
                                    priv->current_x,

src/backends/meta-input-settings-private.h

@@ -63,9 +63,9 @@ struct _MetaInputSettingsClass
   void (* set_invert_scroll) (MetaInputSettings  *settings,
                               ClutterInputDevice *device,
                               gboolean            inverted);
-  void (* set_edge_scroll)   (MetaInputSettings  *settings,
-                              ClutterInputDevice *device,
-                              gboolean            enabled);
+  void (* set_scroll_method) (MetaInputSettings            *settings,
+                              ClutterInputDevice           *device,
+                              GDesktopTouchpadScrollMethod  mode);
   void (* set_scroll_button) (MetaInputSettings  *settings,
                               ClutterInputDevice *device,
                               guint               button);

src/backends/meta-input-settings.c

@@ -395,11 +395,11 @@ update_touchpad_tap_enabled (MetaInputSettings  *input_settings,
 }
 
 static void
-update_touchpad_edge_scroll (MetaInputSettings *input_settings,
-                             ClutterInputDevice *device)
+update_touchpad_scroll_method (MetaInputSettings *input_settings,
+                               ClutterInputDevice *device)
 {
   MetaInputSettingsClass *input_settings_class;
-  gboolean edge_scroll_enabled;
+  GDesktopTouchpadScrollMethod method;
   MetaInputSettingsPrivate *priv;
 
   if (device &&
@@ -408,19 +408,19 @@ update_touchpad_edge_scroll (MetaInputSettings *input_settings,
 
   priv = meta_input_settings_get_instance_private (input_settings);
   input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
-  edge_scroll_enabled = g_settings_get_boolean (priv->touchpad_settings, "edge-scrolling-enabled");
+  method = g_settings_get_enum (priv->touchpad_settings, "scroll-method");
 
   if (device)
     {
-      settings_device_set_bool_setting (input_settings, device,
-                                        input_settings_class->set_edge_scroll,
-                                        edge_scroll_enabled);
+      settings_device_set_uint_setting (input_settings, device,
+                                        input_settings_class->set_scroll_method,
+                                        method);
     }
   else
     {
-      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
-                                 (ConfigBoolFunc) input_settings_class->set_edge_scroll,
-                                 edge_scroll_enabled);
+      settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
+                                 (ConfigUintFunc) input_settings_class->set_scroll_method,
+                                 method);
     }
 }
 
@@ -429,7 +429,7 @@ update_touchpad_click_method (MetaInputSettings *input_settings,
                               ClutterInputDevice *device)
 {
   MetaInputSettingsClass *input_settings_class;
-  GDesktopTouchpadClickMethod method;
+  GDesktopTouchpadScrollMethod method;
   MetaInputSettingsPrivate *priv;
 
   if (device &&
@@ -645,8 +645,8 @@ meta_input_settings_changed_cb (GSettings  *settings,
         update_touchpad_tap_enabled (input_settings, NULL);
       else if (strcmp (key, "send-events") == 0)
         update_touchpad_send_events (input_settings, NULL);
-      else if (strcmp (key, "edge-scrolling-enabled") == 0)
-        update_touchpad_edge_scroll (input_settings, NULL);
+      else if (strcmp (key, "scroll-method") == 0)
+        update_touchpad_scroll_method (input_settings, NULL);
       else if (strcmp (key, "click-method") == 0)
         update_touchpad_click_method (input_settings, NULL);
     }
@@ -771,7 +771,7 @@ apply_device_settings (MetaInputSettings  *input_settings,
   update_device_natural_scroll (input_settings, device);
   update_touchpad_tap_enabled (input_settings, device);
   update_touchpad_send_events (input_settings, device);
-  update_touchpad_edge_scroll (input_settings, device);
+  update_touchpad_scroll_method (input_settings, device);
   update_touchpad_click_method (input_settings, device);
 
   update_trackball_scroll_button (input_settings, device);

src/backends/meta-monitor-manager-private.h

@@ -414,10 +414,6 @@ gint               meta_monitor_manager_get_monitor_at_point (MetaMonitorManager
                                                               gfloat              x,
                                                               gfloat              y);
 
-void meta_monitor_manager_clear_output (MetaOutput *output);
-void meta_monitor_manager_clear_mode (MetaMonitorMode *mode);
-void meta_monitor_manager_clear_crtc (MetaCRTC *crtc);
-
 /* Returns true if transform causes width and height to be inverted
    This is true for the odd transforms in the enum */
 static inline gboolean

src/backends/meta-monitor-manager.c

@@ -178,7 +178,7 @@ make_logical_config (MetaMonitorManager *manager)
   unsigned int i, j;
 
   monitor_infos = g_array_sized_new (FALSE, TRUE, sizeof (MetaMonitorInfo),
-                                     manager->n_crtcs);
+                                     manager->n_outputs);
 
   /* Walk the list of MetaCRTCs, and build a MetaMonitorInfo
      for each of them, unless they reference a rectangle that
@@ -346,23 +346,6 @@ meta_monitor_manager_constructed (GObject *object)
   manager->in_init = FALSE;
 }
 
-void
-meta_monitor_manager_clear_output (MetaOutput *output)
-{
-  g_free (output->name);
-  g_free (output->vendor);
-  g_free (output->product);
-  g_free (output->serial);
-  g_free (output->modes);
-  g_free (output->possible_crtcs);
-  g_free (output->possible_clones);
-
-  if (output->driver_notify)
-    output->driver_notify (output);
-
-  memset (output, 0, sizeof (*output));
-}
-
 static void
 meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
                                         int         n_old_outputs)
@@ -370,22 +353,22 @@ meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
   int i;
 
   for (i = 0; i < n_old_outputs; i++)
-    meta_monitor_manager_clear_output (&old_outputs[i]);
+    {
+      g_free (old_outputs[i].name);
+      g_free (old_outputs[i].vendor);
+      g_free (old_outputs[i].product);
+      g_free (old_outputs[i].serial);
+      g_free (old_outputs[i].modes);
+      g_free (old_outputs[i].possible_crtcs);
+      g_free (old_outputs[i].possible_clones);
+
+      if (old_outputs[i].driver_notify)
+        old_outputs[i].driver_notify (&old_outputs[i]);
+    }
 
   g_free (old_outputs);
 }
 
-void
-meta_monitor_manager_clear_mode (MetaMonitorMode *mode)
-{
-  g_free (mode->name);
-
-  if (mode->driver_notify)
-    mode->driver_notify (mode);
-
-  memset (mode, 0, sizeof (*mode));
-}
-
 static void
 meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
                                       int              n_old_modes)
@@ -393,20 +376,16 @@ meta_monitor_manager_free_mode_array (MetaMonitorMode *old_modes,
   int i;
 
   for (i = 0; i < n_old_modes; i++)
-    meta_monitor_manager_clear_mode (&old_modes[i]);
+    {
+      g_free (old_modes[i].name);
+
+      if (old_modes[i].driver_notify)
+        old_modes[i].driver_notify (&old_modes[i]);
+    }
 
   g_free (old_modes);
 }
 
-void
-meta_monitor_manager_clear_crtc (MetaCRTC *crtc)
-{
-  if (crtc->driver_notify)
-    crtc->driver_notify (crtc);
-
-  memset (crtc, 0, sizeof (*crtc));
-}
-
 static void
 meta_monitor_manager_free_crtc_array (MetaCRTC *old_crtcs,
                                       int       n_old_crtcs)
@@ -414,7 +393,10 @@ meta_monitor_manager_free_crtc_array (MetaCRTC *old_crtcs,
   int i;
 
   for (i = 0; i < n_old_crtcs; i++)
-    meta_monitor_manager_clear_crtc (&old_crtcs[i]);
+    {
+      if (old_crtcs[i].driver_notify)
+        old_crtcs[i].driver_notify (&old_crtcs[i]);
+    }
 
   g_free (old_crtcs);
 }

src/backends/native/meta-backend-native.c

@@ -37,8 +37,6 @@
 #include "meta-cursor-renderer-native.h"
 #include "meta-launcher.h"
 
-#include <stdlib.h>
-
 struct _MetaBackendNativePrivate
 {
   MetaLauncher *launcher;
@@ -329,15 +327,8 @@ static void
 meta_backend_native_init (MetaBackendNative *native)
 {
   MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
-  GError *error = NULL;
-
-  priv->launcher = meta_launcher_new (&error);
-  if (priv->launcher == NULL)
-    {
-      g_warning ("Can't initialize KMS backend: %s\n", error->message);
-      exit (1);
-    }
 
+  priv->launcher = meta_launcher_new ();
   priv->barrier_manager = meta_barrier_manager_native_new ();
 
   priv->up_client = up_client_new ();

src/backends/native/meta-input-settings-native.c

@@ -154,30 +154,30 @@ device_set_click_method (struct libinput_device            *libinput_device,
 }
 
 static void
-meta_input_settings_native_set_edge_scroll (MetaInputSettings            *settings,
-                                            ClutterInputDevice           *device,
-                                            gboolean                      edge_scrolling_enabled)
+meta_input_settings_native_set_scroll_method (MetaInputSettings            *settings,
+                                              ClutterInputDevice           *device,
+                                              GDesktopTouchpadScrollMethod  mode)
 {
   enum libinput_config_scroll_method scroll_method = 0;
   struct libinput_device *libinput_device;
-  enum libinput_config_scroll_method supported;
 
   libinput_device = clutter_evdev_input_device_get_libinput_device (device);
-  supported = libinput_device_config_scroll_get_methods (libinput_device);
 
-  if (supported & LIBINPUT_CONFIG_SCROLL_2FG)
-    {
-      scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
-    }
-  else if (supported & LIBINPUT_CONFIG_SCROLL_EDGE &&
-           edge_scrolling_enabled)
-    {
-      scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE;
-    }
-  else
+  switch (mode)
     {
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED:
       scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
-    }
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING:
+      scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE;
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING:
+      scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
+      break;
+    default:
+      g_assert_not_reached ();
+      return;
+  }
 
   device_set_scroll_method (libinput_device, scroll_method);
 }
@@ -252,7 +252,7 @@ meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass)
   input_settings_class->set_left_handed = meta_input_settings_native_set_left_handed;
   input_settings_class->set_tap_enabled = meta_input_settings_native_set_tap_enabled;
   input_settings_class->set_invert_scroll = meta_input_settings_native_set_invert_scroll;
-  input_settings_class->set_edge_scroll = meta_input_settings_native_set_edge_scroll;
+  input_settings_class->set_scroll_method = meta_input_settings_native_set_scroll_method;
   input_settings_class->set_scroll_button = meta_input_settings_native_set_scroll_button;
   input_settings_class->set_click_method = meta_input_settings_native_set_click_method;
   input_settings_class->set_keyboard_repeat = meta_input_settings_native_set_keyboard_repeat;

src/backends/native/meta-launcher.c

@@ -54,22 +54,30 @@ struct _MetaLauncher
   gboolean session_active;
 };
 
+static void
+report_error_and_die (const char *prefix,
+                      GError *error)
+{
+  /* if a function returns due to g_return_val_if_fail,
+   * then the error may not be set */
+  if (error)
+    g_error ("%s: %s", prefix, error->message);
+  else
+    g_error ("%s", prefix);
+
+  /* the error is not freed, but it is ok as g_error aborts the process */
+}
+
 static Login1Session *
-get_session_proxy (GCancellable *cancellable,
-                   GError      **error)
+get_session_proxy (GCancellable *cancellable)
 {
   char *proxy_path;
   char *session_id;
   Login1Session *session_proxy;
+  GError *error = NULL;
 
   if (sd_pid_get_session (getpid (), &session_id) < 0)
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Could not get session ID: %m");
-      return NULL;
-    }
+    return NULL;
 
   proxy_path = get_escaped_dbus_path ("/org/freedesktop/login1/session", session_id);
 
@@ -77,9 +85,9 @@ get_session_proxy (GCancellable *cancellable,
                                                          G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
                                                          "org.freedesktop.login1",
                                                          proxy_path,
-                                                         cancellable, error);
+                                                         cancellable, &error);
   if (!session_proxy)
-    g_prefix_error(error, "Could not get session proxy: ");
+    report_error_and_die ("Failed getting session proxy", error);
 
   free (proxy_path);
 
@@ -87,16 +95,16 @@ get_session_proxy (GCancellable *cancellable,
 }
 
 static Login1Seat *
-get_seat_proxy (GCancellable *cancellable,
-                GError      **error)
+get_seat_proxy (GCancellable *cancellable)
 {
+  GError *error = NULL;
   Login1Seat *seat = login1_seat_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                          G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
                                                          "org.freedesktop.login1",
                                                          "/org/freedesktop/login1/seat/self",
-                                                         cancellable, error);
+                                                         cancellable, &error);
   if (!seat)
-    g_prefix_error(error, "Could not get seat proxy: ");
+    report_error_and_die ("Could not get seat proxy", error);
 
   return seat;
 }
@@ -295,9 +303,9 @@ get_primary_gpu_path (const gchar *seat_name)
   if (!devices)
     goto out;
 
-  for (tmp = devices; tmp != NULL && path == NULL; tmp = tmp->next)
+  for (tmp = devices; tmp != NULL; tmp = tmp->next)
     {
-      GUdevDevice *platform_device = NULL, *pci_device = NULL;
+      GUdevDevice *pci_device;
       GUdevDevice *dev = tmp->data;
       gint boot_vga;
       const gchar *device_seat;
@@ -324,26 +332,20 @@ get_primary_gpu_path (const gchar *seat_name)
       if (g_strcmp0 (seat_name, device_seat))
         continue;
 
-      platform_device = g_udev_device_get_parent_with_subsystem (dev, "platform", NULL);
       pci_device = g_udev_device_get_parent_with_subsystem (dev, "pci", NULL);
+      if (!pci_device)
+          continue;
 
-      if (platform_device != NULL)
-        {
-          path = g_strdup (g_udev_device_get_device_file (dev));
-        }
-      else if (pci_device != NULL)
-        {
-          /* get value of boot_vga attribute or 0 if the device has no boot_vga */
-          boot_vga = g_udev_device_get_sysfs_attr_as_int (pci_device, "boot_vga");
-          if (boot_vga == 1)
-            {
-              /* found the boot_vga device */
-              path = g_strdup (g_udev_device_get_device_file (dev));
-            }
-        }
-
-      g_object_unref (platform_device);
+      /* get value of boot_vga attribute or 0 if the device has no boot_vga */
+      boot_vga = g_udev_device_get_sysfs_attr_as_int (pci_device, "boot_vga");
       g_object_unref (pci_device);
+
+      if (boot_vga == 1)
+        {
+          /* found the boot_vga device */
+          path = g_strdup (g_udev_device_get_device_file (dev));
+          break;
+        }
     }
 
   g_list_free_full (devices, g_object_unref);
@@ -355,114 +357,69 @@ out:
   return path;
 }
 
-static gboolean
+static void
 get_kms_fd (Login1Session *session_proxy,
-            const gchar   *seat_id,
-            int           *fd_out,
-            GError       **error)
+            const gchar *seat_id,
+            int *fd_out)
 {
   int major, minor;
   int fd;
+  gchar *path;
+  GError *error = NULL;
 
-  g_autofree gchar *path = get_primary_gpu_path (seat_id);
+  path = get_primary_gpu_path (seat_id);
   if (!path)
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "could not find drm kms device");
-      return FALSE;
-    }
+    g_error ("could not find drm kms device");
 
   if (!get_device_info_from_path (path, &major, &minor))
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Could not get device info for path %s: %m", path);
-      return FALSE;
-    }
+    g_error ("Could not stat %s: %m", path);
 
-  if (!take_device (session_proxy, major, minor, &fd, NULL, error))
-    {
-      g_prefix_error (error, "Could not open DRM device: ");
-      return FALSE;
-    }
+  g_free (path);
+
+  if (!take_device (session_proxy, major, minor, &fd, NULL, &error))
+    report_error_and_die ("Could not open DRM device", error);
 
   *fd_out = fd;
-
-  return TRUE;
 }
 
 static gchar *
-get_seat_id (GError **error)
+get_seat_id (void)
 {
-  char *session_id, *seat_id;
-  int r;
+  char *session_id, *seat_id = NULL;
 
-  r = sd_pid_get_session (0, &session_id);
-  if (r < 0)
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Could not get session for PID: %s", g_strerror (-r));
-      return NULL;
-    }
+  if (sd_pid_get_session (0, &session_id) < 0)
+    return NULL;
 
-  r = sd_session_get_seat (session_id, &seat_id);
+  /* on error the seat_id will remain NULL */
+  sd_session_get_seat (session_id, &seat_id);
   free (session_id);
 
-  if (r < 0)
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Could not get seat for session: %s", g_strerror (-r));
-      return NULL;
-    }
-
   return seat_id;
 }
 
 MetaLauncher *
-meta_launcher_new (GError **error)
+meta_launcher_new (void)
 {
   MetaLauncher *self = NULL;
-  Login1Session *session_proxy = NULL;
-  Login1Seat *seat_proxy = NULL;
-  char *seat_id = NULL;
-  gboolean have_control = FALSE;
+  Login1Session *session_proxy;
+  char *seat_id;
+  GError *error = NULL;
   int kms_fd;
 
-  session_proxy = get_session_proxy (NULL, error);
-  if (!session_proxy)
-    goto fail;
+  session_proxy = get_session_proxy (NULL);
+  if (!login1_session_call_take_control_sync (session_proxy, FALSE, NULL, &error))
+    report_error_and_die ("Could not take control", error);
 
-  if (!login1_session_call_take_control_sync (session_proxy, FALSE, NULL, error))
-    {
-      g_prefix_error (error, "Could not take control: ");
-      goto fail;
-    }
-
-  have_control = TRUE;
-
-  seat_id = get_seat_id (error);
+  seat_id = get_seat_id ();
   if (!seat_id)
-    goto fail;
-
-  seat_proxy = get_seat_proxy (NULL, error);
-  if (!seat_proxy)
-    goto fail;
-
-  if (!get_kms_fd (session_proxy, seat_id, &kms_fd, error))
-    goto fail;
+    g_error ("Failed getting seat id");
 
+  get_kms_fd (session_proxy, seat_id, &kms_fd);
   free (seat_id);
 
   self = g_slice_new0 (MetaLauncher);
   self->session_proxy = session_proxy;
-  self->seat_proxy = seat_proxy;
+  self->seat_proxy = get_seat_proxy (NULL);
 
   self->session_active = TRUE;
 
@@ -472,16 +429,8 @@ meta_launcher_new (GError **error)
                                       self);
 
   g_signal_connect (self->session_proxy, "notify::active", G_CALLBACK (on_active_changed), self);
+
   return self;
-
- fail:
-  if (have_control)
-    login1_session_call_release_control_sync (session_proxy, NULL, NULL);
-  g_clear_object (&session_proxy);
-  g_clear_object (&seat_proxy);
-  free (seat_id);
-
-  return NULL;
 }
 
 void

src/backends/native/meta-launcher.h

@@ -24,7 +24,7 @@
 
 typedef struct _MetaLauncher MetaLauncher;
 
-MetaLauncher     *meta_launcher_new                     (GError       **error);
+MetaLauncher     *meta_launcher_new                     (void);
 void              meta_launcher_free                    (MetaLauncher  *self);
 
 gboolean          meta_launcher_activate_session        (MetaLauncher  *self,

src/backends/native/meta-monitor-manager-kms.c

@@ -496,18 +496,8 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
       meta_mode->name = g_strndup (mode->name, DRM_DISPLAY_MODE_LEN);
       meta_mode->width = mode->hdisplay;
       meta_mode->height = mode->vdisplay;
-
-      /* Calculate refresh rate in milliHz first for extra precision. */
-      meta_mode->refresh_rate = (mode->clock * 1000000LL) / mode->htotal;
-      meta_mode->refresh_rate += (mode->vtotal / 2);
-      meta_mode->refresh_rate /= mode->vtotal;
-      if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-	meta_mode->refresh_rate *= 2;
-      if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
-        meta_mode->refresh_rate /= 2;
-      if (mode->vscan > 1)
-        meta_mode->refresh_rate /= mode->vscan;
-      meta_mode->refresh_rate /= 1000.0;
+      meta_mode->refresh_rate = (1000 * mode->clock /
+                                 ((float)mode->htotal * mode->vtotal));
 
       meta_mode->driver_private = g_slice_dup (drmModeModeInfo, mode);
       meta_mode->driver_notify = (GDestroyNotify)meta_monitor_mode_destroy_notify;

src/backends/x11/meta-backend-x11.c

@@ -82,7 +82,6 @@ struct _MetaBackendX11Private
   gchar *keymap_layouts;
   gchar *keymap_variants;
   gchar *keymap_options;
-  int locked_group;
 };
 typedef struct _MetaBackendX11Private MetaBackendX11Private;
 
@@ -298,23 +297,15 @@ handle_host_xevent (MetaBackend *backend,
 
   if (event->type == priv->xkb_event_base)
     {
-      XkbEvent *xkb_ev = (XkbEvent *) event;
+      XkbAnyEvent *xkb_ev = (XkbAnyEvent *) event;
 
-      if (xkb_ev->any.device == META_VIRTUAL_CORE_KEYBOARD_ID)
+      if (xkb_ev->device == META_VIRTUAL_CORE_KEYBOARD_ID)
         {
-          switch (xkb_ev->any.xkb_type)
+          switch (xkb_ev->xkb_type)
             {
             case XkbNewKeyboardNotify:
             case XkbMapNotify:
               keymap_changed (backend);
-              break;
-            case XkbStateNotify:
-              if (xkb_ev->state.changed & XkbGroupLockMask)
-                {
-                  if (priv->locked_group != xkb_ev->state.locked_group)
-                    XkbLockGroup (priv->xdisplay, XkbUseCoreKbd, priv->locked_group);
-                }
-              break;
             default:
               break;
             }
@@ -785,7 +776,6 @@ meta_backend_x11_lock_layout_group (MetaBackend *backend,
   MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
   MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
 
-  priv->locked_group = idx;
   XkbLockGroup (priv->xdisplay, XkbUseCoreKbd, idx);
 }
 

src/backends/x11/meta-input-settings-x11.c

@@ -199,9 +199,9 @@ meta_input_settings_x11_set_invert_scroll (MetaInputSettings  *settings,
 }
 
 static void
-meta_input_settings_x11_set_edge_scroll (MetaInputSettings            *settings,
-                                         ClutterInputDevice           *device,
-                                         gboolean                      edge_scroll_enabled)
+meta_input_settings_x11_set_scroll_method (MetaInputSettings            *settings,
+                                           ClutterInputDevice           *device,
+                                           GDesktopTouchpadScrollMethod  mode)
 {
   guchar values[3] = { 0 }; /* 2fg, edge, button. The last value is unused */
   guchar *available;
@@ -211,21 +211,26 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings            *settings,
   if (!available)
     return;
 
-  if (available[0])
-    {
-      values[0] = 1;
-    }
-  else if (available[1] && edge_scroll_enabled)
+  switch (mode)
     {
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_DISABLED:
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_EDGE_SCROLLING:
       values[1] = 1;
-    }
-  else
-    {
-      /* Disabled */
+      break;
+    case G_DESKTOP_TOUCHPAD_SCROLL_METHOD_TWO_FINGER_SCROLLING:
+      values[0] = 1;
+      break;
+    default:
+      g_assert_not_reached ();
     }
 
-  change_property (device, "libinput Scroll Method Enabled",
-                   XA_INTEGER, 8, &values, 3);
+  if ((values[0] && !available[0]) || (values[1] && !available[1]))
+    g_warning ("Device '%s' does not support scroll mode %d\n",
+               clutter_input_device_get_device_name (device), mode);
+  else
+    change_property (device, "libinput Scroll Method Enabled",
+                     XA_INTEGER, 8, &values, 3);
 
   meta_XFree (available);
 }
@@ -316,7 +321,7 @@ meta_input_settings_x11_class_init (MetaInputSettingsX11Class *klass)
   input_settings_class->set_left_handed = meta_input_settings_x11_set_left_handed;
   input_settings_class->set_tap_enabled = meta_input_settings_x11_set_tap_enabled;
   input_settings_class->set_invert_scroll = meta_input_settings_x11_set_invert_scroll;
-  input_settings_class->set_edge_scroll = meta_input_settings_x11_set_edge_scroll;
+  input_settings_class->set_scroll_method = meta_input_settings_x11_set_scroll_method;
   input_settings_class->set_scroll_button = meta_input_settings_x11_set_scroll_button;
   input_settings_class->set_click_method = meta_input_settings_x11_set_click_method;
   input_settings_class->set_keyboard_repeat = meta_input_settings_x11_set_keyboard_repeat;

src/backends/x11/meta-monitor-manager-xrandr.c

@@ -661,44 +661,6 @@ output_get_modes (MetaMonitorManager *manager,
         }
     }
   meta_output->n_modes = n_actual_modes;
-  if (n_actual_modes > 0)
-    meta_output->preferred_mode = meta_output->modes[0];
-}
-
-static void
-output_get_crtcs (MetaMonitorManager *manager,
-                  MetaOutput         *meta_output,
-                  XRROutputInfo      *output)
-{
-  guint j, k;
-  guint n_actual_crtcs;
-
-  meta_output->possible_crtcs = g_new0 (MetaCRTC *, output->ncrtc);
-
-  n_actual_crtcs = 0;
-  for (j = 0; j < (unsigned)output->ncrtc; j++)
-    {
-      for (k = 0; k < manager->n_crtcs; k++)
-        {
-          if ((XID)manager->crtcs[k].crtc_id == output->crtcs[j])
-            {
-              meta_output->possible_crtcs[n_actual_crtcs] = &manager->crtcs[k];
-              n_actual_crtcs += 1;
-              break;
-            }
-        }
-    }
-  meta_output->n_possible_crtcs = n_actual_crtcs;
-
-  meta_output->crtc = NULL;
-  for (j = 0; j < manager->n_crtcs; j++)
-    {
-      if ((XID)manager->crtcs[j].crtc_id == output->crtc)
-        {
-          meta_output->crtc = &manager->crtcs[j];
-          break;
-        }
-    }
 }
 
 static char *
@@ -863,7 +825,31 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
 
 	  output_get_tile_info (manager_xrandr, meta_output);
 	  output_get_modes (manager, meta_output, output);
-          output_get_crtcs (manager, meta_output, output);
+	  meta_output->preferred_mode = meta_output->modes[0];
+
+	  meta_output->n_possible_crtcs = output->ncrtc;
+	  meta_output->possible_crtcs = g_new0 (MetaCRTC *, meta_output->n_possible_crtcs);
+	  for (j = 0; j < (unsigned)output->ncrtc; j++)
+	    {
+	      for (k = 0; k < manager->n_crtcs; k++)
+		{
+		  if ((XID)manager->crtcs[k].crtc_id == output->crtcs[j])
+		    {
+		      meta_output->possible_crtcs[j] = &manager->crtcs[k];
+		      break;
+		    }
+		}
+	    }
+
+	  meta_output->crtc = NULL;
+	  for (j = 0; j < manager->n_crtcs; j++)
+	    {
+	      if ((XID)manager->crtcs[j].crtc_id == output->crtc)
+		{
+		  meta_output->crtc = &manager->crtcs[j];
+		  break;
+		}
+	    }
 
 	  meta_output->n_possible_clones = output->nclone;
 	  meta_output->possible_clones = g_new0 (MetaOutput *, meta_output->n_possible_clones);
@@ -887,10 +873,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
 	  else
 	    meta_output->backlight = -1;
 
-          if (meta_output->n_modes == 0 || meta_output->n_possible_crtcs == 0)
-            meta_monitor_manager_clear_output (meta_output);
-          else
-            n_actual_outputs++;
+	  n_actual_outputs++;
 	}
 
       XRRFreeOutputInfo (output);

src/compositor/plugins/default.c

@@ -255,31 +255,6 @@ get_actor_private (MetaWindowActor *actor)
   return priv;
 }
 
-static ClutterTimeline *
-actor_animate (ClutterActor         *actor,
-               ClutterAnimationMode  mode,
-               guint                 duration,
-               const gchar          *first_property,
-               ...)
-{
-  va_list args;
-  ClutterTransition *transition;
-
-  clutter_actor_save_easing_state (actor);
-  clutter_actor_set_easing_mode (actor, mode);
-  clutter_actor_set_easing_duration (actor, duration);
-
-  va_start (args, first_property);
-  g_object_set_valist (G_OBJECT (actor), first_property, args);
-  va_end (args);
-
-  transition = clutter_actor_get_transition (actor, first_property);
-
-  clutter_actor_restore_easing_state (actor);
-
-  return CLUTTER_TIMELINE (transition);
-}
-
 static void
 on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)
 {
@@ -296,10 +271,7 @@ on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)
 
       if (apriv->orig_parent)
         {
-          g_object_ref (a);
-          clutter_actor_remove_child (clutter_actor_get_parent (a), a);
-          clutter_actor_add_child (apriv->orig_parent, a);
-          g_object_unref (a);
+          clutter_actor_reparent (a, apriv->orig_parent);
           apriv->orig_parent = NULL;
         }
 
@@ -388,10 +360,11 @@ switch_workspace (MetaPlugin *plugin,
   MetaScreen *screen;
   MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
   GList        *l;
-  ClutterActor *workspace0  = clutter_actor_new ();
-  ClutterActor *workspace1  = clutter_actor_new ();
+  ClutterActor *workspace0  = clutter_group_new ();
+  ClutterActor *workspace1  = clutter_group_new ();
   ClutterActor *stage;
   int           screen_width, screen_height;
+  ClutterAnimation *animation;
 
   screen = meta_plugin_get_screen (plugin);
   stage = meta_get_stage_for_screen (screen);
@@ -400,15 +373,17 @@ switch_workspace (MetaPlugin *plugin,
                         &screen_width,
                         &screen_height);
 
-  clutter_actor_set_pivot_point (workspace1, 1.0, 1.0);
+  clutter_actor_set_anchor_point (workspace1,
+                                  screen_width,
+                                  screen_height);
   clutter_actor_set_position (workspace1,
                               screen_width,
                               screen_height);
 
   clutter_actor_set_scale (workspace1, 0.0, 0.0);
 
-  clutter_actor_add_child (stage, workspace1);
-  clutter_actor_add_child (stage, workspace0);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), workspace1);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), workspace0);
 
   if (from == to)
     {
@@ -431,15 +406,12 @@ switch_workspace (MetaPlugin *plugin,
 
       if (win_workspace == to || win_workspace == from)
         {
-          ClutterActor *parent = win_workspace == to ? workspace1 : workspace0;
           apriv->orig_parent = clutter_actor_get_parent (actor);
 
-          g_object_ref (actor);
-          clutter_actor_remove_child (clutter_actor_get_parent (actor), actor);
-          clutter_actor_add_child (parent, actor);
-          clutter_actor_show (actor);
-          clutter_actor_set_child_below_sibling (parent, actor, NULL);
-          g_object_unref (actor);
+          clutter_actor_reparent (actor,
+				  win_workspace == to ? workspace1 : workspace0);
+          clutter_actor_show_all (actor);
+          clutter_actor_raise_top (actor);
         }
       else if (win_workspace < 0)
         {
@@ -459,21 +431,23 @@ switch_workspace (MetaPlugin *plugin,
   priv->desktop1 = workspace0;
   priv->desktop2 = workspace1;
 
-  priv->tml_switch_workspace1 = actor_animate (workspace0, CLUTTER_EASE_IN_SINE,
-                                               SWITCH_TIMEOUT,
-                                               "scale-x", 1.0,
-                                               "scale-y", 1.0,
-                                               NULL);
+  animation = clutter_actor_animate (workspace0, CLUTTER_EASE_IN_SINE,
+                                     SWITCH_TIMEOUT,
+                                     "scale-x", 1.0,
+                                     "scale-y", 1.0,
+                                     NULL);
+  priv->tml_switch_workspace1 = clutter_animation_get_timeline (animation);
   g_signal_connect (priv->tml_switch_workspace1,
                     "completed",
                     G_CALLBACK (on_switch_workspace_effect_complete),
                     plugin);
 
-  priv->tml_switch_workspace2 = actor_animate (workspace1, CLUTTER_EASE_IN_SINE,
-                                               SWITCH_TIMEOUT,
-                                               "scale-x", 0.0,
-                                               "scale-y", 0.0,
-                                               NULL);
+  animation = clutter_actor_animate (workspace1, CLUTTER_EASE_IN_SINE,
+                                     SWITCH_TIMEOUT,
+                                     "scale-x", 0.0,
+                                     "scale-y", 0.0,
+                                     NULL);
+  priv->tml_switch_workspace2 = clutter_animation_get_timeline (animation);
 }
 
 
@@ -530,17 +504,19 @@ minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)
 
   if (type == META_WINDOW_NORMAL)
     {
+      ClutterAnimation *animation;
       EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
       ActorPrivate *apriv = get_actor_private (window_actor);
 
-      apriv->tml_minimize = actor_animate (actor,
-                                           CLUTTER_EASE_IN_SINE,
-                                           MINIMIZE_TIMEOUT,
-                                           "scale-x", 0.0,
-                                           "scale-y", 0.0,
-                                           "x", (double)icon_geometry.x,
-                                           "y", (double)icon_geometry.y,
-                                           NULL);
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_IN_SINE,
+                                         MINIMIZE_TIMEOUT,
+                                         "scale-x", 0.0,
+                                         "scale-y", 0.0,
+                                         "x", (double)icon_geometry.x,
+                                         "y", (double)icon_geometry.y,
+                                         NULL);
+      apriv->tml_minimize = clutter_animation_get_timeline (animation);
       data->plugin = plugin;
       data->actor = actor;
       g_signal_connect (apriv->tml_minimize, "completed",
@@ -585,6 +561,7 @@ map (MetaPlugin *plugin, MetaWindowActor *window_actor)
 
   if (type == META_WINDOW_NORMAL)
     {
+      ClutterAnimation *animation;
       EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
       ActorPrivate *apriv = get_actor_private (window_actor);
 
@@ -593,13 +570,14 @@ map (MetaPlugin *plugin, MetaWindowActor *window_actor)
       clutter_actor_set_scale (actor, 0.5, 0.5);
       clutter_actor_show (actor);
 
-      apriv->tml_map = actor_animate (actor,
-                                      CLUTTER_EASE_OUT_QUAD,
-                                      MAP_TIMEOUT,
-                                      "opacity", 255,
-                                      "scale-x", 1.0,
-                                      "scale-y", 1.0,
-                                      NULL);
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_OUT_QUAD,
+                                         MAP_TIMEOUT,
+                                         "opacity", 255,
+                                         "scale-x", 1.0,
+                                         "scale-y", 1.0,
+                                         NULL);
+      apriv->tml_map = clutter_animation_get_timeline (animation);
       data->actor = actor;
       data->plugin = plugin;
       g_signal_connect (apriv->tml_map, "completed",
@@ -640,16 +618,18 @@ destroy (MetaPlugin *plugin, MetaWindowActor *window_actor)
 
   if (type == META_WINDOW_NORMAL)
     {
+      ClutterAnimation *animation;
       EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
       ActorPrivate *apriv = get_actor_private (window_actor);
 
-      apriv->tml_destroy = actor_animate (actor,
-                                          CLUTTER_EASE_OUT_QUAD,
-                                          DESTROY_TIMEOUT,
-                                          "opacity", 0,
-                                          "scale-x", 0.8,
-                                          "scale-y", 0.8,
-                                          NULL);
+      animation = clutter_actor_animate (actor,
+                                         CLUTTER_EASE_OUT_QUAD,
+                                         DESTROY_TIMEOUT,
+                                         "opacity", 0,
+                                         "scale-x", 0.8,
+                                         "scale-y", 0.8,
+                                         NULL);
+      apriv->tml_destroy = clutter_animation_get_timeline (animation);
       data->plugin = plugin;
       data->actor = actor;
       g_signal_connect (apriv->tml_destroy, "completed",
@@ -722,9 +702,7 @@ show_tile_preview (MetaPlugin    *plugin,
   clutter_actor_show (preview->actor);
 
   window_actor = CLUTTER_ACTOR (meta_window_get_compositor_private (window));
-  clutter_actor_set_child_below_sibling (clutter_actor_get_parent (preview->actor),
-                                         preview->actor,
-                                         window_actor);
+  clutter_actor_lower (preview->actor, window_actor);
 
   preview->tile_rect = *tile_rect;
 }

src/core/events.c

@@ -182,25 +182,10 @@ meta_display_handle_event (MetaDisplay        *display,
   sequence = clutter_event_get_event_sequence (event);
 
   /* Set the pointer emulating sequence on touch begin, if eligible */
-  if (event->type == CLUTTER_TOUCH_BEGIN)
-    {
-      if (sequence_is_pointer_emulated (display, event))
-        {
-          /* This is the new pointer emulating sequence */
-          display->pointer_emulating_sequence = sequence;
-        }
-      else if (display->pointer_emulating_sequence == sequence)
-        {
-          /* This sequence was "pointer emulating" in a prior incarnation,
-           * but now it isn't. We unset the pointer emulating sequence at
-           * this point so the current sequence is not mistaken as pointer
-           * emulating, while we've ensured that it's been deemed
-           * "pointer emulating" throughout all of the event processing
-           * of the previous incarnation.
-           */
-          display->pointer_emulating_sequence = NULL;
-        }
-    }
+  if (event->type == CLUTTER_TOUCH_BEGIN &&
+      !display->pointer_emulating_sequence &&
+      sequence_is_pointer_emulated (display, event))
+    display->pointer_emulating_sequence = sequence;
 
 #ifdef HAVE_WAYLAND
   MetaWaylandCompositor *compositor = NULL;
@@ -350,6 +335,11 @@ meta_display_handle_event (MetaDisplay        *display,
     }
 #endif
 
+  /* Unset the pointer emulating sequence after its end event is processed */
+  if (event->type == CLUTTER_TOUCH_END &&
+      display->pointer_emulating_sequence == sequence)
+    display->pointer_emulating_sequence = NULL;
+
   display->current_time = CurrentTime;
   return bypass_clutter;
 }

src/core/main.c

@@ -80,10 +80,6 @@
 
 #ifdef HAVE_WAYLAND
 #include "wayland/meta-wayland.h"
-# endif
-
-#if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
-#include <systemd/sd-login.h>
 #endif
 
 /*
@@ -295,95 +291,6 @@ on_sigterm (gpointer user_data)
   return G_SOURCE_REMOVE;
 }
 
-#if defined(HAVE_WAYLAND) && defined(HAVE_NATIVE_BACKEND)
-static char *
-find_logind_session_type (void)
-{
-  char **sessions;
-  char *session_id;
-  char *session_type;
-  int ret, i;
-
-  ret = sd_pid_get_session (0, &session_id);
-
-  if (ret == 0 && session_id != NULL)
-    {
-      ret = sd_session_get_type (session_id, &session_type);
-      free (session_id);
-
-      if (ret < 0)
-        session_type = NULL;
-
-      goto out;
-    }
-  session_type = NULL;
-
-  ret = sd_uid_get_sessions (getuid (), TRUE, &sessions);
-
-  if (ret < 0 || sessions == NULL)
-    goto out;
-
-  for (i = 0; sessions[i] != NULL; i++)
-    {
-      ret = sd_session_get_type (sessions[i], &session_type);
-
-      if (ret < 0)
-        continue;
-
-      if (g_strcmp0 (session_type, "x11") == 0||
-          g_strcmp0 (session_type, "wayland") == 0)
-        break;
-
-      g_clear_pointer (&session_type, (GDestroyNotify) free);
-    }
-
-  for (i = 0; sessions[i] != NULL; i++)
-    free (sessions[i]);
-  free (sessions);
-
-out:
-  return session_type;
-}
-
-static gboolean
-check_for_wayland_session_type (void)
-{
-  char *session_type = NULL;
-  gboolean is_wayland = FALSE;
-
-  session_type = find_logind_session_type ();
-
-  if (session_type != NULL)
-    {
-      is_wayland = g_strcmp0 (session_type, "wayland") == 0;
-      free (session_type);
-    }
-
-  return is_wayland;
-}
-#endif
-
-static void
-init_backend (void)
-{
-  gboolean session_type_is_wayland = FALSE;
-
-#if defined(HAVE_WAYLAND) && defined(HAVE_NATIVE_BACKEND)
-  session_type_is_wayland = check_for_wayland_session_type ();
-#endif
-
-#if defined(CLUTTER_WINDOWING_EGL) && defined(HAVE_NATIVE_BACKEND)
-  if (opt_display_server || session_type_is_wayland)
-    clutter_set_windowing_backend (CLUTTER_WINDOWING_EGL);
-  else
-#endif
-    clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
-
-#ifdef HAVE_WAYLAND
-  meta_set_is_wayland_compositor (opt_wayland || session_type_is_wayland);
-#endif
-}
-
 /**
  * meta_init: (skip)
  *
@@ -416,7 +323,16 @@ meta_init (void)
   if (g_getenv ("MUTTER_DEBUG"))
     meta_set_debugging (TRUE);
 
-  init_backend ();
+#if defined(CLUTTER_WINDOWING_EGL) && defined(HAVE_NATIVE_BACKEND)
+  if (opt_display_server)
+    clutter_set_windowing_backend (CLUTTER_WINDOWING_EGL);
+  else
+#endif
+    clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
+
+#ifdef HAVE_WAYLAND
+  meta_set_is_wayland_compositor (opt_wayland);
+#endif
 
   if (g_get_home_dir ())
     if (chdir (g_get_home_dir ()) < 0)

src/core/window.c

@@ -1579,10 +1579,8 @@ implement_showing (MetaWindow *window,
        * windows we might want to know where they are on the screen,
        * so we should place the window even if we're hiding it rather
        * than showing it.
-       * Force placing windows only when they should be already mapped,
-       * see #751887
        */
-      if (!window->placed && client_window_should_be_mapped (window))
+      if (!window->placed)
         meta_window_force_placement (window);
 
       meta_window_hide (window);
@@ -3536,7 +3534,10 @@ meta_window_update_for_monitors_changed (MetaWindow *window)
 {
   const MetaMonitorInfo *old, *new;
 
-  if (window->override_redirect || window->type == META_WINDOW_DESKTOP)
+  if (window->type == META_WINDOW_DESKTOP)
+    return;
+
+  if (window->override_redirect)
     {
       meta_window_update_monitor (window, FALSE);
       return;
@@ -5302,11 +5303,6 @@ meta_window_recalc_features (MetaWindow *window)
 
   meta_window_recalc_skip_features (window);
 
-  /* To prevent users from losing windows, let's prevent users from
-   * minimizing skip-taskbar windows through the window decorations. */
-  if (window->skip_taskbar)
-    window->has_minimize_func = FALSE;
-
   meta_topic (META_DEBUG_WINDOW_OPS,
               "Window %s decorated = %d border_only = %d has_close = %d has_minimize = %d has_maximize = %d has_move = %d has_shade = %d skip_taskbar = %d skip_pager = %d\n",
               window->desc,
@@ -7674,29 +7670,13 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
   MetaDisplay *display = window->display;
   gboolean unmodified;
   gboolean is_window_grab;
-  ClutterModifierType grab_mods, event_mods;
-  gfloat x, y;
-  guint button;
 
   if (window->frame && meta_ui_frame_handle_event (window->frame->ui_frame, event))
     return;
 
-  if (event->type != CLUTTER_BUTTON_PRESS &&
-      event->type != CLUTTER_TOUCH_BEGIN)
+  if (event->type != CLUTTER_BUTTON_PRESS)
     return;
 
-  if (event->type == CLUTTER_TOUCH_BEGIN)
-    {
-      ClutterEventSequence *sequence;
-
-      button = 1;
-      sequence = clutter_event_get_event_sequence (event);
-      if (!meta_display_is_pointer_emulating_sequence (window->display, sequence))
-        return;
-    }
-  else
-    button = clutter_event_get_button (event);
-
   if (display->grab_op != META_GRAB_OP_NONE)
     return;
 
@@ -7727,12 +7707,9 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
    * care about. Just let the event through.
    */
 
-  grab_mods = meta_display_get_window_grab_modifiers (display);
-  event_mods = clutter_event_get_state (event);
-  unmodified = (event_mods & grab_mods) == 0;
-  is_window_grab = (event_mods & grab_mods) == grab_mods;
-
-  clutter_event_get_coords (event, &x, &y);
+  ClutterModifierType grab_mods = meta_display_get_window_grab_modifiers (display);
+  unmodified = (event->button.modifier_state & grab_mods) == 0;
+  is_window_grab = (event->button.modifier_state & grab_mods) == grab_mods;
 
   if (unmodified)
     {
@@ -7749,7 +7726,7 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
         {
           meta_topic (META_DEBUG_FOCUS,
                       "Focusing %s due to unmodified button %u press (display.c)\n",
-                      window->desc, button);
+                      window->desc, event->button.button);
           meta_window_focus (window, event->any.time);
         }
       else
@@ -7759,9 +7736,9 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
         display->allow_terminal_deactivation = TRUE;
 
       meta_verbose ("Allowing events time %u\n",
-                    (unsigned int)event->any.time);
+                    (unsigned int)event->button.time);
     }
-  else if (is_window_grab && (int) button == meta_prefs_get_mouse_button_resize ())
+  else if (is_window_grab && (int) event->button.button == meta_prefs_get_mouse_button_resize ())
     {
       if (window->has_resize_func)
         {
@@ -7772,10 +7749,10 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
 
           meta_window_get_frame_rect (window, &frame_rect);
 
-          west = x < (frame_rect.x + 1 * frame_rect.width / 3);
-          east = x > (frame_rect.x + 2 * frame_rect.width / 3);
-          north = y < (frame_rect.y + 1 * frame_rect.height / 3);
-          south = y > (frame_rect.y + 2 * frame_rect.height / 3);
+          west = event->button.x < (frame_rect.x + 1 * frame_rect.width / 3);
+          east = event->button.x > (frame_rect.x + 2 * frame_rect.width / 3);
+          north = event->button.y < (frame_rect.y + 1 * frame_rect.height / 3);
+          south = event->button.y > (frame_rect.y + 2 * frame_rect.height / 3);
 
           if (west)
             op |= META_GRAB_OP_WINDOW_DIR_WEST;
@@ -7793,21 +7770,23 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
                                         op,
                                         TRUE,
                                         FALSE,
-                                        button,
+                                        event->button.button,
                                         0,
                                         event->any.time,
-                                        x, y);
+                                        event->button.x,
+                                        event->button.y);
         }
     }
-  else if (is_window_grab && (int) button == meta_prefs_get_mouse_button_menu ())
+  else if (is_window_grab && (int) event->button.button == meta_prefs_get_mouse_button_menu ())
     {
       if (meta_prefs_get_raise_on_click ())
         meta_window_raise (window);
       meta_window_show_menu (window,
                              META_WINDOW_MENU_WM,
-                             x, y);
+                             event->button.x,
+                             event->button.y);
     }
-  else if (is_window_grab && (int) button == 1)
+  else if (is_window_grab && (int) event->button.button == 1)
     {
       if (window->has_move_func)
         {
@@ -7817,10 +7796,11 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
                                       META_GRAB_OP_MOVING,
                                       TRUE,
                                       FALSE,
-                                      button,
+                                      event->button.button,
                                       0,
                                       event->any.time,
-                                      x, y);
+                                      event->button.x,
+                                      event->button.y);
         }
     }
 }

src/org.freedesktop.login1.xml

@@ -9,8 +9,6 @@
     <method name="TakeControl">
       <arg name="force" type="b"/>
     </method>
-    <method name="ReleaseControl">
-    </method>
     <method name="TakeDevice">
       <annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
       <arg name="major" type="u" direction="in"/>

src/ui/theme.c

@@ -929,7 +929,6 @@ static GtkStyleContext *
 create_style_context (GType            widget_type,
                       GtkStyleContext *parent_style,
                       GtkCssProvider  *provider,
-                      const char      *object_name,
                       const char      *first_class,
                       ...)
 {
@@ -949,9 +948,6 @@ create_style_context (GType            widget_type,
 
   gtk_widget_path_append_type (path, widget_type);
 
-  if (object_name)
-    gtk_widget_path_iter_set_object_name (path, -1, object_name);
-
   va_start (ap, first_class);
   for (name = first_class; name; name = va_arg (ap, const char *))
     gtk_widget_path_iter_add_class (path, -1, name);
@@ -991,7 +987,6 @@ meta_theme_create_style_info (GdkScreen   *screen,
     create_style_context (META_TYPE_FRAMES,
                           NULL,
                           provider,
-                          "decoration",
                           GTK_STYLE_CLASS_BACKGROUND,
                           "window-frame",
                           "ssd",
@@ -1000,30 +995,28 @@ meta_theme_create_style_info (GdkScreen   *screen,
     create_style_context (GTK_TYPE_HEADER_BAR,
                           style_info->styles[META_STYLE_ELEMENT_FRAME],
                           provider,
-                          "headerbar",
                           GTK_STYLE_CLASS_TITLEBAR,
                           GTK_STYLE_CLASS_HORIZONTAL,
                           "default-decoration",
+                          "header-bar",
                           NULL);
   style_info->styles[META_STYLE_ELEMENT_TITLE] =
     create_style_context (GTK_TYPE_LABEL,
                           style_info->styles[META_STYLE_ELEMENT_TITLEBAR],
                           provider,
-                          "label",
                           GTK_STYLE_CLASS_TITLE,
                           NULL);
   style_info->styles[META_STYLE_ELEMENT_BUTTON] =
     create_style_context (GTK_TYPE_BUTTON,
                           style_info->styles[META_STYLE_ELEMENT_TITLEBAR],
                           provider,
-                          "button",
+                          GTK_STYLE_CLASS_BUTTON,
                           "titlebutton",
                           NULL);
   style_info->styles[META_STYLE_ELEMENT_IMAGE] =
     create_style_context (GTK_TYPE_IMAGE,
                           style_info->styles[META_STYLE_ELEMENT_BUTTON],
                           provider,
-                          "image",
                           NULL);
   return style_info;
 }
@@ -1130,10 +1123,9 @@ meta_style_info_create_font_desc (MetaStyleInfo *style_info)
 {
   PangoFontDescription *font_desc;
   const PangoFontDescription *override = meta_prefs_get_titlebar_font ();
-  GtkStyleContext *context = style_info->styles[META_STYLE_ELEMENT_TITLE];
 
-  gtk_style_context_get (context,
-                         gtk_style_context_get_state (context),
+  gtk_style_context_get (style_info->styles[META_STYLE_ELEMENT_TITLE],
+                         GTK_STATE_FLAG_NORMAL,
                          "font", &font_desc, NULL);
 
   if (override)

src/wayland/meta-wayland-keyboard.c

@@ -56,16 +56,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <clutter/evdev/clutter-evdev.h>
 
 #include "backends/meta-backend-private.h"
 
 #include "meta-wayland-private.h"
 
-#ifdef HAVE_NATIVE_BACKEND
-#include "backends/native/meta-backend-native.h"
-#endif
-
 static void meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard);
 static void notify_modifiers (MetaWaylandKeyboard *keyboard);
 
@@ -457,10 +452,6 @@ meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
 {
   gboolean is_press = event->type == CLUTTER_KEY_PRESS;
   gboolean handled;
-  guint32 code;
-#ifdef HAVE_NATIVE_BACKEND
-  MetaBackend *backend = meta_get_backend ();
-#endif
 
   /* Synthetic key events are for autorepeat. Ignore those, as
    * autorepeat in Wayland is done on the client side. */
@@ -471,14 +462,7 @@ meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
 		is_press ? "press" : "release",
 		event->hardware_keycode);
 
-#ifdef HAVE_NATIVE_BACKEND
-  if (META_IS_BACKEND_NATIVE (backend))
-    code = clutter_evdev_event_get_event_code ((const ClutterEvent *) event);
-  else
-#endif
-    code = evdev_code (event);
-
-  handled = notify_key (keyboard, event->time, code, is_press);
+  handled = notify_key (keyboard, event->time, evdev_code (event), is_press);
 
   if (handled)
     meta_verbose ("Sent event to wayland client\n");

src/wayland/meta-wayland-outputs.c

@@ -99,7 +99,7 @@ bind_output (struct wl_client *client,
                        mode_flags,
                        (int)monitor_info->rect.width,
                        (int)monitor_info->rect.height,
-                       (int)(monitor_info->refresh_rate * 1000));
+                       (int)monitor_info->refresh_rate);
 
   if (version >= WL_OUTPUT_SCALE_SINCE_VERSION)
     wl_output_send_scale (resource, output->scale);
@@ -160,7 +160,7 @@ wayland_output_update_for_output (MetaWaylandOutput *wayland_output,
                            mode_flags,
                            (int)monitor_info->rect.width,
                            (int)monitor_info->rect.height,
-                           (int)(monitor_info->refresh_rate * 1000));
+                           (int)monitor_info->refresh_rate);
     }
 
   /* It's very important that we change the output pointer here, as

src/wayland/meta-wayland-pointer-gesture-pinch.c

@@ -30,7 +30,7 @@
 #include "meta-wayland-pointer-gesture-pinch.h"
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-surface.h"
-#include "pointer-gestures-unstable-v1-server-protocol.h"
+#include "pointer-gestures-server-protocol.h"
 
 static void
 handle_pinch_begin (MetaWaylandPointer *pointer,
@@ -45,10 +45,10 @@ handle_pinch_begin (MetaWaylandPointer *pointer,
 
   wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
     {
-      zwp_pointer_gesture_pinch_v1_send_begin (resource, serial,
-                                               clutter_event_get_time (event),
-                                               pointer->focus_surface->resource,
-                                               2);
+      _wl_pointer_gesture_pinch_send_begin (resource, serial,
+                                            clutter_event_get_time (event),
+                                            pointer->focus_surface->resource,
+                                            2);
     }
 }
 
@@ -67,12 +67,12 @@ handle_pinch_update (MetaWaylandPointer *pointer,
 
   wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
     {
-      zwp_pointer_gesture_pinch_v1_send_update (resource,
-                                                clutter_event_get_time (event),
-                                                wl_fixed_from_double (dx),
-                                                wl_fixed_from_double (dy),
-                                                wl_fixed_from_double (scale),
-                                                wl_fixed_from_double (rotation));
+      _wl_pointer_gesture_pinch_send_update (resource,
+                                             clutter_event_get_time (event),
+                                             wl_fixed_from_double (dx),
+                                             wl_fixed_from_double (dy),
+                                             wl_fixed_from_double (scale),
+                                             wl_fixed_from_double (rotation));
     }
 }
 
@@ -93,9 +93,9 @@ handle_pinch_end (MetaWaylandPointer *pointer,
 
   wl_resource_for_each (resource, &pointer_client->pinch_gesture_resources)
     {
-      zwp_pointer_gesture_pinch_v1_send_end (resource, serial,
-                                             clutter_event_get_time (event),
-                                             cancelled);
+      _wl_pointer_gesture_pinch_send_end (resource, serial,
+                                          clutter_event_get_time (event),
+                                          cancelled);
     }
 }
 
@@ -135,7 +135,7 @@ pointer_gesture_pinch_destroy (struct wl_client   *client,
   wl_resource_destroy (resource);
 }
 
-static const struct zwp_pointer_gesture_pinch_v1_interface pointer_gesture_pinch_interface = {
+static const struct _wl_pointer_gesture_pinch_interface pointer_gesture_pinch_interface = {
   pointer_gesture_pinch_destroy
 };
 
@@ -151,7 +151,7 @@ meta_wayland_pointer_gesture_pinch_create_new_resource (MetaWaylandPointer *poin
   pointer_client = meta_wayland_pointer_get_pointer_client (pointer, client);
   g_return_if_fail (pointer_client != NULL);
 
-  res = wl_resource_create (client, &zwp_pointer_gesture_pinch_v1_interface,
+  res = wl_resource_create (client, &_wl_pointer_gesture_pinch_interface,
                             wl_resource_get_version (gestures_resource), id);
   wl_resource_set_implementation (res, &pointer_gesture_pinch_interface, pointer,
                                   meta_wayland_pointer_unbind_pointer_client_resource);

src/wayland/meta-wayland-pointer-gesture-swipe.c

@@ -30,7 +30,7 @@
 #include "meta-wayland-pointer-gesture-swipe.h"
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-surface.h"
-#include "pointer-gestures-unstable-v1-server-protocol.h"
+#include "pointer-gestures-server-protocol.h"
 
 static void
 handle_swipe_begin (MetaWaylandPointer *pointer,
@@ -46,10 +46,10 @@ handle_swipe_begin (MetaWaylandPointer *pointer,
 
   wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources)
     {
-      zwp_pointer_gesture_swipe_v1_send_begin (resource, serial,
-                                               clutter_event_get_time (event),
-                                               pointer->focus_surface->resource,
-                                               fingers);
+      _wl_pointer_gesture_swipe_send_begin (resource, serial,
+                                            clutter_event_get_time (event),
+                                            pointer->focus_surface->resource,
+                                            fingers);
     }
 }
 
@@ -66,10 +66,10 @@ handle_swipe_update (MetaWaylandPointer *pointer,
 
   wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources)
     {
-      zwp_pointer_gesture_swipe_v1_send_update (resource,
-                                                clutter_event_get_time (event),
-                                                wl_fixed_from_double (dx),
-                                                wl_fixed_from_double (dy));
+      _wl_pointer_gesture_swipe_send_update (resource,
+                                             clutter_event_get_time (event),
+                                             wl_fixed_from_double (dx),
+                                             wl_fixed_from_double (dy));
     }
 }
 
@@ -90,9 +90,9 @@ handle_swipe_end (MetaWaylandPointer *pointer,
 
   wl_resource_for_each (resource, &pointer_client->swipe_gesture_resources)
     {
-      zwp_pointer_gesture_swipe_v1_send_end (resource, serial,
-                                             clutter_event_get_time (event),
-                                             cancelled);
+      _wl_pointer_gesture_swipe_send_end (resource, serial,
+                                          clutter_event_get_time (event),
+                                          cancelled);
     }
 }
 
@@ -131,7 +131,7 @@ pointer_gesture_swipe_release (struct wl_client   *client,
   wl_resource_destroy (resource);
 }
 
-static const struct zwp_pointer_gesture_swipe_v1_interface pointer_gesture_swipe_interface = {
+static const struct _wl_pointer_gesture_swipe_interface pointer_gesture_swipe_interface = {
   pointer_gesture_swipe_release
 };
 
@@ -147,7 +147,7 @@ meta_wayland_pointer_gesture_swipe_create_new_resource (MetaWaylandPointer *poin
   pointer_client = meta_wayland_pointer_get_pointer_client (pointer, client);
   g_return_if_fail (pointer_client != NULL);
 
-  res = wl_resource_create (client, &zwp_pointer_gesture_swipe_v1_interface,
+  res = wl_resource_create (client, &_wl_pointer_gesture_swipe_interface,
                             wl_resource_get_version (pointer_resource), id);
   wl_resource_set_implementation (res, &pointer_gesture_swipe_interface, pointer,
                                   meta_wayland_pointer_unbind_pointer_client_resource);

src/wayland/meta-wayland-pointer-gestures.c

@@ -27,7 +27,7 @@
 
 #include <glib.h>
 #include "meta-wayland-pointer-gestures.h"
-#include "pointer-gestures-unstable-v1-server-protocol.h"
+#include "pointer-gestures-server-protocol.h"
 #include "meta-wayland-versions.h"
 #include "meta-wayland-private.h"
 
@@ -53,7 +53,7 @@ gestures_get_pinch (struct wl_client   *client,
   meta_wayland_pointer_gesture_pinch_create_new_resource (pointer, client, resource, id);
 }
 
-static const struct zwp_pointer_gestures_v1_interface pointer_gestures_interface = {
+static const struct _wl_pointer_gestures_interface pointer_gestures_interface = {
   gestures_get_swipe,
   gestures_get_pinch
 };
@@ -66,8 +66,16 @@ bind_pointer_gestures (struct wl_client *client,
 {
   struct wl_resource *resource;
 
-  resource = wl_resource_create (client, &zwp_pointer_gestures_v1_interface,
-                                 version, id);
+  resource = wl_resource_create (client, &_wl_pointer_gestures_interface, version, id);
+
+  if (version != META__WL_POINTER_GESTURES_VERSION)
+    {
+      wl_resource_post_error (resource,
+                              _WL_POINTER_GESTURES_ERROR_VERSION_MISMATCH,
+                              "The client bound a non-supported version");
+      return;
+    }
+
   wl_resource_set_implementation (resource, &pointer_gestures_interface,
                                   NULL, NULL);
 }
@@ -76,7 +84,7 @@ void
 meta_wayland_pointer_gestures_init (MetaWaylandCompositor *compositor)
 {
   wl_global_create (compositor->wayland_display,
-                    &zwp_pointer_gestures_v1_interface,
-                    META_ZWP_POINTER_GESTURES_V1_VERSION,
+                    &_wl_pointer_gestures_interface,
+                    META__WL_POINTER_GESTURES_VERSION,
                     NULL, bind_pointer_gestures);
 }

src/wayland/meta-wayland-pointer.c

@@ -44,7 +44,6 @@
 #include "config.h"
 
 #include <clutter/clutter.h>
-#include <clutter/evdev/clutter-evdev.h>
 #include <cogl/cogl.h>
 #include <cogl/cogl-wayland-server.h>
 #include <linux/input.h>
@@ -63,10 +62,6 @@
 #include "backends/meta-cursor-tracker-private.h"
 #include "backends/meta-cursor-renderer.h"
 
-#ifdef HAVE_NATIVE_BACKEND
-#include "backends/native/meta-backend-native.h"
-#endif
-
 #include <string.h>
 
 #define DEFAULT_AXIS_STEP_DISTANCE wl_fixed_from_int (10)
@@ -282,37 +277,26 @@ meta_wayland_pointer_send_button (MetaWaylandPointer *pointer,
       uint32_t button;
       uint32_t serial;
 
-#ifdef HAVE_NATIVE_BACKEND
-      MetaBackend *backend = meta_get_backend ();
-      if (META_IS_BACKEND_NATIVE (backend))
-        button = clutter_evdev_event_get_event_code (event);
-      else
-#endif
-        {
-          button = clutter_event_get_button (event);
-          switch (button)
-            {
-            case 1:
-              button = BTN_LEFT;
-              break;
-
-              /* The evdev input right and middle button numbers are swapped
-                 relative to how Clutter numbers them */
-            case 2:
-              button = BTN_MIDDLE;
-              break;
-
-            case 3:
-              button = BTN_RIGHT;
-              break;
-
-            default:
-              button = button + (BTN_LEFT - 1) + 4;
-              break;
-            }
-        }
-
       time = clutter_event_get_time (event);
+
+      button = clutter_event_get_button (event);
+      switch (button)
+	{
+	  /* The evdev input right and middle button numbers are swapped
+	     relative to how Clutter numbers them */
+	case 2:
+	  button = BTN_MIDDLE;
+	  break;
+
+	case 3:
+	  button = BTN_RIGHT;
+	  break;
+
+	default:
+	  button = button + BTN_LEFT - 1;
+	  break;
+	}
+
       serial = wl_display_next_serial (display);
 
       wl_resource_for_each (resource, &pointer->focus_client->pointer_resources)
@@ -510,10 +494,27 @@ handle_scroll_event (MetaWaylandPointer *pointer,
 {
   struct wl_resource *resource;
   wl_fixed_t x_value = 0, y_value = 0;
+  enum wl_pointer_axis_source source = -1;
 
   if (clutter_event_is_pointer_emulated (event))
     return;
 
+  switch (event->scroll.scroll_source)
+    {
+    case CLUTTER_SCROLL_SOURCE_WHEEL:
+      source = WL_POINTER_AXIS_SOURCE_WHEEL;
+      break;
+    case CLUTTER_SCROLL_SOURCE_FINGER:
+      source = WL_POINTER_AXIS_SOURCE_FINGER;
+      break;
+    case CLUTTER_SCROLL_SOURCE_CONTINUOUS:
+      source = WL_POINTER_AXIS_SOURCE_CONTINUOUS;
+      break;
+    default:
+      source = WL_POINTER_AXIS_SOURCE_WHEEL;
+      break;
+    }
+
   switch (clutter_event_get_scroll_direction (event))
     {
     case CLUTTER_SCROLL_UP:
@@ -553,12 +554,31 @@ handle_scroll_event (MetaWaylandPointer *pointer,
     {
       wl_resource_for_each (resource, &pointer->focus_client->pointer_resources)
         {
+          if (wl_resource_get_version (resource) >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION)
+            wl_pointer_send_axis_source (resource, source);
+
           if (x_value)
             wl_pointer_send_axis (resource, clutter_event_get_time (event),
                                   WL_POINTER_AXIS_HORIZONTAL_SCROLL, x_value);
+
+          if ((event->scroll.finish_flags & CLUTTER_SCROLL_FINISHED_HORIZONTAL) &&
+              wl_resource_get_version (resource) >= WL_POINTER_AXIS_STOP_SINCE_VERSION)
+            wl_pointer_send_axis_stop (resource,
+                                       clutter_event_get_time (event),
+                                       WL_POINTER_AXIS_HORIZONTAL_SCROLL);
+
           if (y_value)
             wl_pointer_send_axis (resource, clutter_event_get_time (event),
                                   WL_POINTER_AXIS_VERTICAL_SCROLL, y_value);
+
+          if ((event->scroll.finish_flags & CLUTTER_SCROLL_FINISHED_VERTICAL) &&
+              wl_resource_get_version (resource) >= WL_POINTER_AXIS_STOP_SINCE_VERSION)
+            wl_pointer_send_axis_stop (resource,
+                                       clutter_event_get_time (event),
+                                       WL_POINTER_AXIS_VERTICAL_SCROLL);
+
+          if (wl_resource_get_version (resource) >= WL_POINTER_AXIS_SOURCE_SINCE_VERSION)
+            wl_pointer_send_axis_frame (resource);
         }
     }
 }
@@ -598,53 +618,13 @@ meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
 }
 
 static void
-meta_wayland_pointer_send_enter (MetaWaylandPointer *pointer,
-                                 struct wl_resource *pointer_resource,
-                                 uint32_t            serial,
-                                 MetaWaylandSurface *surface)
+broadcast_focus (MetaWaylandPointer *pointer,
+                 struct wl_resource *resource)
 {
   wl_fixed_t sx, sy;
 
-  meta_wayland_pointer_get_relative_coordinates (pointer, surface, &sx, &sy);
-  wl_pointer_send_enter (pointer_resource,
-                         serial,
-                         surface->resource,
-                         sx, sy);
-}
-
-static void
-meta_wayland_pointer_send_leave (MetaWaylandPointer *pointer,
-                                 struct wl_resource *pointer_resource,
-                                 uint32_t            serial,
-                                 MetaWaylandSurface *surface)
-{
-  wl_pointer_send_leave (pointer_resource, serial, surface->resource);
-}
-
-static void
-meta_wayland_pointer_broadcast_enter (MetaWaylandPointer *pointer,
-                                      uint32_t            serial,
-                                      MetaWaylandSurface *surface)
-{
-  struct wl_resource *pointer_resource;
-
-  wl_resource_for_each (pointer_resource,
-                        &pointer->focus_client->pointer_resources)
-    meta_wayland_pointer_send_enter (pointer, pointer_resource,
-                                     serial, surface);
-}
-
-static void
-meta_wayland_pointer_broadcast_leave (MetaWaylandPointer *pointer,
-                                      uint32_t            serial,
-                                      MetaWaylandSurface *surface)
-{
-  struct wl_resource *pointer_resource;
-
-  wl_resource_for_each (pointer_resource,
-                        &pointer->focus_client->pointer_resources)
-    meta_wayland_pointer_send_leave (pointer, pointer_resource,
-                                     serial, surface);
+  meta_wayland_pointer_get_relative_coordinates (pointer, pointer->focus_surface, &sx, &sy);
+  wl_pointer_send_enter (resource, pointer->focus_serial, pointer->focus_surface->resource, sx, sy);
 }
 
 void
@@ -663,14 +643,18 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
         wl_resource_get_client (pointer->focus_surface->resource);
       struct wl_display *display = wl_client_get_display (client);
       uint32_t serial;
+      struct wl_resource *resource;
 
       serial = wl_display_next_serial (display);
 
       if (pointer->focus_client)
         {
-          meta_wayland_pointer_broadcast_leave (pointer,
-                                                serial,
-                                                pointer->focus_surface);
+          wl_resource_for_each (resource,
+                                &pointer->focus_client->pointer_resources)
+            {
+              wl_pointer_send_leave (resource, serial, pointer->focus_surface->resource);
+            }
+
           pointer->focus_client = NULL;
         }
 
@@ -682,6 +666,7 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
     {
       struct wl_client *client = wl_resource_get_client (surface->resource);
       struct wl_display *display = wl_client_get_display (client);
+      struct wl_resource *resource;
       ClutterPoint pos;
 
       pointer->focus_surface = surface;
@@ -700,9 +685,12 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
       if (pointer->focus_client)
         {
           pointer->focus_serial = wl_display_next_serial (display);
-          meta_wayland_pointer_broadcast_enter (pointer,
-                                                pointer->focus_serial,
-                                                pointer->focus_surface);
+
+          wl_resource_for_each (resource,
+                                &pointer->focus_client->pointer_resources)
+            {
+              broadcast_focus (pointer, resource);
+            }
         }
     }
 
@@ -978,9 +966,7 @@ meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
                   wl_resource_get_link (cr));
 
   if (pointer->focus_client == pointer_client)
-    meta_wayland_pointer_send_enter (pointer, cr,
-                                     pointer->focus_serial,
-                                     pointer->focus_surface);
+    broadcast_focus (pointer, cr);
 }
 
 gboolean

src/wayland/meta-wayland-surface.c

@@ -31,7 +31,7 @@
 
 #include <wayland-server.h>
 #include "gtk-shell-server-protocol.h"
-#include "xdg-shell-unstable-v5-server-protocol.h"
+#include "xdg-shell-server-protocol.h"
 
 #include "meta-wayland-private.h"
 #include "meta-xwayland-private.h"
@@ -933,26 +933,22 @@ set_surface_is_on_output (MetaWaylandSurface *surface,
                           MetaWaylandOutput *wayland_output,
                           gboolean is_on_output)
 {
-  gpointer orig_id;
-  gboolean was_on_output = g_hash_table_lookup_extended (surface->outputs_to_destroy_notify_id,
-                                                         wayland_output,
-                                                         NULL, &orig_id);
+  gboolean was_on_output = g_hash_table_contains (surface->outputs,
+                                                  wayland_output);
 
   if (!was_on_output && is_on_output)
     {
-      gulong id;
-
-      id = g_signal_connect (wayland_output, "output-destroyed",
-                             G_CALLBACK (surface_handle_output_destroy),
-                             surface);
-      g_hash_table_insert (surface->outputs_to_destroy_notify_id, wayland_output,
-                           GSIZE_TO_POINTER ((gsize)id));
+      g_signal_connect (wayland_output, "output-destroyed",
+                        G_CALLBACK (surface_handle_output_destroy),
+                        surface);
+      g_hash_table_add (surface->outputs, wayland_output);
       surface_entered_output (surface, wayland_output);
     }
   else if (was_on_output && !is_on_output)
     {
-      g_hash_table_remove (surface->outputs_to_destroy_notify_id, wayland_output);
-      g_signal_handler_disconnect (wayland_output, (gulong) GPOINTER_TO_SIZE (orig_id));
+      g_hash_table_remove (surface->outputs, wayland_output);
+      g_signal_handlers_disconnect_by_func  (
+        wayland_output, (gpointer)surface_handle_output_destroy, surface);
       surface_left_output (surface, wayland_output);
     }
 }
@@ -990,12 +986,6 @@ update_surface_output_state (gpointer key, gpointer value, gpointer user_data)
   set_surface_is_on_output (surface, wayland_output, is_on_output);
 }
 
-static void
-surface_output_disconnect_signal (gpointer key, gpointer value, gpointer user_data)
-{
-  g_signal_handler_disconnect (key, (gulong) GPOINTER_TO_SIZE (value));
-}
-
 void
 meta_wayland_surface_update_outputs (MetaWaylandSurface *surface)
 {
@@ -1046,8 +1036,7 @@ wl_surface_destructor (struct wl_resource *resource)
 
   meta_wayland_compositor_destroy_frame_callbacks (compositor, surface);
 
-  g_hash_table_foreach (surface->outputs_to_destroy_notify_id, surface_output_disconnect_signal, surface);
-  g_hash_table_unref (surface->outputs_to_destroy_notify_id);
+  g_hash_table_unref (surface->outputs);
 
   wl_list_for_each_safe (cb, next, &surface->pending_frame_callback_list, link)
     wl_resource_destroy (cb->resource);
@@ -1092,7 +1081,7 @@ meta_wayland_surface_create (MetaWaylandCompositor *compositor,
 
   sync_drag_dest_funcs (surface);
 
-  surface->outputs_to_destroy_notify_id = g_hash_table_new (NULL, NULL);
+  surface->outputs = g_hash_table_new (NULL, NULL);
 
   pending_state_init (&surface->pending);
   return surface;
@@ -1433,8 +1422,8 @@ handle_popup_parent_destroyed (struct wl_listener *listener, void *data)
   MetaWaylandSurface *surface =
     wl_container_of (listener, surface, popup.parent_destroy_listener);
 
-  wl_resource_post_error (surface->xdg_shell_resource,
-                          XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP,
+  wl_resource_post_error (surface->xdg_popup,
+                          XDG_POPUP_ERROR_NOT_THE_TOPMOST_POPUP,
                           "destroyed popup not top most popup");
   surface->popup.parent = NULL;
 
@@ -1452,8 +1441,8 @@ handle_popup_destroyed (struct wl_listener *listener, void *data)
   top_popup = meta_wayland_popup_get_top_popup (popup);
   if (surface != top_popup)
     {
-      wl_resource_post_error (surface->xdg_shell_resource,
-                              XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP,
+      wl_resource_post_error (surface->xdg_popup,
+                              XDG_POPUP_ERROR_NOT_THE_TOPMOST_POPUP,
                               "destroyed popup not top most popup");
     }
 
@@ -1504,7 +1493,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
       (parent_surf->xdg_popup == NULL && parent_surf->xdg_surface == NULL))
     {
       wl_resource_post_error (resource,
-                              XDG_SHELL_ERROR_INVALID_POPUP_PARENT,
+                              XDG_POPUP_ERROR_INVALID_PARENT,
                               "invalid parent surface");
       return;
     }
@@ -1514,7 +1503,7 @@ xdg_shell_get_xdg_popup (struct wl_client *client,
       (top_popup != NULL && parent_surf != top_popup))
     {
       wl_resource_post_error (resource,
-                              XDG_SHELL_ERROR_NOT_THE_TOPMOST_POPUP,
+                              XDG_POPUP_ERROR_NOT_THE_TOPMOST_POPUP,
                               "parent not top most surface");
       return;
     }

src/wayland/meta-wayland-surface.h

@@ -147,7 +147,7 @@ struct _MetaWaylandSurface
   int scale;
   int32_t offset_x, offset_y;
   GList *subsurfaces;
-  GHashTable *outputs_to_destroy_notify_id;
+  GHashTable *outputs;
 
   /* List of pending frame callbacks that needs to stay queued longer than one
    * commit sequence, such as when it has not yet been assigned a role.

src/wayland/meta-wayland-touch.c

@@ -208,8 +208,8 @@ touch_get_relative_coordinates (MetaWaylandTouch   *touch,
                                            &event_x, &event_y);
     }
 
-  *x = event_x / surface->scale;
-  *y = event_y / surface->scale;
+  *x = event_x;
+  *y = event_y;
 }
 
 

src/wayland/meta-wayland-versions.h

@@ -39,11 +39,11 @@
 #define META_WL_DATA_DEVICE_MANAGER_VERSION 2
 #define META_XDG_SHELL_VERSION              1
 #define META_WL_SHELL_VERSION               1
-#define META_WL_SEAT_VERSION                4
+#define META_WL_SEAT_VERSION                5
 #define META_WL_OUTPUT_VERSION              2
 #define META_XSERVER_VERSION                1
 #define META_GTK_SHELL_VERSION              2
 #define META_WL_SUBCOMPOSITOR_VERSION       1
-#define META_ZWP_POINTER_GESTURES_V1_VERSION    1
+#define META__WL_POINTER_GESTURES_VERSION   1
 
 #endif

src/wayland/meta-wayland.c

@@ -337,13 +337,13 @@ meta_wayland_init (void)
   meta_wayland_pointer_gestures_init (compositor);
   meta_wayland_seat_init (compositor);
 
-  if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display))
-    g_error ("Failed to start X Wayland");
-
   compositor->display_name = wl_display_add_socket_auto (compositor->wayland_display);
   if (compositor->display_name == NULL)
     g_error ("Failed to create socket");
 
+  if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display))
+    g_error ("Failed to start X Wayland");
+
   set_gnome_env ("DISPLAY", meta_wayland_get_xwayland_display_name (compositor));
   set_gnome_env ("WAYLAND_DISPLAY", meta_wayland_get_wayland_display_name (compositor));
 }

src/wayland/protocol/pointer-gestures.xml

@@ -0,0 +1,176 @@
+<protocol name="pointer_gestures">
+  <interface name="_wl_pointer_gestures" version="1">
+    <description summary="touchpad gestures">
+      A global interface to provide semantic touchpad gestures for a given
+      pointer.
+
+      Two gestures are currently supported: swipe and zoom/rotate.
+      All gestures follow a three-stage cycle: begin, update, end and
+      are identified by a unique id.
+
+      Warning! The protocol described in this file is experimental. Each
+      version of this protocol should be considered incompatible with any
+      other version, and a client binding to a version different to the one
+      advertised will be terminated. Once the protocol is declared stable,
+      compatibility is guaranteed, the '_' prefix will be removed from the
+      name and the version will be reset to 1.
+    </description>
+
+    <enum name="error">
+      <entry name="version_mismatch" value="0"/>
+    </enum>
+
+    <request name="get_swipe_gesture">
+      <description summary="get swipe gesture">
+	Create a swipe gesture object. See the
+	wl_pointer_gesture_swipe interface for details.
+      </description>
+      <arg name="id" type="new_id" interface="_wl_pointer_gesture_swipe"/>
+      <arg name="pointer" type="object" interface="wl_pointer"/>
+    </request>
+
+    <request name="get_pinch_gesture">
+      <description summary="get pinch gesture">
+	Create a pinch gesture object. See the
+	wl_pointer_gesture_pinch interface for details.
+      </description>
+      <arg name="id" type="new_id" interface="_wl_pointer_gesture_pinch"/>
+      <arg name="pointer" type="object" interface="wl_pointer"/>
+    </request>
+  </interface>
+
+  <interface name="_wl_pointer_gesture_swipe" version="1">
+    <description summary="a swipe gesture object">
+      A swipe gesture object notifies a client about a multi-finger swipe
+      gesture detected on an indirect input device such as a touchpad.
+      The gesture is usually initiated by multiple fingers moving in the
+      same direction but once initiated the direction may change.
+      The precise conditions of when such a gesture is detected are
+      implementation-dependent.
+
+      A gesture consists of three stages: begin, update (optional) and end.
+      There cannot be multiple simultaneous pinch or swipe gestures on a
+      same pointer/seat, how compositors prevent these situations is
+      implementation-dependent.
+
+      A gesture may be cancelled by the compositor or the hardware.
+      Clients should not consider performing permanent or irreversible
+      actions until the end of a gesture has been received.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the pointer swipe gesture object"/>
+    </request>
+
+    <event name="begin">
+      <description summary="multi-finger swipe begin">
+	This event is sent when a multi-finger swipe gesture is detected
+	on the device.
+      </description>
+      <arg name="serial" type="uint"/>
+      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+      <arg name="fingers" type="uint" summary="number of fingers"/>
+    </event>
+
+    <event name="update">
+      <description summary="multi-finger swipe motion">
+	This event is sent when a multi-finger swipe gesture changes the
+	position of the logical center.
+
+	The dx and dy coordinates are relative coordinates of the logical
+	center of the gesture compared to the previous event.
+      </description>
+      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
+      <arg name="dx" type="fixed" summary="delta x coordinate in surface coordinate space"/>
+      <arg name="dy" type="fixed" summary="delta y coordinate in surface coordinate space"/>
+    </event>
+
+    <event name="end">
+      <description summary="multi-finger swipe end">
+	This event is sent when a multi-finger swipe gesture ceases to
+	be valid. This may happen when one or more finger is lifted or
+	the gesture is cancelled.
+
+	When a gesture is cancelled, the client should undo state changes
+	caused by this gesture. What causes a gesture to be cancelled is
+	implementation-dependent.
+      </description>
+      <arg name="serial" type="uint"/>
+      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
+      <arg name="cancelled" type="int" summary="1 if the gesture was cancelled, 0 otherwise"/>
+    </event>
+  </interface>
+
+  <interface name="_wl_pointer_gesture_pinch" version="1">
+    <description summary="a pinch gesture object">
+      A pinch gesture object notifies a client about a multi-finger pinch
+      gesture detected on an indirect input device such as a touchpad.
+      The gesture is usually initiated by multiple fingers moving towards
+      each other or away from each other, or by two or more fingers rotating
+      around a logical center of gravity.  The precise conditions of when
+      such a gesture is detected are implementation-dependent.
+
+      A gesture consists of three stages: begin, update (optional) and end.
+      There cannot be multiple simultaneous pinch or swipe gestures on a
+      same pointer/seat, how compositors prevent these situations is
+      implementation-dependent.
+
+      A gesture may be cancelled by the compositor or the hardware.
+      Clients should not consider performing permanent or irreversible
+      actions until the end of a gesture has been received.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the pinch gesture object"/>
+    </request>
+
+    <event name="begin">
+      <description summary="multi-finger pinch begin">
+	This event is sent when a multi-finger pinch gesture is detected
+	on the device.
+      </description>
+      <arg name="serial" type="uint"/>
+      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+      <arg name="fingers" type="uint" summary="number of fingers"/>
+    </event>
+
+    <event name="update">
+      <description summary="multi-finger pinch motion">
+	This event is sent when a multi-finger pinch gesture changes the
+	position of the logical center, the rotation or the relative scale.
+
+	The dx and dy coordinates are relative coordinates in the
+	surface coordinate space of the logical center of the gesture.
+
+	The scale factor is an absolute scale compared to the
+	pointer_gesture_pinch.begin event, e.g. a scale of 2 means the fingers
+	are now twice as far apart as on pointer_gesture_pinch.begin.
+
+	The rotation is the relative angle in degrees clockwise compared to the previous
+	pointer_gesture_pinch.begin or pointer_gesture_pinch.update event.
+      </description>
+      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
+      <arg name="dx" type="fixed" summary="delta x coordinate in surface coordinate space"/>
+      <arg name="dy" type="fixed" summary="delta y coordinate in surface coordinate space"/>
+      <arg name="scale" type="fixed" summary="scale relative to the initial finger position"/>
+      <arg name="rotation" type="fixed" summary="angle in degrees cw relative to the previous event"/>
+    </event>
+
+    <event name="end">
+      <description summary="multi-finger pinch end">
+	This event is sent when a multi-finger pinch gesture ceases to
+	be valid. This may happen when one or more finger is lifted or
+	the gesture is cancelled.
+
+	When a gesture is cancelled, the client should undo state changes
+	caused by this gesture. What causes a gesture to be cancelled is
+	implementation-dependent.
+      </description>
+      <arg name="serial" type="uint"/>
+      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
+      <arg name="cancelled" type="int" summary="1 if the gesture was cancelled, 0 otherwise"/>
+    </event>
+  </interface>
+</protocol>

src/wayland/protocol/xdg-shell.xml

@@ -0,0 +1,485 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="xdg_shell">
+
+  <copyright>
+    Copyright © 2008-2013 Kristian Høgsberg
+    Copyright © 2013      Rafael Antognolli
+    Copyright © 2013      Jasper St. Pierre
+    Copyright © 2010-2013 Intel Corporation
+
+    Permission to use, copy, modify, distribute, and sell this
+    software and its documentation for any purpose is hereby granted
+    without fee, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation, and that the name of
+    the copyright holders not be used in advertising or publicity
+    pertaining to distribution of the software without specific,
+    written prior permission.  The copyright holders make no
+    representations about the suitability of this software for any
+    purpose.  It is provided "as is" without express or implied
+    warranty.
+
+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+    THIS SOFTWARE.
+  </copyright>
+
+  <interface name="xdg_shell" version="1">
+    <description summary="create desktop-style surfaces">
+      xdg_shell allows clients to turn a wl_surface into a "real window"
+      which can be dragged, resized, stacked, and moved around by the
+      user. Everything about this interface is suited towards traditional
+      desktop environments.
+    </description>
+
+    <enum name="version">
+      <description summary="latest protocol version">
+	The 'current' member of this enum gives the version of the
+	protocol.  Implementations can compare this to the version
+	they implement using static_assert to ensure the protocol and
+	implementation versions match.
+      </description>
+      <entry name="current" value="5" summary="Always the latest version"/>
+    </enum>
+
+    <enum name="error">
+      <entry name="role" value="0" summary="given wl_surface has another role"/>
+    </enum>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy xdg_shell">
+        Destroy this xdg_shell object.
+
+        Destroying a bound xdg_shell object while there are surfaces
+        still alive with roles from this interface is illegal and will
+        result in a protocol error. Make sure to destroy all surfaces
+        before destroying this object.
+      </description>
+    </request>
+
+    <request name="use_unstable_version">
+      <description summary="enable use of this unstable version">
+	Negotiate the unstable version of the interface.  This
+	mechanism is in place to ensure client and server agree on the
+	unstable versions of the protocol that they speak or exit
+	cleanly if they don't agree.  This request will go away once
+	the xdg-shell protocol is stable.
+      </description>
+      <arg name="version" type="int"/>
+    </request>
+
+    <request name="get_xdg_surface">
+      <description summary="create a shell surface from a surface">
+	This creates an xdg_surface for the given surface and gives it the
+	xdg_surface role. See the documentation of xdg_surface for more details.
+      </description>
+      <arg name="id" type="new_id" interface="xdg_surface"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+    </request>
+
+    <request name="get_xdg_popup">
+      <description summary="create a popup for a surface">
+	This creates an xdg_popup for the given surface and gives it the
+	xdg_popup role. See the documentation of xdg_popup for more details.
+
+	This request must be used in response to some sort of user action
+	like a button press, key press, or touch down event.
+      </description>
+      <arg name="id" type="new_id" interface="xdg_popup"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+      <arg name="parent" type="object" interface="wl_surface"/>
+      <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat of the user event"/>
+      <arg name="serial" type="uint" summary="the serial of the user event"/>
+      <arg name="x" type="int"/>
+      <arg name="y" type="int"/>
+    </request>
+
+    <event name="ping">
+      <description summary="check if the client is alive">
+        The ping event asks the client if it's still alive. Pass the
+        serial specified in the event back to the compositor by sending
+        a "pong" request back with the specified serial.
+
+        Compositors can use this to determine if the client is still
+        alive. It's unspecified what will happen if the client doesn't
+        respond to the ping request, or in what timeframe. Clients should
+        try to respond in a reasonable amount of time.
+      </description>
+      <arg name="serial" type="uint" summary="pass this to the pong request"/>
+    </event>
+
+    <request name="pong">
+      <description summary="respond to a ping event">
+	A client must respond to a ping event with a pong request or
+	the client may be deemed unresponsive.
+      </description>
+      <arg name="serial" type="uint" summary="serial of the ping event"/>
+    </request>
+  </interface>
+
+  <interface name="xdg_surface" version="1">
+    <description summary="A desktop window">
+      An interface that may be implemented by a wl_surface, for
+      implementations that provide a desktop-style user interface.
+
+      It provides requests to treat surfaces like windows, allowing to set
+      properties like maximized, fullscreen, minimized, and to move and resize
+      them, and associate metadata like title and app id.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="Destroy the xdg_surface">
+	Unmap and destroy the window. The window will be effectively
+	hidden from the user's point of view, and all state like
+	maximization, fullscreen, and so on, will be lost.
+      </description>
+    </request>
+
+    <request name="set_parent">
+      <description summary="set the parent of this surface">
+	Set the "parent" of this surface. This window should be stacked
+	above a parent. The parent surface must be mapped as long as this
+	surface is mapped.
+
+	Parent windows should be set on dialogs, toolboxes, or other
+	"auxilliary" surfaces, so that the parent is raised when the dialog
+	is raised.
+      </description>
+      <arg name="parent" type="object" interface="xdg_surface" allow-null="true"/>
+    </request>
+
+    <request name="set_title">
+      <description summary="set surface title">
+	Set a short title for the surface.
+
+	This string may be used to identify the surface in a task bar,
+	window list, or other user interface elements provided by the
+	compositor.
+
+	The string must be encoded in UTF-8.
+      </description>
+      <arg name="title" type="string"/>
+    </request>
+
+    <request name="set_app_id">
+      <description summary="set application ID">
+	Set an application identifier for the surface.
+
+	The app ID identifies the general class of applications to which
+	the surface belongs. The compositor can use this to group multiple
+	applications together, or to determine how to launch a new
+	application.
+
+	See the desktop-entry specification [0] for more details on
+	application identifiers and how they relate to well-known DBus
+	names and .desktop files.
+
+	[0] http://standards.freedesktop.org/desktop-entry-spec/
+      </description>
+      <arg name="app_id" type="string"/>
+    </request>
+
+    <request name="show_window_menu">
+      <description summary="show the window menu">
+        Clients implementing client-side decorations might want to show
+        a context menu when right-clicking on the decorations, giving the
+        user a menu that they can use to maximize or minimize the window.
+
+        This request asks the compositor to pop up such a window menu at
+        the given position, relative to the local surface coordinates of
+        the parent surface. There are no guarantees as to what menu items
+        the window menu contains.
+
+        This request must be used in response to some sort of user action
+        like a button press, key press, or touch down event.
+      </description>
+
+      <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat of the user event"/>
+      <arg name="serial" type="uint" summary="the serial of the user event"/>
+      <arg name="x" type="int" summary="the x position to pop up the window menu at"/>
+      <arg name="y" type="int" summary="the y position to pop up the window menu at"/>
+    </request>
+
+    <request name="move">
+      <description summary="start an interactive move">
+	Start an interactive, user-driven move of the surface.
+
+	This request must be used in response to some sort of user action
+	like a button press, key press, or touch down event.
+
+	The server may ignore move requests depending on the state of
+	the surface (e.g. fullscreen or maximized).
+      </description>
+      <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat of the user event"/>
+      <arg name="serial" type="uint" summary="the serial of the user event"/>
+    </request>
+
+    <enum name="resize_edge">
+      <description summary="edge values for resizing">
+	These values are used to indicate which edge of a surface
+	is being dragged in a resize operation. The server may
+	use this information to adapt its behavior, e.g. choose
+	an appropriate cursor image.
+      </description>
+      <entry name="none" value="0"/>
+      <entry name="top" value="1"/>
+      <entry name="bottom" value="2"/>
+      <entry name="left" value="4"/>
+      <entry name="top_left" value="5"/>
+      <entry name="bottom_left" value="6"/>
+      <entry name="right" value="8"/>
+      <entry name="top_right" value="9"/>
+      <entry name="bottom_right" value="10"/>
+    </enum>
+
+    <request name="resize">
+      <description summary="start an interactive resize">
+	Start a user-driven, interactive resize of the surface.
+
+	This request must be used in response to some sort of user action
+	like a button press, key press, or touch down event.
+
+	The server may ignore resize requests depending on the state of
+	the surface (e.g. fullscreen or maximized).
+      </description>
+      <arg name="seat" type="object" interface="wl_seat" summary="the wl_seat of the user event"/>
+      <arg name="serial" type="uint" summary="the serial of the user event"/>
+      <arg name="edges" type="uint" summary="which edge or corner is being dragged"/>
+    </request>
+
+    <enum name="state">
+      <description summary="types of state on the surface">
+        The different state values used on the surface. This is designed for
+        state values like maximized, fullscreen. It is paired with the
+        configure event to ensure that both the client and the compositor
+        setting the state can be synchronized.
+
+        States set in this way are double-buffered. They will get applied on
+        the next commit.
+
+        Desktop environments may extend this enum by taking up a range of
+        values and documenting the range they chose in this description.
+        They are not required to document the values for the range that they
+        chose. Ideally, any good extensions from a desktop environment should
+        make its way into standardization into this enum.
+
+        The current reserved ranges are:
+
+        0x0000 - 0x0FFF: xdg-shell core values, documented below.
+        0x1000 - 0x1FFF: GNOME
+      </description>
+      <entry name="maximized" value="1" summary="the surface is maximized">
+        The surface is maximized. The window geometry specified in the configure
+        event must be obeyed by the client.
+      </entry>
+      <entry name="fullscreen" value="2" summary="the surface is fullscreen">
+        The surface is fullscreen. The window geometry specified in the configure
+        event must be obeyed by the client.
+      </entry>
+      <entry name="resizing" value="3">
+        The surface is being resized. The window geometry specified in the
+        configure event is a maximum; the client cannot resize beyond it.
+        Clients that have aspect ratio or cell sizing configuration can use
+        a smaller size, however.
+      </entry>
+      <entry name="activated" value="4">
+        Client window decorations should be painted as if the window is
+        active. Do not assume this means that the window actually has
+        keyboard or pointer focus.
+      </entry>
+    </enum>
+
+    <event name="configure">
+      <description summary="suggest a surface change">
+	The configure event asks the client to resize its surface or to
+	change its state.
+
+	The width and height arguments specify a hint to the window
+	about how its surface should be resized in window geometry
+	coordinates.
+
+	The states listed in the event specify how the width/height
+	arguments should be interpreted, and possibly how it should be
+	drawn.
+
+	Clients should arrange their surface for the new size and
+	states, and then send a ack_configure request with the serial
+	sent in this configure event at some point before committing
+	the new surface.
+
+	If the client receives multiple configure events before it
+        can respond to one, it is free to discard all but the last
+        event it received.
+      </description>
+
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+      <arg name="states" type="array"/>
+      <arg name="serial" type="uint"/>
+    </event>
+
+    <request name="ack_configure">
+      <description summary="ack a configure event">
+        When a configure event is received, if a client commits the
+        surface in response to the configure event, then the client
+        must make a ack_configure request before the commit request,
+        passing along the serial of the configure event.
+
+        The compositor might use this information to move a surface
+        to the top left only when the client has drawn itself for
+        the maximized or fullscreen state.
+
+        If the client receives multiple configure events before it
+        can respond to one, it only has to ack the last configure event.
+      </description>
+      <arg name="serial" type="uint" summary="the serial from the configure event"/>
+    </request>
+
+    <request name="set_window_geometry">
+      <description summary="set the new window geometry">
+        The window geometry of a window is its "visible bounds" from the
+        user's perspective. Client-side decorations often have invisible
+        portions like drop-shadows which should be ignored for the
+        purposes of aligning, placing and constraining windows.
+
+        Once the window geometry of the surface is set once, it is not
+        possible to unset it, and it will remain the same until
+        set_window_geometry is called again, even if a new subsurface or
+        buffer is attached.
+
+        If never set, the value is the full bounds of the surface,
+        including any subsurfaces. This updates dynamically on every
+        commit. This unset mode is meant for extremely simple clients.
+
+        If responding to a configure event, the window geometry in here
+        must respect the sizing negotiations specified by the states in
+        the configure event.
+
+        The width and height must be greater than zero.
+      </description>
+      <arg name="x" type="int"/>
+      <arg name="y" type="int"/>
+      <arg name="width" type="int"/>
+      <arg name="height" type="int"/>
+    </request>
+
+    <request name="set_maximized" />
+    <request name="unset_maximized" />
+
+    <request name="set_fullscreen">
+      <description summary="set the window as fullscreen on a monitor">
+	Make the surface fullscreen.
+
+        You can specify an output that you would prefer to be fullscreen.
+	If this value is NULL, it's up to the compositor to choose which
+        display will be used to map this surface.
+      </description>
+      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
+    </request>
+    <request name="unset_fullscreen" />
+
+    <request name="set_minimized">
+      <description summary="set the window as minimized">
+	Request that the compositor minimize your surface. There is no
+	way to know if the surface is currently minimized, nor is there
+	any way to unset minimization on this surface.
+
+	If you are looking to throttle redrawing when minimized, please
+	instead use the wl_surface.frame event for this, as this will
+	also work with live previews on windows in Alt-Tab, Expose or
+	similar compositor features.
+      </description>
+    </request>
+
+    <event name="close">
+      <description summary="surface wants to be closed">
+        The close event is sent by the compositor when the user
+        wants the surface to be closed. This should be equivalent to
+        the user clicking the close button in client-side decorations,
+        if your application has any...
+
+        This is only a request that the user intends to close your
+        window. The client may choose to ignore this request, or show
+        a dialog to ask the user to save their data...
+      </description>
+    </event>
+  </interface>
+
+  <interface name="xdg_popup" version="1">
+    <description summary="short-lived, popup surfaces for menus">
+      A popup surface is a short-lived, temporary surface that can be
+      used to implement menus. It takes an explicit grab on the surface
+      that will be dismissed when the user dismisses the popup. This can
+      be done by the user clicking outside the surface, using the keyboard,
+      or even locking the screen through closing the lid or a timeout.
+
+      When the popup is dismissed, a popup_done event will be sent out,
+      and at the same time the surface will be unmapped. The xdg_popup
+      object is now inert and cannot be reactivated, so clients should
+      destroy it. Explicitly destroying the xdg_popup object will also
+      dismiss the popup and unmap the surface.
+
+      Clients will receive events for all their surfaces during this
+      grab (which is an "owner-events" grab in X11 parlance). This is
+      done so that users can navigate through submenus and other
+      "nested" popup windows without having to dismiss the topmost
+      popup.
+
+      Clients that want to dismiss the popup when another surface of
+      their own is clicked should dismiss the popup using the destroy
+      request.
+
+      The parent surface must have either an xdg_surface or xdg_popup
+      role.
+
+      Specifying an xdg_popup for the parent means that the popups are
+      nested, with this popup now being the topmost popup. Nested
+      popups must be destroyed in the reverse order they were created
+      in, e.g. the only popup you are allowed to destroy at all times
+      is the topmost one.
+
+      If there is an existing popup when creating a new popup, the
+      parent must be the current topmost popup.
+
+      A parent surface must be mapped before the new popup is mapped.
+
+      When compositors choose to dismiss a popup, they will likely
+      dismiss every nested popup as well.
+
+      The x and y arguments specify where the top left of the popup
+      should be placed, relative to the local surface coordinates of the
+      parent surface.
+    </description>
+
+    <enum name="error">
+      <description summary="xdg_popup error values">
+	These errors can be emitted in response to xdg_popup requests.
+      </description>
+      <entry name="not_the_topmost_popup" value="0" summary="The client tried to map or destroy a non-toplevel popup"/>
+      <entry name="invalid_parent" value="1" summary="The client specified an invalid parent surface"/>
+    </enum>
+
+    <request name="destroy" type="destructor">
+      <description summary="remove xdg_popup interface">
+	This destroys the popup. Explicitly destroying the xdg_popup
+	object will also dismiss the popup, and unmap the surface.
+
+	If this xdg_popup is not the "topmost" popup, a protocol error
+	will be sent.
+      </description>
+    </request>
+
+    <event name="popup_done">
+      <description summary="popup interaction is done">
+	The popup_done event is sent out when a popup is dismissed
+	by the compositor.
+      </description>
+    </event>
+
+  </interface>
+</protocol>

src/x11/window-props.c

@@ -1843,7 +1843,7 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
     { display->atom__NET_WM_WINDOW_TYPE, META_PROP_VALUE_ATOM_LIST, reload_net_wm_window_type, LOAD_INIT | INCLUDE_OR | FORCE_INIT },
     { display->atom__NET_WM_STRUT,         META_PROP_VALUE_INVALID, reload_struts, NONE },
     { display->atom__NET_WM_STRUT_PARTIAL, META_PROP_VALUE_INVALID, reload_struts, NONE },
-    { display->atom__NET_WM_BYPASS_COMPOSITOR, META_PROP_VALUE_CARDINAL,  reload_bypass_compositor, LOAD_INIT | INCLUDE_OR },
+    { display->atom__NET_WM_BYPASS_COMPOSITOR, META_PROP_VALUE_CARDINAL,  reload_bypass_compositor, NONE },
     { display->atom__NET_WM_WINDOW_OPACITY, META_PROP_VALUE_CARDINAL, reload_window_opacity, LOAD_INIT | INCLUDE_OR },
     { 0 },
   };

src/x11/window-x11.c

@@ -389,7 +389,7 @@ meta_window_apply_session_info (MetaWindow *window,
                   "Restoring minimized state %d for window %s\n",
                   info->minimized, window->desc);
 
-      if (info->minimized)
+      if (window->has_minimize_func && info->minimized)
         meta_window_minimize (window);
     }
 
@@ -542,10 +542,13 @@ meta_window_x11_manage (MetaWindow *window)
    * For normal windows, do a full ConfigureRequest based on the
    * window hints, as that's what the ICCCM says to do.
    */
-  priv->client_rect = window->rect;
-  window->buffer_rect = window->rect;
 
-  if (!window->override_redirect)
+  if (window->override_redirect)
+    {
+      priv->client_rect = window->rect;
+      window->buffer_rect = window->rect;
+    }
+  else
     {
       MetaRectangle rect;
       MetaMoveResizeFlags flags;
@@ -860,7 +863,7 @@ meta_window_x11_grab_op_began (MetaWindow *window,
       if (window->sync_request_counter != None)
         meta_window_x11_create_sync_request_alarm (window);
 
-      if (window->size_hints.width_inc > 2 || window->size_hints.height_inc > 2)
+      if (window->size_hints.width_inc > 1 || window->size_hints.height_inc > 1)
         {
           priv->showing_resize_popup = TRUE;
           meta_window_refresh_resize_popup (window);
@@ -2438,7 +2441,8 @@ meta_window_x11_client_message (MetaWindow *window,
     {
       meta_verbose ("WM_CHANGE_STATE client message, state: %ld\n",
                     event->xclient.data.l[0]);
-      if (event->xclient.data.l[0] == IconicState)
+      if (event->xclient.data.l[0] == IconicState &&
+          window->has_minimize_func)
         meta_window_minimize (window);
 
       return TRUE;