monitor-config-manager: Fallback to closed laptop lid configuration

When closing the lid of a laptop, we reconfigure all the monitors in order
to update the CRTCs and (if enabled) the global UI scaling factor.

To do this, we try first to reuse the current configuration for the usable
monitors, but if we have only monitor enabled and this one is on the laptop
lid we just end up creating a new configuration where the primary monitor is
the laptop one (as per find_primary_monitor() in MetaMonitorConfigManager),
but ignoring the user parameters.

In case the user selected a different resolution / scaling compared to the
default one, while the laptop lid is closed we might change the monitors
layout, causing applications to rescale or reposition.

To avoid this, when creating the monitors configuration from the current
current state, in case we have only one monitor available and that one is
the laptop panel, let's just reuse this configuration.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1200

(cherry-picked from commit e48516679c)

.gitignore

@@ -94,15 +94,12 @@ src/xwayland-keyboard-grab-unstable-v1-protocol.c
 src/xwayland-keyboard-grab-unstable-v1-server-protocol.h
 src/tablet-unstable-v*-protocol.c
 src/tablet-unstable-v*-server-protocol.h
-src/text-input-unstable-v*-protocol.c
-src/text-input-unstable-v*-server-protocol.h
 src/keyboard-shortcuts-inhibit-unstable-v*-protocol.c
 src/keyboard-shortcuts-inhibit-unstable-v*-server-protocol.h
 src/linux-dmabuf-unstable-v*-protocol.c
 src/linux-dmabuf-unstable-v*-server-protocol.h
 src/xdg-shell-protocol.c
 src/xdg-shell-server-protocol.h
-src/wayland-eglstream-controller-server-protocol.h
 src/meta/meta-version.h
 src/libmutter-*.pc
 doc/reference/*.args

NEWS

@@ -1,95 +1,70 @@
-3.29.91
-=======
-* Various crash fixes [Olivier, Iain; #255, #223]
-* Fix lock up with some DRI drivers [Alex; #127]
-* Send correct button codes from virtual evdev devices [Jonas; !190]
-* Improve grab-device clock updates on X11 [Jeff; !174]
-* Fix popups closing immediately on key down [Jonas; !180]
-* Prevent clients from modifying the shared keymap [Jonas; #784206]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Piotr Drąg, Olivier Fourdan, Carlos Garnacho,
-  Jan Grulich, Iain Lane, Alex Villacís Lasso, Jeff Smith, Daniel van Vugt
-
-Translators:
-  Matej Urbančič [sl], Mario Blättermann [de], Piotr Drąg [pl],
-  Aurimas Černius [lt], Yi-Jyun Pan [zh_TW], Emin Tufan Çetin [tr],
-  Fabio Tomat [fur], Bruce Cowan [en_GB]
-
-3.29.90
-=======
-* Various crash fixes [Olivier, Jonas, Florian; #189, #70, #194, #15, #130]
+3.28.4
+======
 * Don't expose resolutions that are below the minimum [Andrea; #793223]
-* Remove support for preference overrides [Florian; #786496]
-* Misc. bug fixes and cleanups [Daniel, Jonas, Florian; #131, #245, !176]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Olivier Fourdan, Florian Müllner, Kevin Tamool,
-  Daniel van Vugt
-
-Translators:
-  Daniel Mustieles [es], Claude Paroz [fr]
-
-3.29.4
-======
-* Fix crash with parent-less modal dialogs [Olivier; #174]
-* Preserve paint volumes where possible to optimize CPU usage [Carlos; #782344]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Iain Lane, Bastien Nocera
-
-Translators:
-  Daniel Șerbănescu [ro]
-
-3.29.3
-======
-* Fix Korean Hangul support on wayland [Changwoo; #152]
-* Improve support for proprietary Nvidia driver [Jonas; #790316]
-* Only upload HW cursor sprite to the GPU that will display them [Jonas; #77]
+* Fix lock up with some DRI drivers [Alex; #127]
+* Improve grab-device clock updates on X11 [Jeff; !174]
+* Prevent clients from modifying the shared keymap [Jonas; #784206]
+* Fix screen rotation regression [Jonas; #216]
+* Fix non-lowercase letters on virtual key devices [Carlos; gnome-shell#135]
+* Send correct button codes from virtual evdev devices [Jonas; !190]
+* Avoid crash when a cursor is not found [Sebastian; #254]
 * Improve EGLstream support [Miguel; #2, #782575]
-* Remove MetaScreen to prepare for non-mandatary X11 dependency
-  [Armin, Jonas; #759538]
-* Misc. bug fixes [Olivier, Jonas, Sam; #160, !130, #786929, #788834]
+* Handle requests to unmanaged windows gracefully [Jonas; #240]
+* Improve support for proprietary Nvidia driver [Jonas; #790316]
+* Fix handling of non-UTF8 encodings [Florian; !227]
+* Consider remapped keys when guessing keycode from keysym [Andrea; #443]
+* Fix support of extended characters in on-screen keyboard [Andrea; #109]
+* Various crash fixes [Jonas, Olivier, Florian, Marco; #70, #189, #15,
+  #130, #255, #194, #336, #576]
+* Misc. bug fixes [Iain, Jonas, Sam, Carlos, Florian, Olivier, Marco; #223,
+  #192, #788834, #782344, !130, #134, #221, #306, #279, #331, !557]
 
 Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Armin Krezović, Corentin Noël,
-  Changwoo Ryu, Sam Spilsbury, Daniel Stone, Marco Trevisan (Treviño),
-  Miguel A. Vico, Daniel van Vugt
+  Jonas Ådahl, Andrea Azzarone, Olivier Fourdan, Carlos Garnacho,
+  Sebastian Keller, Iain Lane, Alex Villacís Lasso, Florian Müllner,
+  Bastien Nocera, Aaron Plattner, Jeff Smith, Sam Spilsbury,
+  Marco Trevisan (Treviño), Miguel A. Vico, Daniel van Vugt
 
-Translators:
-  Yi-Jyun Pan [zh_TW], Jordi Mas [ca], Daniel Șerbănescu [ro], Fabio Tomat [fur]
-
-3.29.2
+3.28.3
 ======
-* Fix size change animations on wayland [Georges; #780292]
 * Handle touch events on server-side titlebars [Carlos; #770185]
-* Misc. bug fixes [Florian, Olivier, Jonas, Georges; #134, #124, !96, #138,
-  !102, #781471, #150]
+* Fix crash with unhandled mouse buttons on titlebars [Olivier; #160]
+* Fix Korean Hangul support on wayland [Changwoo; #152]
+* Fix crash when taking up from suspend [Jonas; #786929]
+* Fix crash with parent-less modal dialogs [Olivier; #174]
+* Misc. bug fixes [Olivier, Georges; #83, #112, #150, #104,
+
+Contributors:
+  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Georges Basile Stavracas Neto,
+  Changwoo Ryu, Marco Trevisan (Treviño)
+
+3.28.2
+======
+* Take inhibitors into account for monitoring idle [Bastien; #705942]
+* Fix window animations on wayland [Georges; #780292]
+* Misc. bug fixes [Mario, Jonas, Olivier, Florian; gnome-shell#157, #130,
+  #21, #124, !96, #138, !102, #781471]
 
 Contributors:
   Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Florian Müllner,
-  Georges Basile Stavracas Neto, Marco Trevisan (Treviño), Daniel van Vugt
+  Georges Basile Stavracas Neto, Bastien Nocera, Mario Sanchez Prada,
+  Ray Strode, Marco Trevisan (Treviño)
 
-Translators:
-  Daniel Șerbănescu [ro], Marcos Lans [gl], Dz Chen [zh_CN]
-
-3.29.1
+3.28.1
 ======
-* Fix various input-method regressions [Carlos, Olivier; #65, #74, #66, #112]
+* Fix various input-method regressions [Carlos; #65, #74, #66]
 * Fix wayland build on FreeBSD [Ting-Wei; #792280, #792717]
 * Fix swapped colors in screenshots (again) [Carlos; #72]
 * Allow building with elogind [Rasmus; !46]
 * Consider display rotation for cursor [Olivier; #85]
 * Fall back to non-modifier GBM surfaces [Daniel; #84]
-* Take inhibitors into account for monitoring idle [Bastien; #705942]
-* Misc. bug fixes [handsome-feng, Olivier, Mario, Jonas; !45, #83, #104,
-  gnome-shell#157, #130, #21]
+* Disable KMS modifiers by default [Jonas; #81]
+* Misc bug fixes [handsome-feng; !45]
 
 Contributors:
   Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, handsome-feng, Yussuf Khalil,
   Ting-Wei Lan, Aleksandr Mezin, Alberts Muktupāvels,
-  Georges Basile Stavracas Neto, Bastien Nocera, Benjamin Otte,
-  Mario Sanchez Prada, Daniel Stone, Ray Strode, Rasmus Thomsen,
+  Georges Basile Stavracas Neto, Benjamin Otte, Daniel Stone, Rasmus Thomsen,
   Marco Trevisan (Treviño), Daniel van Vugt
 
 Translators:

README.md

@@ -1,30 +0,0 @@
-# Mutter
-
-Mutter is a Wayland display server and X11 window manager and compositor library.
-
-When used as a Wayland display server, it runs on top of KMS and libinput. It
-implements the compositor side of the Wayland core protocol as well as various
-protocol extensions. It also has functionality related to running X11
-applications using Xwayland.
-
-When used on top of Xorg it acts as a X11 window manager and compositing manager.
-
-It contains functionality related to, among other things, window management,
-window compositing, focus tracking, workspace management, keybindings and
-monitor configuration.
-
-Internally it uses a fork of Cogl, a hardware acceleration abstraction library
-used to simplify usage of OpenGL pipelines, as well as a fork af Clutter, a
-scene graph and user interface toolkit.
-
-Mutter is used by GNOME Shell, the GNOME core user interface. It can also be run
-standalone, using the command "mutter", but just running plain mutter is only
-intended for debugging purposes.
-
-## License
-
-Mutter is distributed under the terms of the GNU General Public License,
-version 2 or later. See the [COPYING][license] file for detalis.
-
-[bug-tracker]: https://gitlab.gnome.org/GNOME/mutter/issues
-[license]: COPYING

clutter/clutter/clutter-actor.c

@@ -841,6 +841,7 @@ struct _ClutterActorPrivate
   guint needs_x_expand              : 1;
   guint needs_y_expand              : 1;
   guint needs_paint_volume_update   : 1;
+  guint had_effects_on_last_paint_volume_update : 1;
 };
 
 enum
@@ -17485,7 +17486,7 @@ _clutter_actor_get_paint_volume_real (ClutterActor *self,
            */
           effects = _clutter_meta_group_peek_metas (priv->effects);
           for (l = effects;
-               l != NULL || (l != NULL && l->data != priv->current_effect);
+               l != NULL && l->data != priv->current_effect;
                l = l->next)
             {
               if (!_clutter_effect_get_paint_volume (l->data, pv))
@@ -17521,6 +17522,32 @@ _clutter_actor_get_paint_volume_real (ClutterActor *self,
   return TRUE;
 }
 
+static gboolean
+_clutter_actor_has_active_paint_volume_override_effects (ClutterActor *self)
+{
+  const GList *l;
+
+  if (self->priv->effects == NULL)
+    return FALSE;
+
+  /* We just need to all effects current effect to see
+   * if anyone wants to override the paint volume. If so, then
+   * we need to recompute, since the paint volume returned can
+   * change from call to call. */
+  for (l = _clutter_meta_group_peek_metas (self->priv->effects);
+       l != NULL;
+       l = l->next)
+    {
+      ClutterEffect *effect = l->data;
+
+      if (clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)) &&
+          _clutter_effect_has_custom_paint_volume (effect))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
 /* The public clutter_actor_get_paint_volume API returns a const
  * pointer since we return a pointer directly to the cached
  * PaintVolume associated with the actor and don't want the user to
@@ -17531,17 +17558,33 @@ _clutter_actor_get_paint_volume_real (ClutterActor *self,
 static ClutterPaintVolume *
 _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
 {
+  gboolean has_paint_volume_override_effects;
   ClutterActorPrivate *priv;
 
   priv = self->priv;
 
+  has_paint_volume_override_effects = _clutter_actor_has_active_paint_volume_override_effects (self);
+
   if (priv->paint_volume_valid)
     {
-      if (!priv->needs_paint_volume_update)
+      /* If effects are applied, the actor paint volume
+       * needs to be recomputed on each paint, since those
+       * paint volumes could change over the duration of the
+       * effect.
+       *
+       * We also need to update the paint volume if we went
+       * from having effects to not having effects on the last
+       * paint volume update. */
+      if (!priv->needs_paint_volume_update &&
+          priv->current_effect == NULL &&
+          !has_paint_volume_override_effects &&
+          !priv->had_effects_on_last_paint_volume_update)
         return &priv->paint_volume;
       clutter_paint_volume_free (&priv->paint_volume);
     }
 
+  priv->had_effects_on_last_paint_volume_update = has_paint_volume_override_effects;
+
   if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
     {
       priv->paint_volume_valid = TRUE;

clutter/clutter/clutter-effect-private.h

@@ -9,6 +9,7 @@ gboolean        _clutter_effect_pre_paint               (ClutterEffect
 void            _clutter_effect_post_paint              (ClutterEffect           *effect);
 gboolean        _clutter_effect_get_paint_volume        (ClutterEffect           *effect,
                                                          ClutterPaintVolume      *volume);
+gboolean        _clutter_effect_has_custom_paint_volume (ClutterEffect           *effect);
 void            _clutter_effect_paint                   (ClutterEffect           *effect,
                                                          ClutterEffectPaintFlags  flags);
 void            _clutter_effect_pick                    (ClutterEffect           *effect,

clutter/clutter/clutter-effect.c

@@ -308,6 +308,14 @@ _clutter_effect_get_paint_volume (ClutterEffect      *effect,
   return CLUTTER_EFFECT_GET_CLASS (effect)->get_paint_volume (effect, volume);
 }
 
+gboolean
+_clutter_effect_has_custom_paint_volume (ClutterEffect *effect)
+{
+  g_return_val_if_fail (CLUTTER_IS_EFFECT (effect), FALSE);
+
+  return CLUTTER_EFFECT_GET_CLASS (effect)->get_paint_volume != clutter_effect_real_get_paint_volume;
+}
+
 /**
  * clutter_effect_queue_repaint:
  * @effect: A #ClutterEffect which needs redrawing

clutter/clutter/clutter-enums.h

@@ -761,7 +761,6 @@ typedef enum { /*< prefix=CLUTTER_DRAG >*/
  * ClutterEventFlags:
  * @CLUTTER_EVENT_NONE: No flag set
  * @CLUTTER_EVENT_FLAG_SYNTHETIC: Synthetic event
- * @CLUTTER_EVENT_FLAG_REPEATED: Auto-repeated event
  *
  * Flags for the #ClutterEvent
  *
@@ -770,8 +769,7 @@ typedef enum { /*< prefix=CLUTTER_DRAG >*/
 typedef enum { /*< flags prefix=CLUTTER_EVENT >*/
   CLUTTER_EVENT_NONE              = 0,
   CLUTTER_EVENT_FLAG_SYNTHETIC    = 1 << 0,
-  CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1,
-  CLUTTER_EVENT_FLAG_REPEATED     = 1 << 2
+  CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1
 } ClutterEventFlags;
 
 /**

clutter/clutter/clutter-offscreen-effect.c

@@ -186,6 +186,12 @@ update_fbo (ClutterEffect *effect, int fbo_width, int fbo_height)
       priv->texture = NULL;
     }
 
+  if (priv->offscreen != NULL)
+    {
+      cogl_handle_unref (priv->offscreen);
+      priv->offscreen = NULL;
+    }
+
   priv->texture =
     clutter_offscreen_effect_create_texture (self, fbo_width, fbo_height);
   if (priv->texture == NULL)
@@ -196,9 +202,6 @@ update_fbo (ClutterEffect *effect, int fbo_width, int fbo_height)
   priv->fbo_width = fbo_width;
   priv->fbo_height = fbo_height;
 
-  if (priv->offscreen != NULL)
-    cogl_handle_unref (priv->offscreen);
-
   priv->offscreen = cogl_offscreen_new_to_texture (priv->texture);
   if (priv->offscreen == NULL)
     {

clutter/clutter/clutter-paint-volume.c

@@ -1166,6 +1166,21 @@ _clutter_paint_volume_get_stage_paint_box (ClutterPaintVolume *pv,
 
   _clutter_paint_volume_get_bounding_box (&projected_pv, box);
 
+  if (pv->is_2d && pv->actor &&
+      clutter_actor_get_z_position (pv->actor) == 0)
+    {
+      /* If the volume/actor are perfectly 2D, take the bounding box as
+       * good. We won't need to add any extra room for sub-pixel positioning
+       * in this case.
+       */
+      clutter_paint_volume_free (&projected_pv);
+      box->x1 = CLUTTER_NEARBYINT (box->x1);
+      box->y1 = CLUTTER_NEARBYINT (box->y1);
+      box->x2 = CLUTTER_NEARBYINT (box->x2);
+      box->y2 = CLUTTER_NEARBYINT (box->y2);
+      return;
+    }
+
   /* The aim here is that for a given rectangle defined with floating point
    * coordinates we want to determine a stable quantized size in pixels
    * that doesn't vary due to the original box's sub-pixel position.

clutter/clutter/clutter-text.c

@@ -1782,7 +1782,7 @@ selection_paint (ClutterText *self)
       CoglColor cogl_color = { 0, };
       CoglFramebuffer *fb;
 
-      fb = _clutter_actor_get_active_framebuffer (actor);
+      fb = cogl_get_draw_framebuffer ();
       if (G_UNLIKELY (fb == NULL))
         return;
 
@@ -2391,13 +2391,7 @@ clutter_text_paint (ClutterActor *self)
   float alloc_width;
   float alloc_height;
 
-  /* FIXME: this should not be needed, but apparently the text-cache
-   * test unit manages to get in a situation where the active frame
-   * buffer is NULL
-   */
-  fb = _clutter_actor_get_active_framebuffer (self);
-  if (fb == NULL)
-    fb = cogl_get_draw_framebuffer ();
+  fb = cogl_get_draw_framebuffer ();
 
   /* Note that if anything in this paint method changes it needs to be
      reflected in the get_paint_volume implementation which is tightly

clutter/clutter/evdev/clutter-input-device-evdev.c

@@ -313,7 +313,8 @@ start_slow_keys (ClutterEvent               *event,
   SlowKeysEventPending *slow_keys_event;
   ClutterKeyEvent *key_event = (ClutterKeyEvent *) event;
 
-  if (key_event->flags & CLUTTER_EVENT_FLAG_REPEATED)
+  /* Synthetic key events are for autorepeat, ignore those... */
+  if (key_event->flags & CLUTTER_EVENT_FLAG_SYNTHETIC)
     return;
 
   slow_keys_event = g_new0 (SlowKeysEventPending, 1);

clutter/clutter/evdev/clutter-seat-evdev.c

@@ -142,7 +142,7 @@ clutter_seat_evdev_release_touch_state (ClutterSeatEvdev  *seat,
                                         ClutterTouchState *touch_state)
 {
   g_clear_pointer (&seat->touch_states[touch_state->seat_slot],
-                   clutter_touch_state_free);
+                   (GDestroyNotify) clutter_touch_state_free);
 }
 
 ClutterSeatEvdev *
@@ -310,7 +310,7 @@ clutter_seat_evdev_notify_key (ClutterSeatEvdev   *seat,
   else
     {
       changed_state = 0;
-      clutter_event_set_flags (event, CLUTTER_EVENT_FLAG_REPEATED);
+      clutter_event_set_flags (event, CLUTTER_EVENT_FLAG_SYNTHETIC);
     }
 
   queue_event (event);

clutter/clutter/x11/clutter-device-manager-xi2.c

@@ -1271,9 +1271,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                                       ? CLUTTER_KEY_PRESS
                                       : CLUTTER_KEY_RELEASE;
 
-        if (xev->evtype == XI_KeyPress && xev->flags & XIKeyRepeat)
-          clutter_event_set_flags (event, CLUTTER_EVENT_FLAG_REPEATED);
-
         event->key.time = xev->time;
         event->key.stage = stage;
 	_clutter_input_device_xi2_translate_state (event, &xev->mods, &xev->buttons, &xev->group);

clutter/clutter/x11/clutter-input-device-xi2.c

@@ -110,8 +110,7 @@ clutter_input_device_xi2_finalize (GObject *object)
   if (device_xi2->wacom_device)
     libwacom_destroy (device_xi2->wacom_device);
 
-  if (device_xi2->group_modes)
-    g_array_unref (device_xi2->group_modes);
+  g_array_unref (device_xi2->group_modes);
 #endif
 
   G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->finalize (object);

clutter/clutter/x11/clutter-keymap-x11.c

@@ -38,6 +38,14 @@
 
 typedef struct _ClutterKeymapX11Class   ClutterKeymapX11Class;
 typedef struct _DirectionCacheEntry     DirectionCacheEntry;
+typedef struct _ClutterKeymapKey        ClutterKeymapKey;
+
+struct _ClutterKeymapKey
+{
+  guint keycode;
+  guint group;
+  guint level;
+};
 
 struct _DirectionCacheEntry
 {
@@ -59,6 +67,7 @@ struct _ClutterKeymapX11
 
   ClutterModifierType num_lock_mask;
   ClutterModifierType scroll_lock_mask;
+  ClutterModifierType level3_shift_mask;
 
   PangoDirection current_direction;
 
@@ -69,6 +78,10 @@ struct _ClutterKeymapX11
   Atom current_group_atom;
   guint current_cache_serial;
   DirectionCacheEntry group_direction_cache[4];
+  int current_group;
+
+  GHashTable *reserved_keycodes;
+  GQueue *available_keycodes;
 #endif
 
   guint caps_lock_state : 1;
@@ -198,6 +211,9 @@ get_xkb (ClutterKeymapX11 *keymap_x11)
   if (keymap_x11->scroll_lock_mask == 0)
     keymap_x11->scroll_lock_mask = XkbKeysymToModifiers (backend_x11->xdpy,
                                                          XK_Scroll_Lock);
+  if (keymap_x11->level3_shift_mask == 0)
+    keymap_x11->level3_shift_mask = XkbKeysymToModifiers (backend_x11->xdpy,
+                                                          XK_ISO_Level3_Shift);
 
   return keymap_x11->xkb_desc;
 }
@@ -428,16 +444,100 @@ clutter_keymap_x11_set_property (GObject      *gobject,
     }
 }
 
+#ifdef HAVE_XKB
+static void
+clutter_keymap_x11_refresh_reserved_keycodes (ClutterKeymapX11 *keymap_x11)
+{
+  Display *dpy = clutter_x11_get_default_display ();
+  GHashTableIter iter;
+  gpointer key, value;
+
+  g_hash_table_iter_init (&iter, keymap_x11->reserved_keycodes);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      guint reserved_keycode = GPOINTER_TO_UINT (key);
+      guint reserved_keysym = GPOINTER_TO_UINT (value);
+      guint actual_keysym = XkbKeycodeToKeysym (dpy, reserved_keycode, 0, 0);
+
+      /* If an available keycode is no longer mapped to the stored keysym, then
+       * the keycode should not be considered available anymore and should be
+       * removed both from the list of available and reserved keycodes.
+       */
+      if (reserved_keysym != actual_keysym)
+        {
+          g_hash_table_iter_remove (&iter);
+          g_queue_remove (keymap_x11->available_keycodes, key);
+        }
+    }
+}
+
+static gboolean
+clutter_keymap_x11_replace_keycode (ClutterKeymapX11 *keymap_x11,
+                                    KeyCode           keycode,
+                                    KeySym            keysym)
+{
+  if (CLUTTER_BACKEND_X11 (keymap_x11->backend)->use_xkb)
+    {
+      Display *dpy = clutter_x11_get_default_display ();
+      XkbDescPtr xkb = get_xkb (keymap_x11);
+      XkbMapChangesRec changes;
+
+      XFlush (dpy);
+
+      xkb->device_spec = XkbUseCoreKbd;
+      memset (&changes, 0, sizeof(changes));
+
+      if (keysym != NoSymbol)
+        {
+          int types[XkbNumKbdGroups] = { XkbOneLevelIndex };
+          XkbChangeTypesOfKey (xkb, keycode, 1, XkbGroup1Mask, types, &changes);
+          XkbKeySymEntry (xkb, keycode, 0, 0) = keysym;
+        }
+      else
+        {
+          /* Reset to NoSymbol */
+          XkbChangeTypesOfKey (xkb, keycode, 0, XkbGroup1Mask, NULL, &changes);
+        }
+
+      changes.changed = XkbKeySymsMask | XkbKeyTypesMask;
+      changes.first_key_sym = keycode;
+      changes.num_key_syms = 1;
+      changes.first_type = 0;
+      changes.num_types = xkb->map->num_types;
+      XkbChangeMap (dpy, xkb, &changes);
+
+      XFlush (dpy);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+#endif
+
 static void
 clutter_keymap_x11_finalize (GObject *gobject)
 {
   ClutterKeymapX11 *keymap;
   ClutterEventTranslator *translator;
+  GHashTableIter iter;
+  gpointer key, value;
 
   keymap = CLUTTER_KEYMAP_X11 (gobject);
   translator = CLUTTER_EVENT_TRANSLATOR (keymap);
 
 #ifdef HAVE_XKB
+  clutter_keymap_x11_refresh_reserved_keycodes (keymap);
+  g_hash_table_iter_init (&iter, keymap->reserved_keycodes);
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      guint keycode = GPOINTER_TO_UINT (key);
+      clutter_keymap_x11_replace_keycode (keymap, keycode, NoSymbol);
+    }
+
+  g_hash_table_destroy (keymap->reserved_keycodes);
+  g_queue_free (keymap->available_keycodes);
+
   _clutter_backend_remove_event_translator (keymap->backend, translator);
 
   if (keymap->xkb_desc != NULL)
@@ -447,6 +547,7 @@ clutter_keymap_x11_finalize (GObject *gobject)
   G_OBJECT_CLASS (clutter_keymap_x11_parent_class)->finalize (gobject);
 }
 
+
 static void
 clutter_keymap_x11_class_init (ClutterKeymapX11Class *klass)
 {
@@ -469,6 +570,12 @@ static void
 clutter_keymap_x11_init (ClutterKeymapX11 *keymap)
 {
   keymap->current_direction = PANGO_DIRECTION_NEUTRAL;
+  keymap->current_group = -1;
+
+#ifdef HAVE_XKB
+  keymap->reserved_keycodes = g_hash_table_new (NULL, NULL);
+  keymap->available_keycodes = g_queue_new ();
+#endif
 }
 
 static ClutterTranslateReturn
@@ -498,7 +605,8 @@ clutter_keymap_x11_translate_event (ClutterEventTranslator *translator,
         {
         case XkbStateNotify:
           CLUTTER_NOTE (EVENT, "Updating keyboard state");
-          update_direction (keymap_x11, XkbStateGroup (&xkb_event->state));
+          keymap_x11->current_group = XkbStateGroup (&xkb_event->state);
+          update_direction (keymap_x11, keymap_x11->current_group);
           update_locked_mods (keymap_x11, xkb_event->state.locked_mods);
           retval = CLUTTER_TRANSLATE_REMOVE;
           break;
@@ -665,3 +773,258 @@ _clutter_keymap_x11_get_direction (ClutterKeymapX11 *keymap)
 #endif
     return PANGO_DIRECTION_NEUTRAL;
 }
+
+static gboolean
+clutter_keymap_x11_get_entries_for_keyval (ClutterKeymapX11  *keymap_x11,
+                                           guint              keyval,
+                                           ClutterKeymapKey **keys,
+                                           gint              *n_keys)
+{
+#ifdef HAVE_XKB
+  if (CLUTTER_BACKEND_X11 (keymap_x11->backend)->use_xkb)
+    {
+      XkbDescRec *xkb = get_xkb (keymap_x11);
+      GArray *retval;
+      gint keycode;
+
+      keycode = keymap_x11->min_keycode;
+      retval = g_array_new (FALSE, FALSE, sizeof (ClutterKeymapKey));
+
+      while (keycode <= keymap_x11->max_keycode)
+        {
+          gint max_shift_levels = XkbKeyGroupsWidth (xkb, keycode);
+          gint group = 0;
+          gint level = 0;
+          gint total_syms = XkbKeyNumSyms (xkb, keycode);
+          gint i = 0;
+          KeySym *entry;
+
+          /* entry is an array with all syms for group 0, all
+           * syms for group 1, etc. and for each group the
+           * shift level syms are in order
+           */
+          entry = XkbKeySymsPtr (xkb, keycode);
+
+          while (i < total_syms)
+            {
+              g_assert (i == (group * max_shift_levels + level));
+
+              if (entry[i] == keyval)
+                {
+                  ClutterKeymapKey key;
+
+                  key.keycode = keycode;
+                  key.group = group;
+                  key.level = level;
+
+                  g_array_append_val (retval, key);
+
+                  g_assert (XkbKeySymEntry (xkb, keycode, level, group) ==
+                            keyval);
+                }
+
+              ++level;
+
+              if (level == max_shift_levels)
+                {
+                  level = 0;
+                  ++group;
+                }
+
+              ++i;
+            }
+
+          ++keycode;
+        }
+
+      if (retval->len > 0)
+        {
+          *keys = (ClutterKeymapKey*) retval->data;
+          *n_keys = retval->len;
+        }
+      else
+        {
+          *keys = NULL;
+          *n_keys = 0;
+        }
+
+      g_array_free (retval, retval->len > 0 ? FALSE : TRUE);
+
+      return *n_keys > 0;
+    }
+  else
+#endif
+    {
+      return FALSE;
+    }
+}
+
+#ifdef HAVE_XKB
+static guint
+clutter_keymap_x11_get_available_keycode (ClutterKeymapX11 *keymap_x11)
+{
+  if (CLUTTER_BACKEND_X11 (keymap_x11->backend)->use_xkb)
+    {
+      clutter_keymap_x11_refresh_reserved_keycodes (keymap_x11);
+
+      if (g_hash_table_size (keymap_x11->reserved_keycodes) < 5)
+        {
+          Display *dpy = clutter_x11_get_default_display ();
+          XkbDescPtr xkb = get_xkb (keymap_x11);
+          guint i;
+
+          for (i = xkb->max_key_code; i >= xkb->min_key_code; --i)
+            {
+              if (XkbKeycodeToKeysym (dpy, i, 0, 0) == NoSymbol)
+                return i;
+            }
+        }
+
+      return GPOINTER_TO_UINT (g_queue_pop_head (keymap_x11->available_keycodes));
+    }
+
+  return 0;
+}
+#endif
+
+gboolean clutter_keymap_x11_reserve_keycode (ClutterKeymapX11 *keymap_x11,
+                                             guint             keyval,
+                                             guint            *keycode_out)
+{
+  g_return_val_if_fail (CLUTTER_IS_KEYMAP_X11 (keymap_x11), FALSE);
+  g_return_val_if_fail (keyval != 0, FALSE);
+  g_return_val_if_fail (keycode_out != NULL, FALSE);
+
+#ifdef HAVE_XKB
+  *keycode_out = clutter_keymap_x11_get_available_keycode (keymap_x11);
+
+  if (*keycode_out == NoSymbol)
+    {
+      g_warning ("Cannot reserve a keycode for keyval %d: no available keycode", keyval);
+      return FALSE;
+    }
+
+  if (!clutter_keymap_x11_replace_keycode (keymap_x11, *keycode_out, keyval))
+    {
+      g_warning ("Failed to remap keycode %d to keyval %d", *keycode_out, keyval);
+      return FALSE;
+    }
+
+  g_hash_table_insert (keymap_x11->reserved_keycodes, GUINT_TO_POINTER (*keycode_out), GUINT_TO_POINTER (keyval));
+  g_queue_remove (keymap_x11->available_keycodes, GUINT_TO_POINTER (*keycode_out));
+
+  return TRUE;
+#else
+  return FALSE;
+#endif
+}
+
+void clutter_keymap_x11_release_keycode_if_needed (ClutterKeymapX11 *keymap_x11,
+                                                   guint             keycode)
+{
+  g_return_if_fail (CLUTTER_IS_KEYMAP_X11 (keymap_x11));
+
+#ifdef HAVE_XKB
+  if (!g_hash_table_contains (keymap_x11->reserved_keycodes, GUINT_TO_POINTER (keycode)) ||
+      g_queue_index (keymap_x11->available_keycodes, GUINT_TO_POINTER (keycode)) != -1)
+    return;
+
+  g_queue_push_tail (keymap_x11->available_keycodes, GUINT_TO_POINTER (keycode));
+#endif
+}
+
+void
+clutter_keymap_x11_latch_modifiers (ClutterKeymapX11 *keymap_x11,
+                                    uint32_t          level,
+                                    gboolean          enable)
+{
+#ifdef HAVE_XKB
+  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (keymap_x11->backend);
+  uint32_t modifiers[] = {
+    0,
+    ShiftMask,
+    keymap_x11->level3_shift_mask,
+    keymap_x11->level3_shift_mask | ShiftMask,
+  };
+  uint32_t value = 0;
+
+  if (!backend_x11->use_xkb)
+    return;
+
+  level = CLAMP (level, 0, G_N_ELEMENTS (modifiers) - 1);
+
+  if (enable)
+    value = modifiers[level];
+  else
+    value = 0;
+
+  XkbLatchModifiers (clutter_x11_get_default_display (),
+                     XkbUseCoreKbd, modifiers[level],
+                     value);
+#endif
+}
+
+static uint32_t
+clutter_keymap_x11_get_current_group (ClutterKeymapX11 *keymap_x11)
+{
+  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (keymap_x11->backend);
+  XkbStateRec state_rec;
+
+  if (keymap_x11->current_group >= 0)
+    return keymap_x11->current_group;
+
+  XkbGetState (backend_x11->xdpy, XkbUseCoreKbd, &state_rec);
+  return XkbStateGroup (&state_rec);
+}
+
+gboolean
+clutter_keymap_x11_keycode_for_keyval (ClutterKeymapX11 *keymap_x11,
+                                       guint             keyval,
+                                       guint            *keycode_out,
+                                       guint            *level_out)
+{
+  ClutterKeymapKey *keys;
+  gint i, n_keys, group;
+  gboolean found = FALSE;
+
+  g_return_val_if_fail (keycode_out != NULL, FALSE);
+  g_return_val_if_fail (level_out != NULL, FALSE);
+
+  group = clutter_keymap_x11_get_current_group (keymap_x11);
+
+  if (!clutter_keymap_x11_get_entries_for_keyval (keymap_x11, keyval, &keys, &n_keys))
+    return FALSE;
+
+  for (i = 0; i < n_keys && !found; i++)
+    {
+      if (keys[i].group == group)
+        {
+          *keycode_out = keys[i].keycode;
+          *level_out = keys[i].level;
+          found = TRUE;
+        }
+    }
+
+  if (!found)
+    {
+      GHashTableIter iter;
+      gpointer key, value;
+
+      g_hash_table_iter_init (&iter, keymap_x11->reserved_keycodes);
+      while (!found && g_hash_table_iter_next (&iter, &key, &value))
+        {
+          guint reserved_keycode = GPOINTER_TO_UINT (key);
+          guint reserved_keysym = GPOINTER_TO_UINT (value);
+
+          if (keyval == reserved_keysym)
+            {
+              *keycode_out = reserved_keycode;
+              *level_out = 0;
+              found = TRUE;
+            }
+        }
+    }
+
+  g_free (keys);
+  return found;
+}

clutter/clutter/x11/clutter-keymap-x11.h

@@ -51,6 +51,18 @@ gboolean _clutter_keymap_x11_get_is_modifier     (ClutterKeymapX11    *keymap,
 
 PangoDirection _clutter_keymap_x11_get_direction (ClutterKeymapX11    *keymap);
 
+gboolean clutter_keymap_x11_keycode_for_keyval (ClutterKeymapX11 *keymap_x11,
+                                                guint             keyval,
+                                                guint            *keycode_out,
+                                                guint            *level_out);
+void     clutter_keymap_x11_latch_modifiers (ClutterKeymapX11 *keymap_x11,
+                                             uint32_t          level,
+                                             gboolean          enable);
+gboolean clutter_keymap_x11_reserve_keycode (ClutterKeymapX11 *keymap_x11,
+                                             guint             keyval,
+                                             guint            *keycode_out);
+void     clutter_keymap_x11_release_keycode_if_needed (ClutterKeymapX11 *keymap_x11,
+                                                       guint             keycode);
 G_END_DECLS
 
 #endif /* __CLUTTER_KEYMAP_X11_H__ */

clutter/clutter/x11/clutter-virtual-input-device-x11.c

@@ -32,6 +32,8 @@
 
 #include "clutter-virtual-input-device.h"
 #include "x11/clutter-virtual-input-device-x11.h"
+#include "x11/clutter-backend-x11.h"
+#include "x11/clutter-keymap-x11.h"
 
 struct _ClutterVirtualInputDeviceX11
 {
@@ -135,11 +137,36 @@ clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtu
 						uint32_t                   keyval,
 						ClutterKeyState            key_state)
 {
-  KeyCode keycode;
+  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
+  ClutterKeymapX11 *keymap = backend_x11->keymap;
+  uint32_t keycode, level;
+
+  if (!clutter_keymap_x11_keycode_for_keyval (keymap, keyval, &keycode, &level))
+    {
+      level = 0;
+
+      if (!clutter_keymap_x11_reserve_keycode (keymap, keyval, &keycode))
+        {
+          g_warning ("No keycode found for keyval %x in current group", keyval);
+          return;
+        }
+    }
+
+  if (!_clutter_keymap_x11_get_is_modifier (keymap, keycode) &&
+      key_state == CLUTTER_KEY_STATE_PRESSED)
+    clutter_keymap_x11_latch_modifiers (keymap, level, TRUE);
 
-  keycode = XKeysymToKeycode (clutter_x11_get_default_display (), keyval);
   XTestFakeKeyEvent (clutter_x11_get_default_display (),
-                     keycode, key_state == CLUTTER_KEY_STATE_PRESSED, 0);
+                     (KeyCode) keycode,
+                     key_state == CLUTTER_KEY_STATE_PRESSED, 0);
+
+
+  if (key_state == CLUTTER_KEY_STATE_RELEASED)
+    {
+      if (!_clutter_keymap_x11_get_is_modifier (keymap, keycode))
+        clutter_keymap_x11_latch_modifiers (keymap, level, FALSE);
+      clutter_keymap_x11_release_keycode_if_needed (keymap, keycode);
+    }
 }
 
 static void

clutter/tests/conform/actor-shader-effect.c

@@ -230,13 +230,13 @@ paint_cb (ClutterStage *stage,
   gboolean *was_painted = data;
 
   /* old shader effect */
-  g_assert_cmpint (get_pixel (50, 50), ==, 0xff0000);
+  g_assert_cmpint (get_pixel (0, 25), ==, 0xff0000);
   /* new shader effect */
-  g_assert_cmpint (get_pixel (150, 50), ==, 0x00ffff);
+  g_assert_cmpint (get_pixel (100, 25), ==, 0x00ffff);
   /* another new shader effect */
-  g_assert_cmpint (get_pixel (250, 50), ==, 0xff00ff);
+  g_assert_cmpint (get_pixel (200, 25), ==, 0xff00ff);
   /* new shader effect */
-  g_assert_cmpint (get_pixel (350, 50), ==, 0x00ffff);
+  g_assert_cmpint (get_pixel (300, 25), ==, 0x00ffff);
 
   *was_painted = TRUE;
 }

clutter/tests/interactive/test-cogl-offscreen.c

@@ -61,6 +61,11 @@ G_END_DECLS
 /* Coglbox private declaration
  *--------------------------------------------------*/
 
+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
   CoglHandle texhand_id;
@@ -68,11 +73,6 @@ struct _TestCoglboxPrivate
   CoglHandle offscreen_id;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
  *--------------------------------------------------*/
 
@@ -290,6 +290,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
 
   actor_class->map            = test_coglbox_map;
   actor_class->paint          = test_coglbox_paint;
+
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }
 
 static ClutterActor*

clutter/tests/interactive/test-cogl-tex-convert.c

@@ -61,17 +61,17 @@ G_END_DECLS
 /* Coglbox private declaration
  *--------------------------------------------------*/
 
+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
   CoglHandle cogl_tex_id[4];
   gint       frame;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
  *--------------------------------------------------*/
 
@@ -182,6 +182,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
   gobject_class->finalize     = test_coglbox_finalize;
   gobject_class->dispose      = test_coglbox_dispose;  
   actor_class->paint          = test_coglbox_paint;
+  
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }
 
 static ClutterActor*

clutter/tests/interactive/test-cogl-tex-foreign.c

@@ -86,6 +86,11 @@ G_END_DECLS
 /* Coglbox private declaration
  *--------------------------------------------------*/
 
+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
   guint      gl_handle;
@@ -111,11 +116,6 @@ struct _TestCoglboxPrivate
   (* glBindTexture) (guint target, guint texture);
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
  *--------------------------------------------------*/
 
@@ -229,6 +229,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
   gobject_class->finalize     = test_coglbox_finalize;
   gobject_class->dispose      = test_coglbox_dispose;  
   actor_class->paint          = test_coglbox_paint;
+  
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }
 
 static ClutterActor*

clutter/tests/interactive/test-cogl-tex-polygon.c

@@ -61,6 +61,11 @@ G_END_DECLS
 /* Coglbox private declaration
  *--------------------------------------------------*/
 
+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
   CoglHandle sliced_tex, not_sliced_tex;
@@ -69,11 +74,6 @@ struct _TestCoglboxPrivate
   gboolean   use_linear_filtering;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
  *--------------------------------------------------*/
 
@@ -293,6 +293,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
   gobject_class->finalize     = test_coglbox_finalize;
   gobject_class->dispose      = test_coglbox_dispose;
   actor_class->paint          = test_coglbox_paint;
+
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }
 
 static ClutterActor*

clutter/tests/interactive/test-cogl-tex-tile.c

@@ -62,17 +62,17 @@ G_END_DECLS
 /* Coglbox private declaration
  *--------------------------------------------------*/
 
+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
   CoglHandle cogl_tex_id;
   gdouble    animation_progress;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
  *--------------------------------------------------*/
 
@@ -158,6 +158,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
   gobject_class->finalize     = test_coglbox_finalize;
   gobject_class->dispose      = test_coglbox_dispose;
   actor_class->paint          = test_coglbox_paint;
+
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }
 
 static ClutterActor*

clutter/tests/interactive/test-layout.c

@@ -40,6 +40,11 @@ enum
   PROP_USE_TRANSFORMED_BOX
 };
 
+G_DEFINE_TYPE (MyThing, my_thing, CLUTTER_TYPE_ACTOR)
+
+#define MY_THING_GET_PRIVATE(obj)    \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MY_TYPE_THING, MyThingPrivate))
+
 struct _MyThingPrivate
 {
   gfloat  spacing;
@@ -48,11 +53,6 @@ struct _MyThingPrivate
   guint   use_transformed_box : 1;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (MyThing, my_thing, CLUTTER_TYPE_ACTOR)
-
-#define MY_THING_GET_PRIVATE(obj)    \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MY_TYPE_THING, MyThingPrivate))
-
 static void
 my_thing_set_property (GObject      *gobject,
                        guint         prop_id,
@@ -409,6 +409,8 @@ my_thing_class_init (MyThingClass *klass)
                                                          "Use transformed box when allocating",
                                                          FALSE,
                                                          G_PARAM_READWRITE));
+
+  g_type_class_add_private (klass, sizeof (MyThingPrivate));
 }
 
 static void

cogl/cogl/cogl-frame-info.h

@@ -89,8 +89,11 @@ int64_t cogl_frame_info_get_frame_counter (CoglFrameInfo *info);
  * Gets the presentation time for the frame. This is the time at which
  * the frame became visible to the user.
  *
- * The presentation time measured in nanoseconds, is based on
- * cogl_get_clock_time().
+ * The presentation time measured in nanoseconds is based on a
+ * monotonic time source. The time source is not necessarily
+ * correlated with system/wall clock time and may represent the time
+ * elapsed since some undefined system event such as when the system
+ * last booted.
  *
  * <note>Linux kernel version less that 3.8 can result in
  * non-monotonic timestamps being reported when using a drm based

cogl/cogl/cogl-pipeline.c

@@ -492,9 +492,6 @@ _cogl_pipeline_free (CoglPipeline *pipeline)
       _cogl_bitmask_destroy (&uniforms_state->changed_mask);
     }
 
-  if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE)
-    g_slice_free (CoglPipelineBigState, pipeline->big_state);
-
   if (pipeline->differences & COGL_PIPELINE_STATE_LAYERS)
     {
       g_list_foreach (pipeline->layer_differences,
@@ -508,6 +505,9 @@ _cogl_pipeline_free (CoglPipeline *pipeline)
   if (pipeline->differences & COGL_PIPELINE_STATE_FRAGMENT_SNIPPETS)
     _cogl_pipeline_snippet_list_free (&pipeline->big_state->fragment_snippets);
 
+  if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE)
+    g_slice_free (CoglPipelineBigState, pipeline->big_state);
+
   g_list_free (pipeline->deprecated_get_layers_list);
 
   recursively_free_layer_caches (pipeline);

cogl/cogl/deprecated/cogl-auto-texture.c

@@ -94,6 +94,7 @@ cogl_texture_new_with_size (unsigned int width,
       if (!cogl_texture_allocate (tex, &skip_error))
         {
           cogl_error_free (skip_error);
+          skip_error = NULL;
           cogl_object_unref (tex);
           tex = NULL;
         }

configure.ac

@@ -1,15 +1,15 @@
 AC_PREREQ(2.62)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [29])
-m4_define([mutter_micro_version], [91])
+m4_define([mutter_minor_version], [28])
+m4_define([mutter_micro_version], [4])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
 
 m4_define([mutter_plugin_api_version], [3])
 
-m4_define([libmutter_api_version], [3])
+m4_define([libmutter_api_version], [2])
 
 AC_INIT([mutter], [mutter_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
@@ -88,6 +88,7 @@ MUTTER_PC_MODULES="
    cairo >= 1.10.0
    gsettings-desktop-schemas >= 3.21.4
    json-glib-1.0
+   upower-glib >= 0.99.0
    gnome-desktop-3.0
    xcomposite >= 0.2
    xcursor
@@ -244,7 +245,7 @@ AC_ARG_ENABLE(remote-desktop,
   enable_remote_desktop=no
 )
 AS_IF([test "$enable_remote_desktop" = "yes"], [
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libpipewire-0.2 >= 0.2.2"
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libpipewire-0.1 >= 0.1.8"
   AC_DEFINE([HAVE_REMOTE_DESKTOP],[1], [Defined if screen cast and remote desktop support is enabled])
 ])
 AM_CONDITIONAL([HAVE_REMOTE_DESKTOP],[test "$enable_remote_desktop" = "yes"])
@@ -289,24 +290,13 @@ AS_IF([test "$have_native_backend" = "yes"], [
 ])
 AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])
 
-MUTTER_WAYLAND_EGLSTREAM_MODULES="wayland-eglstream-protocols"
-
 AC_ARG_ENABLE(egl-device,
   AS_HELP_STRING([--enable-egl-device], [enable support for EGLDevice on top of KMS]),,
   enable_egl_device=no
-  have_wayland_eglstream=no
 )
 AS_IF([test "$enable_egl_device" = "yes"], [
   AC_DEFINE([HAVE_EGL_DEVICE],[1], [Defined if EGLDevice support is enabled])
-  PKG_CHECK_EXISTS([$MUTTER_WAYLAND_EGLSTREAM_MODULES], [have_wayland_eglstream=yes], [have_wayland_eglstream=no])
 ])
-AS_IF([test "$have_wayland_eglstream" = "yes"], [
-  AC_DEFINE([HAVE_WAYLAND_EGLSTREAM],[1],[Defined if Wayland EGLStream protocols are available])
-  PKG_CHECK_MODULES(WAYLAND_EGLSTREAM, [$MUTTER_WAYLAND_EGLSTREAM_MODULES],
-                    [ac_wayland_eglstream_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir $MUTTER_WAYLAND_EGLSTREAM_MODULES`])
-  AC_SUBST(WAYLAND_EGLSTREAM_DATADIR, $ac_wayland_eglstream_pkgdatadir)
-])
-AM_CONDITIONAL([HAVE_WAYLAND_EGLSTREAM],[test "$have_wayland_eglstream" = "yes"])
 
 MUTTER_WAYLAND_MODULES="wayland-server >= 1.13.0"
 
@@ -325,7 +315,7 @@ AS_IF([test "$have_wayland" = "yes"], [
   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.16],
+  PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.12],
 		    [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
   AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
 ])
@@ -559,7 +549,6 @@ mutter-$VERSION
 	Introspection:            ${found_introspection}
 	Session management:       ${found_sm}
 	Wayland:                  ${have_wayland}
-	Wayland EGLStream:        ${have_wayland_eglstream}
 	Native (KMS) backend:     ${have_native_backend}
 	EGLDevice:                ${enable_egl_device}
 	Remote desktop:           ${enable_remote_desktop}

data/org.gnome.mutter.gschema.xml.in

@@ -120,6 +120,10 @@
                                         framebuffers instead of window content,
                                         to manage HiDPI monitors. Does not
                                         require a restart.
+        • “remote-desktop”            — enables remote desktop support. To support
+                                        remote desktop with screen sharing,
+                                        “screen-cast” must also be enabled.
+        • “screen-cast”               — enables screen cast support.
       </description>
     </key>
 

po/Makevars

@@ -26,6 +26,7 @@ XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
         --flag=g_sprintf:2:c-format \
         --flag=g_snprintf:3:c-format
 
+
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
 # package.  (Note that the msgstr strings, extracted from the package's
@@ -35,7 +36,6 @@ XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ \
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
 COPYRIGHT_HOLDER = Translation copyright holder
-
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -50,7 +50,7 @@ COPYRIGHT_HOLDER = Translation copyright holder
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = https://gitlab.gnome.org/GNOME/mutter/issues
+MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.

po/POTFILES.in

@@ -14,18 +14,18 @@ src/compositor/meta-background.c
 src/core/bell.c
 src/core/core.c
 src/core/display.c
+src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
 src/core/meta-close-dialog-default.c
 src/core/mutter.c
 src/core/prefs.c
+src/core/screen.c
 src/core/util.c
 src/core/window.c
 src/ui/frames.c
 src/ui/theme.c
 src/wayland/meta-wayland-tablet-pad.c
-src/x11/meta-x11-display.c
-src/x11/meta-x11-errors.c
 src/x11/session.c
 src/x11/window-props.c
 src/x11/xprops.c

po/ca.po

@@ -11,9 +11,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.24\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-06-07 13:00+0000\n"
-"PO-Revision-Date: 2018-06-17 10:25+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-25 13:23+0200\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
@@ -21,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.1\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -48,118 +49,134 @@ msgid "Move window to last workspace"
 msgstr "Mou la finestra a l'últim espai de treball"
 
 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Mou la finestra un espai de treball a l'esquerra"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Mou la finestra un espai de treball a la dreta"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Mou la finestra un espai de treball amunt"
 
-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Mou la finestra un espai de treball avall"
 
-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Mou la finestra un monitor a l'esquerra"
 
-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Mou la finestra un monitor a la dreta"
 
-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Mou la finestra un monitor amunt"
 
-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Mou la finestra un monitor avall"
 
-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Canvia d'aplicacions"
 
-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Canvia a l'aplicació anterior"
 
-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Canvia de finestres"
 
-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Canvia a la finestra anterior"
 
-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Canvia entre les finestres d'una aplicació"
 
-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Canvia a la finestra anterior d'una aplicació"
 
-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Canvia els controls del sistema"
 
-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Canvia al control del sistema anterior"
 
-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Canvia immediatament entre finestres"
 
-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Canvia immediatament a la finestra anterior"
 
-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Canvia immediatament entre les finestres d'una aplicació"
 
-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Canvia immediatament a la finestra anterior d'una aplicació"
 
-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Canvia immediatament entre els controls del sistema"
 
-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Canvia immediatament al control del sistema anterior"
 
-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Oculta totes les finestres normals"
 
-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Canvia a l'espai de treball 1"
 
-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Canvia a l'espai de treball 2"
 
-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Canvia a l'espai de treball 3"
 
-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Canvia a l'espai de treball 4"
 
-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Canvia a l'últim espai de treball"
 
-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Mou a l'espai de treball de l'esquerra"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Mou a l'espai de treball de la dreta"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Mou a l'espai de treball de sobre"
 
-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Mou a l'espai de treball de sota"
 
-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistema"
 
@@ -171,10 +188,6 @@ msgstr "Mostra l'indicador d'execució d'aplicacions"
 msgid "Show the activities overview"
 msgstr "Mostra la vista general d'activitats"
 
-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restaura les dreceres de teclat"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Finestres"
@@ -200,52 +213,56 @@ msgid "Restore window"
 msgstr "Restaura la finestra"
 
 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Canvia l'estat d'ombrejat"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Tanca la finestra"
 
-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Oculta la finestra"
 
-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Mou la finestra"
 
-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Redimensiona la finestra"
 
-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 "Canvia la funció que fa que la finestra estigui en tots els espais de "
 "treball o només en un"
 
-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Alça la finestra si està coberta per una altra; altrament, baixa-la"
 
-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Alça la finestra per damunt de les altres"
 
-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Baixa la finestra sota les altres"
 
-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximitza la finestra verticalment"
 
-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximitza la finestra horitzontalment"
 
-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Mostra la partició a l'esquerra"
 
-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Mostra la partició a la dreta"
 
@@ -407,22 +424,25 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Selecció de finestra entre les emergents d'una pestanya"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Cancel·lació de les finestres emergents a les pestanyes"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Canvia configuracions de monitor"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Gira la configuració del monitor integrada"
 
@@ -478,41 +498,10 @@ msgstr "Canvia al terminal virtual 12"
 msgid "Re-enable shortcuts"
 msgstr "Torna a habilitar les dreceres"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Permetre la captura amb Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Les aplicacions Xwayland poden capturar el teclat"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Mode de commutació (grup %d)"
@@ -520,11 +509,11 @@ msgstr "Mode de commutació (grup %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Commuta el monitor"
 
-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostra l'ajuda en pantalla"
 
@@ -550,7 +539,7 @@ msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -568,31 +557,31 @@ msgid "Failed to open X Window System display “%s”\n"
 msgstr ""
 "S'ha produït un error en obrir la pantalla del sistema de finestres X «%s»\n"
 
-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Inhabilita la connexió al gestor de sessions"
 
-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Reemplaça el gestor de finestres en execució"
 
-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Especifica l'ID de gestió de sessió"
 
-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Visualització X per usar"
 
-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inicialitza la sessió des del fitxer desat"
 
-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Fes que les crides a l'X siguin síncrones"
 
-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Funciona com a compositor de Wayland"
 
@@ -601,18 +590,14 @@ msgstr "Funciona com a compositor de Wayland"
 #
 # Camins:
 # ../src/core/main.c:223
-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Funciona com a compositor imbricat"
 
-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Funciona com a servidor de pantalla completa, en comptes d'imbricat"
 
-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Executa amb un rerefons X11"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -668,7 +653,7 @@ msgstr "Connector del Mutter a utilitzar"
 msgid "Workspace %d"
 msgstr "Espai de treball %d"
 
-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -677,7 +662,7 @@ msgstr ""
 "La pantalla «%s» ja té un gestor de finestres; proveu l'opció --replace per "
 "reemplaçar el gestor de finestres actual."
 
-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "El monitor %d en la pantalla '%s' no és vàlida\n"
@@ -686,12 +671,12 @@ msgstr "El monitor %d en la pantalla '%s' no és vàlida\n"
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter es va compilar sense compatibilitat per al mode detallat\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Mode de commutació: mode %d"
 
-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -704,21 +689,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (a %s)"
 
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mou la finestra un espai de treball a l'esquerra"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mou la finestra un espai de treball a la dreta"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Mou a l'espai de treball de l'esquerra"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Mou a l'espai de treball de la dreta"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Canvia l'estat d'ombrejat"
-
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "No s'ha pogut analitzar el directori de temes: %s\n"
 

po/de.po

@@ -2,9 +2,9 @@
 # Copyright (C) 2002-2004 Free Software Foundation, Inc.
 # Matthias Warkus <mawarkus@gnome.org>, 2002.
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
-# Hendrik Richter <hendrikr@gnome.org>, 2005-2008.
+# Hendrik Richter <hendrikr@gnome.org>, 2005, 2006, 2007, 2008.
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016-2018.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011-2012.
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011, 2012.
 # Wolfgang Stöggl <c72578@yahoo.de> 2011, 2017.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
 # Tim Sabsch <timæsabsch.com>, 2018.
@@ -13,16 +13,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-08-04 19:59+0200\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"POT-Creation-Date: 2018-02-26 07:59+0000\n"
+"PO-Revision-Date: 2018-02-26 21:26+0100\n"
+"Last-Translator: Tim Sabsch <tim@sabsch.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.9\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -404,7 +404,10 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Um experimentelle Funktionsmerkmale zu aktivieren, fügen Sie das "
 "entsprechende Schlüsselwort zur Liste hinzu. Möglicherweise muss der "
@@ -415,22 +418,26 @@ msgstr ""
 "framebuffer« – weist Mutter an, in der Voreinstellung logische Bildschirme "
 "in einem logischen Pixel-Koordinatensystem anzuordnen, wobei die Bildschirm-"
 "Framebuffer anstelle der Fensterinhalte skaliert werden, um HiDPI-"
-"Bildschirme besser versorgen zu können. Dafür ist kein Neustart erforderlich."
+"Bildschirme besser versorgen zu können. Dafür ist kein Neustart "
+"erforderlich. • »remote-desktop« – aktiviert Remotedesktop-Unterstützung. Um "
+"das Teilen von Bildschirmen mittels Remotedesktop zu unterstützen, muss "
+"»screen-cast« ebenfalls aktiviert sein. • »screen-cast« – aktiviert »screen "
+"cast«-Unterstützung."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Fenster aus Tab-Anzeige auswählen"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Tab-Anzeige abbrechen"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Bildschirmkonfigurationen wechseln"
 
 # Ich denke nicht, dass »rotate« hier die Bildschirmdrehung meint, sondern eher eine Liste aus Konfigurationen rotiert (d.h. umgewälzt) wird.
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Wechselt die Konfiguration des eingebauten Bildschirms"
 
@@ -554,22 +561,22 @@ msgstr "Bildschirm wechseln"
 msgid "Show on-screen help"
 msgstr "Bildschirmhilfe anzeigen"
 
-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "Eingebaute Anzeige"
 
-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "Unbekannte Anzeige"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -584,65 +591,66 @@ msgstr ""
 "Ein weiterer Compositing-Verwalter läuft bereits auf Bildschirm %i der "
 "Anzeige »%s«."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Klangereignis"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "Den aktuellen Fensterverwalter ersetzen"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "Kennung der Sitzungsverwaltung angeben"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "Zu verwendende X-Anzeige"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "Sitzung anhand gespeicherter Datei starten"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
 msgstr "X-Aufrufe abgleichen"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
 msgstr "Als Wayland-Compositor ausführen"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "Als eingebetteten Compositor ausführen"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Wayland-Compositor ausführen, ohne Xwayland zu starten"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "Mit X11-Backend ausführen"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "»%s« antwortet nicht."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Die Anwendung antwortet nicht."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -650,11 +658,11 @@ msgstr ""
 "Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
 "erzwingen."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Beenden erzwingen"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Warten"
 
@@ -684,11 +692,25 @@ msgstr "Version ausgeben"
 msgid "Mutter plugin to use"
 msgstr "Zu benutzendes Mutter-Plugin"
 
-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
 
+#: src/core/screen.c:583
+#, c-format
+msgid ""
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
+msgstr ""
+"Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
+"»--replace«, um den aktuellen Fensterverwalter zu ersetzen."
+
+#: src/core/screen.c:668
+#, c-format
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"
+
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"
@@ -698,30 +720,7 @@ msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"
 msgid "Mode Switch: Mode %d"
 msgstr "Moduswechsel: Modus %d"
 
-#: src/x11/meta-x11-display.c:666
-#, c-format
-msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
-msgstr ""
-"Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
-"»--replace«, um den aktuellen Fensterverwalter zu ersetzen."
-
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "GDK konnte nicht initialisiert werden\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
-
-#: src/x11/meta-x11-display.c:1117
-#, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"
-
-#: src/x11/session.c:1819
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -729,7 +728,7 @@ msgstr ""
 "Diese Fenster unterstützen das Speichern der aktuellen Einstellungen nicht "
 "und müssen bei der nächsten Anmeldung manuell neu gestartet werden."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (auf %s)"

po/en_GB.po

@@ -5,22 +5,23 @@
 # Gareth Owen <gowen72@yahoo.com>, 2004.
 # Philip Withnall <philip@tecnocode.co.uk>, 2010.
 # Chris Leonard <cjlhomeaddress@gmail.com>, 2012.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2011, 2012, 2013, 2018.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2011, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-08-19 17:43+0100\n"
-"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-09-07 09:27+0000\n"
+"PO-Revision-Date: 2016-09-19 12:10+0200\n"
+"Last-Translator: David King <amigadave@amigadave.com>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Gtranslator 2.91.6\n"
 "X-Project-Style: gnome\n"
 
 #: data/50-mutter-navigation.xml:6
@@ -48,118 +49,134 @@ msgid "Move window to last workspace"
 msgstr "Move window to last workspace"
 
 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Move window one workspace to the left"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Move window one workspace to the right"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Move window one workspace up"
 
-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Move window one workspace down"
 
-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Move window one monitor to the left"
 
-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Move window one monitor to the right"
 
-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Move window one monitor up"
 
-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Move window one monitor down"
 
-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Switch applications"
 
-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Switch to previous application"
 
-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Switch windows"
 
-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Switch to previous window"
 
-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Switch windows of an application"
 
-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Switch to previous window of an application"
 
-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Switch system controls"
 
-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Switch to previous system control"
 
-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Switch windows directly"
 
-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Switch directly to previous window"
 
-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Switch windows of an app directly"
 
-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Switch directly to previous window of an app"
 
-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Switch system controls directly"
 
-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Switch directly to previous system control"
 
-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Hide all normal windows"
 
-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Switch to workspace 1"
 
-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Switch to workspace 2"
 
-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Switch to workspace 3"
 
-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Switch to workspace 4"
 
-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Switch to last workspace"
 
-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Move to workspace left"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Move to workspace right"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Move to workspace above"
 
-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Move to workspace below"
 
-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "System"
 
@@ -171,10 +188,6 @@ msgstr "Show the run command prompt"
 msgid "Show the activities overview"
 msgstr "Show the activities overview"
 
-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restore the keyboard shortcuts"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Windows"
@@ -200,50 +213,54 @@ msgid "Restore window"
 msgstr "Restore window"
 
 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Toggle shaded state"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Close window"
 
-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Hide window"
 
-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Move window"
 
-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Resize window"
 
-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Toggle window on all workspaces or one"
 
-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Raise window if covered, otherwise lower it"
 
-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Raise window above other windows"
 
-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Lower window below other windows"
 
-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximise window vertically"
 
-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximise window horizontally"
 
-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "View split on left"
 
-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "View split on right"
 
@@ -256,21 +273,16 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Modifier to use for extended window management operations"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
-#| msgid ""
-#| "This key will initiate the \"overlay\", which is a combination window "
-#| "overview and application launching system. The default is intended to be "
-#| "the \"Windows key\" on PC hardware. It's expected that this binding "
-#| "either the default or set to the empty string."
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
@@ -305,16 +317,12 @@ msgid "Workspaces are managed dynamically"
 msgstr "Workspaces are managed dynamically"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
-#| msgid ""
-#| "Determines whether workspaces are managed dynamically or whether there's "
-#| "a static number of workspaces (determined by the num-workspaces key in "
-#| "org.gnome.desktop.wm.preferences)."
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 
@@ -347,32 +355,25 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Delay focus changes until the pointer stops moving"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
-#| msgid ""
-#| "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
-#| "the focus will not be changed immediately when entering a window, but "
-#| "only after the pointer stops moving."
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Draggable border width"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
-#| msgid ""
-#| "The amount of total draggable borders. If the theme's visible borders are "
-#| "not enough, invisible borders will be added to meet this value."
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 
 #: data/org.gnome.mutter.gschema.xml.in:89
@@ -399,47 +400,14 @@ msgstr ""
 "When true, the new windows will always be put in the centre of the active "
 "screen of the monitor."
 
-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "Enable experimental features"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
-msgstr ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
-
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Select window from tab popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Cancel tab popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
-#| msgid "Switch monitor"
-msgid "Switch monitor configurations"
-msgstr "Switch monitor configurations"
-
-#: data/org.gnome.mutter.gschema.xml.in:156
-msgid "Rotates the built-in monitor configuration"
-msgstr "Rotates the built-in monitor configuration"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Switch to VT 1"
@@ -488,167 +456,59 @@ msgstr "Switch to VT 11"
 msgid "Switch to VT 12"
 msgstr "Switch to VT 12"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Re-enable shortcuts"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Allow grabs with Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland applications allowed to issue keyboard grabs"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:2325
-#, c-format
-#| msgid "Mode Switch: Mode %d"
-msgid "Mode Switch (Group %d)"
-msgstr "Mode Switch (Group %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:1707
 msgid "Switch monitor"
 msgstr "Switch monitor"
 
-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:1709
 msgid "Show on-screen help"
 msgstr "Show on-screen help"
 
-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Built-in display"
 
-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:539
 msgid "Unknown Display"
 msgstr "Unknown Display"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:547
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: src/compositor/compositor.c:463
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Bell event"
 
-#: src/core/main.c:191
-msgid "Disable connection to session manager"
-msgstr "Disable connection to session manager"
-
-#: src/core/main.c:197
-msgid "Replace the running window manager"
-msgstr "Replace the running window manager"
-
-#: src/core/main.c:203
-msgid "Specify session management ID"
-msgstr "Specify session management ID"
-
-#: src/core/main.c:208
-msgid "X Display to use"
-msgstr "X Display to use"
-
-#: src/core/main.c:214
-msgid "Initialize session from savefile"
-msgstr "Initialise session from savefile"
-
-#: src/core/main.c:220
-msgid "Make X calls synchronous"
-msgstr "Make X calls synchronous"
-
-#: src/core/main.c:227
-msgid "Run as a wayland compositor"
-msgstr "Run as a wayland compositor"
-
-#: src/core/main.c:233
-msgid "Run as a nested compositor"
-msgstr "Run as a nested compositor"
-
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Run wayland compositor without starting Xwayland"
-
-#: src/core/main.c:247
-msgid "Run as a full display server, rather than nested"
-msgstr "Run as a full display server, rather than nested"
-
-#: src/core/main.c:253
-msgid "Run with X11 backend"
-msgstr "Run with X11 backend"
-
-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” is not responding."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Application is not responding."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -656,31 +516,66 @@ msgstr ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 
-#: src/core/meta-close-dialog-default.c:162
-msgid "_Force Quit"
-msgstr "_Force Quit"
-
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Wait"
 
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Force Quit"
+
+#: src/core/display.c:590
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Failed to open X Window System display '%s'\n"
+
+#: src/core/main.c:182
+msgid "Disable connection to session manager"
+msgstr "Disable connection to session manager"
+
+#: src/core/main.c:188
+msgid "Replace the running window manager"
+msgstr "Replace the running window manager"
+
+#: src/core/main.c:194
+msgid "Specify session management ID"
+msgstr "Specify session management ID"
+
+#: src/core/main.c:199
+msgid "X Display to use"
+msgstr "X Display to use"
+
+#: src/core/main.c:205
+msgid "Initialize session from savefile"
+msgstr "Initialise session from savefile"
+
+#: src/core/main.c:211
+msgid "Make X calls synchronous"
+msgstr "Make X calls synchronous"
+
+#: src/core/main.c:218
+msgid "Run as a wayland compositor"
+msgstr "Run as a wayland compositor"
+
+#: src/core/main.c:224
+msgid "Run as a nested compositor"
+msgstr "Run as a nested compositor"
+
+#: src/core/main.c:232
+msgid "Run as a full display server, rather than nested"
+msgstr "Run as a full display server, rather than nested"
+
 #: src/core/mutter.c:39
 #, c-format
-#| msgid ""
-#| "mutter %s\n"
-#| "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
-#| "This is free software; see the source for copying conditions.\n"
-#| "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-#| "PARTICULAR PURPOSE.\n"
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@@ -693,79 +588,47 @@ msgstr "Print version"
 msgid "Mutter plugin to use"
 msgstr "Mutter plugin to use"
 
-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Workspace %d"
 
+#: src/core/screen.c:521
+#, c-format
+msgid ""
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
+msgstr ""
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
+
+#: src/core/screen.c:606
+#, c-format
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Screen %d on display '%s' is invalid\n"
+
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter was compiled without support for verbose mode\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Mode Switch: Mode %d"
 
-#: src/x11/meta-x11-display.c:666
-#, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
+#: src/x11/session.c:1815
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "Failed to initialise GDK\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Failed to open X Window System display “%s”\n"
-
-#: src/x11/meta-x11-display.c:1117
-#, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Screen %d on display “%s” is invalid\n"
-
-#: src/x11/session.c:1819
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
-msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
-msgstr ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
-
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (on %s)"
 
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Move window one workspace to the left"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Move window one workspace to the right"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Move to workspace left"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Move to workspace right"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Toggle shaded state"
-
 #~ msgid "background texture could not be created from file"
 #~ msgstr "background texture could not be created from file"
 

po/es.po

@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-07-23 12:31+0200\n"
+"POT-Creation-Date: 2018-02-07 18:39+0000\n"
+"PO-Revision-Date: 2018-02-22 12:34+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -397,19 +397,6 @@ msgid "Enable experimental features"
 msgstr "Activar las características experimentales"
 
 #: data/org.gnome.mutter.gschema.xml.in:108
-#, fuzzy
-#| msgid ""
-#| "To enable experimental features, add the feature keyword to the list. "
-#| "Whether the feature requires restarting the compositor depends on the "
-#| "given feature. Any experimental feature is not required to still be "
-#| "available, or configurable. Don’t expect adding anything in this setting "
-#| "to be future proof. Currently possible keywords: • “scale-monitor-"
-#| "framebuffer” — makes mutter default to layout logical monitors in a "
-#| "logical pixel coordinate space, while scaling monitor framebuffers "
-#| "instead of window content, to manage HiDPI monitors. Does not require a "
-#| "restart. • “remote-desktop” — enables remote desktop support. To support "
-#| "remote desktop with screen sharing, “screen-cast” must also be enabled. • "
-#| "“screen-cast” — enables screen cast support."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -418,7 +405,10 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Para activar las características experimentales, añada la palabra clave de "
 "la característica a la lista. Depende de la característica que se deba "
@@ -433,19 +423,19 @@ msgstr ""
 "Para soportarlo con compartición de pantalla es necesario activar \"screen-"
 "cast\" • \"screen-cast\" — activa el soporte de compartición de pantalla."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Seleccionar ventana de la pestaña emergente"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Cancelar pestaña emergente"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Cambiar la configuración del monitor"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Rota la configuración del monitor empotrado"
 
@@ -535,7 +525,7 @@ msgstr ""
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2260
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambiar modo (grupo %d)"
@@ -543,30 +533,30 @@ msgstr "Cambiar modo (grupo %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2283
 msgid "Switch monitor"
 msgstr "Cambiar monitor"
 
-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2285
 msgid "Show on-screen help"
 msgstr "Mostrar la ayuda en pantalla"
 
-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "Pantalla integrada"
 
-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "Pantalla desconocida"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -581,65 +571,66 @@ msgstr ""
 "Ya existe un gestor de composición ejecutándose en la monitor %i, pantalla "
 "«%s»."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Evento de campana"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "Desactivar conexión al gestor de sesión"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "Reemplazar el gestor de ventanas en ejecución"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "Especificar el ID se gestión de sesión"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "Pantalla X que usar"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde el archivo de salvaguarda"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
 msgstr "Hacer que las llamadas a las X sean síncronas"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
 msgstr "Ejecutar como compositor Wayland"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "Ejecutar como compositor anidado"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Ejecutar el compositor wayland sin iniciar Xwayland"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "Ejecutar como servidor completo, en lugar de anidado"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "Ejecutar con «backend» de X11"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "«%s» no está respondiendo."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "La aplicación no está respondiendo."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -647,11 +638,11 @@ msgstr ""
 "Puede elegir esperar un rato para ver si continua o forzar la aplicación "
 "para cerrarla completamente."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Forzar la salida"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Esperar"
 
@@ -679,21 +670,12 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Complemento de mutter que usar"
 
-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Área de trabajo %d"
 
-#: src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter fue compilado sin soporte para modo prolijo\n"
-
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Cambiar modo: modo %d"
-
-#: src/x11/meta-x11-display.c:666
+#: src/core/screen.c:583
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -702,21 +684,21 @@ msgstr ""
 "La pantalla «%s» ya tiene un gestor de ventanas; pruebe a usar la opción «--"
 "replace» para reemplazar el gestor de ventanas activo."
 
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "Falló al inicializar GDK\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"
-
-#: src/x11/meta-x11-display.c:1117
+#: src/core/screen.c:668
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "La ventana %d en la pantalla «%s» no es válida\n"
 
-#: src/x11/session.c:1819
+#: src/core/util.c:120
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter fue compilado sin soporte para modo prolijo\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Cambiar modo: modo %d"
+
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -724,7 +706,7 @@ msgstr ""
 "Estas ventanas no soportan «guardar la configuración actual» y tendrán que "
 "reiniciarse manualmente la próxima vez que inicie una sesión."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (on %s)"

po/fr.po

@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-07-24 10:22+0200\n"
+"POT-Creation-Date: 2018-02-06 04:14+0000\n"
+"PO-Revision-Date: 2018-03-03 11:18+0100\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: français <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -409,7 +409,10 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Pour activer les fonctionnalités expérimentales, ajoutez le mot-clé de la "
 "fonctionnalité dans la liste. Selon la fonctionnalité, il peut être "
@@ -420,23 +423,26 @@ msgstr ""
 "mutter d’utiliser par défaut une disposition par moniteur logique dans un "
 "espace de coordonnées de pixels logique, tout en mettant à l’échelle les "
 "« framebuffers » de moniteur au lieu des contenus de fenêtre pour pouvoir "
-"gérer les moniteurs à haute densité. Cela ne nécessite pas de redémarrage."
+"gérer les moniteurs à haute densité. Cela ne nécessite pas de redémarrage. • "
+"« remote-desktop » — active la prise en charge du bureau à distance. Pour la "
+"prise en charge du bureau distant avec partage de l’écran, « screen-cast » "
+"doit aussi être activé. • « screen-cast »  — active la diffusion de l’écran. "
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr ""
 "Sélectionner la fenêtre dans la vue qui apparaît suite à un appui sur la "
 "touche tab"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Fermer la vue qui apparaît suite à un appui sur la touche tab"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Changer de configuration de moniteur"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Passe à la prochaine configuration intégrée de moniteur"
 
@@ -506,9 +512,9 @@ msgid ""
 msgstr ""
 "Permettre aux captures de clavier émises par les applications X11 tournant "
 "dans Xwayland d’être prises en compte. Pour que ceci puisse arriver, le "
-"client doit aussi soit envoyer un ClientMessage X11 spécifique à la fenêtre "
-"racine, soit figurer dans les applications autorisées dans la clé « xwayland-"
-"access-rules »."
+"client doit aussi soit envoyer un ClientMessage X11 spécifique à la "
+"fenêtre racine, soit figurer dans les applications autorisées dans la clé "
+"« xwayland-access-rules »."
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:77
 msgid "Xwayland applications allowed to issue keyboard grabs"
@@ -528,20 +534,20 @@ msgid ""
 "shortcuts”."
 msgstr ""
 "Liste de noms de ressources ou de classes de ressources de fenêtres X11 "
-"autorisées ou non à émettre des captures clavier sous Xwayland. Le nom ou la "
-"classe de ressource d’une fenêtre X11 donnée peut être obtenue à l’aide de "
-"la commande « xprop WM_CLASS ». Les caractères joker « * » et « ? » sont "
+"autorisées ou non à émettre des captures clavier sous Xwayland. Le nom ou "
+"la classe de ressource d’une fenêtre X11 donnée peut être obtenue à l’aide "
+"de la commande « xprop WM_CLASS ». Les caractères joker « * » et « ? » sont "
 "acceptées dans les valeurs. Les valeurs commençant pas « ! » sont en liste "
 "noire, qui a priorité sur la liste blanche, pour révoquer les applications "
-"de la liste système par défaut. Celle-ci contient les applications "
-"suivantes : « @XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@ ». Les utilisateurs "
-"peuvent casser une capture existante en utilisant le raccourci clavier "
-"spécifique défini par la combinaison de touches « restore-shortcuts »."
+"de la liste système par défaut. Celle-ci contient les applications suivantes : "
+"« @XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@ ». Les utilisateurs peuvent casser une "
+"capture existante en utilisant le raccourci clavier spécifique défini par "
+"la combinaison de touches « restore-shortcuts »."
 
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2260
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Changement de mode (groupe %d)"
@@ -549,30 +555,30 @@ msgstr "Changement de mode (groupe %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2283
 msgid "Switch monitor"
 msgstr "Changer de moniteur"
 
-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2285
 msgid "Show on-screen help"
 msgstr "Afficher l’aide à l’écran"
 
-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "Affichage intégré"
 
-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "Affichage inconnu"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -587,65 +593,66 @@ msgstr ""
 "Un autre gestionnaire de composition est déjà lancé sur l’écran %i de "
 "l’affichage « %s »."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Évènement sonore"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Impossible d’ouvrir l’affichage « %s » du système X Window\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "Désactiver la connexion au gestionnaire de sessions"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "Remplacer le gestionnaire de fenêtres en cours de fonctionnement"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "Indiquer l’ID de gestion de sessions"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "Affichage X à utiliser"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "Initialiser la session depuis le fichier de sauvegarde"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
 msgstr "Rendre synchrones les appels à X"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
 msgstr "Lancer comme un compositeur wayland"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "Lancer comme un compositeur imbriqué"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Lancer le compositeur wayland sans démarrer Xwayland"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "Lancer comme un serveur d’affichage complet, plutôt qu’imbriqué"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "Lancer avec le moteur X11"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "« %s » ne répond pas."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "L’application ne répond pas."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -653,11 +660,11 @@ msgstr ""
 "Vous pouvez patienter un instant pour continuer ou forcer l’application à "
 "quitter définitivement."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Forcer à quitter"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Attendre"
 
@@ -685,21 +692,12 @@ msgstr "Afficher la version"
 msgid "Mutter plugin to use"
 msgstr "Greffon de Mutter à utiliser"
 
-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"
 
-#: src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter a été compilé sans la prise en charge du mode bavard\n"
-
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Changement de mode : mode %d"
-
-#: src/x11/meta-x11-display.c:666
+#: src/core/screen.c:583
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -708,21 +706,21 @@ msgstr ""
 "L’affichage « %s » a déjà un gestionnaire de fenêtres ; essayez d’utiliser "
 "l’option --replace pour remplacer le gestionnaire de fenêtres actuel."
 
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "L’initialisation de GDK a échoué\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Impossible d’ouvrir l’affichage « %s » du système X Window\n"
-
-#: src/x11/meta-x11-display.c:1117
+#: src/core/screen.c:668
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "L’écran %d sur l’affichage « %s » n’est pas valide\n"
 
-#: src/x11/session.c:1819
+#: src/core/util.c:120
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter a été compilé sans la prise en charge du mode bavard\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Changement de mode : mode %d"
+
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -731,7 +729,7 @@ msgstr ""
 "configuration actuelle » et devront être redémarrées manuellement à la "
 "prochaine connexion."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (sur %s)"

po/fur.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-08-15 08:53+0000\n"
-"PO-Revision-Date: 2018-08-17 05:49+0200\n"
+"POT-Creation-Date: 2018-02-06 04:14+0000\n"
+"PO-Revision-Date: 2018-02-06 22:43+0100\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "Language: fur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -391,7 +391,10 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Par abilitâ lis funzionalitâts sperimentâls, zonte la peraule clâf de "
 "funzionalitât ae liste. Il fat che la funzionalitât e vedi bisugne di tornâ "
@@ -402,21 +405,25 @@ msgstr ""
 "“scale-monitor-framebuffer” — al rint come predefinît par mutter, la "
 "disposizion logjiche dai visôrs intun spazi logjic di coordenadis di pixel, "
 "in plui si fâs il scjalâ dai framebuffer dai visôrs invezit che il contignût "
-"dal barcon; dut chest par gjestî i visôrs HiDPI. Nol covente tornâ a inviâ."
+"dal barcon; dut chest par gjestî i visôrs HiDPI. Nol covente tornâ a inviâ. "
+"• “remote-desktop” — al abilite il supuart pal scritori rimot. Par podê "
+"supuartâ il scritori rimot cun la condivision dal schermi si scugne abilitâ "
+"ancje “screen-cast”. • “screen-cast” — al abilite il supuart pe trasmission "
+"dal schermi."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Selezione barcon dal tab popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Anule tab popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Cambie configurazions visôr"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Al volte la configurazion dal visôr integrât"
 
@@ -522,7 +529,7 @@ msgstr ""
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2260
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambie mût (Grup %d)"
@@ -530,30 +537,30 @@ msgstr "Cambie mût (Grup %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2283
 msgid "Switch monitor"
 msgstr "Cambie visôr"
 
-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2285
 msgid "Show on-screen help"
 msgstr "Mostre jutori a schermi"
 
-#: src/backends/meta-monitor-manager.c:886
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "Display integrât"
 
-#: src/backends/meta-monitor-manager.c:909
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "No cognossût"
 
-#: src/backends/meta-monitor-manager.c:911
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "Display no cognossût"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:919
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -568,65 +575,66 @@ msgstr ""
 "Un altri compositing manager al è za in esecuzion sul schermi %i sul display "
 "“%s”."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Event cjampane"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Impussibil vierzi il display “%s” di X Window System\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "Disabilite la conession al gjestôr de session"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "Rimplace il window manager in vore"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "Specifiche il ID di gjestion session"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "Display X di doprâ"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "Inizialize session da file salvât"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
 msgstr "Fâs lis clamadis X sincronis"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
 msgstr "Eseguìs come compositor wayland"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "Eseguìs come compositor nidiât"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Eseguìs il compositôr di wayland cence inviâ Xwayland"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "Eseguìs come servidôr display complet, invezit che nidiât"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "Eseguìs cul backend X11"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” nol rispuint."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "La aplicazion no rispuint."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -634,11 +642,11 @@ msgstr ""
 "Al è pussibil sielzi di spietâ un pôc lassant che la aplicazion e continui o "
 "sfuarçâ la aplicazion par sierâle dal dut."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "Sfuarce _Jessude"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Spiete"
 
@@ -665,21 +673,12 @@ msgstr "Stampe version"
 msgid "Mutter plugin to use"
 msgstr "Plugin Mutter di doprâ"
 
-#: src/core/prefs.c:1787
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Spazi di lavôr %d"
 
-#: src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter al è stât compilât cence supuart pe modalitât fetose\n"
-
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Cambie mût: mût %d"
-
-#: src/x11/meta-x11-display.c:666
+#: src/core/screen.c:583
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -688,21 +687,21 @@ msgstr ""
 "Il display “%s” al à za un window manager; prove dopre la opzion --replace "
 "par rimplaçâ chel atuâl."
 
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "No si è rivâts a inizializâ GDK\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Impussibil vierzi il display “%s” di X Window System\n"
-
-#: src/x11/meta-x11-display.c:1117
+#: src/core/screen.c:668
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Schermi %d su display “%s” no valit\n"
 
-#: src/x11/session.c:1819
+#: src/core/util.c:120
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter al è stât compilât cence supuart pe modalitât fetose\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Cambie mût: mût %d"
+
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -710,7 +709,7 @@ msgstr ""
 "Chescj barcons no supuartin la funzion “salve impostazions atuâls” e si "
 "scugnarà tornâ a inviâlis a man tal prossim acès."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (su %s)"

po/gl.po

@@ -14,16 +14,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-03-03 13:19+0000\n"
-"PO-Revision-Date: 2018-05-07 19:37+0200\n"
-"Last-Translator: marcos <marcoslansgarza@gmail.com>\n"
+"POT-Creation-Date: 2018-03-01 10:47+0000\n"
+"PO-Revision-Date: 2018-03-03 14:18+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
 #: data/50-mutter-navigation.xml:6
@@ -100,7 +100,7 @@ msgstr "Cambia á xanela anterior dun aplicativo"
 
 #: data/50-mutter-navigation.xml:70
 msgid "Switch system controls"
-msgstr "Cambiar entre os controis do sistema"
+msgstr "Cambiar entre os controles do sistema"
 
 #: data/50-mutter-navigation.xml:75
 msgid "Switch to previous system control"
@@ -124,7 +124,7 @@ msgstr "Cambia directamente á xanela anterior do aplicativo"
 
 #: data/50-mutter-navigation.xml:97
 msgid "Switch system controls directly"
-msgstr "Cambiar entre os controis do sistema directamente"
+msgstr "Cambiar entre os controles do sistema directamente"
 
 #: data/50-mutter-navigation.xml:102
 msgid "Switch directly to previous system control"

po/lt.po

@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-08-05 23:42+0300\n"
+"POT-Creation-Date: 2018-03-01 18:57+0000\n"
+"PO-Revision-Date: 2018-03-03 13:37+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -389,18 +389,6 @@ msgid "Enable experimental features"
 msgstr "Įjungti eksperimentines savybes"
 
 #: data/org.gnome.mutter.gschema.xml.in:108
-#| msgid ""
-#| "To enable experimental features, add the feature keyword to the list. "
-#| "Whether the feature requires restarting the compositor depends on the "
-#| "given feature. Any experimental feature is not required to still be "
-#| "available, or configurable. Don’t expect adding anything in this setting "
-#| "to be future proof. Currently possible keywords: • “scale-monitor-"
-#| "framebuffer” — makes mutter default to layout logical monitors in a "
-#| "logical pixel coordinate space, while scaling monitor framebuffers "
-#| "instead of window content, to manage HiDPI monitors. Does not require a "
-#| "restart. • “remote-desktop” — enables remote desktop support. To support "
-#| "remote desktop with screen sharing, “screen-cast” must also be enabled. • "
-#| "“screen-cast” — enables screen cast support."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -409,31 +397,37 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Norėdami įjungti eksperimentines savybes, pridėkite į sąrašą raktinį žodį. "
 "Ar savybė reikalauja kompozitoriaus paleidimo iš naujo priklauso nuo "
-"konkrečios savybės. Nei viena eksperimentinė savybė neprivalo būti prieinama "
+"konkrečios savybės. Nei viena eksperimentinė savybė privalo būti prieinama "
 "ar konfigūruojama. Nesitikėkite, kad ką nors pridėjus į šį sąrašą, tai "
 "išliks ir ateityje. Šiuo metu galimi raktažodžiai: • „scale-monitor-"
 "framebuffer“ — mutter numatytai išdėsto loginius monitorius loginėje "
 "pikselių koordinačių erdvėje, tuo pat ištempiant monitorių kadrų buferius "
 "vietoje langų turinio, tokiu būdu valdant didelio tankio monitorius. "
-"Nereikalauja paleisti iš naujo."
+"Nereikalauja paleisti iš naujo. • „remote-desktop“ – įjungia nutolusio "
+"darbalaukio palaikymą. Norint nutolusio darbalaukio su dalinimusi ekranu, "
+"taip pat reikia įjungti „screen-cast“. • „screen-cast“ – įjungia ekrano "
+"transliacijos palaikymą."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Pasirinkti langą iš tab iššokimo"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Atšaukti tab iššokimą"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Perjungti monitorių konfigūracijas"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Suka integruotas monitorių konfigūracijas"
 
@@ -554,22 +548,22 @@ msgstr "Perjungti monitorių"
 msgid "Show on-screen help"
 msgstr "Rodyti pagalbą ekrane"
 
-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "Integruotas vaizduoklis"
 
-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "Nežinomas vaizduoklis"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -582,75 +576,76 @@ msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr "Kita kompozicijos tvarkytuvė jau veikia ekrane %i vaizduoklyje „%s“."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Skambučio įvykis"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Nepavyko atverti X Window sistemos vaizduoklio „%s“\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "Išjungti susijungimą su sesijos tvarkytuve"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "Pakeisti veikiančią langų tvarkytuvę"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "Nurodyti sesijos tvarkymo ID"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "Naudotinas X ekranas"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "Inicializuoti sesiją iš išsaugojimo failo"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
 msgstr "Sinchronizuoti X iškvietimus"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
 msgstr "Vykdyti kaip wayland kompozitorių"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "Vykdyti kaip įdėtinį kompozitorių"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Paleisti wayland kompozitorių nepaleidžiant Xwayland"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "Vykdyti kaip visą vaizduoklio serverį, o ne įdėtinį"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "Paleisti su X11 realizacija"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "%s neatsiliepia į komandas."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Programa neatsiliepia į komandas."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "Galite šiek tiek palaukti arba priverstinai uždaryti programą."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Priverstinai išeiti"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Laukti"
 
@@ -678,11 +673,25 @@ msgstr "Parodyti versiją"
 msgid "Mutter plugin to use"
 msgstr "Naudojamas Mutter įskiepis"
 
-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Darbo sritis %d"
 
+#: src/core/screen.c:583
+#, c-format
+msgid ""
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
+msgstr ""
+"Vaizduoklis „%s“ jau turi langų tvarkytuvę; pabandykite pakeisti esamą langų "
+"tvarkytuvę, naudodami parametrą --replace."
+
+#: src/core/screen.c:668
+#, c-format
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "Ekranas %d vaizduoklyje „%s“ yra netinkamas\n"
+
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter buvo sukompiliuota be išsamaus veikimo veiksenos\n"
@@ -692,30 +701,7 @@ msgstr "Mutter buvo sukompiliuota be išsamaus veikimo veiksenos\n"
 msgid "Mode Switch: Mode %d"
 msgstr "Veiksenos perjungimas: veiksena %d"
 
-#: src/x11/meta-x11-display.c:666
-#, c-format
-msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
-msgstr ""
-"Vaizduoklis „%s“ jau turi langų tvarkytuvę; pabandykite pakeisti esamą langų "
-"tvarkytuvę, naudodami parametrą --replace."
-
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "Nepavyko inicializuoti GDK\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Nepavyko atverti X Window sistemos vaizduoklio „%s“\n"
-
-#: src/x11/meta-x11-display.c:1117
-#, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Ekranas %d vaizduoklyje „%s“ yra netinkamas\n"
-
-#: src/x11/session.c:1819
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -723,7 +709,7 @@ msgstr ""
 "Šie langai nepalaiko „išsaugoti esamus nustatymus“ komandos ir, kai kitą "
 "kartą prisijungsite, turės būti paleisti rankiniu būdu."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (kompiuteryje %s)"

po/pl.po

@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-08-04 20:08+0200\n"
+"POT-Creation-Date: 2018-02-06 04:14+0000\n"
+"PO-Revision-Date: 2018-02-08 02:05+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -405,7 +405,10 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Aby włączyć eksperymentalne funkcje, należy dodać słowo kluczowe funkcji do "
 "tej listy. Niektóre funkcje wymagają ponownego uruchomienia menedżera okien. "
@@ -414,21 +417,24 @@ msgstr ""
 "„scale-monitor-framebuffer” — sprawia, że menedżer okien do zarządzania "
 "monitorami o wysokiej rozdzielczości domyślnie układa logiczne monitory "
 "w przestrzeni współrzędnych logicznych pikseli, jednocześnie skalując bufory "
-"ramki monitorów zamiast zawartości okien. Nie wymaga ponownego uruchomienia."
+"ramki monitorów zamiast zawartości okien. Nie wymaga ponownego uruchomienia. "
+"• „remote-desktop” — włącza obsługę zdalnego pulpitu. Aby dodać "
+"udostępnianie ekranu, należy włączyć także opcję „screen-cast”. • „screen-"
+"cast” — włącza obsługę nagrywania ekranu."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Wybór okna z wyskakującego okna dla tabulacji"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Anulowanie wyskakującego okna dla tabulacji"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Przełączenie konfiguracji monitorów"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Obrócenie wbudowanego monitora"
 
@@ -532,7 +538,7 @@ msgstr ""
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2260
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Przełącznik trybu (%d. grupa)"
@@ -540,30 +546,30 @@ msgstr "Przełącznik trybu (%d. grupa)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2283
 msgid "Switch monitor"
 msgstr "Przełączenie monitora"
 
-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2285
 msgid "Show on-screen help"
 msgstr "Ekran pomocy"
 
-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "Wbudowany ekran"
 
-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "Nieznany ekran"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -577,75 +583,76 @@ msgid ""
 msgstr ""
 "Inny menedżer składania jest już uruchomiony na podekranie %i ekranu „%s”."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Zdarzenie sygnału dźwiękowego"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Otwarcie połączenia z ekranem „%s” systemu X Window się nie powiodło\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "Rozłącza połączenie z menedżerem sesji"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "Zastępuje uruchomionego menedżera okien"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "Podaje identyfikator zarządzania sesją"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "Używany ekran X"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "Inicjuje sesję z zapisanego pliku"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
 msgstr "Uruchamia jako menedżer składania Wayland"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "Uruchamia jako osadzony menedżer składania"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Uruchamia menedżer składania Wayland bez uruchamiania Xwayland"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "Uruchamia jako pełny serwer wyświetlania zamiast osadzonego"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "Uruchamia za pomocą mechanizmu X11"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "Okno „%s” nie odpowiada."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Program nie odpowiada."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "Można poczekać chwilę dłużej lub wymusić zakończenie programu."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Zakończ"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Czekaj"
 
@@ -673,22 +680,12 @@ msgstr "Wyświetla wersję"
 msgid "Mutter plugin to use"
 msgstr "Używana wtyczka menedżera Mutter"
 
-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. obszar roboczy"
 
-#: src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr ""
-"Menedżer Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"
-
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Przełącznik trybu: %d. tryb"
-
-#: src/x11/meta-x11-display.c:666
+#: src/core/screen.c:583
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -697,21 +694,22 @@ msgstr ""
 "Na ekranie „%s” działa już menedżer okien. Aby zastąpić działającego "
 "menedżera okien, należy użyć opcji „--replace”."
 
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "Zainicjowanie biblioteki GDK się nie powiodło\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Otwarcie połączenia z ekranem „%s” systemu X Window się nie powiodło\n"
-
-#: src/x11/meta-x11-display.c:1117
+#: src/core/screen.c:668
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Podekran %d ekranu „%s” jest nieprawidłowy\n"
 
-#: src/x11/session.c:1819
+#: src/core/util.c:120
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr ""
+"Menedżer Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Przełącznik trybu: %d. tryb"
+
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -719,7 +717,7 @@ msgstr ""
 "Te okna nie obsługują opcji zapisu obecnego stanu („save current setup”), "
 "więc przy następnym zalogowaniu będą musiały zostać uruchomione ręcznie."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

po/ro.po

@@ -4,15 +4,15 @@
 # Mugurel Tudor <mugurelu@gnome.ro>, 2002-2004, 2005, 2006, 2007.
 # Adi Roiban https://launchpad.net/~adiroiban, 2008, 2009
 # Lucian Adrian Grijincu <lucian.grijincu@gmail.com>, 2011.
-# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2015, 2018.
+# Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.ro\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-13 13:37+0000\n"
-"PO-Revision-Date: 2018-07-17 18:56+0300\n"
-"Last-Translator: Florentina Mușat <florentina.musat.28 [at] gmail [dot] "
-"com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
+"keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-10-21 11:43+0000\n"
+"PO-Revision-Date: 2015-10-22 19:10+0200\n"
+"Last-Translator: Daniel Șerbănescu <daniel [at] serbanescu [dot] dk>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
@@ -20,259 +20,275 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2);;\n"
-"X-Generator: Poedit 2.0.9\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: data/50-mutter-navigation.xml:6
+#: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Navigare"
 
-#: data/50-mutter-navigation.xml:9
+#: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Mută fereastra pe spațiul de lucru 1"
 
-#: data/50-mutter-navigation.xml:12
+#: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Mută fereastra pe spațiul de lucru 2"
 
-#: data/50-mutter-navigation.xml:15
+#: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Mută fereastra pe spațiul de lucru 3"
 
-#: data/50-mutter-navigation.xml:18
+#: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Mută fereastra pe spațiul de lucru 4"
 
-#: data/50-mutter-navigation.xml:21
+#: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
 msgstr "Mută fereastra pe spațiul de lucru anterior"
 
-#: data/50-mutter-navigation.xml:24
+#: ../data/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the left"
+msgstr "Mută fereastra pe spațiul de lucru de la stânga"
+
+#: ../data/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace to the right"
+msgstr "Mută fereastra pe spațiul de lucru de la dreapta"
+
+#: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Mută fereastra pe spațiul de lucru de mai sus"
 
-#: data/50-mutter-navigation.xml:27
+#: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
 msgstr "Mută fereastra pe spațiul de lucru de mai jos"
 
-#: data/50-mutter-navigation.xml:30
+#: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
 msgstr "Mută fereastra cu un monitor la stânga"
 
-#: data/50-mutter-navigation.xml:33
+#: ../data/50-mutter-navigation.xml.in.h:12
 msgid "Move window one monitor to the right"
 msgstr "Mută fereastra un monitor la dreapta"
 
-#: data/50-mutter-navigation.xml:36
+#: ../data/50-mutter-navigation.xml.in.h:13
 msgid "Move window one monitor up"
 msgstr "Mută fereastra cu un monitor mai sus"
 
-#: data/50-mutter-navigation.xml:39
+#: ../data/50-mutter-navigation.xml.in.h:14
 msgid "Move window one monitor down"
 msgstr "Mută fereastra cu un monitor mai jos"
 
-#: data/50-mutter-navigation.xml:43
+#: ../data/50-mutter-navigation.xml.in.h:15
 msgid "Switch applications"
 msgstr "Comută aplicațiile"
 
-#: data/50-mutter-navigation.xml:48
+#: ../data/50-mutter-navigation.xml.in.h:16
 msgid "Switch to previous application"
 msgstr "Schimbă la aplicația anterioară"
 
-#: data/50-mutter-navigation.xml:52
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Schimbă ferestre"
 
-#: data/50-mutter-navigation.xml:57
+#: ../data/50-mutter-navigation.xml.in.h:18
 msgid "Switch to previous window"
 msgstr "Schimbă la fereastra anterioară"
 
-#: data/50-mutter-navigation.xml:61
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Schimbă ferestrele unei aplicații"
 
-#: data/50-mutter-navigation.xml:66
+#: ../data/50-mutter-navigation.xml.in.h:20
 msgid "Switch to previous window of an application"
 msgstr "Schimbă la fereastra anterioară a unei aplicații"
 
-#: data/50-mutter-navigation.xml:70
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Schimbă comenzile de sistem"
 
-#: data/50-mutter-navigation.xml:75
+#: ../data/50-mutter-navigation.xml.in.h:22
 msgid "Switch to previous system control"
 msgstr "Schimbă la comanda de control anterioară"
 
-#: data/50-mutter-navigation.xml:79
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Schimbă ferestrele în mod direct"
 
-#: data/50-mutter-navigation.xml:84
+#: ../data/50-mutter-navigation.xml.in.h:24
 msgid "Switch directly to previous window"
 msgstr "Schimbă la fereastra anterioară în mod direct"
 
-#: data/50-mutter-navigation.xml:88
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
-msgstr "Comută direct ferestrele unei aplicații"
+msgstr "Schimbă în mod direct ferestrele uneui aplicații "
 
-#: data/50-mutter-navigation.xml:93
+#: ../data/50-mutter-navigation.xml.in.h:26
 msgid "Switch directly to previous window of an app"
 msgstr "Schimbă în mod direct la fereastra anterioară a unei aplicații"
 
-#: data/50-mutter-navigation.xml:97
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Schimbă comenzile de sistem în mod direct"
 
-#: data/50-mutter-navigation.xml:102
+#: ../data/50-mutter-navigation.xml.in.h:28
 msgid "Switch directly to previous system control"
 msgstr "Schimbă în mod direct la o comandă de sistem anterioară"
 
-#: data/50-mutter-navigation.xml:105
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
-msgstr "Ascunde toate ferestrele normale"
+msgstr "Ascunde toate ferestrele normale "
 
-#: data/50-mutter-navigation.xml:108
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Comută la spațiul de lucru 1"
 
-#: data/50-mutter-navigation.xml:111
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Comută la spațiul de lucru 2"
 
-#: data/50-mutter-navigation.xml:114
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Comută la spațiul de lucru 3"
 
-#: data/50-mutter-navigation.xml:117
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Comută la spațiul de lucru 4"
 
-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
-msgstr "Comută la ultimul spațiu de lucru"
+msgstr "Comută la ultimul spațiu de lucru "
 
-#: data/50-mutter-navigation.xml:123
+#: ../data/50-mutter-navigation.xml.in.h:35
+msgid "Move to workspace left"
+msgstr "Mută pe spațiul de lucru din stânga"
+
+#: ../data/50-mutter-navigation.xml.in.h:36
+msgid "Move to workspace right"
+msgstr "Mută pe spațiul de lucru din dreapta"
+
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Mută pe spațiul de lucru deasupra"
 
-#: data/50-mutter-navigation.xml:126
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Mută pe spațiul de lucru de jos"
 
-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Sistem"
 
-#: data/50-mutter-system.xml:8
+#: ../data/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr "Arată prompterul de comandă al comenzii run (rulează)"
 
-#: data/50-mutter-system.xml:10
+#: ../data/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr "Arată prezentarea generală a activităților"
 
-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restaurează scurtăturile de tastatură"
-
-#: data/50-mutter-windows.xml:6
+#: ../data/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Ferestre"
 
-#: data/50-mutter-windows.xml:8
+#: ../data/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Activează meniul ferestrei"
 
-#: data/50-mutter-windows.xml:10
+#: ../data/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Comută modul pe tot ecranul"
 
-#: data/50-mutter-windows.xml:12
+#: ../data/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr "Comută starea de maximizare"
 
-#: data/50-mutter-windows.xml:14
+#: ../data/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Maximizează fereastra"
 
-#: data/50-mutter-windows.xml:16
+#: ../data/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Restabilește fereastra"
 
-#: data/50-mutter-windows.xml:18
+#: ../data/50-mutter-windows.xml.in.h:7
+msgid "Toggle shaded state"
+msgstr "Comută starea de umbrire"
+
+#: ../data/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Închide fereastra"
 
-#: data/50-mutter-windows.xml:20
+#: ../data/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Ascunde fereastra"
 
-#: data/50-mutter-windows.xml:22
+#: ../data/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Mută fereastra"
 
-#: data/50-mutter-windows.xml:24
+#: ../data/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Redimensionează fereastra"
 
-#: data/50-mutter-windows.xml:27
+#: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr "Comută fereastra pe toate spațiile de lucru sau doar pe unul"
 
-#: data/50-mutter-windows.xml:29
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Ridică fereastra dacă este acoperită, altfel, coboar-o"
 
-#: data/50-mutter-windows.xml:31
+#: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr "Ridică fereastra deasupra celorlalte ferestre"
 
-#: data/50-mutter-windows.xml:33
+#: ../data/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr "Coboară fereastra sub alte ferestre"
 
-#: data/50-mutter-windows.xml:35
+#: ../data/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Maximizează fereastra pe verticală"
 
-#: data/50-mutter-windows.xml:37
+#: ../data/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Maximizează fereastra pe orizontală"
 
-#: data/50-mutter-windows.xml:41
+#: ../data/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "Împarte în stânga"
 
-#: data/50-mutter-windows.xml:45
+#: ../data/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr "Împarte în dreapta"
 
-#: data/mutter.desktop.in:4
+#: ../data/mutter.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutter"
 
-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
 msgstr ""
 "Modificatorul folosit pentru operațiile extinse de management al ferestrelor"
 
-#: data/org.gnome.mutter.gschema.xml.in:8
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
-"Această cheie va iniția „suprapunerea”, care este o combinație între o "
-"privire de ansamblu a ferestrelor și un sistem de lansare de aplicații. "
-"Implicit este tasta „Windows” pe hardware PC. Este de așteptat ca această "
-"legătură să fie ori stabilită la implicit sau la șirul vid."
+"Această cheie va iniția „overlay”-ul, care este o combinație între o privire "
+"de ansamblu a ferestrelor și un sistemul de lansare de aplicații. Implicit "
+"este testa „Windows” pe hardware PC. Este de așteptat ca această cheie să "
+"fie sau implicit sau setat la șirul vid."
 
-#: data/org.gnome.mutter.gschema.xml.in:20
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Atașează dialogurile modale"
 
-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -282,12 +298,13 @@ msgstr ""
 "modale apar atașate la bara de titlu a ferestrei părinte și sunt mutate "
 "împreună cu fereastra părinte."
 
-#: data/org.gnome.mutter.gschema.xml.in:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
+#, fuzzy
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Activează mozaicul de margine la plasarea ferestrelor pe marginile ecranului"
+"Activează mozaicul lateral la plasarea ferestrelor pe marginile ecranului"
 
-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
@@ -298,25 +315,25 @@ msgstr ""
 "pentru a acoperi jumătate din suprafața disponibilă. Plasarea ferestrelor pe "
 "marginea de sus a ecranului le maximizează complet."
 
-#: data/org.gnome.mutter.gschema.xml.in:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr "Spațiile de lucru sunt gestionate în mod dinamic"
 
-#: data/org.gnome.mutter.gschema.xml.in:41
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
-"Determină dacă spațiile de lucru sunt administrate dinamic sau dacă există "
-"un număr static de spații de lucru (determinat de cheia num-workspaces din "
-"org.gnome.desktop.wm.preferences)"
+"Determină dacă spațiile de lucru sunt gestionate în mod dinamic sau dacă "
+"există un număr static de spații de lucru (determinată de cheia „num-"
+"workspaces” din ”org.gnome.desktop.wm.preferences”)"
 
-#: data/org.gnome.mutter.gschema.xml.in:50
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr "Spații de lucru doar pe ecranul principal"
 
-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@@ -325,11 +342,11 @@ msgstr ""
 "ferestrele de pe toate monitoarele sau doar pentru ferestrele de pe "
 "monitorul principal."
 
-#: data/org.gnome.mutter.gschema.xml.in:59
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr "Fără popup pentru tab"
 
-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@@ -337,40 +354,42 @@ msgstr ""
 "Determină dacă utilizarea unui popup sau a unui cadrul evidențiat ar trebui "
 "să fie dezactivată pentru rotirea ferestrelor."
 
-#: data/org.gnome.mutter.gschema.xml.in:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
 msgstr ""
 "Întârzie schimbările de focalizare până când cursorul încetează să se miște"
 
-#: data/org.gnome.mutter.gschema.xml.in:69
+#: ../data/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
-"Dacă este stabilit ca adevărat, iar modul de focalizare este ori „neglijent” "
-"ori „maus”, atunci focalizarea nu va fi schimbată imediat la intrarea într-o "
-"fereastră, ci doar după ce indicatorul nu se mai mișcă."
+"Dacă este activat iar modul de focalizare este „alunecos” sau „maus”, "
+"focalizarea nu va fi schimbată imediat după intrarea în câmpul unei "
+"ferestre, ci doar după ce pointerul încetează să se miște."
 
-#: data/org.gnome.mutter.gschema.xml.in:79
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+#, fuzzy
 msgid "Draggable border width"
-msgstr "Lățimea marginii ce poate fi plasată"
+msgstr "Lățimea margini ce poate fi acționată"
 
-#: data/org.gnome.mutter.gschema.xml.in:80
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
+#, fuzzy
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
-"Numărul total de margini ce pot fi plasate. Dacă marginile vizibile ale "
-"temei nu sunt suficiente, vor fi adăugate margini invizibile pentru a "
-"respecta această valoare."
+"Numărul marginilor ce pot fi acționate. Dacă marginile vizibile ale temei "
+"sunt insuficiente vor fi adăugate margini invizibile pentru a completa "
+"aceast număr."
 
-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""
 "Maximizează automat ferestrele de dimensiune apropiată de cea a monitorului"
 
-#: data/org.gnome.mutter.gschema.xml.in:90
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
@@ -378,11 +397,11 @@ msgstr ""
 "Dacă este activată, ferestrele noi care sunt inițial de mărimea monitorului "
 "sunt maximizate în mod automat."
 
-#: data/org.gnome.mutter.gschema.xml.in:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr "Plasează ferestre noi în centru"
 
-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
@@ -390,255 +409,107 @@ msgstr ""
 "Când este adevărat, ferestrele noi vor fi plasate în centrul ecranului activ "
 "al monitorului."
 
-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "Activează funcționalitățile experimentale"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
-msgstr ""
-"Pentru a activa funcționalitățile experimentale, adăugați cuvântul cheie al "
-"funcționalității la listă. Dacă funcționalitatea necesită sau nu repornirea "
-"compunătorului depinde de funcționalitatea dată. Nu este necesar ca "
-"funcționalitatea experimentală să fie încă disponibilă, sau configurabilă. "
-"Nu vă așteptați să adăugați ceva la această configurare care va rezista "
-"timpului. Cuvintele cheie posibile în mod curent: • „scale-monitor-"
-"framebuffer” — face ca mutter să treacă implicit la aranjarea monitoarelor "
-"logice într-un spațiu logic de coordonate pixel, în timpul scalării de "
-"framebuffer-uri de monitor în locul conținutului ferestrei, pentru a "
-"gestiona monitoare HiDPI. Nu necesită o repornire."
-
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr "Selectează fereastra din popup-ul tabului"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
 msgid "Cancel tab popup"
 msgstr "Elimină popup-ul pentru tab"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
-msgid "Switch monitor configurations"
-msgstr "Comută configurațiile de monitor"
-
-#: data/org.gnome.mutter.gschema.xml.in:156
-msgid "Rotates the built-in monitor configuration"
-msgstr "Rotește configurarea de monitor integrat"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 msgid "Switch to VT 1"
 msgstr "Comută la terminalul virtual 1"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
 msgid "Switch to VT 2"
 msgstr "Comută la terminalul virtual 2"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
 msgid "Switch to VT 3"
 msgstr "Comută la terminalul virtual 3"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
 msgid "Switch to VT 4"
 msgstr "Comută la terminalul virtual 4"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
 msgid "Switch to VT 5"
 msgstr "Comută la terminalul virtual 5"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
 msgid "Switch to VT 6"
 msgstr "Comută la terminalul virtual 6"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
 msgid "Switch to VT 7"
 msgstr "Comută la terminalul virtual 7"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
 msgid "Switch to VT 8"
 msgstr "Comută la terminalul virtual 8"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
 msgid "Switch to VT 9"
 msgstr "Comută la terminalul virtual 9"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
 msgid "Switch to VT 10"
 msgstr "Comută la terminalul virtual 10"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
 msgid "Switch to VT 11"
 msgstr "Comută la terminalul virtual 11"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
 msgid "Switch to VT 12"
 msgstr "Comută la terminalul virtual 12"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Reactivează scurtăturile"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Permite capturi de tastatură cu Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Permite capturile de tastatură emise de aplicațiile X11 care rulează în "
-"Xwayland să fie luate în considerare. Pentru ca o captură X11 să fie luată "
-"în considerare în Wayland, clientul trebuie ori să trimită un mesaj specific "
-"ClientMessage X11 la fereastra root ori să se numere printre aplicațiile "
-"permise în cheia „xwayland-grab-access-rules”."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Aplicațiile Xwayland sunt permise de a emite capturi de tastatură"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Listează numele resurselor sau clasa resurselor ale ferestrelor X11 permise "
-"sau nepermise să emită capturi de tastatură X11 în Xwayland. Numele resursei "
-"sau clasa resursei a unei ferestre X11 date pot fi obținute utilizând "
-"comanda „xprop WM_CLASS*. Metacaracterele „*” și jokerii „?” în valori sunt "
-"suportați. Valorile care încep cu „!” sunt adăugate în lista de interziceri, "
-"care are prioritate peste lista de permisiuni, pentru a revoca aplicații din "
-"lista de sistem implicită. Lista de sistem implicită include următoarele "
-"aplicații: „@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Utilizatorii pot să "
-"întrerupă o captură existentă prin utilizarea scurtăturii de tastatură "
-"specifice definite de tasta de stabilire a combinațiilor de taste „restore-"
-"shortcuts”."
-
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:2325
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Comutator de mod (grupul %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:2348
-msgid "Switch monitor"
-msgstr "Comută monitorul"
-
-#: src/backends/meta-input-settings.c:2350
-msgid "Show on-screen help"
-msgstr "Arată ajutorul virtual"
-
-#: src/backends/meta-monitor-manager.c:907
+#: ../src/backends/meta-monitor-manager.c:500
 msgid "Built-in display"
 msgstr "Afișaj integrat"
 
-#: src/backends/meta-monitor-manager.c:930
+#: ../src/backends/meta-monitor-manager.c:526
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: src/backends/meta-monitor-manager.c:932
+#: ../src/backends/meta-monitor-manager.c:528
 msgid "Unknown Display"
 msgstr "Afișaj necunoscut"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: ../src/backends/meta-monitor-manager.c:536
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: ../src/compositor/compositor.c:456
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
-"Un alt administrator de ferestre de compunere rulează deja pe ecranul %i pe "
+"Un alt administrator de ferestre compozit rulează deja pe ecranul %i pe "
 "afișajul „%s”."
 
-#: src/core/bell.c:254
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Eveniment sonor"
 
-#: src/core/main.c:191
-msgid "Disable connection to session manager"
-msgstr "Dezactivează conexiunea la administratorul de sesiune"
-
-#: src/core/main.c:197
-msgid "Replace the running window manager"
-msgstr "Înlocuiește administratorul de ferestre curent"
-
-#: src/core/main.c:203
-msgid "Specify session management ID"
-msgstr "Specifică ID-ul administrării de sesiune"
-
-#: src/core/main.c:208
-msgid "X Display to use"
-msgstr "Ecranul X ce va fi folosit"
-
-#: src/core/main.c:214
-msgid "Initialize session from savefile"
-msgstr "Inițializează sesiunea din fișierul salvat"
-
-#: src/core/main.c:220
-msgid "Make X calls synchronous"
-msgstr "Realizează apelurile X sincron"
-
-#: src/core/main.c:227
-msgid "Run as a wayland compositor"
-msgstr "Rulează ca un compunător wayland"
-
-#: src/core/main.c:233
-msgid "Run as a nested compositor"
-msgstr "Rulează ca un compunător imbricat"
-
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Rulează compunătorul wayland fără a porni Xwayland"
-
-#: src/core/main.c:247
-msgid "Run as a full display server, rather than nested"
-msgstr "Rulează ca server de afișare și nu ca server imbricat"
-
-#: src/core/main.c:253
-msgid "Run with X11 backend"
-msgstr "Rulează cu backend X11"
-
-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "„%s” nu răspunde."
 
-#: src/core/meta-close-dialog-default.c:150
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Aplicația nu răspunde."
 
-#: src/core/meta-close-dialog-default.c:155
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -646,104 +517,112 @@ msgstr ""
 "Puteți alege între a aștepta pentru câteva secunde ca aplicația să continue "
 "sau a forța terminarea aplicației."
 
-#: src/core/meta-close-dialog-default.c:162
-msgid "_Force Quit"
-msgstr "_Forțează închiderea"
-
-#: src/core/meta-close-dialog-default.c:162
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Așteaptă"
 
-#: src/core/mutter.c:39
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Forțează închiderea"
+
+#: ../src/core/display.c:563
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Nu s-a putut deschide afișajul X Window System „%s”\n"
+
+#: ../src/core/main.c:176
+msgid "Disable connection to session manager"
+msgstr "Dezactivează conexiunea la administratorul de sesiune"
+
+#: ../src/core/main.c:182
+msgid "Replace the running window manager"
+msgstr "Înlocuiește administratorul de ferestre curent"
+
+#: ../src/core/main.c:188
+msgid "Specify session management ID"
+msgstr "Specifică ID-ul administrării de sesiune"
+
+#: ../src/core/main.c:193
+msgid "X Display to use"
+msgstr "Ecranul X ce va fi folosit"
+
+#: ../src/core/main.c:199
+msgid "Initialize session from savefile"
+msgstr "Inițializează sesiunea din fișierul salvat"
+
+#: ../src/core/main.c:205
+msgid "Make X calls synchronous"
+msgstr "Realizează apelurile X sincron"
+
+#: ../src/core/main.c:212
+msgid "Run as a wayland compositor"
+msgstr "Rulează ca compozitor wayland"
+
+#: ../src/core/main.c:220
+msgid "Run as a full display server, rather than nested"
+msgstr "Rulează ca server de afișare și nu ca server imbricat"
+
+#: ../src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"Drepturi de autor (C) 2001-%d Havoc Pennington, Red Hat, Inc., și alții\n"
+"Drepturi de autor (C) 2001--%d Havoc Pennington, Red Hat, Inc., și alții\n"
 "Acesta este software liber; consultați codul sursă pentru condițiile de "
 "copiere.\n"
-"Nu există NICIO garanție; nici pentru COMERCIALIZARE sau UTILIZAREA ÎNTR-UN "
+"Nu există NICI O garanție; nici pentru COMERCIALIZARE sau UTILIZAREA ÎNTR-UN "
 "SCOP ANUME.\n"
 
-#: src/core/mutter.c:53
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Afișează versiunea"
 
-#: src/core/mutter.c:59
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Modul Mutter de utilizat"
 
-#: src/core/prefs.c:1915
+#: ../src/core/prefs.c:2050
 #, c-format
 msgid "Workspace %d"
 msgstr "Spațiu de lucru %d"
 
-#: src/core/util.c:120
+#: ../src/core/screen.c:526
+#, c-format
+msgid ""
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
+msgstr ""
+"Afișajul „%s” are deja un administrator de ferestre; încercați să folosiți "
+"opțiunea --replace (înlocuiește) pentru a înlocui administratorul de "
+"ferestre actual."
+
+#: ../src/core/screen.c:608
+#, c-format
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Ecranul %d pe afișajul „%s” este invalid\n"
+
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter a fost compilat fără suport pentru modul detaliat\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Comutator de mod: modul %d"
-
-#: src/x11/meta-x11-display.c:666
-#, c-format
+#: ../src/x11/session.c:1815
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
-msgstr ""
-"Afișajul „%s” are deja un administrator de ferestre; încercați să utilizați "
-"opțiunea --replace (înlocuiește) pentru a înlocui administratorul de "
-"ferestre curent."
-
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "Nu s-a putut inițializa GDK\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Nu s-a putut deschide afișajul sistemului de ferestre X „%s”\n"
-
-#: src/x11/meta-x11-display.c:1117
-#, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Ecranul %d de pe afișajul „%s” nu este valid\n"
-
-#: src/x11/session.c:1819
-msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
 "Aceste ferestre nu suportă „salvează configurarea curentă” și vor trebui "
 "repornite manual următoarea dată când vă veți autentifica."
 
-#: src/x11/window-props.c:565
+#: ../src/x11/window-props.c:549
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (pe %s)"
 
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mută fereastra pe spațiul de lucru de la stânga"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mută fereastra pe spațiul de lucru de la dreapta"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Mută pe spațiul de lucru din stânga"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Mută pe spațiul de lucru din dreapta"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Comută starea de umbrire"
-
 #~ msgid "Switch to workspace on the left of the current workspace"
 #~ msgstr "Schimbă cu spațiul de lucru din stânga celui actual"
 

po/sl.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-08-03 10:14+0000\n"
-"PO-Revision-Date: 2018-08-03 17:00+0200\n"
+"POT-Creation-Date: 2018-04-03 20:43+0000\n"
+"PO-Revision-Date: 2018-04-09 20:28+0200\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -395,29 +395,35 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
-"Za omogočanje preizkusnih možnosti je treba dodati ključne besede na seznam "
-"ključev. Ali vpisana možnost zahteva ponovni zagon sestavljalnika, je "
+"Za omogočanje preizkusnih možnosti, dodajte na seznam ključne besedo "
+"možnosti. Ali vpisana možnost zahteva ponovni zagon sestavljalnika, je "
 "odvisno od posamezne možnosti. Te možnosti niso zahtevane niti nastavljive. "
 "Trenutno so na voljo ključne besede: • »scale-monitor-framebuffer« – določi "
 "privzeto rabo sistema mutter za logične zaslone v logičnem točkovnem "
 "koordinatnem prostoru, pri čemer prilagaja predpomnilnik in ne vsebine za "
-"upravljanje z zasloni HiDPI. Možnost ne zahteva ponovnega zagona."
+"upravljanje z zasloni HiDPI. Možnost ne zahteva ponovnega zagona. • »remote-"
+"desktop« – omogoči podporo oddaljenim namizjem. Za souporabo zaslona mora "
+"biti omogočena tudi možnost »screen-cast«. • »screen-cast« – omogoči podporo "
+"objavljanja na zaslon."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Izbor okna iz pojavnega zavihka"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Prekliči pojavni zavihek"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Nastavitve nadzornika preklopa"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Zavrti vgrajene nastavitve zaslona"
 
@@ -536,22 +542,22 @@ msgstr "Nadzornik preklopa"
 msgid "Show on-screen help"
 msgstr "Pokaži zaslonsko pomoč"
 
-#: src/backends/meta-monitor-manager.c:886
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "Vgrajen zaslon"
 
-#: src/backends/meta-monitor-manager.c:909
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "Neznano"
 
-#: src/backends/meta-monitor-manager.c:911
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "Neznan zaslon"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:919
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -565,65 +571,66 @@ msgid ""
 msgstr ""
 "Drug upravljalnik sestavljanja je že zagnan na zaslonu %i prikaza »%s«."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Dogodek zvonjenja"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Odpiranje zaslona »%s« okenskega sistema X je spodletelo\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "Onemogoči povezavo z upravljalnikom sej"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "Zamenjaj trenutni upravljalnik oken"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "Navedite ID upravljanja seje"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "Zaslon X za uporabo"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "Začni sejo iz shranjene datoteke"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
 msgstr "Uskladi klice X"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
 msgstr "Zaženi izbirnik wayland"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "Zaženi kot gnezden vpisovalnik"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Zaženi sestavljalnik wayland brez zagona okolja Xwayland"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "Zaženi kot polni strežnik zaslona in ne vstavljeno"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "Zaženi z zaledjem X11"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "Okno »%s« se ne odziva."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Program se ne odziva."
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -631,11 +638,11 @@ msgstr ""
 "Lahko še malo počakate, če program morda spet začne delovati, ali pa vsilite "
 "končanje delovanja."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Vsili konec"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Počakaj"
 
@@ -662,11 +669,25 @@ msgid "Mutter plugin to use"
 msgstr "Vstavek Mutter za uporabo"
 
 # G:1 K:0 O:0
-#: src/core/prefs.c:1787
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Delovna površina %d"
 
+#: src/core/screen.c:583
+#, c-format
+msgid ""
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
+msgstr ""
+"Zaslon »%s« že ima določen upravljalnik oken; poskušajte uporabiti možnost --"
+"replace za zamenjavo trenutnega upravljalnika zaslona."
+
+#: src/core/screen.c:668
+#, c-format
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "Zaslon %d na prikazu »%s« ni veljaven\n"
+
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
@@ -677,31 +698,8 @@ msgstr ""
 msgid "Mode Switch: Mode %d"
 msgstr "Način preklopa: način %d"
 
-#: src/x11/meta-x11-display.c:666
-#, c-format
-msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
-msgstr ""
-"Zaslon »%s« že ima določen upravljalnik oken; poskušajte uporabiti možnost --"
-"replace za zamenjavo trenutnega upravljalnika zaslona."
-
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "Začenjanje okolja GDK je spodletelo\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Odpiranje zaslona »%s« okenskega sistema X je spodletelo\n"
-
-#: src/x11/meta-x11-display.c:1117
-#, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Zaslon %d na prikazu »%s« ni veljaven\n"
-
 # G:2 K:6 O:0
-#: src/x11/session.c:1819
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -709,7 +707,7 @@ msgstr ""
 "Ta okna ne podpirajo možnosti »shranjevanja trenutnih nastavitev«, zato jih "
 "bo treba ob naslednji prijavi zagnati ročno."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

po/tr.po

@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-08-08 10:19+0300\n"
+"POT-Creation-Date: 2018-02-06 04:14+0000\n"
+"PO-Revision-Date: 2018-03-13 10:53+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
@@ -289,7 +289,7 @@ msgstr ""
 #: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Pencereler ekran kenarlarında bırakıldığında kenar döşemeyi etkinleştir"
+"Pencereler ekran kenarlarında bırakıldığında kenar döşemeyi etkinleştir."
 
 #: data/org.gnome.mutter.gschema.xml.in:31
 msgid ""
@@ -396,18 +396,6 @@ msgid "Enable experimental features"
 msgstr "Deneysel özellikleri etkinleştir"
 
 #: data/org.gnome.mutter.gschema.xml.in:108
-#| msgid ""
-#| "To enable experimental features, add the feature keyword to the list. "
-#| "Whether the feature requires restarting the compositor depends on the "
-#| "given feature. Any experimental feature is not required to still be "
-#| "available, or configurable. Don’t expect adding anything in this setting "
-#| "to be future proof. Currently possible keywords: • “scale-monitor-"
-#| "framebuffer” — makes mutter default to layout logical monitors in a "
-#| "logical pixel coordinate space, while scaling monitor framebuffers "
-#| "instead of window content, to manage HiDPI monitors. Does not require a "
-#| "restart. • “remote-desktop” — enables remote desktop support. To support "
-#| "remote desktop with screen sharing, “screen-cast” must also be enabled. • "
-#| "“screen-cast” — enables screen cast support."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -416,32 +404,42 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Deneysel özellikleri etkinleştirmek için özelliğin anahtar sözcüğünü listeye "
 "ekleyin. Özelliğin yeniden başlatmayı gerektirip gerektirmeyeceği verilen "
 "özelliğe bağlıdır. Hiçbir deneysel özellik hala kullanılabilir veya "
 "yapılandırılabilir olmak zorunda değildir. Bu ayara eklenecek herhangi bir "
 "şeyin gelecekte olabilecek değişikliklerden etkilenmeyeceğini düşünmeyin. Şu "
-"anda kullanılabilir anahtar sözcükler: • “scale-monitor-framebuffer” — "
-"mutter’in HiDPI monitörleri yönetmesi için pencere içeriği yerine monitör "
-"çerçeve arabelleğini ölçeklendirirken, mantıksal monitörleri mantıksal "
-"piksel koordinat aralığına yerleştirmesini öntanımlı yapar. Yeniden başlatma "
-"gerektirmez."
+"anda kullanılabilir anahtar sözcükler: • “monitor-config-manager” — "
+"eskisinin yerini alması amaçlanan yeni monitör yapılandırma sistemini "
+"kullan. Bu, yapılandırma uygulamaları tarafından kullanılmak üzere daha "
+"yüksek düzeyde bir yapılandırma API’sini etkinleştirir ve ayrıca mantıksal "
+"monitör ölçeğinde yapılandırma yapmaya olanak tanır.• “scale-monitor-"
+"framebuffer” — mutter’in HiDPI monitörleri yönetmesi için pencere içeriği "
+"yerine monitör çerçeve arabelleğini ölçeklendirirken, mantıksal monitörleri "
+"mantıksal piksel koordinat aralığına yerleştirmesini öntanımlı yapar. "
+"Yeniden başlatma gerektirmez. • “remote-desktop” — uzak masaüstü desteğini "
+"etkinleştirir. Uzak masaüstünü ekran paylaşmayla desteklemek için “screen-"
+"cast” mutlaka etkinleştirilmelidir. • “screen-cast” — ekran kaydı desteğini "
+"etkinleştirir."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Pencereyi, sekme açılır penceresinden seç"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Sekmeyi yeni pencerede açmayı iptal et"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Monitör yapılandırmaları arasında geçiş yap"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Yerleşik monitör yapılandırmaları arasında geçiş yapar"
 
@@ -562,22 +560,22 @@ msgstr "Monitör değiştir"
 msgid "Show on-screen help"
 msgstr "Ekranda yardımı göster"
 
-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "Yerleşik ekran"
 
-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "Bilinmeyen Ekran"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -592,65 +590,66 @@ msgstr ""
 "“%2$s” monitöründeki %1$i ekranında zaten başka bir birleştirme yöneticisi "
 "çalışıyor."
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Etkinlik zili"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "X Pencere Sistemi “%s” ekranı açılamadı\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "Ortam yöneticisine olan bağlantıyı kapat"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "Çalışan pencere yöneticisinin yerini al"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "Ortam yönetim ID’sini belirt"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "Kullanılacak X Ekranı"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "Ortamı kayıtlı dosyadan başlat"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
-msgstr "X çağrılarını eşzamanlı yap"
+msgstr "X çağrılarını eşazamanlı yap"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
-msgstr "Wayland dizgici olarak çalıştır"
+msgstr "Bir wayland dizgicisi olarak çalıştır"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "Yuvalanmış dizgici olarak çalıştır"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Xwayland’i çalıştırmadan Wayland dizgici çalıştır"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "İç içe değil tam ekran sunucusu olarak çalıştır"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "X11 arkayüzüyle çalıştır"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” yanıt vermiyor."
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
-msgstr "Uygulama yanıt vermiyor."
+msgstr "Uygulama yanıt vermiyor"
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -658,11 +657,11 @@ msgstr ""
 "Uygulamanın devam etmesi için bir süre beklemeyi seçebilir veya tümüyle "
 "çıkması için zorlayabilirsiniz."
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Zorla Çık"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Bekle"
 
@@ -689,11 +688,26 @@ msgstr "Sürümü yazdır"
 msgid "Mutter plugin to use"
 msgstr "Kullanılacak Mutter eklentisi"
 
-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Çalışma Alanı %d"
 
+#: src/core/screen.c:583
+#, c-format
+msgid ""
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
+msgstr ""
+"“%s” ekranı zaten bir pencere yöneticisine sahip; geçerli pencere "
+"yöneticisinin yerine bir başkasını koymak için --replace seçeneğini "
+"kullanmayı deneyin."
+
+#: src/core/screen.c:668
+#, c-format
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "“%2$s” monitöründeki %1$d ekranı geçersiz\n"
+
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter, ayrıntılı kip desteği olmadan derlenmiş\n"
@@ -703,31 +717,7 @@ msgstr "Mutter, ayrıntılı kip desteği olmadan derlenmiş\n"
 msgid "Mode Switch: Mode %d"
 msgstr "Kip Anahtarı: Kip %d"
 
-#: src/x11/meta-x11-display.c:666
-#, c-format
-msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
-msgstr ""
-"“%s” ekranı zaten bir pencere yöneticisine sahip; geçerli pencere "
-"yöneticisinin yerine bir başkasını koymak için --replace seçeneğini "
-"kullanmayı deneyin."
-
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "GDK ilklendirilemedi\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "X Pencere Sistemi “%s” ekranı açılamadı\n"
-
-#: src/x11/meta-x11-display.c:1117
-#, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "“%2$s” monitöründeki %1$d ekranı geçersiz\n"
-
-#: src/x11/session.c:1819
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -735,7 +725,7 @@ msgstr ""
 "Bu pencereler, “geçerli ayarları kaydet” özelliğini desteklemiyor ve bir "
 "dahaki girişinizde elle yeniden başlatılmak zorundadır."
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s üzerinde)"

po/zh_CN.po

@@ -1,6 +1,6 @@
+# translation of mutter.po to zh_CN
 # Simplified Chinese translation of mutter.
-# Copyright (C) 2012-2018 mutter's COPYRIGHT HOLDER
-# This file is distributed under the same license as the mutter package.
+# Copyright (C) 2002, 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
 # Sun G11n <gnome_int_l10n@ireland.sun.com>, 2002.
 # He Qiangqiang <carton@linux.net.cn>, 2002
 # Xiong Jiang <jxiong@offtopic.org>, 2003
@@ -11,24 +11,22 @@
 # Lele Long <schemacs@gmail.com>, 2011.
 # YunQiang Su <wzssyqa@gmail.com>, 2011, 2012.
 # Tong Hui <tonghuix@gmail.com>, 2014.
-# Mandy Wang <wangmychn@gmail.com>, 2017.
-# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
-# Dingzhong Chen <wsxy162@gmail.com>, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-09 13:01+0000\n"
-"PO-Revision-Date: 2018-02-16 22:22+0800\n"
-"Last-Translator: Dingzhong Chen <wsxy162@gmail.com>\n"
-"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-02-03 10:06+0000\n"
+"PO-Revision-Date: 2017-01-04 21:52+0800\n"
+"Last-Translator: Mandy Wang <wangmychn@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -55,118 +53,134 @@ msgid "Move window to last workspace"
 msgstr "将窗口移到最后一个工作区"
 
 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "将窗口左移一个工作区"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "将窗口右移一个工作区"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "将窗口上移一个工作区"
 
-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "将窗口下移一个工作区"
 
-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "将窗口左移一个显示器"
 
-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "将窗口右移一个显示器"
 
-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "将窗口上移一个显示器"
 
-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "将窗口下移一个显示器"
 
-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "切换应用程序"
 
-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "切换到前一个应用程序"
 
-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "切换窗口"
 
-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "切换到前一个窗口"
 
-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "在应用程序的窗口之间切换窗口"
 
-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "切换到一个应用程序的前一个窗口"
 
-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "切换系统控制"
 
-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "切换到前一个系统控制"
 
-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "直接切换窗口"
 
-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "直接切换到前一个窗口"
 
-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "在应用程序窗口间直接移动焦点"
 
-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "直接切换到一个应用程序的前一个窗口"
 
-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "直接切换系统控制"
 
-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "直接切换到前一个系统控制"
 
-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "隐藏所有正常窗口"
 
-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "切换到工作区 1"
 
-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "切换到工作区 2"
 
-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "切换到工作区 3"
 
-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "切换到工作区 4"
 
-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "切换到最后一个工作区"
 
-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "移动到左侧工作区"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "移动到右侧工作区"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "移动到上层工作区"
 
-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "移动到下层工作区"
 
-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "系统"
 
@@ -176,11 +190,7 @@ msgstr "显示运行命令提示符"
 
 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
-msgstr "显示活动视图"
-
-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "还原键盘快捷键"
+msgstr "显示活动大纲"
 
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
@@ -207,50 +217,54 @@ msgid "Restore window"
 msgstr "恢复窗口"
 
 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "切换卷起状态"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "关闭窗口"
 
-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "隐藏窗口"
 
-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "移动窗口"
 
-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "改变窗口大小"
 
-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "在位于所有或仅一个工作区的窗口间切换"
 
-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "如果窗口被其他窗口遮盖，则提升它，否则降低它"
 
-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "将窗口提升到其它窗口之上"
 
-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "将窗口降低到其它窗口之下"
 
-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "垂直最大化窗口"
 
-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "水平最大化窗口"
 
-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "在左侧查看分割"
 
-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "在右侧查看分割"
 
@@ -264,10 +278,10 @@ msgstr "用于修改窗口点击动作的修饰键 met"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "这个键指出的“覆盖”是一种混合窗口概述和应用程序运行的系统。默认要求使用 "
 "“Super 键”。可能使用默认或者空白。"
@@ -304,12 +318,12 @@ msgstr "动态管理工作区"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
-"决定工作区动态管理还是静态数量的工作区（由 org.gnome.desktop.wm.preferences "
-"中的 num-workspaces 键确定）。"
+"决定工作区动态管理还是静态数量的工作区(由 org.gnome.desktop.wm.preferences 中"
+"的 num-workspaces 键确定)。"
 
 # 或者 只在主显示器上显示工作区
 #: data/org.gnome.mutter.gschema.xml.in:50
@@ -339,9 +353,9 @@ msgstr "将焦点改变推迟到光标停止移动之后"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
-"If set to true, and the focus mode is either “sloppy” or “mouse” then the "
-"focus will not be changed immediately when entering a window, but only after "
-"the pointer stops moving."
+"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+"the focus will not be changed immediately when entering a window, but only "
+"after the pointer stops moving."
 msgstr ""
 "如果为 true，而聚焦模式为“sloppy”或“mouse”，那么进入某个窗口时焦点将不会立即"
 "改变，而是等到光标停止移动之后。"
@@ -352,7 +366,7 @@ msgstr "可拖拽的边界宽度"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "可拖拽的边界总数。如果主题的可见边界不足，将添加不可见的边界来满足此值。"
@@ -377,50 +391,14 @@ msgid ""
 "screen of the monitor."
 msgstr "为 true 时，新窗口将总是置于此显示器已激活屏幕的中央。"
 
-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "开启实验性特性"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-msgstr ""
-"要启用实验性特性，请将如下特性关键字添加到列表中。特性是否要求重启合成器取决"
-"于特性本身。实验性特性不需启用即可配置和使用。请不要将实验性特性作为未来保障"
-"的基础。当前可用的关键字：• “monitor-config-manager” — 使用新的监视器配置系"
-"统，用于替代老的系统。启用此特性将打开一个上级配置 API 以用于配置应用程序，并"
-"可提供基于每屏幕的逻辑缩放功能。• “scale-monitor-framebuffer” — 让 Mutter 默"
-"认基于像素座标排布多屏幕，并同时缩放监视器帧缓冲器而不是窗口内容，以便管理 "
-"HiDPI 监视器。该特性不需要重启来生效。• “remote-desktop” — 启用远程桌面支持。"
-"要支持远程桌面共享，还需要设置“screen-cast”。 • “screen-cast” — 启用屏幕广播"
-"支持。"
-
-#: data/org.gnome.mutter.gschema.xml.in:145
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "从 Tab 轮换弹出界面选择窗口"
 
-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "取消 Tab 轮换弹出"
 
-#: data/org.gnome.mutter.gschema.xml.in:155
-msgid "Switch monitor configurations"
-msgstr "切换显示器配置"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr "旋转内置显示器配置"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "切换到 VT 1"
@@ -469,183 +447,127 @@ msgstr "切换到 VT 11"
 msgid "Switch to VT 12"
 msgstr "切换到 VT 12"
 
-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "重新启用快捷键"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "允许用 Xwayland 捕获"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"允许考虑运行在 Xwayland 中的 X11 应用程序发起的键盘捕获。在 Wayland 下，为了"
-"将 X11 捕获考虑在内，客户端也必须发送一个指定的 X11 ClientMessage 到根窗口，"
-"或是包含进“xwayland-grab-access-rules”键成为其中一个白名单应用程序。"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "允许发起键盘捕获的 Xwayland 应用程序"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Xwayland 下允许或不允许发起 X11 键盘捕获的 X11 窗口，其资源名或资源类的列表。"
-"给定 X11 窗口的资源名或资源类可以使用“xprop WM_CLASS”命令获取。支持在键值中使"
-"用通配符“*”和“?”。以“!”开头的键值会列入黑名单，它们的优先级高于白名单，用来撤"
-"销默认系统列表中的应用程序。默认系统列表包含了下列应用程"
-"序：“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” 用户可以使用键绑定键“restore-"
-"shortcuts”定义的键盘快捷键来中断进行中的捕获。"
-
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:2260
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "模式切换（组别 %d）"
-
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:1861
 msgid "Switch monitor"
 msgstr "切换显示器"
 
-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:1863
 msgid "Show on-screen help"
 msgstr "显示在屏帮助"
 
-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:515
 msgid "Built-in display"
 msgstr "内置显示器"
 
-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:538
 msgid "Unknown"
 msgstr "未知"
 
-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:540
 msgid "Unknown Display"
 msgstr "未知的 Display"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:548
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/compositor/compositor.c:481
+#: src/compositor/compositor.c:471
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr "显示器 %2$s 的屏幕 %1$i 上已有另外一个混成窗口管理器正在运行。"
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "响铃事件"
 
-#: src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "无法打开 X Window System 显示器“%s”\n"
-
-#: src/core/main.c:190
-msgid "Disable connection to session manager"
-msgstr "禁止连接到会话管理器"
-
-#: src/core/main.c:196
-msgid "Replace the running window manager"
-msgstr "替换正在运行的窗口管理器"
-
-#: src/core/main.c:202
-msgid "Specify session management ID"
-msgstr "指定会话管理 ID"
-
-#: src/core/main.c:207
-msgid "X Display to use"
-msgstr "要使用的 X Display"
-
-#: src/core/main.c:213
-msgid "Initialize session from savefile"
-msgstr "从保存文件中初始化会话"
-
-#: src/core/main.c:219
-msgid "Make X calls synchronous"
-msgstr "使 X 调用同步"
-
-#: src/core/main.c:226
-msgid "Run as a wayland compositor"
-msgstr "作为 wayland 混成管理器运行"
-
-#: src/core/main.c:232
-msgid "Run as a nested compositor"
-msgstr "作为嵌套混成器运行"
-
-#: src/core/main.c:240
-msgid "Run as a full display server, rather than nested"
-msgstr "以完整显示服务器方式运行，而不是以嵌套方式"
-
-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "以 X11 后端运行"
-
-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” 未响应。"
 
-#: src/core/meta-close-dialog-default.c:149
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "应用程序未响应。"
 
-#: src/core/meta-close-dialog-default.c:154
+#: src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "您可以选择稍等一会儿，或者强制退出该应用程序。"
 
-#: src/core/meta-close-dialog-default.c:161
+#: src/core/delete.c:141
+msgid "_Wait"
+msgstr "等待(_W)"
+
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "强制退出(_F)"
 
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "等待(_W)"
+#: src/core/display.c:590
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "无法打开 X Window System 显示器“%s”\n"
+
+#: src/core/main.c:182
+msgid "Disable connection to session manager"
+msgstr "禁止连接到会话管理器"
+
+#: src/core/main.c:188
+msgid "Replace the running window manager"
+msgstr "替换正在运行的窗口管理器"
+
+#: src/core/main.c:194
+msgid "Specify session management ID"
+msgstr "指定会话管理 ID"
+
+#: src/core/main.c:199
+msgid "X Display to use"
+msgstr "要使用的 X Display"
+
+#: src/core/main.c:205
+msgid "Initialize session from savefile"
+msgstr "从保存文件中初始化会话"
+
+#: src/core/main.c:211
+msgid "Make X calls synchronous"
+msgstr "使 X 调用同步"
+
+#: src/core/main.c:218
+msgid "Run as a wayland compositor"
+msgstr "作为 wayland 混成管理器运行"
+
+#: src/core/main.c:224
+msgid "Run as a nested compositor"
+msgstr "作为嵌套混成器运行"
+
+#: src/core/main.c:232
+msgid "Run as a full display server, rather than nested"
+msgstr "以完整显示服务器方式运行，而不是以嵌套方式"
 
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., 以及其他\n"
-"本软件为自由软件；版权条款请参见源码\n"
-"不存在任何保证；即便是对商业性或者特定目的的适应性也不作保证。\n"
+"版权所有 (C) 2001-%d Havoc Pennington, Red Hat, Inc., 以及其他\n"
+"本软件为自由软件：版权条款请参见源码\n"
+"不存在任何保证：即便是对商业性或者特定目的的适应性也不作保证。\n"
 
 #: src/core/mutter.c:53
 msgid "Print version"
@@ -660,54 +582,41 @@ msgstr "要使用的 Mutter 插件"
 msgid "Workspace %d"
 msgstr "工作区 %d"
 
-#: src/core/screen.c:583
+#: src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
 "Display“%s”已经有一个窗口管理器；请尝试使用 --replace 选项替换当前的窗口管理"
 "器。"
 
-#: src/core/screen.c:668
+#: src/core/screen.c:606
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
+msgid "Screen %d on display '%s' is invalid\n"
 msgstr "显示“%2$s”上的屏幕 %1$d 无效\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter 编译的时候没有加入详细模式的支持\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "模式切换：%d 模式"
 
-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
-msgstr "这些窗口不支持“保存当前设置”，并且在您下次登录时，必须手动重启它们。"
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
+msgstr ""
+"这些窗口不支持 &quot;保存当前设置 &quot;  您在下次登录时，必须手动重启动它"
+"们。"
 
-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
-msgstr "%s（于 %s）"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "将窗口左移一个工作区"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "将窗口右移一个工作区"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "移动到左侧工作区"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "移动到右侧工作区"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "切换卷起状态"
+msgstr "%s (于 %s)"
 
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "扫描主题目录失败：%s\n"

po/zh_TW.po

@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity 3.3.4\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-08-06 14:19+0000\n"
-"PO-Revision-Date: 2018-08-12 16:35+0800\n"
-"Last-Translator: pan93412 <pan93412@gmail.com>\n"
+"POT-Creation-Date: 2018-03-01 18:57+0000\n"
+"PO-Revision-Date: 2018-03-03 15:20+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -379,27 +379,32 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "若要啟用實驗性功能，請將功能關鍵字加入列表中。置於該功能是否須要重新啟動混成"
 "器則視給予的功能而定。任何實驗性功能不一定能用、或是可以調整設定。請不要預期"
 "在此設定中加入的任何東西未來都能存在。目前可用的關鍵字有： • “scale-monitor-"
 "framebuffer” — 讓 mutter 預設採用邏輯像素座標空間的配置邏輯螢幕，而縮放螢幕 "
-"framebuffer 則取代視窗內容以管理 HiDPI 螢幕。不須要重新啟動。"
+"framebuffer 則取代視窗內容以管理 HiDPI 螢幕。不須要重新啟動。 • “remote-"
+"desktop” — 啟用遠端桌面支援。若要支援遠端桌面的螢幕分享，則必須也啟用“screen-"
+"cast”。• “screen-cast” — 啟用螢幕投放支援。"
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "從分頁彈出項選擇視窗"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "取消分頁彈出項"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "切換螢幕組態"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "旋轉切換內建螢幕組態"
 
@@ -515,22 +520,22 @@ msgstr "切換螢幕"
 msgid "Show on-screen help"
 msgstr "顯示螢幕求助"
 
-#: src/backends/meta-monitor-manager.c:886
+#: src/backends/meta-monitor-manager.c:900
 msgid "Built-in display"
 msgstr "內建顯示"
 
-#: src/backends/meta-monitor-manager.c:909
+#: src/backends/meta-monitor-manager.c:923
 msgid "Unknown"
 msgstr "不明"
 
-#: src/backends/meta-monitor-manager.c:911
+#: src/backends/meta-monitor-manager.c:925
 msgid "Unknown Display"
 msgstr "不明的顯示器"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:919
+#: src/backends/meta-monitor-manager.c:933
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -544,75 +549,76 @@ msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr "在畫面「%2$s」中的第 %1$i 個螢幕中已啟動另一個組合視窗管理員。"
 
-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "響鈴事件"
 
-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "無法開啟 X Window 系統畫面「%s」\n"
+
+#: src/core/main.c:190
 msgid "Disable connection to session manager"
 msgstr "停用到作業階段管理員的連線"
 
-#: src/core/main.c:197
+#: src/core/main.c:196
 msgid "Replace the running window manager"
 msgstr "取代執行中的視窗管理員"
 
-#: src/core/main.c:203
+#: src/core/main.c:202
 msgid "Specify session management ID"
 msgstr "指定作業階段管理 ID"
 
-#: src/core/main.c:208
+#: src/core/main.c:207
 msgid "X Display to use"
 msgstr "使用的 X 畫面"
 
-#: src/core/main.c:214
+#: src/core/main.c:213
 msgid "Initialize session from savefile"
 msgstr "以 savefile 初始化作業階段"
 
-#: src/core/main.c:220
+#: src/core/main.c:219
 msgid "Make X calls synchronous"
 msgstr "使用同步方式調用 X 函式"
 
-#: src/core/main.c:227
+#: src/core/main.c:226
 msgid "Run as a wayland compositor"
 msgstr "以 wayland 組合器執行"
 
-#: src/core/main.c:233
+#: src/core/main.c:232
 msgid "Run as a nested compositor"
 msgstr "以巢狀組合器執行"
 
-#: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "在不啟動 Xwayland 的情況下開啟 Wayland 合成器"
-
-#: src/core/main.c:247
+#: src/core/main.c:240
 msgid "Run as a full display server, rather than nested"
 msgstr "以完全顯示伺服器執行，而非巢狀"
 
-#: src/core/main.c:253
+#: src/core/main.c:246
 msgid "Run with X11 backend"
 msgstr "透過 X11 後端執行"
 
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "「%s」沒有回應。"
 
-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "應用程式沒有回應。"
 
-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "您可以選擇稍等一下讓它繼續，或者強制完全退出程式。"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "強制退出(_F)"
 
-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "等待(_W)"
 
@@ -639,11 +645,25 @@ msgid "Mutter plugin to use"
 msgstr "要使用的 Mutter 外掛程式"
 
 # (Abel) take care of the same string in libwnck
-#: src/core/prefs.c:1787
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "工作區 %d"
 
+#: src/core/screen.c:583
+#, c-format
+msgid ""
+"Display “%s” already has a window manager; try using the --replace option to "
+"replace the current window manager."
+msgstr ""
+"畫面「%s」已經有了視窗管理員；請嘗試使用 --replace 選項來替換目前的視窗管理"
+"員。"
+
+#: src/core/screen.c:668
+#, c-format
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "畫面「%2$s」中的第 %1$d 個螢幕無效\n"
+
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "編譯 Mutter 時並沒有加入詳細偵錯模式的支援\n"
@@ -653,36 +673,13 @@ msgstr "編譯 Mutter 時並沒有加入詳細偵錯模式的支援\n"
 msgid "Mode Switch: Mode %d"
 msgstr "模式切換：模式 %d"
 
-#: src/x11/meta-x11-display.c:666
-#, c-format
-msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
-msgstr ""
-"畫面「%s」已經有了視窗管理員；請嘗試使用 --replace 選項來替換目前的視窗管理"
-"員。"
-
-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "無法初始化 GDK\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "無法開啟 X Window 系統畫面「%s」\n"
-
-#: src/x11/meta-x11-display.c:1117
-#, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "畫面「%2$s」中的第 %1$d 個螢幕無效\n"
-
-#: src/x11/session.c:1819
+#: src/x11/session.c:1818
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
 msgstr "這些視窗不支援「儲存目前的設定」，必須在下次登入後自行啟動。"
 
-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s（在 %s）"

src/Makefile-tests.am

@@ -11,15 +11,20 @@ test_programs = \
 
 if BUILDOPT_INSTALL_TESTS
 stackingdir = $(pkgdatadir)/tests/stacking
-dist_stacking_DATA =						\
-	$(srcdir)/tests/stacking/basic-x11.metatest 	\
-	$(srcdir)/tests/stacking/basic-wayland.metatest	\
-	$(srcdir)/tests/stacking/closed-transient.metatest	\
-	$(srcdir)/tests/stacking/minimized.metatest 	\
-	$(srcdir)/tests/stacking/mixed-windows.metatest     \
-	$(srcdir)/tests/stacking/set-parent.metatest	\
-	$(srcdir)/tests/stacking/set-parent-exported.metatest	\
-	$(srcdir)/tests/stacking/override-redirect.metatest
+dist_stacking_DATA =				\
+	tests/stacking/basic-x11.metatest	\
+	tests/stacking/basic-wayland.metatest	\
+	tests/stacking/closed-transient.metatest	\
+	tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest	\
+	tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest	\
+	tests/stacking/closed-transient-no-input-parent.metatest	\
+	tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest	\
+	tests/stacking/closed-transient-no-input-parents.metatest	\
+	tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest	\
+	tests/stacking/minimized.metatest   	\
+	tests/stacking/mixed-windows.metatest   \
+	tests/stacking/set-parent.metatest	\
+	tests/stacking/override-redirect.metatest
 
 mutter-all.test: tests/mutter-all.test.in
 	$(AM_V_GEN) sed  -e "s|@libexecdir[@]|$(libexecdir)|g"  $< > $@.tmp && mv $@.tmp $@
@@ -74,9 +79,6 @@ mutter_test_headless_start_test_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API
 
 .PHONY: run-tests run-test-runner-tests run-unit-tests run-headless-start-test
 
-export G_TEST_SRCDIR = $(abs_srcdir)
-export G_TEST_BUILDDIR = $(abs_builddir)
-
 run-test-runner-tests: mutter-test-client mutter-test-runner
 	./mutter-test-runner $(dist_stacking_DATA)
 

src/Makefile.am

@@ -88,17 +88,9 @@ mutter_built_sources += \
 	xdg-output-unstable-v1-server-protocol.h			\
 	xwayland-keyboard-grab-unstable-v1-protocol.c			\
 	xwayland-keyboard-grab-unstable-v1-server-protocol.h		\
-	text-input-unstable-v3-protocol.c				\
-	text-input-unstable-v3-server-protocol.h			\
 	gtk-text-input-protocol.c					\
 	gtk-text-input-server-protocol.h				\
 	$(NULL)
-
-if HAVE_WAYLAND_EGLSTREAM
-mutter_built_sources += \
-	wayland-eglstream-controller-server-protocol.h \
-	$(NULL)
-endif
 endif
 
 wayland_protocols =				\
@@ -122,8 +114,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-cursor-tracker-private.h	\
 	backends/meta-cursor-renderer.c		\
 	backends/meta-cursor-renderer.h		\
-	backends/meta-cursor-sprite-xcursor.c	\
-	backends/meta-cursor-sprite-xcursor.h	\
 	backends/meta-dnd-private.h		\
 	backends/meta-egl.c			\
 	backends/meta-egl.h			\
@@ -169,9 +159,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-renderer.h		\
 	backends/meta-renderer-view.c		\
 	backends/meta-renderer-view.h		\
-	backends/meta-remote-access-controller.c	\
-	backends/meta-remote-access-controller-private.h	\
-	meta/meta-remote-access-controller.h	\
 	backends/edid-parse.c			\
 	backends/edid.h				\
 	backends/gsm-inhibitor-flag.h		\
@@ -189,8 +176,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/x11/meta-gpu-xrandr.h			\
 	backends/x11/cm/meta-backend-x11-cm.c		\
 	backends/x11/cm/meta-backend-x11-cm.h		\
-	backends/x11/cm/meta-cursor-sprite-xfixes.c	\
-	backends/x11/cm/meta-cursor-sprite-xfixes.h	\
 	backends/x11/cm/meta-renderer-x11-cm.c		\
 	backends/x11/cm/meta-renderer-x11-cm.h		\
 	backends/x11/nested/meta-backend-x11-nested.c	\
@@ -294,13 +279,12 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	core/edge-resistance.h			\
 	core/events.c				\
 	core/events.h				\
+	core/errors.c				\
+	meta/errors.h				\
 	core/frame.c				\
 	core/frame.h				\
 	core/meta-gesture-tracker.c		\
 	core/meta-gesture-tracker-private.h	\
-	core/meta-workspace-manager.c		\
-	core/meta-workspace-manager-private.h	\
-	meta/meta-workspace-manager.h		\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main-private.h			\
@@ -309,6 +293,9 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	core/place.h				\
 	core/prefs.c				\
 	meta/prefs.h				\
+	core/screen.c				\
+	core/screen-private.h			\
+	meta/screen.h				\
 	core/startup-notification.c		\
 	core/startup-notification-private.h	\
 	meta/types.h				\
@@ -335,11 +322,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	ui/theme-private.h			\
 	ui/ui.c					\
 	x11/atomnames.h				\
-	x11/meta-x11-display.c			\
-	x11/meta-x11-display-private.h		\
-	meta/meta-x11-display.h			\
-	x11/meta-x11-errors.c			\
-	meta/meta-x11-errors.h			\
 	x11/events.c				\
 	x11/events.h				\
 	x11/group-private.h			\
@@ -388,8 +370,6 @@ if HAVE_WAYLAND
 libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
 	compositor/meta-surface-actor-wayland.c	\
 	compositor/meta-surface-actor-wayland.h	\
-	wayland/meta-cursor-sprite-wayland.c	\
-	wayland/meta-cursor-sprite-wayland.h	\
 	wayland/meta-wayland.c			\
 	wayland/meta-wayland.h			\
 	wayland/meta-wayland-private.h		\
@@ -451,18 +431,16 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
 	wayland/meta-wayland-touch.h		\
 	wayland/meta-wayland-surface.c		\
 	wayland/meta-wayland-surface.h		\
-	wayland/meta-wayland-cursor-surface.c	\
-	wayland/meta-wayland-cursor-surface.h	\
-	wayland/meta-wayland-tablet-cursor-surface.c	\
-	wayland/meta-wayland-tablet-cursor-surface.h	\
+	wayland/meta-wayland-surface-role-cursor.c	\
+	wayland/meta-wayland-surface-role-cursor.h	\
+	wayland/meta-wayland-surface-role-tablet-cursor.c	\
+	wayland/meta-wayland-surface-role-tablet-cursor.h	\
 	wayland/meta-wayland-actor-surface.c	\
 	wayland/meta-wayland-actor-surface.h	\
 	wayland/meta-wayland-subsurface.c	\
 	wayland/meta-wayland-subsurface.h	\
 	wayland/meta-wayland-shell-surface.c	\
 	wayland/meta-wayland-shell-surface.h	\
-	wayland/meta-wayland-text-input-legacy.c	\
-	wayland/meta-wayland-text-input-legacy.h	\
 	wayland/meta-wayland-text-input.c	\
 	wayland/meta-wayland-text-input.h	\
 	wayland/meta-wayland-types.h		\
@@ -546,6 +524,7 @@ libmutterinclude_headers =			\
 	meta/compositor-mutter.h		\
 	meta/compositor.h			\
 	meta/display.h				\
+	meta/errors.h				\
 	meta/group.h				\
 	meta/keybindings.h			\
 	meta/main.h				\
@@ -561,7 +540,6 @@ libmutterinclude_headers =			\
 	meta/meta-idle-monitor.h		\
 	meta/meta-plugin.h			\
 	meta/meta-monitor-manager.h		\
-	meta/meta-remote-access-controller.h	\
 	meta/meta-settings.h			\
 	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
@@ -569,10 +547,8 @@ libmutterinclude_headers =			\
 	meta/meta-window-actor.h		\
 	meta/meta-window-group.h		\
 	meta/meta-window-shape.h		\
-	meta/meta-workspace-manager.h		\
-	meta/meta-x11-display.h			\
-	meta/meta-x11-errors.h			\
 	meta/prefs.h				\
+	meta/screen.h				\
 	meta/theme.h				\
 	meta/types.h				\
 	meta/util.h				\
@@ -784,5 +760,3 @@ endef
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@
 %-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@
-%-server-protocol.h : $(WAYLAND_EGLSTREAM_DATADIR)/%.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@

src/backends/meta-backend-private.h

@@ -51,6 +51,14 @@
 #define META_TYPE_BACKEND (meta_backend_get_type ())
 G_DECLARE_DERIVABLE_TYPE (MetaBackend, meta_backend, META, BACKEND, GObject)
 
+typedef enum _MetaSequenceState
+{
+  META_SEQUENCE_NONE,
+  META_SEQUENCE_ACCEPTED,
+  META_SEQUENCE_REJECTED,
+  META_SEQUENCE_PENDING_END
+} MetaSequenceState;
+
 struct _MetaBackendClass
 {
   GObjectClass parent_class;
@@ -73,6 +81,10 @@ struct _MetaBackendClass
                               int          device_id,
                               uint32_t     timestamp);
 
+  void (* finish_touch_sequence) (MetaBackend          *backend,
+                                  ClutterEventSequence *sequence,
+                                  MetaSequenceState     state);
+
   void (* warp_pointer) (MetaBackend *backend,
                          int          x,
                          int          y);
@@ -84,8 +96,6 @@ struct _MetaBackendClass
                        const char  *variants,
                        const char  *options);
 
-  gboolean (* is_lid_closed) (MetaBackend *backend);
-
   struct xkb_keymap * (* get_keymap) (MetaBackend *backend);
 
   xkb_layout_index_t (* get_keymap_layout_group) (MetaBackend *backend);
@@ -136,6 +146,10 @@ gboolean meta_backend_ungrab_device (MetaBackend *backend,
                                      int          device_id,
                                      uint32_t     timestamp);
 
+void meta_backend_finish_touch_sequence (MetaBackend          *backend,
+                                         ClutterEventSequence *sequence,
+                                         MetaSequenceState     state);
+
 void meta_backend_warp_pointer (MetaBackend *backend,
                                 int          x,
                                 int          y);
@@ -146,8 +160,6 @@ struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
 
 xkb_layout_index_t meta_backend_get_keymap_layout_group (MetaBackend *backend);
 
-gboolean meta_backend_is_lid_closed (MetaBackend *backend);
-
 void meta_backend_update_last_device (MetaBackend *backend,
                                       int          device_id);
 

src/backends/meta-backend.c

@@ -39,7 +39,6 @@
 #ifdef HAVE_REMOTE_DESKTOP
 #include "backends/meta-dbus-session-watcher.h"
 #include "backends/meta-screen-cast.h"
-#include "backends/meta-remote-access-controller-private.h"
 #include "backends/meta-remote-desktop.h"
 #endif
 
@@ -59,7 +58,6 @@ enum
   KEYMAP_CHANGED,
   KEYMAP_LAYOUT_GROUP_CHANGED,
   LAST_DEVICE_CHANGED,
-  LID_IS_CLOSED_CHANGED,
 
   N_SIGNALS
 };
@@ -94,7 +92,6 @@ struct _MetaBackendPrivate
   MetaEgl *egl;
   MetaSettings *settings;
 #ifdef HAVE_REMOTE_DESKTOP
-  MetaRemoteAccessController *remote_access_controller;
   MetaDbusSessionWatcher *dbus_session_watcher;
   MetaScreenCast *screen_cast;
   MetaRemoteDesktop *remote_desktop;
@@ -114,10 +111,7 @@ struct _MetaBackendPrivate
   MetaPointerConstraint *client_pointer_constraint;
   MetaDnd *dnd;
 
-  guint upower_watch_id;
-  GDBusProxy *upower_proxy;
-  gboolean lid_is_closed;
-
+  UpClient *up_client;
   guint sleep_signal_id;
   GCancellable *cancellable;
   GDBusConnection *system_bus;
@@ -145,17 +139,14 @@ meta_backend_finalize (GObject *object)
   g_clear_object (&priv->remote_desktop);
   g_clear_object (&priv->screen_cast);
   g_clear_object (&priv->dbus_session_watcher);
-  g_clear_object (&priv->remote_access_controller);
 #endif
 
+  g_object_unref (priv->up_client);
   if (priv->sleep_signal_id)
     g_dbus_connection_signal_unsubscribe (priv->system_bus, priv->sleep_signal_id);
-  if (priv->upower_watch_id)
-    g_bus_unwatch_name (priv->upower_watch_id);
   g_cancellable_cancel (priv->cancellable);
   g_clear_object (&priv->cancellable);
   g_clear_object (&priv->system_bus);
-  g_clear_object (&priv->upower_proxy);
 
   if (priv->device_update_idle_id)
     g_source_remove (priv->device_update_idle_id);
@@ -427,6 +418,28 @@ meta_backend_create_input_settings (MetaBackend *backend)
   return META_BACKEND_GET_CLASS (backend)->create_input_settings (backend);
 }
 
+#ifdef HAVE_REMOTE_DESKTOP
+static gboolean
+is_screen_cast_enabled (MetaBackend *backend)
+{
+  MetaSettings *settings = meta_backend_get_settings (backend);
+
+  return meta_settings_is_experimental_feature_enabled (
+    settings,
+    META_EXPERIMENTAL_FEATURE_SCREEN_CAST);
+}
+
+static gboolean
+is_remote_desktop_enabled (MetaBackend *backend)
+{
+  MetaSettings *settings = meta_backend_get_settings (backend);
+
+  return meta_settings_is_experimental_feature_enabled (
+    settings,
+    META_EXPERIMENTAL_FEATURE_REMOTE_DESKTOP);
+}
+#endif /* HAVE_REMOTE_DESKTOP */
+
 static void
 meta_backend_real_post_init (MetaBackend *backend)
 {
@@ -459,11 +472,11 @@ meta_backend_real_post_init (MetaBackend *backend)
   priv->input_settings = meta_backend_create_input_settings (backend);
 
 #ifdef HAVE_REMOTE_DESKTOP
-  priv->remote_access_controller =
-    g_object_new (META_TYPE_REMOTE_ACCESS_CONTROLLER, NULL);
   priv->dbus_session_watcher = g_object_new (META_TYPE_DBUS_SESSION_WATCHER, NULL);
-  priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
-  priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
+  if (is_screen_cast_enabled (backend))
+    priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
+  if (is_remote_desktop_enabled (backend))
+    priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
 #endif /* HAVE_REMOTE_DESKTOP */
 
   if (!meta_monitor_manager_is_headless (priv->monitor_manager))
@@ -514,144 +527,6 @@ meta_backend_real_get_relative_motion_deltas (MetaBackend *backend,
   return FALSE;
 }
 
-static gboolean
-meta_backend_real_is_lid_closed (MetaBackend *backend)
-{
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  return priv->lid_is_closed;
-}
-
-gboolean
-meta_backend_is_lid_closed (MetaBackend *backend)
-{
-  return META_BACKEND_GET_CLASS (backend)->is_lid_closed (backend);
-}
-
-static void
-upower_properties_changed (GDBusProxy *proxy,
-                           GVariant   *changed_properties,
-                           GStrv       invalidated_properties,
-                           gpointer    user_data)
-{
-  MetaBackend *backend = user_data;
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  GVariant *v;
-  gboolean lid_is_closed;
-
-  v = g_variant_lookup_value (changed_properties,
-                              "LidIsClosed",
-                              G_VARIANT_TYPE_BOOLEAN);
-  if (!v)
-    return;
-
-  lid_is_closed = g_variant_get_boolean (v);
-  g_variant_unref (v);
-
-  if (lid_is_closed == priv->lid_is_closed)
-    return;
-
-  priv->lid_is_closed = lid_is_closed;
-  g_signal_emit (backend, signals[LID_IS_CLOSED_CHANGED], 0,
-                 priv->lid_is_closed);
-
-  if (lid_is_closed)
-    return;
-
-  meta_idle_monitor_reset_idletime (meta_idle_monitor_get_core ());
-}
-
-static void
-upower_ready_cb (GObject      *source_object,
-                 GAsyncResult *res,
-                 gpointer      user_data)
-{
-  MetaBackend *backend;
-  MetaBackendPrivate *priv;
-  GDBusProxy *proxy;
-  GError *error = NULL;
-  GVariant *v;
-
-  proxy = g_dbus_proxy_new_finish (res, &error);
-  if (!proxy)
-    {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning ("Failed to create UPower proxy: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  backend = META_BACKEND (user_data);
-  priv = meta_backend_get_instance_private (backend);
-
-  priv->upower_proxy = proxy;
-  g_signal_connect (proxy, "g-properties-changed",
-                    G_CALLBACK (upower_properties_changed), backend);
-
-  v = g_dbus_proxy_get_cached_property (proxy, "LidIsClosed");
-  if (!v)
-    return;
-  priv->lid_is_closed = g_variant_get_boolean (v);
-  g_variant_unref (v);
-
-  if (priv->lid_is_closed)
-    {
-      g_signal_emit (backend, signals[LID_IS_CLOSED_CHANGED], 0,
-                     priv->lid_is_closed);
-    }
-}
-
-static void
-upower_appeared (GDBusConnection *connection,
-                 const gchar     *name,
-                 const gchar     *name_owner,
-                 gpointer         user_data)
-{
-  MetaBackend *backend = META_BACKEND (user_data);
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  g_dbus_proxy_new (connection,
-                    G_DBUS_PROXY_FLAGS_NONE,
-                    NULL,
-                    "org.freedesktop.UPower",
-                    "/org/freedesktop/UPower",
-                    "org.freedesktop.UPower",
-                    priv->cancellable,
-                    upower_ready_cb,
-                    backend);
-}
-
-static void
-upower_vanished (GDBusConnection *connection,
-                 const gchar     *name,
-                 gpointer         user_data)
-{
-  MetaBackend *backend = META_BACKEND (user_data);
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  g_clear_object (&priv->upower_proxy);
-}
-
-static void
-meta_backend_constructed (GObject *object)
-{
-  MetaBackend *backend = META_BACKEND (object);
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-  MetaBackendClass *backend_class =
-   META_BACKEND_GET_CLASS (backend);
-
-  if (backend_class->is_lid_closed != meta_backend_real_is_lid_closed)
-    return;
-
-  priv->upower_watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM,
-                                            "org.freedesktop.UPower",
-                                            G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                            upower_appeared,
-                                            upower_vanished,
-                                            backend,
-                                            NULL);
-}
-
 static void
 meta_backend_class_init (MetaBackendClass *klass)
 {
@@ -659,7 +534,6 @@ meta_backend_class_init (MetaBackendClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
   object_class->finalize = meta_backend_finalize;
-  object_class->constructed = meta_backend_constructed;
 
   klass->post_init = meta_backend_real_post_init;
   klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer;
@@ -667,7 +541,6 @@ meta_backend_class_init (MetaBackendClass *klass)
   klass->ungrab_device = meta_backend_real_ungrab_device;
   klass->select_stage_events = meta_backend_real_select_stage_events;
   klass->get_relative_motion_deltas = meta_backend_real_get_relative_motion_deltas;
-  klass->is_lid_closed = meta_backend_real_is_lid_closed;
 
   signals[KEYMAP_CHANGED] =
     g_signal_new ("keymap-changed",
@@ -690,18 +563,31 @@ meta_backend_class_init (MetaBackendClass *klass)
                   0,
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 1, G_TYPE_INT);
-  signals[LID_IS_CLOSED_CHANGED] =
-    g_signal_new ("lid-is-closed-changed",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
   mutter_stage_views = g_getenv ("MUTTER_STAGE_VIEWS");
   stage_views_disabled = g_strcmp0 (mutter_stage_views, "0") == 0;
 }
 
+static void
+experimental_features_changed (MetaSettings            *settings,
+                               MetaExperimentalFeature  old_experimental_features,
+                               MetaBackend             *backend)
+{
+#ifdef HAVE_REMOTE_DESKTOP
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+
+  if (is_screen_cast_enabled (backend) && !priv->screen_cast)
+    priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
+  else if (!is_screen_cast_enabled (backend))
+    g_clear_object (&priv->screen_cast);
+
+  if (is_remote_desktop_enabled (backend) && !priv->remote_desktop)
+    priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
+  else if (!is_remote_desktop_enabled (backend))
+    g_clear_object (&priv->remote_desktop);
+#endif /* HAVE_REMOTE_DESKTOP */
+}
+
 static MetaMonitorManager *
 meta_backend_create_monitor_manager (MetaBackend *backend,
                                      GError     **error)
@@ -720,6 +606,17 @@ meta_backend_create_renderer (MetaBackend *backend,
   return META_BACKEND_GET_CLASS (backend)->create_renderer (backend, error);
 }
 
+static void
+lid_is_closed_changed_cb (UpClient   *client,
+                          GParamSpec *pspec,
+                          gpointer    user_data)
+{
+  if (up_client_get_lid_is_closed (client))
+    return;
+
+  meta_idle_monitor_reset_idletime (meta_idle_monitor_get_core ());
+}
+
 static void
 prepare_for_sleep_cb (GDBusConnection *connection,
                       const gchar     *sender_name,
@@ -773,6 +670,9 @@ meta_backend_initable_init (GInitable     *initable,
   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
 
   priv->settings = meta_settings_new (backend);
+  g_signal_connect (priv->settings, "experimental-features-changed",
+                    G_CALLBACK (experimental_features_changed),
+                    backend);
 
   priv->egl = g_object_new (META_TYPE_EGL, NULL);
 
@@ -790,6 +690,10 @@ meta_backend_initable_init (GInitable     *initable,
 
   priv->dnd = g_object_new (META_TYPE_DND, NULL);
 
+  priv->up_client = up_client_new ();
+  g_signal_connect (priv->up_client, "notify::lid-is-closed",
+                    G_CALLBACK (lid_is_closed_changed_cb), NULL);
+
   priv->cancellable = g_cancellable_new ();
   g_bus_get (G_BUS_TYPE_SYSTEM,
              priv->cancellable,
@@ -920,24 +824,6 @@ meta_backend_get_remote_desktop (MetaBackend *backend)
 }
 #endif /* HAVE_REMOTE_DESKTOP */
 
-/**
- * meta_backend_get_remote_access_controller:
- * @backend: A #MetaBackend
- *
- * Return Value: (transfer none): The #MetaRemoteAccessController
- */
-MetaRemoteAccessController *
-meta_backend_get_remote_access_controller (MetaBackend *backend)
-{
-#ifdef HAVE_REMOTE_DESKTOP
-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
-
-  return priv->remote_access_controller;
-#else
-  return NULL;
-#endif
-}
-
 /**
  * meta_backend_grab_device: (skip)
  */
@@ -960,6 +846,20 @@ meta_backend_ungrab_device (MetaBackend *backend,
   return META_BACKEND_GET_CLASS (backend)->ungrab_device (backend, device_id, timestamp);
 }
 
+/**
+ * meta_backend_finish_touch_sequence: (skip)
+ */
+void
+meta_backend_finish_touch_sequence (MetaBackend          *backend,
+                                    ClutterEventSequence *sequence,
+                                    MetaSequenceState     state)
+{
+  if (META_BACKEND_GET_CLASS (backend)->finish_touch_sequence)
+    META_BACKEND_GET_CLASS (backend)->finish_touch_sequence (backend,
+                                                             sequence,
+                                                             state);
+}
+
 /**
  * meta_backend_warp_pointer: (skip)
  */

src/backends/meta-barrier.c

@@ -18,7 +18,7 @@
 #include "backends/x11/meta-barrier-x11.h"
 #include <meta/meta-enum-types.h>
 
-G_DEFINE_TYPE_WITH_PRIVATE (MetaBarrier, meta_barrier, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MetaBarrier, meta_barrier, G_TYPE_OBJECT)
 G_DEFINE_TYPE (MetaBarrierImpl, meta_barrier_impl, G_TYPE_OBJECT)
 
 enum {
@@ -281,6 +281,8 @@ meta_barrier_class_init (MetaBarrierClass *klass)
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 1,
                   META_TYPE_BARRIER_EVENT);
+
+  g_type_class_add_private (object_class, sizeof(MetaBarrierPrivate));
 }
 
 void

src/backends/meta-cursor-renderer.c

@@ -193,8 +193,8 @@ meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
 }
 
 static void
-meta_cursor_renderer_update_cursor (MetaCursorRenderer *renderer,
-                                    MetaCursorSprite   *cursor_sprite)
+update_cursor (MetaCursorRenderer *renderer,
+               MetaCursorSprite   *cursor_sprite)
 {
   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
   gboolean handled_by_backend;
@@ -237,7 +237,7 @@ meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
     return;
   priv->displayed_cursor = cursor_sprite;
 
-  meta_cursor_renderer_update_cursor (renderer, cursor_sprite);
+  update_cursor (renderer, cursor_sprite);
 }
 
 void
@@ -246,7 +246,7 @@ meta_cursor_renderer_force_update (MetaCursorRenderer *renderer)
   MetaCursorRendererPrivate *priv =
     meta_cursor_renderer_get_instance_private (renderer);
 
-  meta_cursor_renderer_update_cursor (renderer, priv->displayed_cursor);
+  update_cursor (renderer, priv->displayed_cursor);
 }
 
 void
@@ -261,7 +261,7 @@ meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
   priv->current_x = x;
   priv->current_y = y;
 
-  meta_cursor_renderer_update_cursor (renderer, priv->displayed_cursor);
+  update_cursor (renderer, priv->displayed_cursor);
 }
 
 ClutterPoint
@@ -283,3 +283,28 @@ meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)
 
   return priv->displayed_cursor;
 }
+
+#ifdef HAVE_WAYLAND
+void
+meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
+                                                    MetaCursorSprite   *cursor_sprite,
+                                                    struct wl_resource *buffer)
+{
+
+  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);
+
+  if (renderer_class->realize_cursor_from_wl_buffer)
+    renderer_class->realize_cursor_from_wl_buffer (renderer, cursor_sprite, buffer);
+}
+#endif
+
+void
+meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
+                                                  MetaCursorSprite   *cursor_sprite,
+                                                  XcursorImage       *xc_image)
+{
+  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);
+
+  if (renderer_class->realize_cursor_from_xcursor)
+    renderer_class->realize_cursor_from_xcursor (renderer, cursor_sprite, xc_image);
+}

src/backends/meta-cursor-renderer.h

@@ -26,7 +26,12 @@
 #define META_CURSOR_RENDERER_H
 
 #include <glib-object.h>
+#include <X11/Xcursor/Xcursor.h>
+#ifdef HAVE_WAYLAND
+#include <wayland-server.h>
+#endif
 
+#include <meta/screen.h>
 #include "meta-cursor.h"
 
 #define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ())
@@ -39,6 +44,14 @@ struct _MetaCursorRendererClass
 
   gboolean (* update_cursor) (MetaCursorRenderer *renderer,
                               MetaCursorSprite   *cursor_sprite);
+#ifdef HAVE_WAYLAND
+  void (* realize_cursor_from_wl_buffer) (MetaCursorRenderer *renderer,
+                                          MetaCursorSprite *cursor_sprite,
+                                          struct wl_resource *buffer);
+#endif
+  void (* realize_cursor_from_xcursor) (MetaCursorRenderer *renderer,
+                                        MetaCursorSprite *cursor_sprite,
+                                        XcursorImage *xc_image);
 };
 
 MetaCursorRenderer * meta_cursor_renderer_new (void);
@@ -57,6 +70,16 @@ MetaCursorSprite * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer
 ClutterRect meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
                                                  MetaCursorSprite   *cursor_sprite);
 
+#ifdef HAVE_WAYLAND
+void meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
+                                                         MetaCursorSprite   *cursor_sprite,
+                                                         struct wl_resource *buffer);
+#endif
+
+void meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
+                                                       MetaCursorSprite   *cursor_sprite,
+                                                       XcursorImage       *xc_image);
+
 void meta_cursor_renderer_emit_painted (MetaCursorRenderer *renderer,
                                         MetaCursorSprite   *cursor_sprite);
 

src/backends/meta-cursor-sprite-xcursor.c

@@ -1,292 +0,0 @@
-/*
- * Copyright 2013, 2018 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "config.h"
-
-#include "backends/meta-cursor-sprite-xcursor.h"
-
-#include "backends/meta-cursor.h"
-#include "backends/meta-cursor-renderer.h"
-#include "clutter/clutter.h"
-#include "cogl/cogl.h"
-#include "meta/prefs.h"
-
-struct _MetaCursorSpriteXcursor
-{
-  MetaCursorSprite parent;
-
-  MetaCursor cursor;
-
-  int current_frame;
-  XcursorImages *xcursor_images;
-
-  int theme_scale;
-  gboolean theme_dirty;
-};
-
-G_DEFINE_TYPE (MetaCursorSpriteXcursor, meta_cursor_sprite_xcursor,
-               META_TYPE_CURSOR_SPRITE)
-
-static const char *
-translate_meta_cursor (MetaCursor cursor)
-{
-  switch (cursor)
-    {
-    case META_CURSOR_DEFAULT:
-      return "left_ptr";
-    case META_CURSOR_NORTH_RESIZE:
-      return "top_side";
-    case META_CURSOR_SOUTH_RESIZE:
-      return "bottom_side";
-    case META_CURSOR_WEST_RESIZE:
-      return "left_side";
-    case META_CURSOR_EAST_RESIZE:
-      return "right_side";
-    case META_CURSOR_SE_RESIZE:
-      return "bottom_right_corner";
-    case META_CURSOR_SW_RESIZE:
-      return "bottom_left_corner";
-    case META_CURSOR_NE_RESIZE:
-      return "top_right_corner";
-    case META_CURSOR_NW_RESIZE:
-      return "top_left_corner";
-    case META_CURSOR_MOVE_OR_RESIZE_WINDOW:
-      return "fleur";
-    case META_CURSOR_BUSY:
-      return "watch";
-    case META_CURSOR_DND_IN_DRAG:
-      return "dnd-none";
-    case META_CURSOR_DND_MOVE:
-      return "dnd-move";
-    case META_CURSOR_DND_COPY:
-      return "dnd-copy";
-    case META_CURSOR_DND_UNSUPPORTED_TARGET:
-      return "dnd-none";
-    case META_CURSOR_POINTING_HAND:
-      return "hand2";
-    case META_CURSOR_CROSSHAIR:
-      return "crosshair";
-    case META_CURSOR_IBEAM:
-      return "xterm";
-    case META_CURSOR_NONE:
-    case META_CURSOR_LAST:
-      break;
-    }
-
-  g_assert_not_reached ();
-  return NULL;
-}
-
-MetaCursor
-meta_cursor_sprite_xcursor_get_cursor (MetaCursorSpriteXcursor *sprite_xcursor)
-{
-  return sprite_xcursor->cursor;
-}
-
-Cursor
-meta_create_x_cursor (Display    *xdisplay,
-                      MetaCursor  cursor)
-{
-  return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));
-}
-
-static XcursorImages *
-load_cursor_on_client (MetaCursor cursor, int scale)
-{
-  return XcursorLibraryLoadImages (translate_meta_cursor (cursor),
-                                   meta_prefs_get_cursor_theme (),
-                                   meta_prefs_get_cursor_size () * scale);
-}
-
-static void
-load_from_current_xcursor_image (MetaCursorSpriteXcursor *sprite_xcursor)
-{
-  MetaCursorSprite *sprite = META_CURSOR_SPRITE (sprite_xcursor);
-  XcursorImage *xc_image;
-  int width, height, rowstride;
-  CoglPixelFormat cogl_format;
-  ClutterBackend *clutter_backend;
-  CoglContext *cogl_context;
-  CoglTexture2D *texture;
-  CoglError *error = NULL;
-
-  g_assert (!meta_cursor_sprite_get_cogl_texture (sprite));
-
-  xc_image = meta_cursor_sprite_xcursor_get_current_image (sprite_xcursor);
-  width = (int) xc_image->width;
-  height = (int) xc_image->height;
-  rowstride = width * 4;
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  cogl_format = COGL_PIXEL_FORMAT_BGRA_8888;
-#else
-  cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;
-#endif
-
-  clutter_backend = clutter_get_default_backend ();
-  cogl_context = clutter_backend_get_cogl_context (clutter_backend);
-  texture = cogl_texture_2d_new_from_data (cogl_context,
-                                           width, height,
-                                           cogl_format,
-                                           rowstride,
-                                           (uint8_t *) xc_image->pixels,
-                                           &error);
-  if (!texture)
-    {
-      g_warning ("Failed to allocate cursor texture: %s\n", error->message);
-      cogl_error_free (error);
-    }
-
-  meta_cursor_sprite_set_texture (sprite,
-                                  COGL_TEXTURE (texture),
-                                  xc_image->xhot, xc_image->yhot);
-
-  g_clear_pointer (&texture, cogl_object_unref);
-}
-
-void
-meta_cursor_sprite_xcursor_set_theme_scale (MetaCursorSpriteXcursor *sprite_xcursor,
-                                            int                      theme_scale)
-{
-  if (sprite_xcursor->theme_scale != theme_scale)
-    sprite_xcursor->theme_dirty = TRUE;
-  sprite_xcursor->theme_scale = theme_scale;
-}
-
-static gboolean
-meta_cursor_sprite_xcursor_is_animated (MetaCursorSprite *sprite)
-{
-  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);
-
-  return (sprite_xcursor->xcursor_images &&
-          sprite_xcursor->xcursor_images->nimage > 1);
-}
-
-XcursorImage *
-meta_cursor_sprite_xcursor_get_current_image (MetaCursorSpriteXcursor *sprite_xcursor)
-{
-  return sprite_xcursor->xcursor_images->images[sprite_xcursor->current_frame];
-}
-
-static void
-meta_cursor_sprite_xcursor_tick_frame (MetaCursorSprite *sprite)
-{
-  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);
-
-  if (!meta_cursor_sprite_is_animated (sprite))
-    return;
-
-  sprite_xcursor->current_frame++;
-
-  if (sprite_xcursor->current_frame >= sprite_xcursor->xcursor_images->nimage)
-    sprite_xcursor->current_frame = 0;
-
-  meta_cursor_sprite_clear_texture (sprite);
-  load_from_current_xcursor_image (sprite_xcursor);
-}
-
-static unsigned int
-meta_cursor_sprite_xcursor_get_current_frame_time (MetaCursorSprite *sprite)
-{
-  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);
-  XcursorImages *xcursor_images;
-
-  g_return_val_if_fail (meta_cursor_sprite_is_animated (sprite), 0);
-
-  xcursor_images = sprite_xcursor->xcursor_images;
-  return xcursor_images->images[sprite_xcursor->current_frame]->delay;
-}
-
-static void
-load_cursor_from_theme (MetaCursorSprite *sprite)
-{
-  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);
-
-  g_assert (sprite_xcursor->cursor != META_CURSOR_NONE);
-
-  sprite_xcursor->theme_dirty = FALSE;
-
-  /* We might be reloading with a different scale. If so clear the old data. */
-  if (sprite_xcursor->xcursor_images)
-    {
-      meta_cursor_sprite_clear_texture (sprite);
-      XcursorImagesDestroy (sprite_xcursor->xcursor_images);
-    }
-
-  sprite_xcursor->current_frame = 0;
-  sprite_xcursor->xcursor_images =
-    load_cursor_on_client (sprite_xcursor->cursor,
-                           sprite_xcursor->theme_scale);
-  if (!sprite_xcursor->xcursor_images)
-    g_error ("Could not find cursor. Perhaps set XCURSOR_PATH?");
-
-  load_from_current_xcursor_image (sprite_xcursor);
-}
-
-static void
-meta_cursor_sprite_xcursor_realize_texture (MetaCursorSprite *sprite)
-{
-  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);
-
-  if (sprite_xcursor->theme_dirty)
-    load_cursor_from_theme (sprite);
-}
-
-MetaCursorSpriteXcursor *
-meta_cursor_sprite_xcursor_new (MetaCursor cursor)
-{
-  MetaCursorSpriteXcursor *sprite_xcursor;
-
-  sprite_xcursor = g_object_new (META_TYPE_CURSOR_SPRITE_XCURSOR, NULL);
-  sprite_xcursor->cursor = cursor;
-
-  return sprite_xcursor;
-}
-
-static void
-meta_cursor_sprite_xcursor_finalize (GObject *object)
-{
-  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (object);
-
-  g_clear_pointer (&sprite_xcursor->xcursor_images,
-                   XcursorImagesDestroy);
-
-  G_OBJECT_CLASS (meta_cursor_sprite_xcursor_parent_class)->finalize (object);
-}
-
-static void
-meta_cursor_sprite_xcursor_init (MetaCursorSpriteXcursor *sprite_xcursor)
-{
-  sprite_xcursor->theme_dirty = TRUE;
-}
-
-static void
-meta_cursor_sprite_xcursor_class_init (MetaCursorSpriteXcursorClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  MetaCursorSpriteClass *cursor_sprite_class = META_CURSOR_SPRITE_CLASS (klass);
-
-  object_class->finalize = meta_cursor_sprite_xcursor_finalize;
-
-  cursor_sprite_class->realize_texture =
-    meta_cursor_sprite_xcursor_realize_texture;
-  cursor_sprite_class->is_animated = meta_cursor_sprite_xcursor_is_animated;
-  cursor_sprite_class->tick_frame = meta_cursor_sprite_xcursor_tick_frame;
-  cursor_sprite_class->get_current_frame_time =
-    meta_cursor_sprite_xcursor_get_current_frame_time;
-}

src/backends/meta-cursor-sprite-xcursor.h

@@ -1,43 +0,0 @@
-/*
- * Copyright 2013, 2018 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef META_CURSOR_SPRITE_XCURSOR_H
-#define META_CURSOR_SPRITE_XCURSOR_H
-
-#include <glib-object.h>
-#include <X11/Xcursor/Xcursor.h>
-
-#include "backends/meta-cursor.h"
-
-#define META_TYPE_CURSOR_SPRITE_XCURSOR meta_cursor_sprite_xcursor_get_type ()
-G_DECLARE_FINAL_TYPE (MetaCursorSpriteXcursor, meta_cursor_sprite_xcursor,
-                      META, CURSOR_SPRITE_XCURSOR, MetaCursorSprite)
-
-MetaCursorSpriteXcursor * meta_cursor_sprite_xcursor_new (MetaCursor cursor);
-
-void meta_cursor_sprite_xcursor_set_theme_scale (MetaCursorSpriteXcursor *sprite_xcursor,
-                                                 int                      scale);
-
-MetaCursor meta_cursor_sprite_xcursor_get_cursor (MetaCursorSpriteXcursor *sprite_xcusror);
-
-XcursorImage * meta_cursor_sprite_xcursor_get_current_image (MetaCursorSpriteXcursor *sprite_xcursor);
-
-Cursor meta_create_x_cursor (Display    *xdisplay,
-                             MetaCursor  cursor);
-
-#endif /* META_CURSOR_SPRITE_XCURSOR_H */

src/backends/meta-cursor-tracker-private.h

@@ -26,7 +26,6 @@
 
 #include "meta-cursor.h"
 #include "meta-cursor-renderer.h"
-#include "backends/x11/cm/meta-cursor-sprite-xfixes.h"
 
 struct _MetaCursorTracker {
   GObject parent_instance;
@@ -47,7 +46,7 @@ struct _MetaCursorTracker {
   MetaCursorSprite *root_cursor;
 
   /* The cursor from the X11 server. */
-  MetaCursorSpriteXfixes *xfixes_cursor;
+  MetaCursorSprite *xfixes_cursor;
 };
 
 struct _MetaCursorTrackerClass {

src/backends/meta-cursor-tracker.c

@@ -33,17 +33,16 @@
 #include <string.h>
 #include <meta/main.h>
 #include <meta/util.h>
-#include <meta/meta-x11-errors.h>
+#include <meta/errors.h>
 
 #include <cogl/cogl.h>
 #include <clutter/clutter.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <X11/extensions/Xfixes.h>
 
 #include "meta-backend-private.h"
-#include "backends/x11/cm/meta-cursor-sprite-xfixes.h"
-#include "x11/meta-x11-display-private.h"
 
 G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);
 
@@ -162,15 +161,15 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
 }
 
 /**
- * meta_cursor_tracker_get_for_display:
- * @display: the #MetaDisplay
+ * meta_cursor_tracker_get_for_screen:
+ * @screen: the #MetaScreen
  *
- * Retrieves the cursor tracker object for @display.
+ * Retrieves the cursor tracker object for @screen.
  *
  * Returns: (transfer none):
  */
 MetaCursorTracker *
-meta_cursor_tracker_get_for_display (MetaDisplay *display)
+meta_cursor_tracker_get_for_screen (MetaScreen *screen)
 {
   MetaBackend *backend = meta_get_backend ();
   MetaCursorTracker *tracker = meta_backend_get_cursor_tracker (backend);
@@ -196,13 +195,13 @@ gboolean
 meta_cursor_tracker_handle_xevent (MetaCursorTracker *tracker,
                                    XEvent            *xevent)
 {
-  MetaX11Display *x11_display = meta_get_display ()->x11_display;
+  MetaDisplay *display = meta_get_display ();
   XFixesCursorNotifyEvent *notify_event;
 
   if (meta_is_wayland_compositor ())
     return FALSE;
 
-  if (xevent->xany.type != x11_display->xfixes_event_base + XFixesCursorNotify)
+  if (xevent->xany.type != display->xfixes_event_base + XFixesCursorNotify)
     return FALSE;
 
   notify_event = (XFixesCursorNotifyEvent *)xevent;
@@ -219,14 +218,75 @@ static void
 ensure_xfixes_cursor (MetaCursorTracker *tracker)
 {
   MetaDisplay *display = meta_get_display ();
-  g_autoptr (GError) error = NULL;
+  XFixesCursorImage *cursor_image;
+  CoglTexture2D *sprite;
+  guint8 *cursor_data;
+  gboolean free_cursor_data;
+  CoglContext *ctx;
+  CoglError *error = NULL;
 
   if (tracker->xfixes_cursor)
     return;
 
-  tracker->xfixes_cursor = meta_cursor_sprite_xfixes_new (display, &error);
-  if (!tracker->xfixes_cursor)
-    g_warning ("Failed to create XFIXES cursor: %s", error->message);
+  cursor_image = XFixesGetCursorImage (display->xdisplay);
+  if (!cursor_image)
+    return;
+
+  /* Like all X APIs, XFixesGetCursorImage() returns arrays of 32-bit
+   * quantities as arrays of long; we need to convert on 64 bit */
+  if (sizeof(long) == 4)
+    {
+      cursor_data = (guint8 *)cursor_image->pixels;
+      free_cursor_data = FALSE;
+    }
+  else
+    {
+      int i, j;
+      guint32 *cursor_words;
+      gulong *p;
+      guint32 *q;
+
+      cursor_words = g_new (guint32, cursor_image->width * cursor_image->height);
+      cursor_data = (guint8 *)cursor_words;
+
+      p = cursor_image->pixels;
+      q = cursor_words;
+      for (j = 0; j < cursor_image->height; j++)
+        for (i = 0; i < cursor_image->width; i++)
+          *(q++) = *(p++);
+
+      free_cursor_data = TRUE;
+    }
+
+  ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+  sprite = cogl_texture_2d_new_from_data (ctx,
+                                          cursor_image->width,
+                                          cursor_image->height,
+                                          CLUTTER_CAIRO_FORMAT_ARGB32,
+                                          cursor_image->width * 4, /* stride */
+                                          cursor_data,
+                                          &error);
+
+  if (free_cursor_data)
+    g_free (cursor_data);
+
+  if (error != NULL)
+    {
+      meta_warning ("Failed to allocate cursor sprite texture: %s\n", error->message);
+      cogl_error_free (error);
+    }
+
+  if (sprite != NULL)
+    {
+      MetaCursorSprite *cursor_sprite = meta_cursor_sprite_new ();
+      meta_cursor_sprite_set_texture (cursor_sprite,
+                                      COGL_TEXTURE (sprite),
+                                      cursor_image->xhot,
+                                      cursor_image->yhot);
+      cogl_object_unref (sprite);
+      tracker->xfixes_cursor = cursor_sprite;
+    }
+  XFree (cursor_image);
 }
 
 /**
@@ -248,7 +308,7 @@ meta_cursor_tracker_get_sprite (MetaCursorTracker *tracker)
   else
     {
       ensure_xfixes_cursor (tracker);
-      cursor_sprite = META_CURSOR_SPRITE (tracker->xfixes_cursor);
+      cursor_sprite = tracker->xfixes_cursor;
     }
 
   if (cursor_sprite)
@@ -285,7 +345,7 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
   else
     {
       ensure_xfixes_cursor (tracker);
-      cursor_sprite = META_CURSOR_SPRITE (tracker->xfixes_cursor);
+      cursor_sprite = tracker->xfixes_cursor;
     }
 
   if (cursor_sprite)

src/backends/meta-cursor.c

@@ -23,12 +23,19 @@
 
 #include "meta-cursor.h"
 
-#include "backends/meta-backend-private.h"
-#include "cogl/cogl.h"
-#include "meta/common.h"
+#include <meta/errors.h>
 
-enum
-{
+#include "display-private.h"
+#include "screen-private.h"
+#include "meta-backend-private.h"
+
+#include <string.h>
+
+#include <X11/cursorfont.h>
+#include <X11/extensions/Xfixes.h>
+#include <X11/Xcursor/Xcursor.h>
+
+enum {
   PREPARE_AT,
   TEXTURE_CHANGED,
 
@@ -37,148 +44,316 @@ enum
 
 static guint signals[LAST_SIGNAL];
 
-typedef struct _MetaCursorSpritePrivate
+struct _MetaCursorSprite
 {
   GObject parent;
 
+  MetaCursor cursor;
+
   CoglTexture2D *texture;
   float texture_scale;
   int hot_x, hot_y;
-} MetaCursorSpritePrivate;
 
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (MetaCursorSprite,
-                                     meta_cursor_sprite,
-                                     G_TYPE_OBJECT)
+  int current_frame;
+  XcursorImages *xcursor_images;
+
+  int theme_scale;
+  gboolean theme_dirty;
+};
+
+G_DEFINE_TYPE (MetaCursorSprite, meta_cursor_sprite, G_TYPE_OBJECT)
+
+static const char *
+translate_meta_cursor (MetaCursor cursor)
+{
+  switch (cursor)
+    {
+    case META_CURSOR_DEFAULT:
+      return "left_ptr";
+    case META_CURSOR_NORTH_RESIZE:
+      return "top_side";
+    case META_CURSOR_SOUTH_RESIZE:
+      return "bottom_side";
+    case META_CURSOR_WEST_RESIZE:
+      return "left_side";
+    case META_CURSOR_EAST_RESIZE:
+      return "right_side";
+    case META_CURSOR_SE_RESIZE:
+      return "bottom_right_corner";
+    case META_CURSOR_SW_RESIZE:
+      return "bottom_left_corner";
+    case META_CURSOR_NE_RESIZE:
+      return "top_right_corner";
+    case META_CURSOR_NW_RESIZE:
+      return "top_left_corner";
+    case META_CURSOR_MOVE_OR_RESIZE_WINDOW:
+      return "fleur";
+    case META_CURSOR_BUSY:
+      return "watch";
+    case META_CURSOR_DND_IN_DRAG:
+      return "dnd-none";
+    case META_CURSOR_DND_MOVE:
+      return "dnd-move";
+    case META_CURSOR_DND_COPY:
+      return "dnd-copy";
+    case META_CURSOR_DND_UNSUPPORTED_TARGET:
+      return "dnd-none";
+    case META_CURSOR_POINTING_HAND:
+      return "hand2";
+    case META_CURSOR_CROSSHAIR:
+      return "crosshair";
+    case META_CURSOR_IBEAM:
+      return "xterm";
+    default:
+      break;
+    }
+
+  g_assert_not_reached ();
+}
+
+Cursor
+meta_cursor_create_x_cursor (Display    *xdisplay,
+                             MetaCursor  cursor)
+{
+  return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));
+}
+
+static XcursorImages *
+load_cursor_on_client (MetaCursor cursor, int scale)
+{
+  return XcursorLibraryLoadImages (translate_meta_cursor (cursor),
+                                   meta_prefs_get_cursor_theme (),
+                                   meta_prefs_get_cursor_size () * scale);
+}
+
+static void
+meta_cursor_sprite_load_from_xcursor_image (MetaCursorSprite *self,
+                                            XcursorImage     *xc_image)
+{
+  MetaBackend *meta_backend = meta_get_backend ();
+  MetaCursorRenderer *renderer = meta_backend_get_cursor_renderer (meta_backend);
+  uint width, height, rowstride;
+  CoglPixelFormat cogl_format;
+  ClutterBackend *clutter_backend;
+  CoglContext *cogl_context;
+  CoglTexture2D *texture;
+  CoglError *error = NULL;
+
+  g_assert (self->texture == NULL);
+
+  width           = xc_image->width;
+  height          = xc_image->height;
+  rowstride       = width * 4;
+
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+  cogl_format = COGL_PIXEL_FORMAT_BGRA_8888;
+#else
+  cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;
+#endif
+
+  clutter_backend = clutter_get_default_backend ();
+  cogl_context = clutter_backend_get_cogl_context (clutter_backend);
+  texture = cogl_texture_2d_new_from_data (cogl_context,
+                                           width, height,
+                                           cogl_format,
+                                           rowstride,
+                                           (uint8_t *) xc_image->pixels,
+                                           &error);
+
+  if (error)
+    {
+      meta_warning ("Failed to allocate cursor texture: %s\n", error->message);
+      cogl_error_free (error);
+    }
+
+  meta_cursor_sprite_set_texture (self, COGL_TEXTURE (texture),
+                                  xc_image->xhot, xc_image->yhot);
+
+  if (texture)
+    cogl_object_unref (texture);
+
+  meta_cursor_renderer_realize_cursor_from_xcursor (renderer, self, xc_image);
+}
+
+static XcursorImage *
+meta_cursor_sprite_get_current_frame_image (MetaCursorSprite *self)
+{
+  return self->xcursor_images->images[self->current_frame];
+}
+
+void
+meta_cursor_sprite_tick_frame (MetaCursorSprite *self)
+{
+  XcursorImage *image;
+
+  if (!meta_cursor_sprite_is_animated (self))
+    return;
+
+  self->current_frame++;
+
+  if (self->current_frame >= self->xcursor_images->nimage)
+    self->current_frame = 0;
+
+  image = meta_cursor_sprite_get_current_frame_image (self);
+
+  g_clear_pointer (&self->texture, cogl_object_unref);
+  meta_cursor_sprite_load_from_xcursor_image (self, image);
+}
+
+guint
+meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self)
+{
+  if (!meta_cursor_sprite_is_animated (self))
+    return 0;
+
+  return self->xcursor_images->images[self->current_frame]->delay;
+}
 
 gboolean
-meta_cursor_sprite_is_animated (MetaCursorSprite *sprite)
+meta_cursor_sprite_is_animated (MetaCursorSprite *self)
 {
-  MetaCursorSpriteClass *klass = META_CURSOR_SPRITE_GET_CLASS (sprite);
+  return (self->xcursor_images &&
+          self->xcursor_images->nimage > 1);
+}
 
-  if (klass->is_animated)
-    return klass->is_animated (sprite);
-  else
-    return FALSE;
+MetaCursorSprite *
+meta_cursor_sprite_new (void)
+{
+  return g_object_new (META_TYPE_CURSOR_SPRITE, NULL);
+}
+
+static void
+meta_cursor_sprite_load_from_theme (MetaCursorSprite *self)
+{
+  XcursorImage *image;
+
+  g_assert (self->cursor != META_CURSOR_NONE);
+
+  self->theme_dirty = FALSE;
+
+  /* We might be reloading with a different scale. If so clear the old data. */
+  if (self->xcursor_images)
+    {
+      g_clear_pointer (&self->texture, cogl_object_unref);
+      XcursorImagesDestroy (self->xcursor_images);
+    }
+
+  self->current_frame = 0;
+  self->xcursor_images = load_cursor_on_client (self->cursor,
+                                                self->theme_scale);
+  if (!self->xcursor_images)
+    meta_fatal ("Could not find cursor. Perhaps set XCURSOR_PATH?");
+
+  image = meta_cursor_sprite_get_current_frame_image (self);
+  meta_cursor_sprite_load_from_xcursor_image (self, image);
+}
+
+MetaCursorSprite *
+meta_cursor_sprite_from_theme (MetaCursor cursor)
+{
+  MetaCursorSprite *self;
+
+  self = meta_cursor_sprite_new ();
+
+  self->cursor = cursor;
+  self->theme_dirty = TRUE;
+
+  return self;
 }
 
 void
-meta_cursor_sprite_tick_frame (MetaCursorSprite *sprite)
-{
-  return META_CURSOR_SPRITE_GET_CLASS (sprite)->tick_frame (sprite);
-}
-
-unsigned int
-meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *sprite)
-{
-  return META_CURSOR_SPRITE_GET_CLASS (sprite)->get_current_frame_time (sprite);
-}
-
-void
-meta_cursor_sprite_clear_texture (MetaCursorSprite *sprite)
-{
-  MetaCursorSpritePrivate *priv =
-    meta_cursor_sprite_get_instance_private (sprite);
-
-  g_clear_pointer (&priv->texture, cogl_object_unref);
-}
-
-void
-meta_cursor_sprite_set_texture (MetaCursorSprite *sprite,
+meta_cursor_sprite_set_texture (MetaCursorSprite *self,
                                 CoglTexture      *texture,
                                 int               hot_x,
                                 int               hot_y)
 {
-  MetaCursorSpritePrivate *priv =
-    meta_cursor_sprite_get_instance_private (sprite);
-
-  if (priv->texture == COGL_TEXTURE_2D (texture) &&
-      priv->hot_x == hot_x &&
-      priv->hot_y == hot_y)
+  if (self->texture == COGL_TEXTURE_2D (texture) &&
+      self->hot_x == hot_x &&
+      self->hot_y == hot_y)
     return;
 
-  g_clear_pointer (&priv->texture, cogl_object_unref);
+  g_clear_pointer (&self->texture, cogl_object_unref);
   if (texture)
-    priv->texture = cogl_object_ref (texture);
-  priv->hot_x = hot_x;
-  priv->hot_y = hot_y;
+    self->texture = cogl_object_ref (texture);
+  self->hot_x = hot_x;
+  self->hot_y = hot_y;
 
-  g_signal_emit (sprite, signals[TEXTURE_CHANGED], 0);
+  g_signal_emit (self, signals[TEXTURE_CHANGED], 0);
 }
 
 void
-meta_cursor_sprite_set_texture_scale (MetaCursorSprite *sprite,
+meta_cursor_sprite_set_texture_scale (MetaCursorSprite *self,
                                       float             scale)
 {
-  MetaCursorSpritePrivate *priv =
-    meta_cursor_sprite_get_instance_private (sprite);
+  self->texture_scale = scale;
+}
 
-  priv->texture_scale = scale;
+void
+meta_cursor_sprite_set_theme_scale (MetaCursorSprite *self,
+                                    int               theme_scale)
+{
+  if (self->theme_scale != theme_scale)
+    self->theme_dirty = TRUE;
+  self->theme_scale = theme_scale;
 }
 
 CoglTexture *
-meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *sprite)
+meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self)
 {
-  MetaCursorSpritePrivate *priv =
-    meta_cursor_sprite_get_instance_private (sprite);
+  return COGL_TEXTURE (self->texture);
+}
 
-  return COGL_TEXTURE (priv->texture);
+MetaCursor
+meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *self)
+{
+  return self->cursor;
 }
 
 void
-meta_cursor_sprite_get_hotspot (MetaCursorSprite *sprite,
+meta_cursor_sprite_get_hotspot (MetaCursorSprite *self,
                                 int              *hot_x,
                                 int              *hot_y)
 {
-  MetaCursorSpritePrivate *priv =
-    meta_cursor_sprite_get_instance_private (sprite);
-
-  *hot_x = priv->hot_x;
-  *hot_y = priv->hot_y;
+  *hot_x = self->hot_x;
+  *hot_y = self->hot_y;
 }
 
 float
-meta_cursor_sprite_get_texture_scale (MetaCursorSprite *sprite)
+meta_cursor_sprite_get_texture_scale (MetaCursorSprite *self)
 {
-  MetaCursorSpritePrivate *priv =
-    meta_cursor_sprite_get_instance_private (sprite);
-
-  return priv->texture_scale;
+  return self->texture_scale;
 }
 
 void
-meta_cursor_sprite_prepare_at (MetaCursorSprite *sprite,
+meta_cursor_sprite_prepare_at (MetaCursorSprite *self,
                                int               x,
                                int               y)
 {
-  g_signal_emit (sprite, signals[PREPARE_AT], 0, x, y);
+  g_signal_emit (self, signals[PREPARE_AT], 0, x, y);
 }
 
 void
-meta_cursor_sprite_realize_texture (MetaCursorSprite *sprite)
+meta_cursor_sprite_realize_texture (MetaCursorSprite *self)
 {
-  MetaCursorSpriteClass *klass = META_CURSOR_SPRITE_GET_CLASS (sprite);
-
-  if (klass->realize_texture)
-    klass->realize_texture (sprite);
+  if (self->theme_dirty)
+    meta_cursor_sprite_load_from_theme (self);
 }
 
 static void
-meta_cursor_sprite_init (MetaCursorSprite *sprite)
+meta_cursor_sprite_init (MetaCursorSprite *self)
 {
-  MetaCursorSpritePrivate *priv =
-    meta_cursor_sprite_get_instance_private (sprite);
-
-  priv->texture_scale = 1.0f;
+  self->texture_scale = 1.0f;
 }
 
 static void
 meta_cursor_sprite_finalize (GObject *object)
 {
-  MetaCursorSprite *sprite = META_CURSOR_SPRITE (object);
-  MetaCursorSpritePrivate *priv =
-    meta_cursor_sprite_get_instance_private (sprite);
+  MetaCursorSprite *self = META_CURSOR_SPRITE (object);
 
-  g_clear_pointer (&priv->texture, cogl_object_unref);
+  if (self->xcursor_images)
+    XcursorImagesDestroy (self->xcursor_images);
+
+  g_clear_pointer (&self->texture, cogl_object_unref);
 
   G_OBJECT_CLASS (meta_cursor_sprite_parent_class)->finalize (object);
 }

src/backends/meta-cursor.h

@@ -25,50 +25,51 @@
 #include <meta/common.h>
 #include <meta/boxes.h>
 
+typedef struct _MetaCursorSprite MetaCursorSprite;
+
 #define META_TYPE_CURSOR_SPRITE (meta_cursor_sprite_get_type ())
-G_DECLARE_DERIVABLE_TYPE (MetaCursorSprite,
-                          meta_cursor_sprite,
-                          META, CURSOR_SPRITE,
-                          GObject)
+G_DECLARE_FINAL_TYPE (MetaCursorSprite,
+                      meta_cursor_sprite,
+                      META, CURSOR_SPRITE,
+                      GObject);
 
-struct _MetaCursorSpriteClass
-{
-  GObjectClass parent_class;
+MetaCursorSprite * meta_cursor_sprite_new (void);
 
-  void (* realize_texture) (MetaCursorSprite *sprite);
-  gboolean (* is_animated) (MetaCursorSprite *sprite);
-  void (* tick_frame) (MetaCursorSprite *sprite);
-  unsigned int (* get_current_frame_time) (MetaCursorSprite *sprite);
-};
+MetaCursorSprite * meta_cursor_sprite_from_theme  (MetaCursor cursor);
 
-void meta_cursor_sprite_prepare_at (MetaCursorSprite *sprite,
+
+void meta_cursor_sprite_set_theme_scale (MetaCursorSprite *self,
+                                         int               scale);
+
+MetaCursor meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *self);
+
+Cursor meta_cursor_create_x_cursor (Display    *xdisplay,
+                                    MetaCursor  cursor);
+
+void meta_cursor_sprite_prepare_at (MetaCursorSprite *self,
                                     int               x,
                                     int               y);
 
-void meta_cursor_sprite_realize_texture (MetaCursorSprite *sprite);
+void meta_cursor_sprite_realize_texture (MetaCursorSprite *self);
 
-void meta_cursor_sprite_clear_texture (MetaCursorSprite *sprite);
-
-void meta_cursor_sprite_set_texture (MetaCursorSprite *sprite,
+void meta_cursor_sprite_set_texture (MetaCursorSprite *self,
                                      CoglTexture      *texture,
                                      int               hot_x,
                                      int               hot_y);
 
-void meta_cursor_sprite_set_texture_scale (MetaCursorSprite *sprite,
+void meta_cursor_sprite_set_texture_scale (MetaCursorSprite *self,
                                            float             scale);
 
-CoglTexture *meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *sprite);
+CoglTexture *meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self);
 
-void meta_cursor_sprite_get_hotspot (MetaCursorSprite *sprite,
+void meta_cursor_sprite_get_hotspot (MetaCursorSprite *self,
                                      int              *hot_x,
                                      int              *hot_y);
 
-float meta_cursor_sprite_get_texture_scale (MetaCursorSprite *sprite);
+float meta_cursor_sprite_get_texture_scale (MetaCursorSprite *self);
 
-gboolean meta_cursor_sprite_is_animated (MetaCursorSprite *sprite);
-
-void meta_cursor_sprite_tick_frame (MetaCursorSprite *sprite);
-
-unsigned int meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *sprite);
+gboolean meta_cursor_sprite_is_animated            (MetaCursorSprite *self);
+void     meta_cursor_sprite_tick_frame             (MetaCursorSprite *self);
+guint    meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self);
 
 #endif /* META_CURSOR_H */

src/backends/meta-dnd-private.h

@@ -24,7 +24,7 @@
 
 gboolean meta_dnd_handle_xdnd_event (MetaBackend    *backend,
                                      MetaCompositor *compositor,
-                                     Display        *xdisplay,
+                                     MetaDisplay    *display,
                                      XEvent         *xev);
 
 #ifdef HAVE_WAYLAND

src/backends/meta-idle-monitor.c

@@ -226,7 +226,7 @@ meta_idle_monitor_inhibited_actions_changed (GDBusProxy  *session,
     {
       gboolean inhibited;
 
-      inhibited = !!(g_variant_get_uint32 (v) & GSM_INHIBITOR_FLAG_IDLE);
+      inhibited = g_variant_get_uint32 (v) & GSM_INHIBITOR_FLAG_IDLE;
       g_variant_unref (v);
 
       if (!inhibited)
@@ -265,8 +265,7 @@ meta_idle_monitor_init (MetaIdleMonitor *monitor)
                                         "InhibitedActions");
   if (v)
     {
-      monitor->inhibited = !!(g_variant_get_uint32 (v) &
-                              GSM_INHIBITOR_FLAG_IDLE);
+      monitor->inhibited = g_variant_get_uint32 (v) & GSM_INHIBITOR_FLAG_IDLE;
       g_variant_unref (v);
     }
 }

src/backends/meta-logical-monitor.c

@@ -279,34 +279,34 @@ meta_logical_monitor_class_init (MetaLogicalMonitorClass *klass)
 }
 
 gboolean
-meta_logical_monitor_has_neighbor (MetaLogicalMonitor   *logical_monitor,
-                                   MetaLogicalMonitor   *neighbor,
-                                   MetaDisplayDirection  neighbor_direction)
+meta_logical_monitor_has_neighbor (MetaLogicalMonitor  *logical_monitor,
+                                   MetaLogicalMonitor  *neighbor,
+                                   MetaScreenDirection  neighbor_direction)
 {
   switch (neighbor_direction)
     {
-    case META_DISPLAY_RIGHT:
+    case META_SCREEN_RIGHT:
       if (neighbor->rect.x == (logical_monitor->rect.x +
                                logical_monitor->rect.width) &&
           meta_rectangle_vert_overlap (&neighbor->rect,
                                        &logical_monitor->rect))
         return TRUE;
       break;
-    case META_DISPLAY_LEFT:
+    case META_SCREEN_LEFT:
       if (logical_monitor->rect.x == (neighbor->rect.x +
                                       neighbor->rect.width) &&
           meta_rectangle_vert_overlap (&neighbor->rect,
                                        &logical_monitor->rect))
         return TRUE;
       break;
-    case META_DISPLAY_UP:
+    case META_SCREEN_UP:
       if (logical_monitor->rect.y == (neighbor->rect.y +
                                       neighbor->rect.height) &&
           meta_rectangle_horiz_overlap (&neighbor->rect,
                                         &logical_monitor->rect))
         return TRUE;
       break;
-    case META_DISPLAY_DOWN:
+    case META_SCREEN_DOWN:
       if (neighbor->rect.y == (logical_monitor->rect.y +
                                logical_monitor->rect.height) &&
           meta_rectangle_horiz_overlap (&neighbor->rect,

src/backends/meta-logical-monitor.h

@@ -90,9 +90,9 @@ MetaRectangle meta_logical_monitor_get_layout (MetaLogicalMonitor *logical_monit
 
 GList * meta_logical_monitor_get_monitors (MetaLogicalMonitor *logical_monitor);
 
-gboolean meta_logical_monitor_has_neighbor (MetaLogicalMonitor   *logical_monitor,
-                                            MetaLogicalMonitor   *neighbor,
-                                            MetaDisplayDirection  neighbor_dir);
+gboolean meta_logical_monitor_has_neighbor (MetaLogicalMonitor  *logical_monitor,
+                                            MetaLogicalMonitor  *neighbor,
+                                            MetaScreenDirection  neighbor_dir);
 
 void meta_logical_monitor_foreach_crtc (MetaLogicalMonitor        *logical_monitor,
                                         MetaLogicalMonitorCrtcFunc func,

src/backends/meta-monitor-config-manager.c

@@ -23,7 +23,6 @@
 
 #include "backends/meta-monitor-config-manager.h"
 
-#include "backends/meta-backend-private.h"
 #include "backends/meta-monitor-config-migration.h"
 #include "backends/meta-monitor-config-store.h"
 #include "backends/meta-monitor-manager-private.h"
@@ -327,36 +326,39 @@ meta_monitor_config_manager_assign (MetaMonitorManager *manager,
   return TRUE;
 }
 
-static gboolean
-is_lid_closed (MetaMonitorManager *monitor_manager)
-{
-    MetaBackend *backend;
-
-    backend = meta_monitor_manager_get_backend (monitor_manager);
-    return meta_backend_is_lid_closed (backend);
-}
-
 MetaMonitorsConfigKey *
 meta_create_monitors_config_key_for_current_state (MetaMonitorManager *monitor_manager)
 {
   MetaMonitorsConfigKey *config_key;
+  MetaMonitorSpec *laptop_monitor_spec;
   GList *l;
   GList *monitor_specs;
 
+  laptop_monitor_spec = NULL;
   monitor_specs = NULL;
   for (l = monitor_manager->monitors; l; l = l->next)
     {
       MetaMonitor *monitor = l->data;
       MetaMonitorSpec *monitor_spec;
 
-      if (meta_monitor_is_laptop_panel (monitor) &&
-          is_lid_closed (monitor_manager))
-        continue;
+      if (meta_monitor_is_laptop_panel (monitor))
+        {
+          laptop_monitor_spec = meta_monitor_get_spec (monitor);
+
+          if (meta_monitor_manager_is_lid_closed (monitor_manager))
+            continue;
+        }
 
       monitor_spec = meta_monitor_spec_clone (meta_monitor_get_spec (monitor));
       monitor_specs = g_list_prepend (monitor_specs, monitor_spec);
     }
 
+  if (!monitor_specs && laptop_monitor_spec)
+    {
+      monitor_specs =
+        g_list_prepend (NULL, meta_monitor_spec_clone (laptop_monitor_spec));
+    }
+
   if (!monitor_specs)
     return NULL;
 
@@ -465,7 +467,7 @@ find_primary_monitor (MetaMonitorManager *monitor_manager)
 {
   MetaMonitor *monitor;
 
-  if (is_lid_closed (monitor_manager))
+  if (meta_monitor_manager_is_lid_closed (monitor_manager))
     {
       monitor = meta_monitor_manager_get_primary_monitor (monitor_manager);
       if (monitor && !meta_monitor_is_laptop_panel (monitor))
@@ -608,7 +610,7 @@ meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_mana
         continue;
 
       if (meta_monitor_is_laptop_panel (monitor) &&
-          is_lid_closed (monitor_manager))
+          meta_monitor_manager_is_lid_closed (monitor_manager))
         continue;
 
       logical_monitor_config =
@@ -1017,6 +1019,7 @@ meta_monitor_config_manager_create_for_switch_config (MetaMonitorConfigManager
                                                       MetaMonitorSwitchConfigType  config_type)
 {
   MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
+  MetaMonitorsConfig *config;
 
   if (!meta_monitor_manager_can_switch_config (monitor_manager))
     return NULL;
@@ -1024,18 +1027,27 @@ meta_monitor_config_manager_create_for_switch_config (MetaMonitorConfigManager
   switch (config_type)
     {
     case META_MONITOR_SWITCH_CONFIG_ALL_MIRROR:
-      return create_for_switch_config_all_mirror (config_manager);
-    case META_MONITOR_SWITCH_CONFIG_ALL_LINEAR:
-      return meta_monitor_config_manager_create_linear (config_manager);
-    case META_MONITOR_SWITCH_CONFIG_EXTERNAL:
-      return create_for_switch_config_external (config_manager);
-    case META_MONITOR_SWITCH_CONFIG_BUILTIN:
-      return create_for_switch_config_builtin (config_manager);
-    case META_MONITOR_SWITCH_CONFIG_UNKNOWN:
-      g_warn_if_reached ();
+      config = create_for_switch_config_all_mirror (config_manager);
       break;
+    case META_MONITOR_SWITCH_CONFIG_ALL_LINEAR:
+      config = meta_monitor_config_manager_create_linear (config_manager);
+      break;
+    case META_MONITOR_SWITCH_CONFIG_EXTERNAL:
+      config = create_for_switch_config_external (config_manager);
+      break;
+    case META_MONITOR_SWITCH_CONFIG_BUILTIN:
+      config = create_for_switch_config_builtin (config_manager);
+      break;
+    case META_MONITOR_SWITCH_CONFIG_UNKNOWN:
+    default:
+      g_warn_if_reached ();
+      return NULL;
     }
-  return NULL;
+
+  if (config)
+    meta_monitors_config_set_switch_config (config, config_type);
+
+  return config;
 }
 
 void
@@ -1227,6 +1239,19 @@ meta_monitors_config_key_equal (gconstpointer data_a,
   return TRUE;
 }
 
+MetaMonitorSwitchConfigType
+meta_monitors_config_get_switch_config (MetaMonitorsConfig *config)
+{
+  return config->switch_config;
+}
+
+void
+meta_monitors_config_set_switch_config (MetaMonitorsConfig          *config,
+                                        MetaMonitorSwitchConfigType  switch_config)
+{
+  config->switch_config = switch_config;
+}
+
 MetaMonitorsConfig *
 meta_monitors_config_new_full (GList                        *logical_monitor_configs,
                                GList                        *disabled_monitor_specs,
@@ -1242,6 +1267,7 @@ meta_monitors_config_new_full (GList                        *logical_monitor_con
                                               disabled_monitor_specs);
   config->layout_mode = layout_mode;
   config->flags = flags;
+  config->switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
 
   return config;
 }
@@ -1262,7 +1288,7 @@ meta_monitors_config_new (MetaMonitorManager           *monitor_manager,
       MetaMonitor *monitor = l->data;
       MetaMonitorSpec *monitor_spec;
 
-      if (is_lid_closed (monitor_manager) &&
+      if (meta_monitor_manager_is_lid_closed (monitor_manager) &&
           meta_monitor_is_laptop_panel (monitor))
         continue;
 

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

@@ -69,6 +69,8 @@ struct _MetaMonitorsConfig
   MetaMonitorsConfigFlag flags;
 
   MetaLogicalMonitorLayoutMode layout_mode;
+
+  MetaMonitorSwitchConfigType switch_config;
 };
 
 #define META_TYPE_MONITORS_CONFIG (meta_monitors_config_get_type ())
@@ -124,6 +126,11 @@ MetaMonitorsConfig * meta_monitors_config_new (MetaMonitorManager           *mon
                                                MetaLogicalMonitorLayoutMode  layout_mode,
                                                MetaMonitorsConfigFlag        flags);
 
+MetaMonitorSwitchConfigType meta_monitors_config_get_switch_config (MetaMonitorsConfig *config);
+
+void meta_monitors_config_set_switch_config (MetaMonitorsConfig          *config,
+                                             MetaMonitorSwitchConfigType  switch_config);
+
 unsigned int meta_monitors_config_key_hash (gconstpointer config_key);
 
 gboolean meta_monitors_config_key_equal (gconstpointer config_key_a,

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

@@ -37,8 +37,10 @@
 
 #include <cogl/cogl.h>
 #include <libgnome-desktop/gnome-pnp-ids.h>
+#include <libupower-glib/upower.h>
 
 #include "display-private.h"
+#include <meta/screen.h>
 #include "stack-tracker.h"
 #include <meta/meta-monitor-manager.h>
 
@@ -178,6 +180,8 @@ struct _MetaMonitorManager
   MetaMonitorConfigManager *config_manager;
 
   GnomePnpIds *pnp_ids;
+  UpClient *up_client;
+  gboolean lid_is_closed;
 
   gulong experimental_features_changed_handler_id;
 
@@ -193,6 +197,8 @@ struct _MetaMonitorManagerClass
   GBytes* (*read_edid) (MetaMonitorManager *,
                         MetaOutput         *);
 
+  gboolean (*is_lid_closed) (MetaMonitorManager *);
+
   void (*ensure_initial_config) (MetaMonitorManager *);
 
   gboolean (*apply_monitors_config) (MetaMonitorManager      *,
@@ -274,9 +280,9 @@ MetaLogicalMonitor *meta_monitor_manager_get_logical_monitor_at (MetaMonitorMana
 MetaLogicalMonitor *meta_monitor_manager_get_logical_monitor_from_rect (MetaMonitorManager *manager,
                                                                         MetaRectangle      *rect);
 
-MetaLogicalMonitor *meta_monitor_manager_get_logical_monitor_neighbor (MetaMonitorManager  *manager,
-                                                                       MetaLogicalMonitor  *logical_monitor,
-                                                                       MetaDisplayDirection direction);
+MetaLogicalMonitor *meta_monitor_manager_get_logical_monitor_neighbor (MetaMonitorManager *manager,
+                                                                       MetaLogicalMonitor *logical_monitor,
+                                                                       MetaScreenDirection direction);
 
 MetaMonitor *       meta_monitor_manager_get_primary_monitor (MetaMonitorManager *manager);
 
@@ -331,6 +337,8 @@ void               meta_monitor_manager_update_logical_state (MetaMonitorManager
 void               meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager,
                                                                       MetaMonitorsConfig *config);
 
+gboolean           meta_monitor_manager_is_lid_closed (MetaMonitorManager *manager);
+
 void               meta_monitor_manager_lid_is_closed_changed (MetaMonitorManager *manager);
 
 gboolean           meta_monitor_manager_is_headless (MetaMonitorManager *manager);

src/backends/meta-monitor-manager.c

@@ -34,9 +34,8 @@
 
 #include <meta/main.h>
 #include "util-private.h"
-#include <meta/meta-x11-errors.h>
+#include <meta/errors.h>
 #include "edid.h"
-#include "backends/meta-backend-private.h"
 #include "backends/meta-crtc.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor.h"
@@ -347,14 +346,36 @@ meta_monitor_manager_lid_is_closed_changed (MetaMonitorManager *manager)
 }
 
 static void
-lid_is_closed_changed (MetaBackend *backend,
-                       gboolean     lid_is_closed,
-                       gpointer     user_data)
+lid_is_closed_changed (UpClient   *client,
+                       GParamSpec *pspec,
+                       gpointer    user_data)
 {
   MetaMonitorManager *manager = user_data;
+  gboolean lid_is_closed;
+
+  lid_is_closed = up_client_get_lid_is_closed (manager->up_client);
+  if (lid_is_closed == manager->lid_is_closed)
+    return;
+
+  manager->lid_is_closed = lid_is_closed;
   meta_monitor_manager_lid_is_closed_changed (manager);
 }
 
+static gboolean
+meta_monitor_manager_real_is_lid_closed (MetaMonitorManager *manager)
+{
+  if (!manager->up_client)
+    return FALSE;
+
+  return manager->lid_is_closed;
+}
+
+gboolean
+meta_monitor_manager_is_lid_closed (MetaMonitorManager *manager)
+{
+  return META_MONITOR_MANAGER_GET_CLASS (manager)->is_lid_closed (manager);
+}
+
 gboolean
 meta_monitor_manager_is_headless (MetaMonitorManager *manager)
 {
@@ -704,6 +725,8 @@ static void
 meta_monitor_manager_constructed (GObject *object)
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (object);
+  MetaMonitorManagerClass *manager_class =
+    META_MONITOR_MANAGER_GET_CLASS (manager);
   MetaBackend *backend = manager->backend;
   MetaSettings *settings = meta_backend_get_settings (backend);
 
@@ -713,6 +736,17 @@ meta_monitor_manager_constructed (GObject *object)
                       G_CALLBACK (experimental_features_changed),
                       manager);
 
+  if (manager_class->is_lid_closed == meta_monitor_manager_real_is_lid_closed)
+    {
+      manager->up_client = up_client_new ();
+      if (manager->up_client)
+        {
+          g_signal_connect_object (manager->up_client, "notify::lid-is-closed",
+                                   G_CALLBACK (lid_is_closed_changed), manager, 0);
+          manager->lid_is_closed = up_client_get_lid_is_closed (manager->up_client);
+        }
+    }
+
   g_signal_connect_object (manager, "notify::power-save-mode",
                            G_CALLBACK (power_save_mode_changed), manager, 0);
 
@@ -721,11 +755,6 @@ meta_monitor_manager_constructed (GObject *object)
                            G_CALLBACK (orientation_changed),
                            manager, 0);
 
-  g_signal_connect_object (backend,
-                           "lid-is-closed-changed",
-                           G_CALLBACK (lid_is_closed_changed),
-                           manager, 0);
-
   manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
 
   initialize_dbus_interface (manager);
@@ -757,6 +786,7 @@ meta_monitor_manager_dispose (GObject *object)
     }
 
   g_clear_object (&manager->config_manager);
+  g_clear_object (&manager->up_client);
 
   G_OBJECT_CLASS (meta_monitor_manager_parent_class)->dispose (object);
 }
@@ -824,6 +854,7 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
 
   klass->get_edid_file = meta_monitor_manager_real_get_edid_file;
   klass->read_edid = meta_monitor_manager_real_read_edid;
+  klass->is_lid_closed = meta_monitor_manager_real_is_lid_closed;
 
   signals[MONITORS_CHANGED_INTERNAL] =
     g_signal_new ("monitors-changed-internal",
@@ -1565,7 +1596,7 @@ meta_monitor_manager_is_config_applicable (MetaMonitorManager *manager,
             }
 
           if (meta_monitor_is_laptop_panel (monitor) &&
-              meta_backend_is_lid_closed (manager->backend))
+              meta_monitor_manager_is_lid_closed (manager))
             {
               g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
                            "Refusing to activate a closed laptop panel");
@@ -2475,9 +2506,9 @@ meta_monitor_manager_get_logical_monitor_from_rect (MetaMonitorManager *manager,
 }
 
 MetaLogicalMonitor *
-meta_monitor_manager_get_logical_monitor_neighbor (MetaMonitorManager  *manager,
-                                                   MetaLogicalMonitor  *logical_monitor,
-                                                   MetaDisplayDirection direction)
+meta_monitor_manager_get_logical_monitor_neighbor (MetaMonitorManager *manager,
+                                                   MetaLogicalMonitor *logical_monitor,
+                                                   MetaScreenDirection direction)
 {
   GList *l;
 
@@ -2621,8 +2652,6 @@ meta_monitor_manager_read_current_state (MetaMonitorManager *manager)
 static void
 meta_monitor_manager_notify_monitors_changed (MetaMonitorManager *manager)
 {
-  manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
-
   meta_backend_monitors_changed (manager->backend);
 
   g_signal_emit (manager, signals[MONITORS_CHANGED_INTERNAL], 0);
@@ -2679,10 +2708,17 @@ meta_monitor_manager_update_logical_state (MetaMonitorManager *manager,
                                            MetaMonitorsConfig *config)
 {
   if (config)
-    manager->layout_mode = config->layout_mode;
+    {
+      manager->layout_mode = config->layout_mode;
+      manager->current_switch_config =
+        meta_monitors_config_get_switch_config (config);
+    }
   else
-    manager->layout_mode =
-      meta_monitor_manager_get_default_layout_mode (manager);
+    {
+      manager->layout_mode =
+        meta_monitor_manager_get_default_layout_mode (manager);
+      manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
+    }
 
   meta_monitor_manager_rebuild_logical_monitors (manager, config);
 }
@@ -2724,6 +2760,12 @@ void
 meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager,
                                                    MetaMonitorsConfig *config)
 {
+  if (config)
+    manager->current_switch_config =
+      meta_monitors_config_get_switch_config (config);
+  else
+    manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
+
   manager->layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL;
 
   meta_monitor_manager_rebuild_logical_monitors_derived (manager, config);
@@ -2967,7 +3009,7 @@ meta_monitor_manager_switch_config (MetaMonitorManager          *manager,
 gboolean
 meta_monitor_manager_can_switch_config (MetaMonitorManager *manager)
 {
-  return (!meta_backend_is_lid_closed (manager->backend) &&
+  return (!meta_monitor_manager_is_lid_closed (manager) &&
           g_list_length (manager->monitors) > 1);
 }
 

src/backends/meta-remote-access-controller-private.h

@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2018 Red Hat Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-#ifndef META_REMOTE_ACCESS_CONTROLLER_PRIVATE_H
-#define META_REMOTE_ACCESS_CONTROLLER_PRIVATE_H
-
-#include "meta/meta-remote-access-controller.h"
-
-void meta_remote_access_controller_notify_new_handle (MetaRemoteAccessController *controller,
-                                                      MetaRemoteAccessHandle     *handle);
-
-void meta_remote_access_handle_notify_stopped (MetaRemoteAccessHandle *handle);
-
-#endif /* META_REMOTE_ACCESS_CONTROLLER_PRIVATE_H */

src/backends/meta-remote-access-controller.c

@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2018 Red Hat Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-#include "config.h"
-
-#include "backends/meta-remote-access-controller-private.h"
-
-enum
-{
-  HANDLE_STOPPED,
-
-  N_HANDLE_SIGNALS
-};
-
-static int handle_signals[N_HANDLE_SIGNALS];
-
-enum
-{
-  CONTROLLER_NEW_HANDLE,
-
-  N_CONTROLLER_SIGNALS
-};
-
-static int controller_signals[N_CONTROLLER_SIGNALS];
-
-typedef struct _MetaRemoteAccessHandlePrivate
-{
-  gboolean has_stopped;
-} MetaRemoteAccessHandlePrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (MetaRemoteAccessHandle,
-                            meta_remote_access_handle,
-                            G_TYPE_OBJECT)
-
-struct _MetaRemoteAccessController
-{
-  GObject parent;
-};
-
-G_DEFINE_TYPE (MetaRemoteAccessController,
-               meta_remote_access_controller,
-               G_TYPE_OBJECT)
-
-/**
- * meta_remote_access_handle_stop:
- * @handle: A #MetaRemoteAccessHandle
- *
- * Stop the associated remote access session.
- */
-void
-meta_remote_access_handle_stop (MetaRemoteAccessHandle *handle)
-{
-  MetaRemoteAccessHandlePrivate *priv =
-    meta_remote_access_handle_get_instance_private (handle);
-
-  if (priv->has_stopped)
-    return;
-
-  META_REMOTE_ACCESS_HANDLE_GET_CLASS (handle)->stop (handle);
-}
-
-void
-meta_remote_access_handle_notify_stopped (MetaRemoteAccessHandle *handle)
-{
-  MetaRemoteAccessHandlePrivate *priv =
-    meta_remote_access_handle_get_instance_private (handle);
-
-  priv->has_stopped = TRUE;
-  g_signal_emit (handle, handle_signals[HANDLE_STOPPED], 0);
-}
-
-void
-meta_remote_access_controller_notify_new_handle (MetaRemoteAccessController *controller,
-                                                 MetaRemoteAccessHandle     *handle)
-{
-  g_signal_emit (controller, controller_signals[CONTROLLER_NEW_HANDLE], 0,
-                 handle);
-}
-
-static void
-meta_remote_access_handle_init (MetaRemoteAccessHandle *handle)
-{
-}
-
-static void
-meta_remote_access_handle_class_init (MetaRemoteAccessHandleClass *klass)
-{
-  handle_signals[HANDLE_STOPPED] =
-    g_signal_new ("stopped",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-}
-
-static void
-meta_remote_access_controller_init (MetaRemoteAccessController *controller)
-{
-}
-
-static void
-meta_remote_access_controller_class_init (MetaRemoteAccessControllerClass *klass)
-{
-  controller_signals[CONTROLLER_NEW_HANDLE] =
-    g_signal_new ("new-handle",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1,
-                  META_TYPE_REMOTE_ACCESS_HANDLE);
-}

src/backends/meta-remote-desktop-session.c

@@ -30,11 +30,11 @@
 
 #include "backends/meta-dbus-session-watcher.h"
 #include "backends/meta-screen-cast-session.h"
-#include "backends/meta-remote-access-controller-private.h"
 #include "backends/native/meta-backend-native.h"
 #include "backends/x11/meta-backend-x11.h"
 #include "cogl/cogl.h"
 #include "meta/meta-backend.h"
+#include "meta/errors.h"
 #include "meta-dbus-remote-desktop.h"
 
 #define META_REMOTE_DESKTOP_SESSION_DBUS_PATH "/org/gnome/Mutter/RemoteDesktop/Session"
@@ -59,8 +59,6 @@ struct _MetaRemoteDesktopSession
   ClutterVirtualInputDevice *virtual_pointer;
   ClutterVirtualInputDevice *virtual_keyboard;
   ClutterVirtualInputDevice *virtual_touchscreen;
-
-  MetaRemoteDesktopSessionHandle *handle;
 };
 
 static void
@@ -77,41 +75,12 @@ G_DEFINE_TYPE_WITH_CODE (MetaRemoteDesktopSession,
                          G_IMPLEMENT_INTERFACE (META_TYPE_DBUS_SESSION,
                                                 meta_dbus_session_init_iface))
 
-struct _MetaRemoteDesktopSessionHandle
-{
-  MetaRemoteAccessHandle parent;
-
-  MetaRemoteDesktopSession *session;
-};
-
-G_DEFINE_TYPE (MetaRemoteDesktopSessionHandle,
-               meta_remote_desktop_session_handle,
-               META_TYPE_REMOTE_ACCESS_HANDLE)
-
-static MetaRemoteDesktopSessionHandle *
-meta_remote_desktop_session_handle_new (MetaRemoteDesktopSession *session);
-
 static gboolean
 meta_remote_desktop_session_is_running (MetaRemoteDesktopSession *session)
 {
   return !!session->virtual_pointer;
 }
 
-static void
-init_remote_access_handle (MetaRemoteDesktopSession *session)
-{
-  MetaBackend *backend = meta_get_backend ();
-  MetaRemoteAccessController *remote_access_controller;
-  MetaRemoteAccessHandle *remote_access_handle;
-
-  session->handle = meta_remote_desktop_session_handle_new (session);
-
-  remote_access_controller = meta_backend_get_remote_access_controller (backend);
-  remote_access_handle = META_REMOTE_ACCESS_HANDLE (session->handle);
-  meta_remote_access_controller_notify_new_handle (remote_access_controller,
-                                                   remote_access_handle);
-}
-
 static gboolean
 meta_remote_desktop_session_start (MetaRemoteDesktopSession *session,
                                    GError                  **error)
@@ -138,8 +107,6 @@ meta_remote_desktop_session_start (MetaRemoteDesktopSession *session,
     clutter_device_manager_create_virtual_device (device_manager,
                                                   CLUTTER_TOUCHSCREEN_DEVICE);
 
-  init_remote_access_handle (session);
-
   return TRUE;
 }
 
@@ -164,14 +131,6 @@ meta_remote_desktop_session_close (MetaRemoteDesktopSession *session)
   meta_dbus_remote_desktop_session_emit_closed (skeleton);
   g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (session));
 
-  if (session->handle)
-    {
-      MetaRemoteAccessHandle *remote_access_handle =
-        META_REMOTE_ACCESS_HANDLE (session->handle);
-
-      meta_remote_access_handle_notify_stopped (remote_access_handle);
-    }
-
   g_object_unref (session);
 }
 
@@ -770,7 +729,6 @@ meta_remote_desktop_session_finalize (GObject *object)
 
   g_assert (!meta_remote_desktop_session_is_running (session));
 
-  g_clear_object (&session->handle);
   g_free (session->peer_name);
   g_free (session->session_id);
   g_free (session->object_path);
@@ -805,40 +763,3 @@ meta_remote_desktop_session_class_init (MetaRemoteDesktopSessionClass *klass)
 
   object_class->finalize = meta_remote_desktop_session_finalize;
 }
-
-static MetaRemoteDesktopSessionHandle *
-meta_remote_desktop_session_handle_new (MetaRemoteDesktopSession *session)
-{
-  MetaRemoteDesktopSessionHandle *handle;
-
-  handle = g_object_new (META_TYPE_REMOTE_DESKTOP_SESSION_HANDLE, NULL);
-  handle->session = session;
-
-  return handle;
-}
-
-static void
-meta_remote_desktop_session_handle_stop (MetaRemoteAccessHandle *handle)
-{
-  MetaRemoteDesktopSession *session;
-
-  session = META_REMOTE_DESKTOP_SESSION_HANDLE (handle)->session;
-  if (!session)
-    return;
-
-  meta_remote_desktop_session_close (session);
-}
-
-static void
-meta_remote_desktop_session_handle_init (MetaRemoteDesktopSessionHandle *handle)
-{
-}
-
-static void
-meta_remote_desktop_session_handle_class_init (MetaRemoteDesktopSessionHandleClass *klass)
-{
-  MetaRemoteAccessHandleClass *remote_access_handle_class =
-    META_REMOTE_ACCESS_HANDLE_CLASS (klass);
-
-  remote_access_handle_class->stop = meta_remote_desktop_session_handle_stop;
-}

src/backends/meta-remote-desktop-session.h

@@ -33,12 +33,6 @@ G_DECLARE_FINAL_TYPE (MetaRemoteDesktopSession, meta_remote_desktop_session,
                       META, REMOTE_DESKTOP_SESSION,
                       MetaDBusRemoteDesktopSessionSkeleton)
 
-#define META_TYPE_REMOTE_DESKTOP_SESSION_HANDLE (meta_remote_desktop_session_handle_get_type ())
-G_DECLARE_FINAL_TYPE (MetaRemoteDesktopSessionHandle,
-                      meta_remote_desktop_session_handle,
-                      META, REMOTE_DESKTOP_SESSION_HANDLE,
-                      MetaRemoteAccessHandle)
-
 char * meta_remote_desktop_session_get_object_path (MetaRemoteDesktopSession *session);
 
 char * meta_remote_desktop_session_get_session_id (MetaRemoteDesktopSession *session);

src/backends/meta-remote-desktop.c

@@ -37,6 +37,7 @@
 #include "backends/meta-cursor-renderer.h"
 #include "backends/meta-remote-desktop-session.h"
 #include "backends/native/meta-cursor-renderer-native.h"
+#include "meta/errors.h"
 #include "meta/meta-backend.h"
 
 #define META_REMOTE_DESKTOP_DBUS_SERVICE "org.gnome.Mutter.RemoteDesktop"

src/backends/meta-screen-cast-session.c

@@ -28,7 +28,6 @@
 #include "backends/meta-dbus-session-watcher.h"
 #include "backends/meta-screen-cast-monitor-stream.h"
 #include "backends/meta-screen-cast-stream.h"
-#include "backends/meta-remote-access-controller-private.h"
 
 #define META_SCREEN_CAST_SESSION_DBUS_PATH "/org/gnome/Mutter/ScreenCast/Session"
 
@@ -42,8 +41,6 @@ struct _MetaScreenCastSession
   char *object_path;
 
   GList *streams;
-
-  MetaScreenCastSessionHandle *handle;
 };
 
 static void
@@ -60,35 +57,6 @@ G_DEFINE_TYPE_WITH_CODE (MetaScreenCastSession,
                          G_IMPLEMENT_INTERFACE (META_TYPE_DBUS_SESSION,
                                                 meta_dbus_session_init_iface))
 
-struct _MetaScreenCastSessionHandle
-{
-  MetaRemoteAccessHandle parent;
-
-  MetaScreenCastSession *session;
-};
-
-G_DEFINE_TYPE (MetaScreenCastSessionHandle,
-               meta_screen_cast_session_handle,
-               META_TYPE_REMOTE_ACCESS_HANDLE)
-
-static MetaScreenCastSessionHandle *
-meta_screen_cast_session_handle_new (MetaScreenCastSession *session);
-
-static void
-init_remote_access_handle (MetaScreenCastSession *session)
-{
-  MetaBackend *backend = meta_get_backend ();
-  MetaRemoteAccessController *remote_access_controller;
-  MetaRemoteAccessHandle *remote_access_handle;
-
-  session->handle = meta_screen_cast_session_handle_new (session);
-
-  remote_access_controller = meta_backend_get_remote_access_controller (backend);
-  remote_access_handle = META_REMOTE_ACCESS_HANDLE (session->handle);
-  meta_remote_access_controller_notify_new_handle (remote_access_controller,
-                                                   remote_access_handle);
-}
-
 gboolean
 meta_screen_cast_session_start (MetaScreenCastSession  *session,
                                 GError                **error)
@@ -103,8 +71,6 @@ meta_screen_cast_session_start (MetaScreenCastSession  *session,
         return FALSE;
     }
 
-  init_remote_access_handle (session);
-
   return TRUE;
 }
 
@@ -128,14 +94,6 @@ meta_screen_cast_session_close (MetaScreenCastSession *session)
 
   g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (session));
 
-  if (session->handle)
-    {
-      MetaRemoteAccessHandle *remote_access_handle =
-        META_REMOTE_ACCESS_HANDLE (session->handle);
-
-      meta_remote_access_handle_notify_stopped (remote_access_handle);
-    }
-
   g_object_unref (session);
 }
 
@@ -403,7 +361,6 @@ meta_screen_cast_session_finalize (GObject *object)
 {
   MetaScreenCastSession *session = META_SCREEN_CAST_SESSION (object);
 
-  g_clear_object (&session->handle);
   g_free (session->peer_name);
   g_free (session->object_path);
 
@@ -422,40 +379,3 @@ meta_screen_cast_session_class_init (MetaScreenCastSessionClass *klass)
 
   object_class->finalize = meta_screen_cast_session_finalize;
 }
-
-static MetaScreenCastSessionHandle *
-meta_screen_cast_session_handle_new (MetaScreenCastSession *session)
-{
-  MetaScreenCastSessionHandle *handle;
-
-  handle = g_object_new (META_TYPE_SCREEN_CAST_SESSION_HANDLE, NULL);
-  handle->session = session;
-
-  return handle;
-}
-
-static void
-meta_screen_cast_session_handle_stop (MetaRemoteAccessHandle *handle)
-{
-  MetaScreenCastSession *session;
-
-  session = META_SCREEN_CAST_SESSION_HANDLE (handle)->session;
-  if (!session)
-    return;
-
-  meta_screen_cast_session_close (session);
-}
-
-static void
-meta_screen_cast_session_handle_init (MetaScreenCastSessionHandle *handle)
-{
-}
-
-static void
-meta_screen_cast_session_handle_class_init (MetaScreenCastSessionHandleClass *klass)
-{
-  MetaRemoteAccessHandleClass *remote_access_handle_class =
-    META_REMOTE_ACCESS_HANDLE_CLASS (klass);
-
-  remote_access_handle_class->stop = meta_screen_cast_session_handle_stop;
-}

src/backends/meta-screen-cast-session.h

@@ -26,7 +26,6 @@
 #include "backends/meta-screen-cast.h"
 
 #include "backends/meta-screen-cast-stream.h"
-#include "meta/meta-remote-access-controller.h"
 
 typedef enum _MetaScreenCastSessionType
 {
@@ -39,12 +38,6 @@ G_DECLARE_FINAL_TYPE (MetaScreenCastSession, meta_screen_cast_session,
                       META, SCREEN_CAST_SESSION,
                       MetaDBusScreenCastSessionSkeleton)
 
-#define META_TYPE_SCREEN_CAST_SESSION_HANDLE (meta_screen_cast_session_handle_get_type ())
-G_DECLARE_FINAL_TYPE (MetaScreenCastSessionHandle,
-                      meta_screen_cast_session_handle,
-                      META, SCREEN_CAST_SESSION_HANDLE,
-                      MetaRemoteAccessHandle)
-
 char * meta_screen_cast_session_get_object_path (MetaScreenCastSession *session);
 
 MetaScreenCastSession * meta_screen_cast_session_new (MetaScreenCast             *screen_cast,

src/backends/meta-screen-cast-stream-src.c

@@ -132,8 +132,8 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src)
 {
   MetaScreenCastStreamSrcPrivate *priv =
     meta_screen_cast_stream_src_get_instance_private (src);
-  struct pw_buffer *buffer;
-  struct spa_buffer *spa_buffer;
+  uint32_t buffer_id;
+  struct spa_buffer *buffer;
   uint8_t *map = NULL;
   uint8_t *data;
   uint64_t now_us;
@@ -148,24 +148,22 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src)
   if (!priv->pipewire_stream)
     return;
 
-  buffer = pw_stream_dequeue_buffer (priv->pipewire_stream);
+  buffer_id = pw_stream_get_empty_buffer (priv->pipewire_stream);
+  if (buffer_id == SPA_ID_INVALID)
+    return;
+
+  buffer = pw_stream_peek_buffer (priv->pipewire_stream, buffer_id);
   if (!buffer)
     {
-      g_warning ("Failed to dequeue at PipeWire buffer");
+      g_warning ("Failed to peek at PipeWire buffer");
       return;
     }
 
-  spa_buffer = buffer->buffer;
-
-  if (spa_buffer->datas[0].data)
+  if (buffer->datas[0].type == priv->pipewire_type->data.MemFd)
     {
-      data = spa_buffer->datas[0].data;
-    }
-  else if (spa_buffer->datas[0].type == priv->pipewire_type->data.MemFd)
-    {
-      map = mmap (NULL, spa_buffer->datas[0].maxsize + spa_buffer->datas[0].mapoffset,
+      map = mmap (NULL, buffer->datas[0].maxsize + buffer->datas[0].mapoffset,
                   PROT_READ | PROT_WRITE, MAP_SHARED,
-                  spa_buffer->datas[0].fd, 0);
+                  buffer->datas[0].fd, 0);
       if (map == MAP_FAILED)
         {
           g_warning ("Failed to mmap pipewire stream buffer: %s\n",
@@ -173,11 +171,14 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src)
           return;
         }
 
-      data = SPA_MEMBER (map, spa_buffer->datas[0].mapoffset, uint8_t);
+      data = SPA_MEMBER (map, buffer->datas[0].mapoffset, uint8_t);
+    }
+  else if (buffer->datas[0].type == priv->pipewire_type->data.MemPtr)
+    {
+      data = buffer->datas[0].data;
     }
   else
     {
-      g_warning ("Unhandled spa buffer type: %d", spa_buffer->datas[0].type);
       return;
     }
 
@@ -185,11 +186,11 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src)
   priv->last_frame_timestamp_us = now_us;
 
   if (map)
-    munmap (map, spa_buffer->datas[0].maxsize + spa_buffer->datas[0].mapoffset);
+    munmap (map, buffer->datas[0].maxsize + buffer->datas[0].mapoffset);
 
-  spa_buffer->datas[0].chunk->size = spa_buffer->datas[0].maxsize;
+  buffer->datas[0].chunk->size = buffer->datas[0].maxsize;
 
-  pw_stream_queue_buffer (priv->pipewire_stream, buffer);
+  pw_stream_send_buffer (priv->pipewire_stream, buffer_id);
 }
 
 static gboolean
@@ -265,8 +266,8 @@ on_stream_state_changed (void                 *data,
 }
 
 static void
-on_stream_format_changed (void                 *data,
-                          const struct spa_pod *format)
+on_stream_format_changed (void           *data,
+                          struct spa_pod *format)
 {
   MetaScreenCastStreamSrc *src = data;
   MetaScreenCastStreamSrcPrivate *priv =
@@ -275,7 +276,7 @@ on_stream_format_changed (void                 *data,
   uint8_t params_buffer[1024];
   int32_t width, height, stride, size;
   struct spa_pod_builder pod_builder;
-  const struct spa_pod *params[1];
+  struct spa_pod *params[1];
   const int bpp = 4;
 
   if (!format)
@@ -371,8 +372,7 @@ create_pipewire_stream (MetaScreenCastStreamSrc  *src,
   result = pw_stream_connect (pipewire_stream,
                               PW_DIRECTION_OUTPUT,
                               NULL,
-                              (PW_STREAM_FLAG_DRIVER |
-                               PW_STREAM_FLAG_MAP_BUFFERS),
+                              PW_STREAM_FLAG_NONE,
                               params, G_N_ELEMENTS (params));
   if (result != 0)
     {
@@ -578,9 +578,9 @@ meta_screen_cast_stream_src_finalize (GObject *object)
   if (meta_screen_cast_stream_src_is_enabled (src))
     meta_screen_cast_stream_src_disable (src);
 
-  g_clear_pointer (&priv->pipewire_stream, pw_stream_destroy);
-  g_clear_pointer (&priv->pipewire_remote, pw_remote_destroy);
-  g_clear_pointer (&priv->pipewire_core, pw_core_destroy);
+  g_clear_pointer (&priv->pipewire_stream, (GDestroyNotify) pw_stream_destroy);
+  g_clear_pointer (&priv->pipewire_remote, (GDestroyNotify) pw_remote_destroy);
+  g_clear_pointer (&priv->pipewire_core, (GDestroyNotify) pw_core_destroy);
   g_source_destroy (&priv->pipewire_source->base);
 
   G_OBJECT_CLASS (meta_screen_cast_stream_src_parent_class)->finalize (object);

src/backends/meta-settings-private.h

@@ -31,7 +31,9 @@ typedef enum _MetaExperimentalFeature
 {
   META_EXPERIMENTAL_FEATURE_NONE = 0,
   META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER = (1 << 0),
-  META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS  = (1 << 1),
+  META_EXPERIMENTAL_FEATURE_SCREEN_CAST = (1 << 1),
+  META_EXPERIMENTAL_FEATURE_REMOTE_DESKTOP  = (1 << 2),
+  META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS = (1 << 3),
 } MetaExperimentalFeature;
 
 #define META_TYPE_SETTINGS (meta_settings_get_type ())

src/backends/meta-settings.c

@@ -260,8 +260,13 @@ experimental_features_handler (GVariant *features_variant,
   g_variant_iter_init (&features_iter, features_variant);
   while (g_variant_iter_loop (&features_iter, "s", &feature))
     {
+      /* So far no experimental features defined. */
       if (g_str_equal (feature, "scale-monitor-framebuffer"))
         features |= META_EXPERIMENTAL_FEATURE_SCALE_MONITOR_FRAMEBUFFER;
+      else if (g_str_equal (feature, "screen-cast"))
+        features |= META_EXPERIMENTAL_FEATURE_SCREEN_CAST;
+      else if (g_str_equal (feature, "remote-desktop"))
+        features |= META_EXPERIMENTAL_FEATURE_REMOTE_DESKTOP;
       else if (g_str_equal (feature, "kms-modifiers"))
         features |= META_EXPERIMENTAL_FEATURE_KMS_MODIFIERS;
       else

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

@@ -29,6 +29,7 @@
 
 #include <meta/main.h>
 #include <clutter/evdev/clutter-evdev.h>
+#include <libupower-glib/upower.h>
 
 #include "clutter/egl/clutter-egl.h"
 #include "clutter/evdev/clutter-evdev.h"
@@ -211,7 +212,7 @@ relative_motion_across_outputs (MetaMonitorManager *monitor_manager,
   MetaLogicalMonitor *cur = current;
   float x = cur_x, y = cur_y;
   float dx = *dx_inout, dy = *dy_inout;
-  MetaDisplayDirection direction = -1;
+  MetaScreenDirection direction = -1;
 
   while (cur)
     {
@@ -239,18 +240,18 @@ relative_motion_across_outputs (MetaMonitorManager *monitor_manager,
         { cur->rect.x + cur->rect.width, cur->rect.y + cur->rect.height }
       };
 
-      if (direction != META_DISPLAY_RIGHT &&
+      if (direction != META_SCREEN_RIGHT &&
           meta_line2_intersects_with (&motion, &left, &intersection))
-        direction = META_DISPLAY_LEFT;
-      else if (direction != META_DISPLAY_LEFT &&
+        direction = META_SCREEN_LEFT;
+      else if (direction != META_SCREEN_LEFT &&
                meta_line2_intersects_with (&motion, &right, &intersection))
-        direction = META_DISPLAY_RIGHT;
-      else if (direction != META_DISPLAY_DOWN &&
+        direction = META_SCREEN_RIGHT;
+      else if (direction != META_SCREEN_DOWN &&
                meta_line2_intersects_with (&motion, &top, &intersection))
-        direction = META_DISPLAY_UP;
-      else if (direction != META_DISPLAY_UP &&
+        direction = META_SCREEN_UP;
+      else if (direction != META_SCREEN_UP &&
                meta_line2_intersects_with (&motion, &bottom, &intersection))
-        direction = META_DISPLAY_DOWN;
+        direction = META_SCREEN_DOWN;
       else
         {
           /* We reached the dest logical monitor */
@@ -644,6 +645,8 @@ void meta_backend_native_resume (MetaBackendNative *native)
     meta_backend_get_monitor_manager (backend);
   MetaMonitorManagerKms *monitor_manager_kms =
     META_MONITOR_MANAGER_KMS (monitor_manager);
+  MetaCursorRenderer *cursor_renderer;
+  MetaCursorRendererNative *cursor_renderer_native;
   ClutterActor *stage;
   MetaIdleMonitor *idle_monitor;
 
@@ -655,6 +658,10 @@ void meta_backend_native_resume (MetaBackendNative *native)
   stage = meta_backend_get_stage (backend);
   clutter_actor_queue_redraw (stage);
 
+  cursor_renderer = meta_backend_get_cursor_renderer (backend);
+  cursor_renderer_native = META_CURSOR_RENDERER_NATIVE (cursor_renderer);
+  meta_cursor_renderer_native_force_update (cursor_renderer_native);
+
   idle_monitor = meta_backend_get_idle_monitor (backend, 0);
   meta_idle_monitor_reset_idletime (idle_monitor);
 }

src/backends/native/meta-cursor-renderer-native.c

@@ -35,7 +35,6 @@
 #include <meta/meta-backend.h>
 
 #include "backends/meta-backend-private.h"
-#include "backends/meta-cursor-sprite-xcursor.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor.h"
 #include "backends/meta-monitor-manager-private.h"
@@ -44,11 +43,6 @@
 #include "core/boxes-private.h"
 #include "meta/boxes.h"
 
-#ifdef HAVE_WAYLAND
-#include "wayland/meta-cursor-sprite-wayland.h"
-#include "wayland/meta-wayland-buffer.h"
-#endif
-
 #ifndef DRM_CAP_CURSOR_WIDTH
 #define DRM_CAP_CURSOR_WIDTH 0x8
 #endif
@@ -119,11 +113,6 @@ static GQuark quark_cursor_renderer_native_gpu_data = 0;
 
 G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRendererNative, meta_cursor_renderer_native, META_TYPE_CURSOR_RENDERER);
 
-static void
-realize_cursor_sprite (MetaCursorRenderer *renderer,
-                       MetaCursorSprite   *cursor_sprite,
-                       GList              *gpus);
-
 static MetaCursorNativeGpuState *
 get_cursor_gpu_state (MetaCursorNativePrivate *cursor_priv,
                       MetaGpuKms              *gpu_kms);
@@ -163,8 +152,7 @@ static void
 meta_cursor_renderer_native_finalize (GObject *object)
 {
   MetaCursorRendererNative *renderer = META_CURSOR_RENDERER_NATIVE (object);
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (renderer);
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (renderer);
 
   if (priv->animation_timeout_id)
     g_source_remove (priv->animation_timeout_id);
@@ -215,8 +203,7 @@ set_crtc_cursor (MetaCursorRendererNative *native,
                  MetaCrtc                 *crtc,
                  MetaCursorSprite         *cursor_sprite)
 {
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
   MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
   MetaGpuKms *gpu_kms;
   int kms_fd;
@@ -384,8 +371,7 @@ static void
 update_hw_cursor (MetaCursorRendererNative *native,
                   MetaCursorSprite         *cursor_sprite)
 {
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
   MetaCursorRenderer *renderer = META_CURSOR_RENDERER (native);
   MetaMonitorManager *monitor_manager = priv->monitor_manager;
   GList *logical_monitors;
@@ -578,15 +564,18 @@ can_draw_cursor_unscaled (MetaCursorRenderer *renderer,
 
 static gboolean
 should_have_hw_cursor (MetaCursorRenderer *renderer,
-                       MetaCursorSprite   *cursor_sprite,
-                       GList              *gpus)
+                       MetaCursorSprite   *cursor_sprite)
 {
+  MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+  GList *gpus;
   GList *l;
   CoglTexture *texture;
 
   if (!cursor_sprite)
     return FALSE;
 
+  gpus = meta_monitor_manager_get_gpus (priv->monitor_manager);
   for (l = gpus; l; l = l->next)
     {
       MetaGpuKms *gpu_kms = l->data;
@@ -620,8 +609,7 @@ should_have_hw_cursor (MetaCursorRenderer *renderer,
 static gboolean
 meta_cursor_renderer_native_update_animation (MetaCursorRendererNative *native)
 {
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
   MetaCursorRenderer *renderer = META_CURSOR_RENDERER (native);
   MetaCursorSprite *cursor_sprite = meta_cursor_renderer_get_cursor (renderer);
 
@@ -633,11 +621,10 @@ meta_cursor_renderer_native_update_animation (MetaCursorRendererNative *native)
 }
 
 static void
-maybe_schedule_cursor_sprite_animation_frame (MetaCursorRendererNative *native,
-                                              MetaCursorSprite         *cursor_sprite)
+meta_cursor_renderer_native_trigger_frame (MetaCursorRendererNative *native,
+                                           MetaCursorSprite         *cursor_sprite)
 {
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
   gboolean cursor_change;
   guint delay;
 
@@ -669,78 +656,21 @@ maybe_schedule_cursor_sprite_animation_frame (MetaCursorRendererNative *native,
     }
 }
 
-static GList *
-calculate_cursor_sprite_gpus (MetaCursorRenderer *renderer,
-                              MetaCursorSprite   *cursor_sprite)
-{
-  MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
-  MetaMonitorManager *monitor_manager = priv->monitor_manager;
-  GList *gpus = NULL;
-  GList *logical_monitors;
-  GList *l;
-  ClutterRect cursor_rect;
-
-  cursor_rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
-
-  logical_monitors =
-    meta_monitor_manager_get_logical_monitors (monitor_manager);
-  for (l = logical_monitors; l; l = l->next)
-    {
-      MetaLogicalMonitor *logical_monitor = l->data;
-      MetaRectangle logical_monitor_layout;
-      ClutterRect logical_monitor_rect;
-      GList *monitors, *l_mon;
-
-      logical_monitor_layout =
-        meta_logical_monitor_get_layout (logical_monitor);
-      logical_monitor_rect =
-        meta_rectangle_to_clutter_rect (&logical_monitor_layout);
-
-      if (!clutter_rect_intersection (&cursor_rect, &logical_monitor_rect,
-                                      NULL))
-        continue;
-
-      monitors = meta_logical_monitor_get_monitors (logical_monitor);
-      for (l_mon = monitors; l_mon; l_mon = l_mon->next)
-        {
-          MetaMonitor *monitor = l_mon->data;
-          MetaGpu *gpu;
-
-          gpu = meta_monitor_get_gpu (monitor);
-          if (!g_list_find (gpus, gpu))
-            gpus = g_list_prepend (gpus, gpu);
-        }
-    }
-
-  return gpus;
-}
-
 static gboolean
 meta_cursor_renderer_native_update_cursor (MetaCursorRenderer *renderer,
                                            MetaCursorSprite   *cursor_sprite)
 {
   MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
-  g_autoptr (GList) gpus = NULL;
+  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
 
   if (cursor_sprite)
-    {
-      meta_cursor_sprite_realize_texture (cursor_sprite);
-      gpus = calculate_cursor_sprite_gpus (renderer, cursor_sprite);
-      realize_cursor_sprite (renderer, cursor_sprite, gpus);
-    }
+    meta_cursor_sprite_realize_texture (cursor_sprite);
 
-  maybe_schedule_cursor_sprite_animation_frame (native, cursor_sprite);
+  meta_cursor_renderer_native_trigger_frame (native, cursor_sprite);
 
-  priv->has_hw_cursor = should_have_hw_cursor (renderer, cursor_sprite, gpus);
+  priv->has_hw_cursor = should_have_hw_cursor (renderer, cursor_sprite);
   update_hw_cursor (native, cursor_sprite);
-
-  return (priv->has_hw_cursor ||
-          !cursor_sprite ||
-          !meta_cursor_sprite_get_cogl_texture (cursor_sprite));
+  return priv->has_hw_cursor;
 }
 
 static void
@@ -749,7 +679,7 @@ cursor_gpu_state_free (MetaCursorNativeGpuState *cursor_gpu_state)
   int i;
 
   for (i = 0; i < HW_CURSOR_BUFFER_COUNT; i++)
-    g_clear_pointer (&cursor_gpu_state->bos[i], gbm_bo_destroy);
+    g_clear_pointer (&cursor_gpu_state->bos[i], (GDestroyNotify) gbm_bo_destroy);
   g_free (cursor_gpu_state);
 }
 
@@ -776,28 +706,11 @@ ensure_cursor_gpu_state (MetaCursorNativePrivate *cursor_priv,
   return cursor_gpu_state;
 }
 
-static void
-on_cursor_sprite_texture_changed (MetaCursorSprite *cursor_sprite)
-{
-  MetaCursorNativePrivate *cursor_priv = get_cursor_priv (cursor_sprite);
-  GHashTableIter iter;
-  MetaCursorNativeGpuState *cursor_gpu_state;
-
-  g_hash_table_iter_init (&iter, cursor_priv->gpu_states);
-  while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &cursor_gpu_state))
-    {
-      guint pending_bo;
-      pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_gpu_state);
-      g_clear_pointer (&cursor_gpu_state->bos[pending_bo],
-                       gbm_bo_destroy);
-      cursor_gpu_state->pending_bo_state = META_CURSOR_GBM_BO_STATE_INVALIDATED;
-    }
-}
-
 static void
 cursor_priv_free (MetaCursorNativePrivate *cursor_priv)
 {
   g_hash_table_destroy (cursor_priv->gpu_states);
+  g_free (cursor_priv);
 }
 
 static MetaCursorNativePrivate *
@@ -826,9 +739,6 @@ ensure_cursor_priv (MetaCursorSprite *cursor_sprite)
                            cursor_priv,
                            (GDestroyNotify) cursor_priv_free);
 
-  g_signal_connect (cursor_sprite, "texture-changed",
-                    G_CALLBACK (on_cursor_sprite_texture_changed), NULL);
-
   return cursor_priv;
 }
 
@@ -896,71 +806,57 @@ load_cursor_sprite_gbm_buffer_for_gpu (MetaCursorRendererNative *native,
     }
 }
 
-static gboolean
-is_cursor_hw_state_valid (MetaCursorSprite *cursor_sprite,
-                          MetaGpuKms       *gpu_kms)
+static void
+invalidate_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite,
+                                         MetaGpuKms       *gpu_kms)
 {
   MetaCursorNativePrivate *cursor_priv;
   MetaCursorNativeGpuState *cursor_gpu_state;
+  guint pending_bo;
 
   cursor_priv = get_cursor_priv (cursor_sprite);
   if (!cursor_priv)
-    return FALSE;
+    return;
 
   cursor_gpu_state = get_cursor_gpu_state (cursor_priv, gpu_kms);
   if (!cursor_gpu_state)
-    return FALSE;
+    return;
 
-  switch (cursor_gpu_state->pending_bo_state)
-    {
-    case META_CURSOR_GBM_BO_STATE_SET:
-    case META_CURSOR_GBM_BO_STATE_NONE:
-      return TRUE;
-    case META_CURSOR_GBM_BO_STATE_INVALIDATED:
-      return FALSE;
-    }
-
-  g_assert_not_reached ();
+  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_gpu_state);
+  g_clear_pointer (&cursor_gpu_state->bos[pending_bo],
+                   (GDestroyNotify) gbm_bo_destroy);
+  cursor_gpu_state->pending_bo_state = META_CURSOR_GBM_BO_STATE_INVALIDATED;
 }
 
 #ifdef HAVE_WAYLAND
 static void
-realize_cursor_sprite_from_wl_buffer_for_gpu (MetaCursorRenderer      *renderer,
-                                              MetaGpuKms              *gpu_kms,
-                                              MetaCursorSpriteWayland *sprite_wayland)
+meta_cursor_renderer_native_realize_cursor_from_wl_buffer_for_gpu (MetaCursorRenderer *renderer,
+                                                                   MetaGpuKms         *gpu_kms,
+                                                                   MetaCursorSprite   *cursor_sprite,
+                                                                   struct wl_resource *buffer)
 {
   MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
-  MetaCursorSprite *cursor_sprite = META_CURSOR_SPRITE (sprite_wayland);
   MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
   uint32_t gbm_format;
   uint64_t cursor_width, cursor_height;
   CoglTexture *texture;
   uint width, height;
-  MetaWaylandBuffer *buffer;
-  struct wl_resource *buffer_resource;
-  struct wl_shm_buffer *shm_buffer;
 
   cursor_renderer_gpu_data =
     meta_cursor_renderer_native_gpu_data_from_gpu (gpu_kms);
   if (!cursor_renderer_gpu_data || cursor_renderer_gpu_data->hw_cursor_broken)
     return;
 
-  if (is_cursor_hw_state_valid (cursor_sprite, gpu_kms))
-    return;
+  /* Destroy any previous pending cursor buffer; we'll always either fail (which
+   * should unset, or succeed, which will set new buffer.
+   */
+  invalidate_pending_cursor_sprite_gbm_bo (cursor_sprite, gpu_kms);
 
   texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
   width = cogl_texture_get_width (texture);
   height = cogl_texture_get_height (texture);
 
-  buffer = meta_cursor_sprite_wayland_get_buffer (sprite_wayland);
-  if (!buffer)
-    return;
-
-  buffer_resource = meta_wayland_buffer_get_resource (buffer);
-  if (!buffer_resource)
-    return;
-
-  shm_buffer = wl_shm_buffer_get (buffer_resource);
+  struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (buffer);
   if (shm_buffer)
     {
       int rowstride = wl_shm_buffer_get_stride (shm_buffer);
@@ -1034,27 +930,47 @@ realize_cursor_sprite_from_wl_buffer_for_gpu (MetaCursorRenderer      *renderer,
       set_pending_cursor_sprite_gbm_bo (cursor_sprite, gpu_kms, bo);
     }
 }
+
+static void
+meta_cursor_renderer_native_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
+                                                           MetaCursorSprite *cursor_sprite,
+                                                           struct wl_resource *buffer)
+{
+  MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
+  MetaCursorRendererNativePrivate *priv =
+	  meta_cursor_renderer_native_get_instance_private (native);
+  GList *gpus;
+  GList *l;
+
+  gpus = meta_monitor_manager_get_gpus (priv->monitor_manager);
+  for (l = gpus; l; l = l->next)
+    {
+      MetaGpuKms *gpu_kms = l->data;
+
+      meta_cursor_renderer_native_realize_cursor_from_wl_buffer_for_gpu (
+        renderer,
+        gpu_kms,
+        cursor_sprite,
+        buffer);
+    }
+}
 #endif
 
 static void
-realize_cursor_sprite_from_xcursor_for_gpu (MetaCursorRenderer      *renderer,
-                                            MetaGpuKms              *gpu_kms,
-                                            MetaCursorSpriteXcursor *sprite_xcursor)
+meta_cursor_renderer_native_realize_cursor_from_xcursor_for_gpu (MetaCursorRenderer *renderer,
+                                                                 MetaGpuKms         *gpu_kms,
+                                                                 MetaCursorSprite   *cursor_sprite,
+                                                                 XcursorImage       *xc_image)
 {
   MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
   MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
-  MetaCursorSprite *cursor_sprite = META_CURSOR_SPRITE (sprite_xcursor);
-  XcursorImage *xc_image;
 
   cursor_renderer_gpu_data =
     meta_cursor_renderer_native_gpu_data_from_gpu (gpu_kms);
   if (!cursor_renderer_gpu_data || cursor_renderer_gpu_data->hw_cursor_broken)
     return;
 
-  if (is_cursor_hw_state_valid (cursor_sprite, gpu_kms))
-    return;
-
-  xc_image = meta_cursor_sprite_xcursor_get_current_image (sprite_xcursor);
+  invalidate_pending_cursor_sprite_gbm_bo (cursor_sprite, gpu_kms);
 
   load_cursor_sprite_gbm_buffer_for_gpu (native,
                                          gpu_kms,
@@ -1067,44 +983,26 @@ realize_cursor_sprite_from_xcursor_for_gpu (MetaCursorRenderer      *renderer,
 }
 
 static void
-realize_cursor_sprite_for_gpu (MetaCursorRenderer *renderer,
-                               MetaGpuKms         *gpu_kms,
-                               MetaCursorSprite   *cursor_sprite)
-{
-  if (META_IS_CURSOR_SPRITE_XCURSOR (cursor_sprite))
-    {
-      MetaCursorSpriteXcursor *sprite_xcursor =
-        META_CURSOR_SPRITE_XCURSOR (cursor_sprite);
-
-      realize_cursor_sprite_from_xcursor_for_gpu (renderer,
-                                                  gpu_kms,
-                                                  sprite_xcursor);
-    }
-#ifdef HAVE_WAYLAND
-  else if (META_IS_CURSOR_SPRITE_WAYLAND (cursor_sprite))
-    {
-      MetaCursorSpriteWayland *sprite_wayland =
-        META_CURSOR_SPRITE_WAYLAND (cursor_sprite);
-
-      realize_cursor_sprite_from_wl_buffer_for_gpu (renderer,
-                                                    gpu_kms,
-                                                    sprite_wayland);
-    }
-#endif
-}
-
-static void
-realize_cursor_sprite (MetaCursorRenderer *renderer,
-                       MetaCursorSprite   *cursor_sprite,
-                       GList              *gpus)
+meta_cursor_renderer_native_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
+                                                         MetaCursorSprite   *cursor_sprite,
+                                                         XcursorImage       *xc_image)
 {
+  MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
+  MetaCursorRendererNativePrivate *priv =
+	  meta_cursor_renderer_native_get_instance_private (native);
+  GList *gpus;
   GList *l;
 
+  gpus = meta_monitor_manager_get_gpus (priv->monitor_manager);
   for (l = gpus; l; l = l->next)
     {
       MetaGpuKms *gpu_kms = l->data;
 
-      realize_cursor_sprite_for_gpu (renderer, gpu_kms, cursor_sprite);
+      meta_cursor_renderer_native_realize_cursor_from_xcursor_for_gpu (
+        renderer,
+        gpu_kms,
+        cursor_sprite,
+        xc_image);
     }
 }
 
@@ -1116,6 +1014,12 @@ meta_cursor_renderer_native_class_init (MetaCursorRendererNativeClass *klass)
 
   object_class->finalize = meta_cursor_renderer_native_finalize;
   renderer_class->update_cursor = meta_cursor_renderer_native_update_cursor;
+#ifdef HAVE_WAYLAND
+  renderer_class->realize_cursor_from_wl_buffer =
+    meta_cursor_renderer_native_realize_cursor_from_wl_buffer;
+#endif
+  renderer_class->realize_cursor_from_xcursor =
+    meta_cursor_renderer_native_realize_cursor_from_xcursor;
 
   quark_cursor_sprite = g_quark_from_static_string ("-meta-cursor-native");
   quark_cursor_renderer_native_gpu_data =
@@ -1130,13 +1034,14 @@ force_update_hw_cursor (MetaCursorRendererNative *native)
     meta_cursor_renderer_native_get_instance_private (native);
 
   priv->hw_state_invalidated = TRUE;
-  meta_cursor_renderer_force_update (renderer);
+  update_hw_cursor (native, meta_cursor_renderer_get_cursor (renderer));
 }
 
 static void
 on_monitors_changed (MetaMonitorManager       *monitors,
                      MetaCursorRendererNative *native)
 {
+  /* Our tracking is all messed up, so force an update. */
   force_update_hw_cursor (native);
 }
 
@@ -1208,3 +1113,9 @@ static void
 meta_cursor_renderer_native_init (MetaCursorRendererNative *native)
 {
 }
+
+void
+meta_cursor_renderer_native_force_update (MetaCursorRendererNative *native)
+{
+  force_update_hw_cursor (native);
+}

src/backends/native/meta-cursor-renderer-native.h

@@ -26,13 +26,14 @@
 #define META_CURSOR_RENDERER_NATIVE_H
 
 #include "meta-cursor-renderer.h"
-#include "meta/meta-backend.h"
 
 #define META_TYPE_CURSOR_RENDERER_NATIVE (meta_cursor_renderer_native_get_type ())
 G_DECLARE_FINAL_TYPE (MetaCursorRendererNative, meta_cursor_renderer_native,
                       META, CURSOR_RENDERER_NATIVE,
                       MetaCursorRenderer)
 
+void meta_cursor_renderer_native_force_update (MetaCursorRendererNative *renderer);
+
 MetaCursorRendererNative * meta_cursor_renderer_native_new (MetaBackend *backend);
 
 #endif /* META_CURSOR_RENDERER_NATIVE_H */

src/backends/native/meta-gpu-kms.c

@@ -68,8 +68,11 @@ struct _MetaGpuKms
   int max_buffer_height;
 
   gboolean page_flips_not_supported;
+
+  gboolean resources_init_failed_before;
 };
 
+G_DEFINE_QUARK (MetaGpuKmsError, meta_gpu_kms_error)
 G_DEFINE_TYPE (MetaGpuKms, meta_gpu_kms, META_TYPE_GPU)
 
 static gboolean
@@ -726,20 +729,34 @@ init_outputs (MetaGpuKms       *gpu_kms,
   setup_output_clones (gpu);
 }
 
-static void
-meta_kms_resources_init (MetaKmsResources *resources,
-                         int               fd)
+static gboolean
+meta_kms_resources_init (MetaKmsResources  *resources,
+                         int                fd,
+                         GError           **error)
+
 {
   drmModeRes *drm_resources;
   unsigned int i;
 
   drm_resources = drmModeGetResources (fd);
+
+  if (!drm_resources)
+    {
+      g_set_error (error,
+                   G_IO_ERROR,
+                   G_IO_ERROR_FAILED,
+                   "Calling drmModeGetResources() failed");
+      return FALSE;
+    }
+
   resources->resources = drm_resources;
 
   resources->n_encoders = (unsigned int) drm_resources->count_encoders;
   resources->encoders = g_new (drmModeEncoder *, resources->n_encoders);
   for (i = 0; i < resources->n_encoders; i++)
     resources->encoders[i] = drmModeGetEncoder (fd, drm_resources->encoders[i]);
+
+  return TRUE;
 }
 
 static void
@@ -751,7 +768,7 @@ meta_kms_resources_release (MetaKmsResources *resources)
     drmModeFreeEncoder (resources->encoders[i]);
   g_free (resources->encoders);
 
-  drmModeFreeResources (resources->resources);
+  g_clear_pointer (&resources->resources, drmModeFreeResources);
 }
 
 static gboolean
@@ -762,8 +779,18 @@ meta_gpu_kms_read_current (MetaGpu  *gpu,
   MetaMonitorManager *monitor_manager =
     meta_gpu_get_monitor_manager (gpu);
   MetaKmsResources resources;
+  g_autoptr (GError) local_error = NULL;
 
-  meta_kms_resources_init (&resources, gpu_kms->fd);
+  if (!meta_kms_resources_init (&resources, gpu_kms->fd, &local_error))
+    {
+      if (!gpu_kms->resources_init_failed_before)
+        {
+          g_warning ("meta_kms_resources_init failed: %s, assuming we have no outputs",
+                     local_error->message);
+          gpu_kms->resources_init_failed_before = TRUE;
+        }
+      return TRUE;
+    }
 
   gpu_kms->max_buffer_width = resources.resources->max_width;
   gpu_kms->max_buffer_height = resources.resources->max_height;
@@ -776,6 +803,8 @@ meta_gpu_kms_read_current (MetaGpu  *gpu,
      are freed by the platform-independent layer. */
   free_resources (gpu_kms);
 
+  g_assert (resources.resources->count_connectors > 0);
+
   init_connectors (gpu_kms, resources.resources);
   init_modes (gpu_kms, resources.resources);
   init_crtcs (gpu_kms, &resources);
@@ -786,6 +815,12 @@ meta_gpu_kms_read_current (MetaGpu  *gpu,
   return TRUE;
 }
 
+gboolean
+meta_gpu_kms_can_have_outputs (MetaGpuKms *gpu_kms)
+{
+  return gpu_kms->n_connectors > 0;
+}
+
 MetaGpuKms *
 meta_gpu_kms_new (MetaMonitorManagerKms  *monitor_manager_kms,
                   const char             *kms_file_path,
@@ -799,12 +834,47 @@ meta_gpu_kms_new (MetaMonitorManagerKms  *monitor_manager_kms,
   GSource *source;
   MetaKmsSource *kms_source;
   MetaGpuKms *gpu_kms;
+  drmModeRes *drm_resources;
+  guint n_connectors;
   int kms_fd;
 
   kms_fd = meta_launcher_open_restricted (launcher, kms_file_path, error);
   if (kms_fd == -1)
     return NULL;
 
+  /* Some GPUs might have no connectors, for example dedicated GPUs on PRIME (hybrid) laptops.
+   * These GPUs cannot render anything on separate screens, and they are aggressively switched
+   * off by the kernel.
+   *
+   * If we add these PRIME GPUs to the GPU list anyway, Mutter keeps awakening the secondary GPU,
+   * and doing this causes a considerable stuttering. These GPUs are usually put to sleep again
+   * after ~2s without a workload.
+   *
+   * For now, to avoid this situation, only create the MetaGpuKms when the GPU has any connectors.
+   */
+  drm_resources = drmModeGetResources (kms_fd);
+
+  if (!drm_resources)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "No resources");
+      meta_launcher_close_restricted (launcher, kms_fd);
+      return NULL;
+    }
+
+  n_connectors = drm_resources->count_connectors;
+
+  drmModeFreeResources (drm_resources);
+
+  if (n_connectors == 0)
+    {
+      g_set_error (error,
+                   META_GPU_KMS_ERROR,
+                   META_GPU_KMS_ERROR_NO_CONNECTORS,
+                   "No connectors available in this GPU. This is probably a dedicated GPU in a hybrid setup.");
+      meta_launcher_close_restricted (launcher, kms_fd);
+      return NULL;
+    }
+
   gpu_kms = g_object_new (META_TYPE_GPU_KMS,
                           "monitor-manager", monitor_manager_kms,
                           NULL);
@@ -814,6 +884,8 @@ meta_gpu_kms_new (MetaMonitorManagerKms  *monitor_manager_kms,
 
   drmSetClientCap (gpu_kms->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
 
+  meta_gpu_kms_read_current (META_GPU (gpu_kms), NULL);
+
   source = g_source_new (&kms_event_funcs, sizeof (MetaKmsSource));
   kms_source = (MetaKmsSource *) source;
   kms_source->fd_tag = g_source_add_unix_fd (source,

src/backends/native/meta-gpu-kms.h

@@ -29,6 +29,14 @@
 #include "backends/meta-gpu.h"
 #include "backends/native/meta-monitor-manager-kms.h"
 
+typedef enum
+{
+  META_GPU_KMS_ERROR_NO_CONNECTORS,
+} MetaGpuKmsError;
+
+#define META_GPU_KMS_ERROR (meta_gpu_kms_error_quark ())
+GQuark meta_gpu_kms_error_quark (void);
+
 #define META_TYPE_GPU_KMS (meta_gpu_kms_get_type ())
 G_DECLARE_FINAL_TYPE (MetaGpuKms, meta_gpu_kms, META, GPU_KMS, MetaGpu)
 
@@ -53,6 +61,8 @@ gboolean meta_gpu_kms_apply_crtc_mode (MetaGpuKms *gpu_kms,
                                        int         y,
                                        uint32_t    fb_id);
 
+gboolean meta_gpu_kms_can_have_outputs (MetaGpuKms *gpu_kms);
+
 gboolean meta_gpu_kms_is_crtc_active (MetaGpuKms *gpu_kms,
                                       MetaCrtc   *crtc);
 

src/backends/native/meta-launcher.c

@@ -62,179 +62,20 @@ meta_launcher_get_seat_id (MetaLauncher *launcher)
   return launcher->seat_id;
 }
 
-static gboolean
-find_systemd_session (gchar **session_id,
-                      GError **error)
-{
-  const gchar * const graphical_session_types[] = { "wayland", "x11", "mir", NULL };
-  const gchar * const active_states[] = { "active", "online", NULL };
-  g_autofree gchar *class = NULL;
-  g_autofree gchar *local_session_id = NULL;
-  g_autofree gchar *type = NULL;
-  g_autofree gchar *state = NULL;
-  g_auto (GStrv) sessions = NULL;
-  int n_sessions;
-  int saved_errno;
-
-  g_assert (session_id != NULL);
-  g_assert (error == NULL || *error == NULL);
-
-  /* if we are in a logind session, we can trust that value, so use it. This
-   * happens for example when you run mutter directly from a VT but when
-   * systemd starts us we will not be in a logind session. */
-  saved_errno = sd_pid_get_session (0, &local_session_id);
-  if (saved_errno < 0)
-    {
-      if (saved_errno != -ENODATA)
-        {
-          g_set_error (error,
-                       G_IO_ERROR,
-                       G_IO_ERROR_NOT_FOUND,
-                       "Failed to get session by pid for user %d (%s)",
-                       getuid (),
-                       g_strerror (-saved_errno));
-          return FALSE;
-        }
-    }
-  else
-    {
-      *session_id = g_steal_pointer (&local_session_id);
-      return TRUE;
-    }
-
-  saved_errno = sd_uid_get_display (getuid (), &local_session_id);
-  if (saved_errno < 0)
-    {
-      /* no session, maybe there's a greeter session */
-      if (saved_errno == -ENODATA)
-        {
-          n_sessions = sd_uid_get_sessions (getuid (), 1, &sessions);
-          if (n_sessions < 0)
-            {
-              g_set_error (error,
-                           G_IO_ERROR,
-                           G_IO_ERROR_NOT_FOUND,
-                           "Failed to get all sessions for user %d (%m)",
-                           getuid ());
-              return FALSE;
-            }
-
-        if (n_sessions == 0)
-          {
-            g_set_error (error,
-                         G_IO_ERROR,
-                         G_IO_ERROR_NOT_FOUND,
-                         "User %d has no sessions",
-                         getuid ());
-            return FALSE;
-          }
-
-        for (int i = 0; i < n_sessions; ++i)
-          {
-            saved_errno = sd_session_get_class (sessions[i], &class);
-            if (saved_errno < 0)
-              {
-                g_warning ("Couldn't get class for session '%d': %s",
-                           i,
-                           g_strerror (-saved_errno));
-                continue;
-              }
-
-            if (g_strcmp0 (class, "greeter") == 0)
-              {
-                local_session_id = g_strdup (sessions[i]);
-                break;
-              }
-          }
-
-        if (!local_session_id)
-          {
-            g_set_error (error,
-                         G_IO_ERROR,
-                         G_IO_ERROR_NOT_FOUND,
-                         "Couldn't find a session or a greeter session for user %d",
-                         getuid ());
-            return FALSE;
-          }
-        }
-      else
-        {
-          g_set_error (error,
-                       G_IO_ERROR,
-                       G_IO_ERROR_NOT_FOUND,
-                       "Couldn't get display for user %d: %s",
-                       getuid (),
-                       g_strerror (-saved_errno));
-          return FALSE;
-        }
-    }
-
-  /* sd_uid_get_display will return any session if there is no graphical
-   * one, so let's check it really is graphical. */
-  saved_errno = sd_session_get_type (local_session_id, &type);
-  if (saved_errno < 0)
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Couldn't get type for session '%s': %s",
-                   local_session_id,
-                   g_strerror (-saved_errno));
-      return FALSE;
-    }
-
-  if (!g_strv_contains (graphical_session_types, type))
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_NOT_FOUND,
-                   "Session '%s' is not a graphical session (type: '%s')",
-                   local_session_id,
-                   type);
-      return FALSE;
-    }
-
-    /* and display sessions can be 'closing' if they are logged out but
-     * some processes are lingering; we shouldn't consider these */
-    saved_errno = sd_session_get_state (local_session_id, &state);
-    if (saved_errno < 0)
-      {
-        g_set_error (error,
-                     G_IO_ERROR,
-                     G_IO_ERROR_NOT_FOUND,
-                     "Couldn't get state for session '%s': %s",
-                     local_session_id,
-                     g_strerror (-saved_errno));
-        return FALSE;
-      }
-
-    if (!g_strv_contains (active_states, state))
-      {
-         g_set_error (error,
-                         G_IO_ERROR,
-                         G_IO_ERROR_NOT_FOUND,
-                         "Session '%s' is not active",
-                         local_session_id);
-         return FALSE;
-      }
-
-  *session_id = g_steal_pointer (&local_session_id);
-
-  return TRUE;
-}
-
 static Login1Session *
 get_session_proxy (GCancellable *cancellable,
                    GError      **error)
 {
   g_autofree char *proxy_path = NULL;
   g_autofree char *session_id = NULL;
-  g_autoptr (GError) local_error = NULL;
   Login1Session *session_proxy;
 
-  if (!find_systemd_session (&session_id, &local_error))
+  if (sd_pid_get_session (getpid (), &session_id) < 0)
     {
-      g_propagate_prefixed_error (error, local_error, "Could not get session ID: ");
+      g_set_error (error,
+                   G_IO_ERROR,
+                   G_IO_ERROR_NOT_FOUND,
+                   "Could not get session ID: %m");
       return NULL;
     }
 
@@ -461,14 +302,17 @@ on_active_changed (Login1Session *session,
 static gchar *
 get_seat_id (GError **error)
 {
-  g_autoptr (GError) local_error = NULL;
   g_autofree char *session_id = NULL;
   char *seat_id = NULL;
   int r;
 
-  if (!find_systemd_session (&session_id, &local_error))
+  r = sd_pid_get_session (0, &session_id);
+  if (r < 0)
     {
-      g_propagate_prefixed_error (error, local_error, "Could not get session ID: ");
+      g_set_error (error,
+                   G_IO_ERROR,
+                   G_IO_ERROR_NOT_FOUND,
+                   "Could not get session for PID: %s", g_strerror (-r));
       return NULL;
     }
 

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

@@ -46,7 +46,7 @@
 #include <unistd.h>
 
 #include <meta/main.h>
-#include <meta/meta-x11-errors.h>
+#include <meta/errors.h>
 
 #include <gudev/gudev.h>
 
@@ -642,10 +642,12 @@ meta_monitor_manager_kms_initable_init (GInitable    *initable,
                                         GError      **error)
 {
   MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (initable);
+  MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_kms);
   const char *subsystems[2] = { "drm", NULL };
   GList *gpu_paths;
   g_autofree char *primary_gpu_path = NULL;
   GList *l;
+  gboolean can_have_outputs;
 
   manager_kms->udev = g_udev_client_new (subsystems);
 
@@ -681,8 +683,11 @@ meta_monitor_manager_kms_initable_init (GInitable    *initable,
       gpu_kms = meta_gpu_kms_new (manager_kms, gpu_path, &secondary_error);
       if (!gpu_kms)
         {
-          g_warning ("Failed to open secondary gpu '%s': %s",
-                     gpu_path, secondary_error->message);
+          if (g_error_matches (secondary_error, META_GPU_KMS_ERROR, META_GPU_KMS_ERROR_NO_CONNECTORS))
+            g_message ("Ignoring GPU %s due to the lack of connectors", gpu_path);
+          else
+            g_warning ("Failed to open secondary gpu '%s': %s", gpu_path, secondary_error->message);
+
           continue;
         }
 
@@ -691,6 +696,24 @@ meta_monitor_manager_kms_initable_init (GInitable    *initable,
     }
   g_list_free_full (gpu_paths, g_free);
 
+  can_have_outputs = FALSE;
+  for (l = meta_monitor_manager_get_gpus (manager); l; l = l->next)
+    {
+      MetaGpuKms *gpu_kms = l->data;
+
+      if (meta_gpu_kms_can_have_outputs (gpu_kms))
+        {
+          can_have_outputs = TRUE;
+          break;
+        }
+    }
+  if (!can_have_outputs)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+                   "No GPUs with outputs found");
+      return FALSE;
+    }
+
   return TRUE;
 }
 

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

@@ -103,6 +103,8 @@ typedef struct _MetaRendererNativeGpuData
 
   MetaRendererNativeMode mode;
 
+  gboolean no_add_fb2;
+
   EGLDisplay egl_display;
 
   /*
@@ -2207,15 +2209,14 @@ init_dumb_fb (MetaDumbBuffer  *dumb_fb,
               uint32_t         format,
               GError         **error)
 {
+  MetaRendererNative *renderer_native = meta_renderer_native_from_gpu (gpu_kms);
+  MetaRendererNativeGpuData *renderer_gpu_data;
   struct drm_mode_create_dumb create_arg;
   struct drm_mode_destroy_dumb destroy_arg;
   struct drm_mode_map_dumb map_arg;
   uint32_t fb_id = 0;
   void *map;
   int kms_fd;
-  uint32_t handles[4] = { 0, };
-  uint32_t pitches[4] = { 0, };
-  uint32_t offsets[4] = { 0, };
 
   kms_fd = meta_gpu_kms_get_fd (gpu_kms);
 
@@ -2233,18 +2234,25 @@ init_dumb_fb (MetaDumbBuffer  *dumb_fb,
       goto err_ioctl;
     }
 
-  handles[0] = create_arg.handle;
-  pitches[0] = create_arg.pitch;
-
-  if (drmModeAddFB2 (kms_fd, width, height, format,
-                     handles, pitches, offsets,
-                     &fb_id, 0) != 0)
+  renderer_gpu_data = meta_renderer_native_get_gpu_data (renderer_native,
+                                                         gpu_kms);
+  if (!renderer_gpu_data->no_add_fb2)
     {
-      g_debug ("drmModeAddFB2 failed (%s), falling back to drmModeAddFB",
-               g_strerror (errno));
+      uint32_t handles[4] = { create_arg.handle, };
+      uint32_t pitches[4] = { create_arg.pitch, };
+      uint32_t offsets[4] = { 0 };
+
+      if (drmModeAddFB2 (kms_fd, width, height, format,
+                         handles, pitches, offsets,
+                         &fb_id, 0) != 0)
+        {
+          g_warning ("drmModeAddFB2 failed (%s), falling back to drmModeAddFB",
+                     g_strerror (errno));
+          renderer_gpu_data->no_add_fb2 = TRUE;
+        }
     }
 
-  if (fb_id == 0)
+  if (renderer_gpu_data->no_add_fb2)
     {
       if (drmModeAddFB (kms_fd, width, height,
                         24 /* depth of RGBX8888 */,
@@ -2743,9 +2751,14 @@ calculate_view_transform (MetaMonitorManager *monitor_manager,
   MetaMonitor *main_monitor;
   MetaOutput *main_output;
   MetaCrtc *crtc;
+  MetaMonitorTransform crtc_transform;
+
   main_monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;
   main_output = meta_monitor_get_main_output (main_monitor);
   crtc = meta_output_get_assigned_crtc (main_output);
+  crtc_transform =
+    meta_monitor_logical_to_crtc_transform (main_monitor,
+                                            logical_monitor->transform);
 
   /*
    * Pick any monitor and output and check; all CRTCs of a logical monitor will
@@ -2754,10 +2767,10 @@ calculate_view_transform (MetaMonitorManager *monitor_manager,
 
   if (meta_monitor_manager_is_transform_handled (monitor_manager,
                                                  crtc,
-                                                 crtc->transform))
+                                                 crtc_transform))
     return META_MONITOR_TRANSFORM_NORMAL;
   else
-    return crtc->transform;
+    return crtc_transform;
 }
 
 static MetaRendererView *

src/backends/x11/cm/meta-cursor-sprite-xfixes.c

@@ -1,231 +0,0 @@
-/*
- * Copyright 2013, 2018 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "config.h"
-
-#include "backends/x11/cm/meta-cursor-sprite-xfixes.h"
-
-#include <X11/extensions/Xfixes.h>
-
-#include "core/display-private.h"
-#include "meta/meta-x11-display.h"
-
-enum
-{
-  PROP_0,
-
-  PROP_DISPLAY,
-
-  N_PROPS
-};
-
-static GParamSpec *obj_props[N_PROPS];
-
-struct _MetaCursorSpriteXfixes
-{
-  MetaCursorSprite parent;
-
-  MetaDisplay *display;
-};
-
-static void
-meta_screen_cast_xfixes_init_initable_iface (GInitableIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (MetaCursorSpriteXfixes,
-                         meta_cursor_sprite_xfixes,
-                         META_TYPE_CURSOR_SPRITE,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                                meta_screen_cast_xfixes_init_initable_iface))
-
-static void
-meta_cursor_sprite_xfixes_realize_texture (MetaCursorSprite *sprite)
-{
-}
-
-static gboolean
-meta_cursor_sprite_xfixes_is_animated (MetaCursorSprite *sprite)
-{
-  return FALSE;
-}
-
-static void
-meta_cursor_sprite_xfixes_get_property (GObject    *object,
-                                        guint       prop_id,
-                                        GValue     *value,
-                                        GParamSpec *pspec)
-{
-  MetaCursorSpriteXfixes *sprite_xfixes = META_CURSOR_SPRITE_XFIXES (object);
-
-  switch (prop_id)
-    {
-    case PROP_DISPLAY:
-      g_value_set_object (value, sprite_xfixes->display);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_cursor_sprite_xfixes_set_property (GObject      *object,
-                                        guint         prop_id,
-                                        const GValue *value,
-                                        GParamSpec   *pspec)
-{
-  MetaCursorSpriteXfixes *sprite_xfixes = META_CURSOR_SPRITE_XFIXES (object);
-
-  switch (prop_id)
-    {
-    case PROP_DISPLAY:
-      sprite_xfixes->display = g_value_get_object (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-MetaCursorSpriteXfixes *
-meta_cursor_sprite_xfixes_new (MetaDisplay  *display,
-                               GError      **error)
-{
-  return g_initable_new (META_TYPE_CURSOR_SPRITE_XFIXES,
-                         NULL, error,
-                         "display", display,
-                         NULL);
-}
-
-static gboolean
-meta_cursor_sprite_xfixes_initable_init (GInitable     *initable,
-                                         GCancellable  *cancellable,
-                                         GError       **error)
-{
-  MetaCursorSpriteXfixes *sprite_xfixes =
-    META_CURSOR_SPRITE_XFIXES (initable);
-  MetaCursorSprite *sprite = META_CURSOR_SPRITE (sprite_xfixes);
-  MetaX11Display *x11_display;
-  Display *xdisplay;
-  XFixesCursorImage *cursor_image;
-  CoglTexture2D *texture;
-  uint8_t *cursor_data;
-  gboolean free_cursor_data;
-  ClutterBackend *clutter_backend;
-  CoglContext *cogl_context;
-
-  x11_display = meta_display_get_x11_display (sprite_xfixes->display);
-  xdisplay = meta_x11_display_get_xdisplay (x11_display);
-  cursor_image = XFixesGetCursorImage (xdisplay);
-  if (!cursor_image)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Failed to get cursor image");
-      return FALSE;
-    }
-
-  /*
-   * Like all X APIs, XFixesGetCursorImage() returns arrays of 32-bit
-   * quantities as arrays of long; we need to convert on 64 bit
-   */
-  if (sizeof (long) == 4)
-    {
-      cursor_data = (uint8_t *) cursor_image->pixels;
-      free_cursor_data = FALSE;
-    }
-  else
-    {
-      int i, j;
-      uint32_t *cursor_words;
-      unsigned long *p;
-      uint32_t *q;
-
-      cursor_words = g_new (uint32_t,
-                            cursor_image->width * cursor_image->height);
-      cursor_data = (uint8_t *) cursor_words;
-
-      p = cursor_image->pixels;
-      q = cursor_words;
-      for (j = 0; j < cursor_image->height; j++)
-        {
-          for (i = 0; i < cursor_image->width; i++)
-            *(q++) = *(p++);
-        }
-
-      free_cursor_data = TRUE;
-    }
-
-  clutter_backend = clutter_get_default_backend ();
-  cogl_context = clutter_backend_get_cogl_context (clutter_backend);
-  texture = cogl_texture_2d_new_from_data (cogl_context,
-                                          cursor_image->width,
-                                          cursor_image->height,
-                                          CLUTTER_CAIRO_FORMAT_ARGB32,
-                                          cursor_image->width * 4, /* stride */
-                                          cursor_data,
-                                          error);
-
-  if (free_cursor_data)
-    g_free (cursor_data);
-
-  if (!sprite)
-    return FALSE;
-
-  meta_cursor_sprite_set_texture (sprite,
-                                  COGL_TEXTURE (texture),
-                                  cursor_image->xhot,
-                                  cursor_image->yhot);
-  cogl_object_unref (texture);
-  XFree (cursor_image);
-
-  return TRUE;
-}
-
-static void
-meta_screen_cast_xfixes_init_initable_iface (GInitableIface *iface)
-{
-  iface->init = meta_cursor_sprite_xfixes_initable_init;
-}
-
-static void
-meta_cursor_sprite_xfixes_init (MetaCursorSpriteXfixes *sprite_xfixes)
-{
-}
-
-static void
-meta_cursor_sprite_xfixes_class_init (MetaCursorSpriteXfixesClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  MetaCursorSpriteClass *cursor_sprite_class = META_CURSOR_SPRITE_CLASS (klass);
-
-  object_class->get_property = meta_cursor_sprite_xfixes_get_property;
-  object_class->set_property = meta_cursor_sprite_xfixes_set_property;
-
-  cursor_sprite_class->realize_texture =
-    meta_cursor_sprite_xfixes_realize_texture;
-  cursor_sprite_class->is_animated = meta_cursor_sprite_xfixes_is_animated;
-
-  obj_props[PROP_DISPLAY] =
-    g_param_spec_object ("display",
-                         "display",
-                         "MetaDisplay",
-                         META_TYPE_DISPLAY,
-                         G_PARAM_READWRITE |
-                         G_PARAM_CONSTRUCT_ONLY |
-                         G_PARAM_STATIC_STRINGS);
-  g_object_class_install_properties (object_class, N_PROPS, obj_props);
-}

src/backends/x11/cm/meta-cursor-sprite-xfixes.h

@@ -1,36 +0,0 @@
-/*
- * Copyright 2013, 2018 Red Hat, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef META_CURSOR_SPRITE_XFIXES_H
-#define META_CURSOR_SPRITE_XFIXES_H
-
-#include <glib-object.h>
-
-#include "backends/meta-cursor.h"
-#include "meta/types.h"
-
-#define META_TYPE_CURSOR_SPRITE_XFIXES (meta_cursor_sprite_xfixes_get_type ())
-G_DECLARE_FINAL_TYPE (MetaCursorSpriteXfixes,
-                      meta_cursor_sprite_xfixes,
-                      META, CURSOR_SPRITE_XFIXES,
-                      MetaCursorSprite)
-
-MetaCursorSpriteXfixes * meta_cursor_sprite_xfixes_new (MetaDisplay  *display,
-                                                        GError      **error);
-
-#endif /* META_CURSOR_SPRITE_XFIXES_H */

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

@@ -60,6 +60,10 @@ struct _MetaBackendX11Private
   XSyncAlarm user_active_alarm;
   XSyncCounter counter;
 
+  int current_touch_replay_sync_serial;
+  int pending_touch_replay_sync_serial;
+  Atom touch_replay_sync_atom;
+
   int xinput_opcode;
   int xinput_event_base;
   int xinput_error_base;
@@ -168,6 +172,26 @@ meta_backend_x11_translate_device_event (MetaBackendX11 *x11,
   backend_x11_class->translate_device_event (x11, device_event);
 }
 
+static void
+maybe_translate_touch_replay_pointer_event (MetaBackendX11 *x11,
+                                            XIDeviceEvent  *device_event)
+{
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+
+  if (!device_event->send_event &&
+      device_event->time != CurrentTime &&
+      priv->current_touch_replay_sync_serial !=
+      priv->pending_touch_replay_sync_serial &&
+      XSERVER_TIME_IS_BEFORE (device_event->time, priv->latest_evtime))
+    {
+      /* Emulated pointer events received after XIRejectTouch is received
+       * on a passive touch grab will contain older timestamps, update those
+       * so we dont get InvalidTime at grabs.
+       */
+      device_event->time = priv->latest_evtime;
+    }
+}
+
 static void
 translate_device_event (MetaBackendX11 *x11,
                         XIDeviceEvent  *device_event)
@@ -176,20 +200,8 @@ translate_device_event (MetaBackendX11 *x11,
 
   meta_backend_x11_translate_device_event (x11, device_event);
 
-  if (!device_event->send_event && device_event->time != META_CURRENT_TIME)
-    {
-      if (XSERVER_TIME_IS_BEFORE (device_event->time, priv->latest_evtime))
-        {
-          /* Emulated pointer events received after XIRejectTouch is received
-           * on a passive touch grab will contain older timestamps, update those
-           * so we dont get InvalidTime at grabs.
-           */
-          device_event->time = priv->latest_evtime;
-        }
-
-      /* Update the internal latest evtime, for any possible later use */
-      priv->latest_evtime = device_event->time;
-    }
+  if (!device_event->send_event && device_event->time != CurrentTime)
+    priv->latest_evtime = device_event->time;
 }
 
 static void
@@ -254,6 +266,9 @@ maybe_spoof_event_as_stage_event (MetaBackendX11 *x11,
     case XI_Motion:
     case XI_ButtonPress:
     case XI_ButtonRelease:
+      maybe_translate_touch_replay_pointer_event (x11,
+                                                  (XIDeviceEvent *) input_event);
+      /* Intentional fall-through */
     case XI_KeyPress:
     case XI_KeyRelease:
     case XI_TouchBegin:
@@ -321,6 +336,17 @@ handle_host_xevent (MetaBackend *backend,
   MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
   gboolean bypass_clutter = FALSE;
 
+  switch (event->type)
+    {
+    case ClientMessage:
+      if (event->xclient.window == meta_backend_x11_get_xwindow (x11) &&
+          event->xclient.message_type == priv->touch_replay_sync_atom)
+        priv->current_touch_replay_sync_serial = event->xclient.data.l[0];
+      break;
+    default:
+      break;
+    }
+
   XGetEventData (priv->xdisplay, &event->xcookie);
 
   {
@@ -332,7 +358,7 @@ handle_host_xevent (MetaBackend *backend,
         if (meta_plugin_manager_xevent_filter (compositor->plugin_mgr, event))
           bypass_clutter = TRUE;
 
-        if (meta_dnd_handle_xdnd_event (backend, compositor, priv->xdisplay, event))
+        if (meta_dnd_handle_xdnd_event (backend, compositor, display, event))
           bypass_clutter = TRUE;
       }
   }
@@ -528,6 +554,10 @@ meta_backend_x11_post_init (MetaBackend *backend)
   monitor_manager = meta_backend_get_monitor_manager (backend);
   g_signal_connect (monitor_manager, "monitors-changed-internal",
                     G_CALLBACK (on_monitors_changed), backend);
+
+  priv->touch_replay_sync_atom = XInternAtom (priv->xdisplay,
+                                              "_MUTTER_TOUCH_SEQUENCE_SYNC",
+                                              False);
 }
 
 static ClutterBackend *
@@ -547,7 +577,7 @@ meta_backend_x11_grab_device (MetaBackend *backend,
   XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
   int ret;
 
-  if (timestamp != META_CURRENT_TIME &&
+  if (timestamp != CurrentTime &&
       XSERVER_TIME_IS_BEFORE (timestamp, priv->latest_evtime))
     timestamp = priv->latest_evtime;
 
@@ -584,6 +614,43 @@ meta_backend_x11_ungrab_device (MetaBackend *backend,
   return (ret == Success);
 }
 
+static void
+meta_backend_x11_finish_touch_sequence (MetaBackend          *backend,
+                                        ClutterEventSequence *sequence,
+                                        MetaSequenceState     state)
+{
+  MetaBackendX11 *x11 = META_BACKEND_X11 (backend);
+  MetaBackendX11Private *priv = meta_backend_x11_get_instance_private (x11);
+  int event_mode;
+
+  if (state == META_SEQUENCE_ACCEPTED)
+    event_mode = XIAcceptTouch;
+  else if (state == META_SEQUENCE_REJECTED)
+    event_mode = XIRejectTouch;
+  else
+    g_return_if_reached ();
+
+  XIAllowTouchEvents (priv->xdisplay,
+                      META_VIRTUAL_CORE_POINTER_ID,
+                      clutter_x11_event_sequence_get_touch_detail (sequence),
+                      DefaultRootWindow (priv->xdisplay), event_mode);
+
+  if (state == META_SEQUENCE_REJECTED)
+    {
+      XClientMessageEvent ev;
+
+      ev = (XClientMessageEvent) {
+          .type = ClientMessage,
+            .window = meta_backend_x11_get_xwindow (x11),
+            .message_type = priv->touch_replay_sync_atom,
+            .format = 32,
+            .data.l[0] = ++priv->pending_touch_replay_sync_serial,
+      };
+      XSendEvent (priv->xdisplay, meta_backend_x11_get_xwindow (x11),
+                  False, 0, (XEvent *) &ev);
+    }
+}
+
 static void
 meta_backend_x11_warp_pointer (MetaBackend *backend,
                                int          x,
@@ -769,6 +836,7 @@ meta_backend_x11_class_init (MetaBackendX11Class *klass)
   backend_class->post_init = meta_backend_x11_post_init;
   backend_class->grab_device = meta_backend_x11_grab_device;
   backend_class->ungrab_device = meta_backend_x11_ungrab_device;
+  backend_class->finish_touch_sequence = meta_backend_x11_finish_touch_sequence;
   backend_class->warp_pointer = meta_backend_x11_warp_pointer;
   backend_class->get_current_logical_monitor = meta_backend_x11_get_current_logical_monitor;
   backend_class->get_keymap = meta_backend_x11_get_keymap;
@@ -803,13 +871,3 @@ meta_backend_x11_get_xwindow (MetaBackendX11 *x11)
   ClutterActor *stage = meta_backend_get_stage (META_BACKEND (x11));
   return clutter_x11_get_stage_window (CLUTTER_STAGE (stage));
 }
-
-void
-meta_backend_x11_reload_cursor (MetaBackendX11 *x11)
-{
-  MetaBackend *backend = META_BACKEND (x11);
-  MetaCursorRenderer *cursor_renderer =
-    meta_backend_get_cursor_renderer (backend);
-
-  meta_cursor_renderer_force_update (cursor_renderer);
-}

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

@@ -57,6 +57,4 @@ void meta_backend_x11_handle_event (MetaBackendX11 *x11,
 
 uint8_t meta_backend_x11_get_xkb_event_base (MetaBackendX11 *x11);
 
-void meta_backend_x11_reload_cursor (MetaBackendX11 *x11);
-
 #endif /* META_BACKEND_X11_H */

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

@@ -40,7 +40,6 @@
 #include <meta/barrier.h>
 #include "backends/x11/meta-barrier-x11.h"
 #include "display-private.h"
-#include "x11/meta-x11-display-private.h"
 
 struct _MetaBarrierImplX11Private
 {
@@ -69,11 +68,10 @@ _meta_barrier_impl_x11_release (MetaBarrierImpl  *impl,
   MetaBarrierImplX11Private *priv =
     meta_barrier_impl_x11_get_instance_private (self);
   MetaDisplay *display = priv->barrier->priv->display;
-  Display *dpy = meta_x11_display_get_xdisplay (display->x11_display);
 
-  if (META_X11_DISPLAY_HAS_XINPUT_23 (display->x11_display))
+  if (META_DISPLAY_HAS_XINPUT_23 (display))
     {
-      XIBarrierReleasePointer (dpy,
+      XIBarrierReleasePointer (display->xdisplay,
                                META_VIRTUAL_CORE_POINTER_ID,
                                priv->xbarrier, event->event_id);
     }
@@ -91,13 +89,13 @@ _meta_barrier_impl_x11_destroy (MetaBarrierImpl *impl)
   if (display == NULL)
     return;
 
-  dpy = meta_x11_display_get_xdisplay (display->x11_display);
+  dpy = display->xdisplay;
 
   if (!meta_barrier_is_active (priv->barrier))
     return;
 
   XFixesDestroyPointerBarrier (dpy, priv->xbarrier);
-  g_hash_table_remove (display->x11_display->xids, &priv->xbarrier);
+  g_hash_table_remove (display->xids, &priv->xbarrier);
   priv->xbarrier = 0;
 }
 
@@ -121,7 +119,7 @@ meta_barrier_impl_x11_new (MetaBarrier *barrier)
   priv = meta_barrier_impl_x11_get_instance_private (self);
   priv->barrier = barrier;
 
-  dpy = meta_x11_display_get_xdisplay (display->x11_display);
+  dpy = display->xdisplay;
   root = DefaultRootWindow (dpy);
 
   allowed_motion_dirs =
@@ -134,7 +132,7 @@ meta_barrier_impl_x11_new (MetaBarrier *barrier)
                                                allowed_motion_dirs,
                                                0, NULL);
 
-  g_hash_table_insert (display->x11_display->xids, &priv->xbarrier, barrier);
+  g_hash_table_insert (display->xids, &priv->xbarrier, barrier);
 
   return META_BARRIER_IMPL (self);
 }
@@ -174,8 +172,8 @@ meta_barrier_fire_xevent (MetaBarrier    *barrier,
 }
 
 gboolean
-meta_x11_display_process_barrier_xevent (MetaX11Display *x11_display,
-                                         XIEvent        *event)
+meta_display_process_barrier_xevent (MetaDisplay *display,
+                                     XIEvent     *event)
 {
   MetaBarrier *barrier;
   XIBarrierEvent *xev;
@@ -193,7 +191,7 @@ meta_x11_display_process_barrier_xevent (MetaX11Display *x11_display,
     }
 
   xev = (XIBarrierEvent *) event;
-  barrier = g_hash_table_lookup (x11_display->xids, &xev->barrier);
+  barrier = g_hash_table_lookup (display->xids, &xev->barrier);
   if (barrier != NULL)
     {
       meta_barrier_fire_xevent (barrier, xev);

src/backends/x11/meta-cursor-renderer-x11.c

@@ -30,7 +30,6 @@
 
 #include "meta-backend-x11.h"
 #include "meta-stage-private.h"
-#include "backends/meta-cursor-sprite-xcursor.h"
 
 struct _MetaCursorRendererX11Private
 {
@@ -60,18 +59,13 @@ meta_cursor_renderer_x11_update_cursor (MetaCursorRenderer *renderer,
 
   gboolean has_server_cursor = FALSE;
 
-  if (cursor_sprite && META_IS_CURSOR_SPRITE_XCURSOR (cursor_sprite))
+  if (cursor_sprite)
     {
-      MetaCursorSpriteXcursor *sprite_xcursor =
-        META_CURSOR_SPRITE_XCURSOR (cursor_sprite);
-      MetaCursor cursor;
+      MetaCursor cursor = meta_cursor_sprite_get_meta_cursor (cursor_sprite);
 
-      cursor = meta_cursor_sprite_xcursor_get_cursor (sprite_xcursor);
       if (cursor != META_CURSOR_NONE)
         {
-          Cursor xcursor;
-
-          xcursor = meta_create_x_cursor (xdisplay, cursor);
+          Cursor xcursor = meta_cursor_create_x_cursor (xdisplay, cursor);
           XDefineCursor (xdisplay, xwindow, xcursor);
           XFlush (xdisplay);
           XFreeCursor (xdisplay, xcursor);

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

@@ -35,7 +35,7 @@
 #include <gudev/gudev.h>
 #endif
 
-#include <meta/meta-x11-errors.h>
+#include <meta/errors.h>
 #include "backends/meta-logical-monitor.h"
 
 typedef struct _MetaInputSettingsX11Private
@@ -63,9 +63,9 @@ device_free_xdevice (gpointer user_data)
   Display *xdisplay = meta_backend_x11_get_xdisplay (META_BACKEND_X11 (backend));
   XDevice *xdev = user_data;
 
-  meta_x11_error_trap_push (display->x11_display);
+  meta_error_trap_push (display);
   XCloseDevice (xdisplay, xdev);
-  meta_x11_error_trap_pop (display->x11_display);
+  meta_error_trap_pop (display);
 }
 
 static XDevice *
@@ -81,9 +81,9 @@ device_ensure_xdevice (ClutterInputDevice *device)
   if (xdev)
     return xdev;
 
-  meta_x11_error_trap_push (display->x11_display);
+  meta_error_trap_push (display);
   xdev = XOpenDevice (xdisplay, device_id);
-  meta_x11_error_trap_pop (display->x11_display);
+  meta_error_trap_pop (display);
 
   if (xdev)
     {
@@ -586,7 +586,7 @@ meta_input_settings_x11_set_tablet_mapping (MetaInputSettings     *settings,
     return;
 
   /* Grab the puke bucket! */
-  meta_x11_error_trap_push (display->x11_display);
+  meta_error_trap_push (display);
   xdev = device_ensure_xdevice (device);
   if (xdev)
     {
@@ -595,7 +595,7 @@ meta_input_settings_x11_set_tablet_mapping (MetaInputSettings     *settings,
                       Absolute : Relative);
     }
 
-  if (meta_x11_error_trap_pop_with_return (display->x11_display))
+  if (meta_error_trap_pop_with_return (display))
     {
       g_warning ("Could not set tablet mapping for %s",
                  clutter_input_device_get_device_name (device));
@@ -782,6 +782,7 @@ meta_input_settings_x11_set_stylus_button_map (MetaInputSettings          *setti
     return;
 
   /* Grab the puke bucket! */
+  meta_error_trap_push (display);
   xdev = device_ensure_xdevice (device);
   if (xdev)
     {
@@ -799,7 +800,7 @@ meta_input_settings_x11_set_stylus_button_map (MetaInputSettings          *setti
       XSetDeviceButtonMapping (xdisplay, xdev, map, G_N_ELEMENTS (map));
     }
 
-  if (meta_x11_error_trap_pop_with_return (display->x11_display))
+  if (meta_error_trap_pop_with_return (display))
     {
       g_warning ("Could not set stylus button map for %s",
                  clutter_input_device_get_device_name (device));

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

@@ -39,7 +39,7 @@
 
 #include "meta-backend-x11.h"
 #include <meta/main.h>
-#include <meta/meta-x11-errors.h>
+#include <meta/errors.h>
 #include "backends/meta-crtc.h"
 #include "backends/meta-monitor-config-manager.h"
 #include "backends/meta-logical-monitor.h"

src/backends/x11/nested/meta-cursor-renderer-x11-nested.c

@@ -26,8 +26,6 @@
 
 #include "backends/x11/nested/meta-cursor-renderer-x11-nested.h"
 
-#include <X11/Xcursor/Xcursor.h>
-
 #include "backends/x11/meta-backend-x11.h"
 
 struct _MetaCursorRendererX11Nested

src/backends/x11/nested/meta-renderer-x11-nested.c

@@ -51,10 +51,14 @@ calculate_view_transform (MetaMonitorManager *monitor_manager,
   MetaMonitor *main_monitor;
   MetaOutput *main_output;
   MetaCrtc *crtc;
+  MetaMonitorTransform crtc_transform;
 
   main_monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;
   main_output = meta_monitor_get_main_output (main_monitor);
   crtc = meta_output_get_assigned_crtc (main_output);
+  crtc_transform =
+    meta_monitor_logical_to_crtc_transform (main_monitor,
+                                            logical_monitor->transform);
   /*
    * Pick any monitor and output and check; all CRTCs of a logical monitor will
    * always have the same transform assigned to them.
@@ -62,10 +66,10 @@ calculate_view_transform (MetaMonitorManager *monitor_manager,
 
   if (meta_monitor_manager_is_transform_handled (monitor_manager,
                                                  crtc,
-                                                 crtc->transform))
+                                                 crtc_transform))
     return META_MONITOR_TRANSFORM_NORMAL;
   else
-    return crtc->transform;
+    return crtc_transform;
 }
 
 static MetaRendererView *

src/compositor/compositor-private.h

@@ -18,10 +18,14 @@ struct _MetaCompositor
   guint           pre_paint_func_id;
   guint           post_paint_func_id;
 
+  guint           stage_presented_id;
+  guint           stage_after_paint_id;
+
   gint64          server_time_query_time;
   gint64          server_time_offset;
 
   guint           server_time_is_monotonic_time : 1;
+  guint           no_mipmaps  : 1;
 
   ClutterActor          *stage, *window_group, *top_window_group, *feedback_group;
   ClutterActor          *background_actor;
@@ -69,4 +73,6 @@ MetaCloseDialog * meta_compositor_create_close_dialog (MetaCompositor *composito
 MetaInhibitShortcutsDialog * meta_compositor_create_inhibit_shortcuts_dialog (MetaCompositor *compositor,
                                                                               MetaWindow     *window);
 
+void meta_compositor_unmanage_window_actors (MetaCompositor *compositor);
+
 #endif /* META_COMPOSITOR_PRIVATE_H */

src/compositor/compositor.c

@@ -42,8 +42,8 @@
  * There's two containers in the stage that are used to place window actors, here
  * are listed in the order in which they are painted:
  *
- * - window group, accessible with meta_get_window_group_for_display()
- * - top window group, accessible with meta_get_top_window_group_for_display()
+ * - window group, accessible with meta_get_window_group_for_screen()
+ * - top window group, accessible with meta_get_top_window_group_for_screen()
  *
  * Mutter will place actors representing windows in the window group, except for
  * override-redirect windows (ie. popups and menus) which will be placed in the
@@ -55,7 +55,8 @@
 #include <clutter/x11/clutter-x11.h>
 
 #include "core.h"
-#include <meta/meta-x11-errors.h>
+#include <meta/screen.h>
+#include <meta/errors.h>
 #include <meta/window.h>
 #include "compositor-private.h"
 #include <meta/compositor-mutter.h>
@@ -79,8 +80,6 @@
 #include "backends/x11/meta-backend-x11.h"
 #include "clutter/clutter-mutter.h"
 
-#include "x11/meta-x11-display-private.h"
-
 #ifdef HAVE_WAYLAND
 #include "wayland/meta-wayland-private.h"
 #endif
@@ -91,6 +90,10 @@ on_presented (ClutterStage     *stage,
               ClutterFrameInfo *frame_info,
               MetaCompositor   *compositor);
 
+static void
+on_top_window_actor_destroyed (MetaWindowActor *window_actor,
+                               MetaCompositor  *compositor);
+
 static gboolean
 is_modal (MetaDisplay *display)
 {
@@ -130,6 +133,15 @@ meta_switch_workspace_completed (MetaCompositor *compositor)
 void
 meta_compositor_destroy (MetaCompositor *compositor)
 {
+  g_signal_handler_disconnect (compositor->stage,
+                               compositor->stage_after_paint_id);
+  g_signal_handler_disconnect (compositor->stage,
+                               compositor->stage_presented_id);
+
+  compositor->stage_after_paint_id = 0;
+  compositor->stage_presented_id = 0;
+  compositor->stage = NULL;
+
   clutter_threads_remove_repaint_func (compositor->pre_paint_func_id);
   clutter_threads_remove_repaint_func (compositor->post_paint_func_id);
 
@@ -150,78 +162,78 @@ process_damage (MetaCompositor     *compositor,
 
 /* compat helper */
 static MetaCompositor *
-get_compositor_for_display (MetaDisplay *display)
+get_compositor_for_screen (MetaScreen *screen)
 {
-  return display->compositor;
+  return screen->display->compositor;
 }
 
 /**
- * meta_get_stage_for_display:
- * @display: a #MetaDisplay
+ * meta_get_stage_for_screen:
+ * @screen: a #MetaScreen
  *
- * Returns: (transfer none): The #ClutterStage for the display
+ * Returns: (transfer none): The #ClutterStage for the screen
  */
 ClutterActor *
-meta_get_stage_for_display (MetaDisplay *display)
+meta_get_stage_for_screen (MetaScreen *screen)
 {
-  MetaCompositor *compositor = get_compositor_for_display (display);
+  MetaCompositor *compositor = get_compositor_for_screen (screen);
   return compositor->stage;
 }
 
 /**
- * meta_get_window_group_for_display:
- * @display: a #MetaDisplay
+ * meta_get_window_group_for_screen:
+ * @screen: a #MetaScreen
  *
- * Returns: (transfer none): The window group corresponding to @display
+ * Returns: (transfer none): The window group corresponding to @screen
  */
 ClutterActor *
-meta_get_window_group_for_display (MetaDisplay *display)
+meta_get_window_group_for_screen (MetaScreen *screen)
 {
-  MetaCompositor *compositor = get_compositor_for_display (display);
+  MetaCompositor *compositor = get_compositor_for_screen (screen);
   return compositor->window_group;
 }
 
 /**
- * meta_get_top_window_group_for_display:
- * @display: a #MetaDisplay
+ * meta_get_top_window_group_for_screen:
+ * @screen: a #MetaScreen
  *
- * Returns: (transfer none): The top window group corresponding to @display
+ * Returns: (transfer none): The top window group corresponding to @screen
  */
 ClutterActor *
-meta_get_top_window_group_for_display (MetaDisplay *display)
+meta_get_top_window_group_for_screen (MetaScreen *screen)
 {
-  MetaCompositor *compositor = get_compositor_for_display (display);
+  MetaCompositor *compositor = get_compositor_for_screen (screen);
   return compositor->top_window_group;
 }
 
 /**
- * meta_get_feedback_group_for_display:
- * @display: a #MetaDisplay
+ * meta_get_feedback_group_for_screen:
+ * @screen: a #MetaScreen
  *
- * Returns: (transfer none): The feedback group corresponding to @display
+ * Returns: (transfer none): The feedback group corresponding to @screen
  */
 ClutterActor *
-meta_get_feedback_group_for_display (MetaDisplay *display)
+meta_get_feedback_group_for_screen (MetaScreen *screen)
 {
-  MetaCompositor *compositor = get_compositor_for_display (display);
+  MetaCompositor *compositor = get_compositor_for_screen (screen);
   return compositor->feedback_group;
 }
 
 /**
  * meta_get_window_actors:
- * @display: a #MetaDisplay
+ * @screen: a #MetaScreen
  *
- * Returns: (transfer none) (element-type Clutter.Actor): The set of #MetaWindowActor on @display
+ * Returns: (transfer none) (element-type Clutter.Actor): The set of #MetaWindowActor on @screen
  */
 GList *
-meta_get_window_actors (MetaDisplay *display)
+meta_get_window_actors (MetaScreen *screen)
 {
-  MetaCompositor *compositor = get_compositor_for_display (display);
+  MetaCompositor *compositor = get_compositor_for_screen (screen);
   return compositor->windows;
 }
 
 void
-meta_set_stage_input_region (MetaDisplay  *display,
+meta_set_stage_input_region (MetaScreen   *screen,
                              XserverRegion region)
 {
   /* As a wayland compositor we can simply ignore all this trickery
@@ -231,8 +243,9 @@ meta_set_stage_input_region (MetaDisplay  *display,
    */
   if (!meta_is_wayland_compositor ())
     {
+      MetaDisplay *display = screen->display;
       MetaCompositor *compositor = display->compositor;
-      Display *xdpy = meta_x11_display_get_xdisplay (display->x11_display);
+      Display *xdpy = meta_display_get_xdisplay (display);
       Window xstage = clutter_x11_get_stage_window (CLUTTER_STAGE (compositor->stage));
 
       XFixesSetWindowShapeRegion (xdpy, xstage, ShapeInput, 0, 0, region);
@@ -247,7 +260,7 @@ meta_set_stage_input_region (MetaDisplay  *display,
 }
 
 void
-meta_empty_stage_input_region (MetaDisplay *display)
+meta_empty_stage_input_region (MetaScreen *screen)
 {
   /* Using a static region here is a bit hacky, but Metacity never opens more than
    * one XDisplay, so it works fine. */
@@ -255,21 +268,22 @@ meta_empty_stage_input_region (MetaDisplay *display)
 
   if (region == None)
     {
-      Display *xdpy = meta_x11_display_get_xdisplay (display->x11_display);
+      MetaDisplay  *display = meta_screen_get_display (screen);
+      Display      *xdpy    = meta_display_get_xdisplay (display);
       region = XFixesCreateRegion (xdpy, NULL, 0);
     }
 
-  meta_set_stage_input_region (display, region);
+  meta_set_stage_input_region (screen, region);
 }
 
 void
-meta_focus_stage_window (MetaDisplay *display,
-                         guint32      timestamp)
+meta_focus_stage_window (MetaScreen *screen,
+                         guint32     timestamp)
 {
   ClutterStage *stage;
   Window window;
 
-  stage = CLUTTER_STAGE (meta_get_stage_for_display (display));
+  stage = CLUTTER_STAGE (meta_get_stage_for_screen (screen));
   if (!stage)
     return;
 
@@ -278,13 +292,14 @@ meta_focus_stage_window (MetaDisplay *display,
   if (window == None)
     return;
 
-  meta_x11_display_set_input_focus_xwindow (display->x11_display,
-                                            window,
-                                            timestamp);
+  meta_display_set_input_focus_xwindow (screen->display,
+                                        screen,
+                                        window,
+                                        timestamp);
 }
 
 gboolean
-meta_stage_is_focused (MetaDisplay *display)
+meta_stage_is_focused (MetaScreen *screen)
 {
   ClutterStage *stage;
   Window window;
@@ -292,7 +307,7 @@ meta_stage_is_focused (MetaDisplay *display)
   if (meta_is_wayland_compositor ())
     return TRUE;
 
-  stage = CLUTTER_STAGE (meta_get_stage_for_display (display));
+  stage = CLUTTER_STAGE (meta_get_stage_for_screen (screen));
   if (!stage)
     return FALSE;
 
@@ -301,7 +316,7 @@ meta_stage_is_focused (MetaDisplay *display)
   if (window == None)
     return FALSE;
 
-  return (display->x11_display->focus_xwindow == window);
+  return (screen->display->focus_xwindow == window);
 }
 
 static gboolean
@@ -362,14 +377,11 @@ meta_begin_modal_for_plugin (MetaCompositor   *compositor,
   if (is_modal (display) || display->grab_op != META_GRAB_OP_NONE)
     return FALSE;
 
-  if (display->x11_display)
-    {
-      /* XXX: why is this needed? */
-      XIUngrabDevice (display->x11_display->xdisplay,
-                      META_VIRTUAL_CORE_POINTER_ID,
-                      timestamp);
-      XSync (display->x11_display->xdisplay, False);
-    }
+  /* XXX: why is this needed? */
+  XIUngrabDevice (display->xdisplay,
+                  META_VIRTUAL_CORE_POINTER_ID,
+                  timestamp);
+  XSync (display->xdisplay, False);
 
   if (!grab_devices (options, timestamp))
     return FALSE;
@@ -381,7 +393,7 @@ meta_begin_modal_for_plugin (MetaCompositor   *compositor,
   display->grab_have_keyboard = TRUE;
 
   g_signal_emit_by_name (display, "grab-op-begin",
-                         meta_plugin_get_display (plugin),
+                         meta_plugin_get_screen (plugin),
                          display->grab_window, display->grab_op);
 
   if (meta_is_wayland_compositor ())
@@ -408,7 +420,7 @@ meta_end_modal_for_plugin (MetaCompositor *compositor,
   g_return_if_fail (is_modal (display));
 
   g_signal_emit_by_name (display, "grab-op-end",
-                         meta_plugin_get_display (plugin),
+                         meta_plugin_get_screen (plugin),
                          display->grab_window, display->grab_op);
 
   display->grab_op = META_GRAB_OP_NONE;
@@ -446,13 +458,14 @@ after_stage_paint (ClutterStage *stage,
 }
 
 static void
-redirect_windows (MetaX11Display *x11_display)
+redirect_windows (MetaScreen *screen)
 {
-  Display *xdisplay = meta_x11_display_get_xdisplay (x11_display);
-  Window xroot = meta_x11_display_get_xroot (x11_display);
-  int screen_number = meta_x11_display_get_screen_number (x11_display);
-  guint n_retries;
-  guint max_retries;
+  MetaDisplay *display       = meta_screen_get_display (screen);
+  Display     *xdisplay      = meta_display_get_xdisplay (display);
+  Window       xroot         = meta_screen_get_xroot (screen);
+  int          screen_number = meta_screen_get_screen_number (screen);
+  guint        n_retries;
+  guint        max_retries;
 
   if (meta_get_replace_current_wm ())
     max_retries = 5;
@@ -467,11 +480,11 @@ redirect_windows (MetaX11Display *x11_display)
    */
   while (TRUE)
     {
-      meta_x11_error_trap_push (x11_display);
+      meta_error_trap_push (display);
       XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
       XSync (xdisplay, FALSE);
 
-      if (!meta_x11_error_trap_pop_with_return (x11_display))
+      if (!meta_error_trap_pop_with_return (display))
         break;
 
       if (n_retries == max_retries)
@@ -479,7 +492,7 @@ redirect_windows (MetaX11Display *x11_display)
           /* This probably means that a non-WM compositor like xcompmgr is running;
            * we have no way to get it to exit */
           meta_fatal (_("Another compositing manager is already running on screen %i on display “%s”."),
-                      screen_number, x11_display->name);
+                      screen_number, display->name);
         }
 
       n_retries++;
@@ -491,20 +504,18 @@ void
 meta_compositor_manage (MetaCompositor *compositor)
 {
   MetaDisplay *display = compositor->display;
-  Display *xdisplay = NULL;
+  Display *xdisplay = display->xdisplay;
+  MetaScreen *screen = display->screen;
   MetaBackend *backend = meta_get_backend ();
 
-  if (display->x11_display)
-    {
-      xdisplay = display->x11_display->xdisplay;
-      meta_x11_display_set_cm_selection (display->x11_display);
-    }
+  meta_screen_set_cm_selection (display->screen);
 
   compositor->stage = meta_backend_get_stage (backend);
 
-  g_signal_connect (compositor->stage, "presented",
-                    G_CALLBACK (on_presented),
-                    compositor);
+  compositor->stage_presented_id =
+    g_signal_connect (compositor->stage, "presented",
+                      G_CALLBACK (on_presented),
+                                                     compositor);
 
   /* We use connect_after() here to accomodate code in GNOME Shell that,
    * when benchmarking drawing performance, connects to ::after-paint
@@ -514,14 +525,15 @@ meta_compositor_manage (MetaCompositor *compositor)
    * connections to ::after-paint, connect() vs. connect_after() doesn't
    * matter.
    */
-  g_signal_connect_after (CLUTTER_STAGE (compositor->stage), "after-paint",
-                          G_CALLBACK (after_stage_paint), compositor);
+  compositor->stage_after_paint_id =
+    g_signal_connect_after (compositor->stage, "after-paint",
+                            G_CALLBACK (after_stage_paint), compositor);
 
   clutter_stage_set_sync_delay (CLUTTER_STAGE (compositor->stage), META_SYNC_DELAY);
 
-  compositor->window_group = meta_window_group_new (display);
-  compositor->top_window_group = meta_window_group_new (display);
-  compositor->feedback_group = meta_window_group_new (display);
+  compositor->window_group = meta_window_group_new (screen);
+  compositor->top_window_group = meta_window_group_new (screen);
+  compositor->feedback_group = meta_window_group_new (screen);
 
   clutter_actor_add_child (compositor->stage, compositor->window_group);
   clutter_actor_add_child (compositor->stage, compositor->top_window_group);
@@ -538,13 +550,13 @@ meta_compositor_manage (MetaCompositor *compositor)
     {
       Window xwin;
 
-      compositor->output = display->x11_display->composite_overlay_window;
+      compositor->output = screen->composite_overlay_window;
 
       xwin = meta_backend_x11_get_xwindow (META_BACKEND_X11 (backend));
 
       XReparentWindow (xdisplay, xwin, compositor->output, 0, 0);
 
-      meta_empty_stage_input_region (display);
+      meta_empty_stage_input_region (screen);
 
       /* Make sure there isn't any left-over output shape on the
        * overlay window by setting the whole screen to be an
@@ -564,8 +576,7 @@ meta_compositor_manage (MetaCompositor *compositor)
       compositor->have_x11_sync_object = meta_sync_ring_init (xdisplay);
     }
 
-  if (display->x11_display)
-    redirect_windows (display->x11_display);
+  redirect_windows (display->screen);
 
   compositor->plugin_mgr = meta_plugin_manager_new (compositor);
 }
@@ -575,9 +586,9 @@ meta_compositor_unmanage (MetaCompositor *compositor)
 {
   if (!meta_is_wayland_compositor ())
     {
-      MetaX11Display *display = compositor->display->x11_display;
-      Display *xdisplay = display->xdisplay;
-      Window xroot = display->xroot;
+      MetaDisplay *display = compositor->display;
+      Display *xdisplay = meta_display_get_xdisplay (display);
+      Window xroot = display->screen->xroot;
 
       /* This is the most important part of cleanup - we have to do this
        * before giving up the window manager selection or the next
@@ -586,6 +597,23 @@ meta_compositor_unmanage (MetaCompositor *compositor)
     }
 }
 
+void
+meta_compositor_unmanage_window_actors (MetaCompositor *compositor)
+{
+  if (compositor->top_window_actor)
+    {
+      g_signal_handlers_disconnect_by_func (compositor->top_window_actor,
+                                            on_top_window_actor_destroyed,
+                                            compositor);
+      compositor->top_window_actor = NULL;
+    }
+
+  g_clear_pointer (&compositor->window_group, clutter_actor_destroy);
+  g_clear_pointer (&compositor->top_window_group, clutter_actor_destroy);
+  g_clear_pointer (&compositor->feedback_group, clutter_actor_destroy);
+  g_clear_pointer (&compositor->windows, g_list_free);
+}
+
 /**
  * meta_shape_cow_for_window:
  * @compositor: A #MetaCompositor
@@ -602,7 +630,7 @@ meta_shape_cow_for_window (MetaCompositor *compositor,
                            MetaWindow *window)
 {
   MetaDisplay *display = compositor->display;
-  Display *xdisplay = meta_x11_display_get_xdisplay (display->x11_display);
+  Display *xdisplay = meta_display_get_xdisplay (display);
 
   if (window == NULL)
     XFixesSetWindowShapeRegion (xdisplay, compositor->output, ShapeBounding, 0, 0, None);
@@ -620,7 +648,7 @@ meta_shape_cow_for_window (MetaCompositor *compositor,
       window_bounds.width = rect.width;
       window_bounds.height = rect.height;
 
-      meta_display_get_size (display, &width, &height);
+      meta_screen_get_size (display->screen, &width, &height);
       screen_rect.x = 0;
       screen_rect.y = 0;
       screen_rect.width = width;
@@ -663,12 +691,12 @@ meta_compositor_add_window (MetaCompositor    *compositor,
 {
   MetaDisplay *display = compositor->display;
 
-  meta_x11_error_trap_push (display->x11_display);
+  meta_error_trap_push (display);
 
   meta_window_actor_new (window);
   sync_actor_stacking (compositor);
 
-  meta_x11_error_trap_pop (display->x11_display);
+  meta_error_trap_pop (display);
 }
 
 void
@@ -748,10 +776,8 @@ meta_compositor_process_event (MetaCompositor *compositor,
                                XEvent         *event,
                                MetaWindow     *window)
 {
-  MetaX11Display *x11_display = compositor->display->x11_display;
-
   if (!meta_is_wayland_compositor () &&
-      event->type == meta_x11_display_get_damage_event_base (x11_display) + XDamageNotify)
+      event->type == meta_display_get_damage_event_base (compositor->display) + XDamageNotify)
     {
       /* Core code doesn't handle damage events, so we need to extract the MetaWindow
        * ourselves
@@ -759,7 +785,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
       if (window == NULL)
         {
           Window xwin = ((XDamageNotifyEvent *) event)->drawable;
-          window = meta_x11_display_lookup_x_window (x11_display, xwin);
+          window = meta_display_lookup_x_window (compositor->display, xwin);
         }
 
       if (window)
@@ -804,6 +830,7 @@ meta_compositor_hide_window (MetaCompositor *compositor,
 {
   MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   meta_window_actor_hide (window_actor, effect);
+  meta_stack_tracker_queue_sync_stack (compositor->display->screen->stack_tracker);
 }
 
 void
@@ -949,13 +976,14 @@ get_top_visible_window_actor (MetaCompositor *compositor)
       MetaWindowActor *window_actor = l->data;
       MetaWindow *window = meta_window_actor_get_meta_window (window_actor);
       MetaRectangle buffer_rect;
-      MetaRectangle display_rect = { 0 };
+
+      if (!window->visible_to_compositor)
+        continue;
 
       meta_window_get_buffer_rect (window, &buffer_rect);
-      meta_display_get_size (compositor->display,
-                             &display_rect.width, &display_rect.height);
 
-      if (meta_rectangle_overlap (&display_rect, &buffer_rect))
+      if (meta_rectangle_overlap (&compositor->display->screen->rect,
+                                  &buffer_rect))
         return window_actor;
     }
 
@@ -969,7 +997,7 @@ on_top_window_actor_destroyed (MetaWindowActor *window_actor,
   compositor->top_window_actor = NULL;
   compositor->windows = g_list_remove (compositor->windows, window_actor);
 
-  meta_stack_tracker_queue_sync_stack (compositor->display->stack_tracker);
+  meta_stack_tracker_queue_sync_stack (compositor->display->screen->stack_tracker);
 }
 
 void
@@ -1177,7 +1205,7 @@ meta_pre_paint_func (gpointer data)
       if (compositor->have_x11_sync_object)
         compositor->have_x11_sync_object = meta_sync_ring_insert_wait ();
       else
-        XSync (compositor->display->x11_display->xdisplay, False);
+        XSync (compositor->display->xdisplay, False);
     }
 
   return TRUE;
@@ -1249,6 +1277,9 @@ meta_compositor_new (MetaDisplay *display)
   compositor->display = display;
   compositor->context = clutter_backend->cogl_context;
 
+  if (g_getenv("META_DISABLE_MIPMAPS"))
+    compositor->no_mipmaps = TRUE;
+
   g_signal_connect (meta_shadow_factory_get_default (),
                     "changed",
                     G_CALLBACK (on_shadow_factory_changed),
@@ -1269,44 +1300,44 @@ meta_compositor_new (MetaDisplay *display)
 
 /**
  * meta_get_overlay_window: (skip)
- * @display: a #MetaDisplay
+ * @screen: a #MetaScreen
  *
  */
 Window
-meta_get_overlay_window (MetaDisplay *display)
+meta_get_overlay_window (MetaScreen *screen)
 {
-  MetaCompositor *compositor = get_compositor_for_display (display);
+  MetaCompositor *compositor = get_compositor_for_screen (screen);
   return compositor->output;
 }
 
 /**
- * meta_disable_unredirect_for_display:
- * @display: a #MetaDisplay
+ * meta_disable_unredirect_for_screen:
+ * @screen: a #MetaScreen
  *
  * Disables unredirection, can be usefull in situations where having
  * unredirected windows is undesireable like when recording a video.
  *
  */
 void
-meta_disable_unredirect_for_display (MetaDisplay *display)
+meta_disable_unredirect_for_screen (MetaScreen *screen)
 {
-  MetaCompositor *compositor = get_compositor_for_display (display);
+  MetaCompositor *compositor = get_compositor_for_screen (screen);
   compositor->disable_unredirect_count++;
 }
 
 /**
- * meta_enable_unredirect_for_display:
- * @display: a #MetaDisplay
+ * meta_enable_unredirect_for_screen:
+ * @screen: a #MetaScreen
  *
  * Enables unredirection which reduces the overhead for apps like games.
  *
  */
 void
-meta_enable_unredirect_for_display (MetaDisplay *display)
+meta_enable_unredirect_for_screen (MetaScreen *screen)
 {
-  MetaCompositor *compositor = get_compositor_for_display (display);
+  MetaCompositor *compositor = get_compositor_for_screen (screen);
   if (compositor->disable_unredirect_count == 0)
-    g_warning ("Called enable_unredirect_for_display while unredirection is enabled.");
+    g_warning ("Called enable_unredirect_for_screen while unredirection is enabled.");
   if (compositor->disable_unredirect_count > 0)
     compositor->disable_unredirect_count--;
 }
@@ -1323,15 +1354,15 @@ flash_out_completed (ClutterTimeline *timeline,
 }
 
 void
-meta_compositor_flash_display (MetaCompositor *compositor,
-                               MetaDisplay    *display)
+meta_compositor_flash_screen (MetaCompositor *compositor,
+                              MetaScreen     *screen)
 {
   ClutterActor *stage;
   ClutterActor *flash;
   ClutterTransition *transition;
   gfloat width, height;
 
-  stage = meta_get_stage_for_display (display);
+  stage = meta_get_stage_for_screen (screen);
   clutter_actor_get_size (stage, &width, &height);
 
   flash = clutter_actor_new ();

src/compositor/meta-background-actor-private.h

@@ -3,6 +3,7 @@
 #ifndef META_BACKGROUND_ACTOR_PRIVATE_H
 #define META_BACKGROUND_ACTOR_PRIVATE_H
 
+#include <meta/screen.h>
 #include <meta/meta-background-actor.h>
 
 cairo_region_t *meta_background_actor_get_clip_region (MetaBackgroundActor *self);

src/compositor/meta-background-actor.c

@@ -78,15 +78,14 @@
 
 #include "cogl-utils.h"
 #include "clutter-utils.h"
-#include <meta/meta-x11-errors.h>
+#include <meta/errors.h>
 #include "meta-background-actor-private.h"
 #include "meta-background-private.h"
 #include "meta-cullable.h"
-#include "meta/display.h"
 
 enum
 {
-  PROP_META_DISPLAY = 1,
+  PROP_META_SCREEN = 1,
   PROP_MONITOR,
   PROP_BACKGROUND,
   PROP_GRADIENT,
@@ -151,7 +150,7 @@ typedef enum {
 
 struct _MetaBackgroundActorPrivate
 {
-  MetaDisplay *display;
+  MetaScreen *screen;
   int monitor;
 
   MetaBackground *background;
@@ -176,7 +175,6 @@ struct _MetaBackgroundActorPrivate
 static void cullable_iface_init (MetaCullableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR,
-                         G_ADD_PRIVATE (MetaBackgroundActor)
                          G_IMPLEMENT_INTERFACE (META_TYPE_CULLABLE, cullable_iface_init));
 
 static void
@@ -185,7 +183,7 @@ set_clip_region (MetaBackgroundActor *self,
 {
   MetaBackgroundActorPrivate *priv = self->priv;
 
-  g_clear_pointer (&priv->clip_region, cairo_region_destroy);
+  g_clear_pointer (&priv->clip_region, (GDestroyNotify) cairo_region_destroy);
   if (clip_region)
     priv->clip_region = cairo_region_copy (clip_region);
 }
@@ -215,9 +213,7 @@ get_preferred_size (MetaBackgroundActor *self,
   MetaBackgroundActorPrivate *priv = META_BACKGROUND_ACTOR (self)->priv;
   MetaRectangle monitor_geometry;
 
-  meta_display_get_monitor_geometry (priv->display,
-                                     priv->monitor,
-                                     &monitor_geometry);
+  meta_screen_get_monitor_geometry (priv->screen, priv->monitor, &monitor_geometry);
 
   if (width != NULL)
     *width = monitor_geometry.width;
@@ -385,8 +381,7 @@ setup_pipeline (MetaBackgroundActor   *self,
       MetaRectangle monitor_geometry;
       float gradient_height_perc;
 
-      meta_display_get_monitor_geometry (priv->display,
-                                         priv->monitor, &monitor_geometry);
+      meta_screen_get_monitor_geometry (priv->screen, priv->monitor, &monitor_geometry);
       gradient_height_perc = MAX (0.0001, priv->gradient_height / (float)monitor_geometry.height);
       cogl_pipeline_set_uniform_1f (priv->pipeline,
                                     cogl_pipeline_get_uniform_location (priv->pipeline,
@@ -553,8 +548,8 @@ meta_background_actor_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_META_DISPLAY:
-      priv->display = g_value_get_object (value);
+    case PROP_META_SCREEN:
+      priv->screen = g_value_get_object (value);
       break;
     case PROP_MONITOR:
       meta_background_actor_set_monitor (self, g_value_get_int (value));
@@ -614,8 +609,8 @@ meta_background_actor_get_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_META_DISPLAY:
-      g_value_set_object (value, priv->display);
+    case PROP_META_SCREEN:
+      g_value_set_object (value, priv->screen);
       break;
     case PROP_MONITOR:
       g_value_set_int (value, priv->monitor);
@@ -654,6 +649,8 @@ meta_background_actor_class_init (MetaBackgroundActorClass *klass)
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
   GParamSpec *param_spec;
 
+  g_type_class_add_private (klass, sizeof (MetaBackgroundActorPrivate));
+
   object_class->dispose = meta_background_actor_dispose;
   object_class->set_property = meta_background_actor_set_property;
   object_class->get_property = meta_background_actor_get_property;
@@ -663,14 +660,14 @@ meta_background_actor_class_init (MetaBackgroundActorClass *klass)
   actor_class->get_paint_volume = meta_background_actor_get_paint_volume;
   actor_class->paint = meta_background_actor_paint;
 
-  param_spec = g_param_spec_object ("meta-display",
-                                    "MetaDisplay",
-                                    "MetaDisplay",
-                                    META_TYPE_DISPLAY,
+  param_spec = g_param_spec_object ("meta-screen",
+                                    "MetaScreen",
+                                    "MetaScreen",
+                                    META_TYPE_SCREEN,
                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 
   g_object_class_install_property (object_class,
-                                   PROP_META_DISPLAY,
+                                   PROP_META_SCREEN,
                                    param_spec);
 
   param_spec = g_param_spec_int ("monitor",
@@ -781,13 +778,13 @@ meta_background_actor_init (MetaBackgroundActor *self)
  * Return value: the newly created background actor
  */
 ClutterActor *
-meta_background_actor_new (MetaDisplay *display,
-                           int          monitor)
+meta_background_actor_new (MetaScreen *screen,
+                           int         monitor)
 {
   MetaBackgroundActor *self;
 
   self = g_object_new (META_TYPE_BACKGROUND_ACTOR,
-                       "meta-display", display,
+                       "meta-screen", screen,
                        "monitor", monitor,
                        NULL);
 
@@ -926,13 +923,12 @@ meta_background_actor_set_monitor (MetaBackgroundActor *self,
   MetaBackgroundActorPrivate *priv = self->priv;
   MetaRectangle old_monitor_geometry;
   MetaRectangle new_monitor_geometry;
-  MetaDisplay *display = priv->display;
 
   if(priv->monitor == monitor)
       return;
 
-  meta_display_get_monitor_geometry (display, priv->monitor, &old_monitor_geometry);
-  meta_display_get_monitor_geometry (display, monitor, &new_monitor_geometry);
+  meta_screen_get_monitor_geometry (priv->screen, priv->monitor, &old_monitor_geometry);
+  meta_screen_get_monitor_geometry (priv->screen, monitor, &new_monitor_geometry);
   if(old_monitor_geometry.height != new_monitor_geometry.height)
       invalidate_pipeline (self, CHANGED_GRADIENT_PARAMETERS);
 

src/compositor/meta-background.c

@@ -17,11 +17,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <meta/display.h>
 #include <meta/util.h>
 #include <meta/meta-background.h>
 #include <meta/meta-background-image.h>
-#include <meta/meta-monitor-manager.h>
 #include "meta-background-private.h"
 #include "cogl-utils.h"
 
@@ -46,7 +44,7 @@ struct _MetaBackgroundMonitor
 
 struct _MetaBackgroundPrivate
 {
-  MetaDisplay *display;
+  MetaScreen *screen;
   MetaBackgroundMonitor *monitors;
   int n_monitors;
 
@@ -70,11 +68,11 @@ struct _MetaBackgroundPrivate
 
 enum
 {
-  PROP_META_DISPLAY = 1,
+  PROP_META_SCREEN = 1,
   PROP_MONITOR,
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (MetaBackground, meta_background, G_TYPE_OBJECT)
+G_DEFINE_TYPE (MetaBackground, meta_background, G_TYPE_OBJECT)
 
 static gboolean texture_has_alpha (CoglTexture *texture);
 
@@ -130,7 +128,8 @@ free_wallpaper_texture (MetaBackground *self)
 }
 
 static void
-invalidate_monitor_backgrounds (MetaBackground *self)
+on_monitors_changed (MetaScreen     *screen,
+                     MetaBackground *self)
 {
   MetaBackgroundPrivate *priv = self->priv;
 
@@ -139,11 +138,11 @@ invalidate_monitor_backgrounds (MetaBackground *self)
   priv->monitors = NULL;
   priv->n_monitors = 0;
 
-  if (priv->display)
+  if (priv->screen)
     {
       int i;
 
-      priv->n_monitors = meta_display_get_n_monitors (priv->display);
+      priv->n_monitors = meta_screen_get_n_monitors (screen);
       priv->monitors = g_new0 (MetaBackgroundMonitor, priv->n_monitors);
 
       for (i = 0; i < priv->n_monitors; i++)
@@ -152,20 +151,27 @@ invalidate_monitor_backgrounds (MetaBackground *self)
 }
 
 static void
-on_monitors_changed (MetaBackground *self)
-{
-  invalidate_monitor_backgrounds (self);
-}
-
-static void
-set_display (MetaBackground *self,
-             MetaDisplay    *display)
+set_screen (MetaBackground *self,
+            MetaScreen     *screen)
 {
   MetaBackgroundPrivate *priv = self->priv;
 
-  g_set_object (&priv->display, display);
+  if (priv->screen != NULL)
+    {
+      g_signal_handlers_disconnect_by_func (priv->screen,
+                                            (gpointer)on_monitors_changed,
+                                            self);
+    }
 
-  invalidate_monitor_backgrounds (self);
+  g_set_object (&priv->screen, screen);
+
+  if (priv->screen != NULL)
+    {
+      g_signal_connect (priv->screen, "monitors-changed",
+                        G_CALLBACK (on_monitors_changed), self);
+    }
+
+  on_monitors_changed (priv->screen, self);
 }
 
 static void
@@ -176,8 +182,8 @@ meta_background_set_property (GObject      *object,
 {
   switch (prop_id)
     {
-    case PROP_META_DISPLAY:
-      set_display (META_BACKGROUND (object), g_value_get_object (value));
+    case PROP_META_SCREEN:
+      set_screen (META_BACKGROUND (object), g_value_get_object (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -195,8 +201,8 @@ meta_background_get_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_META_DISPLAY:
-      g_value_set_object (value, priv->display);
+    case PROP_META_SCREEN:
+      g_value_set_object (value, priv->screen);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -298,7 +304,7 @@ meta_background_dispose (GObject *object)
   set_file (self, &priv->file1, &priv->background_image1, NULL);
   set_file (self, &priv->file2, &priv->background_image2, NULL);
 
-  set_display (self, NULL);
+  set_screen (self, NULL);
 
   G_OBJECT_CLASS (meta_background_parent_class)->dispose (object);
 }
@@ -316,16 +322,11 @@ meta_background_constructed (GObject *object)
 {
   MetaBackground        *self = META_BACKGROUND (object);
   MetaBackgroundPrivate *priv = self->priv;
-  MetaMonitorManager *monitor_manager = meta_monitor_manager_get ();
 
   G_OBJECT_CLASS (meta_background_parent_class)->constructed (object);
 
-  g_signal_connect_object (priv->display, "gl-video-memory-purged",
+  g_signal_connect_object (meta_screen_get_display (priv->screen), "gl-video-memory-purged",
                            G_CALLBACK (mark_changed), object, G_CONNECT_SWAPPED);
-
-  g_signal_connect_object (monitor_manager, "monitors-changed",
-                           G_CALLBACK (on_monitors_changed), self,
-                           G_CONNECT_SWAPPED);
 }
 
 static void
@@ -334,6 +335,8 @@ meta_background_class_init (MetaBackgroundClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GParamSpec *param_spec;
 
+  g_type_class_add_private (klass, sizeof (MetaBackgroundPrivate));
+
   object_class->dispose = meta_background_dispose;
   object_class->finalize = meta_background_finalize;
   object_class->constructed = meta_background_constructed;
@@ -348,14 +351,14 @@ meta_background_class_init (MetaBackgroundClass *klass)
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
-  param_spec = g_param_spec_object ("meta-display",
-                                    "MetaDisplay",
-                                    "MetaDisplay",
-                                    META_TYPE_DISPLAY,
+  param_spec = g_param_spec_object ("meta-screen",
+                                    "MetaScreen",
+                                    "MetaScreen",
+                                    META_TYPE_SCREEN,
                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 
   g_object_class_install_property (object_class,
-                                   PROP_META_DISPLAY,
+                                   PROP_META_SCREEN,
                                    param_spec);
 
 }
@@ -404,7 +407,7 @@ get_texture_area (MetaBackground          *self,
       set_texture_area_from_monitor_area (monitor_rect, texture_area);
       break;
     case G_DESKTOP_BACKGROUND_STYLE_WALLPAPER:
-      meta_display_get_size (priv->display, &screen_width, &screen_height);
+      meta_screen_get_size (priv->screen, &screen_width, &screen_height);
 
       /* Start off by centering a tile in the middle of the
        * total screen area.
@@ -473,7 +476,7 @@ get_texture_area (MetaBackground          *self,
         /* paint region is the union of all monitors, with the origin
          * of the region set to align with monitor associated with the background.
          */
-        meta_display_get_size (priv->display, &screen_width, &screen_height);
+        meta_screen_get_size (priv->screen, &screen_width, &screen_height);
 
         /* unclipped texture area is whole screen */
         image_area.width = screen_width;
@@ -747,7 +750,7 @@ meta_background_get_texture (MetaBackground         *self,
 
   monitor = &priv->monitors[monitor_index];
 
-  meta_display_get_monitor_geometry (priv->display, monitor_index, &geometry);
+  meta_screen_get_monitor_geometry (priv->screen, monitor_index, &geometry);
   monitor_area.x = geometry.x;
   monitor_area.y = geometry.y;
   monitor_area.width = geometry.width;
@@ -876,10 +879,10 @@ meta_background_get_texture (MetaBackground         *self,
 }
 
 MetaBackground *
-meta_background_new (MetaDisplay *display)
+meta_background_new  (MetaScreen *screen)
 {
   return g_object_new (META_TYPE_BACKGROUND,
-                       "meta-display", display,
+                       "meta-screen", screen,
                        NULL);
 }
 

src/compositor/meta-dnd.c

@@ -27,7 +27,6 @@
 #include "core/display-private.h"
 #include "backends/meta-dnd-private.h"
 #include "meta/meta-dnd.h"
-#include "x11/meta-x11-display-private.h"
 
 struct _MetaDndClass
 {
@@ -140,7 +139,7 @@ meta_dnd_notify_dnd_leave (MetaDnd *dnd)
 gboolean
 meta_dnd_handle_xdnd_event (MetaBackend    *backend,
                             MetaCompositor *compositor,
-                            Display        *xdisplay,
+                            MetaDisplay    *display,
                             XEvent         *xev)
 {
   MetaDnd *dnd = meta_backend_get_dnd (backend);
@@ -153,23 +152,23 @@ meta_dnd_handle_xdnd_event (MetaBackend    *backend,
       xev->xany.window != clutter_x11_get_stage_window (CLUTTER_STAGE (compositor->stage)))
     return FALSE;
 
-  if (xev->xclient.message_type == XInternAtom (xdisplay, "XdndPosition", TRUE))
+  if (xev->xclient.message_type == gdk_x11_get_xatom_by_name ("XdndPosition"))
     {
       XEvent xevent;
       Window src = xev->xclient.data.l[0];
 
       memset (&xevent, 0, sizeof(xevent));
       xevent.xany.type = ClientMessage;
-      xevent.xany.display = xdisplay;
+      xevent.xany.display = display->xdisplay;
       xevent.xclient.window = src;
-      xevent.xclient.message_type = XInternAtom (xdisplay, "XdndStatus", TRUE);
+      xevent.xclient.message_type = gdk_x11_get_xatom_by_name ("XdndStatus");
       xevent.xclient.format = 32;
       xevent.xclient.data.l[0] = output_window;
       /* flags: bit 0: will we accept the drop? bit 1: do we want more position messages */
       xevent.xclient.data.l[1] = 2;
       xevent.xclient.data.l[4] = None;
 
-      XSendEvent (xdisplay, src, False, 0, &xevent);
+      XSendEvent (display->xdisplay, src, False, 0, &xevent);
 
       meta_dnd_notify_dnd_position_change (dnd,
                                             (int)(xev->xclient.data.l[2] >> 16),
@@ -177,13 +176,13 @@ meta_dnd_handle_xdnd_event (MetaBackend    *backend,
 
       return TRUE;
     }
-  else if (xev->xclient.message_type == XInternAtom (xdisplay, "XdndLeave", TRUE))
+  else if (xev->xclient.message_type == gdk_x11_get_xatom_by_name ("XdndLeave"))
     {
       meta_dnd_notify_dnd_leave (dnd);
 
       return TRUE;
     }
-  else if (xev->xclient.message_type == XInternAtom (xdisplay, "XdndEnter", TRUE))
+  else if (xev->xclient.message_type == gdk_x11_get_xatom_by_name ("XdndEnter"))
     {
       meta_dnd_notify_dnd_enter (dnd);