Bump version to 3.27.1

Update NEWS.

.gitignore

@@ -55,6 +55,7 @@ mutter-restart-helper
 mutter-test-client
 mutter-test-runner
 mutter-test-unit-tests
+mutter-test-headless-start-test
 mutter-all.test
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
@@ -71,6 +72,8 @@ src/stamp-meta-enum-types.h
 src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
 src/meta-dbus-login1.[ch]
+src/meta-dbus-remote-desktop.[ch]
+src/meta-dbus-screen-cast.[ch]
 src/gtk-primary-selection-protocol.c
 src/gtk-primary-selection-server-protocol.h
 src/gtk-shell-protocol.c
@@ -112,3 +115,4 @@ ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
 .dirstamp
+**/tags.*

NEWS

@@ -1,3 +1,79 @@
+3.27.1
+======
+* Work with clients that require older linux_dmabuf protocol [Daniel; #788558]
+* Support hybrid GPU systems [Jonas; #785381]
+* Prevent crash when closing maximized windows [Jonni; #788666]
+* Use the correct monitor for HiDPI scaling of shell chrome [Jonas; #788820]
+* Fix unredirection of fullscreen windows [Rui, Jonas; #788493]
+* Fix list of supported monitor scales on X11 [Jonas; #788901]
+* Misc. bug fixes [Florian, Jonas, Marco; #788572, #788569, #788607, #788860,
+  #788921]
+
+Contributors:
+  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner, Daniel Stone,
+  Marco Trevisan, Jonni Westphalen
+
+Translations:
+  Xavi Ivars [ca@valencia]
+
+3.26.1
+======
+* Fix crash when respawning shortcut inhibitor dialog [Olivier; #787568]
+* Fix crash during monitor configuration migration [Carlos, Jonas; #787668]
+* Fix multihead regressions in X11 session [Jonas; #787477]
+* Fix screen rotation regressions [Hans; #787836]
+* Fix keybindings not being resolved with non-latin layouts [Jonas; #787016]
+* Support snap packages for sandboxed app IDs [Marco; #788217]
+* Fix crash when reconnecting tablet device [Jason; #787649]
+* Support running headless [Jonas; #730551, #787637]
+* Support _NET_RESTACK_WINDOW and ConfigureRequest siblings [Vasilis; #786365]
+* Fix monitor layout not being remembered across sessions [Jonas; #787629]
+* Make sure to export _NET_NUMBER_OF_DESKTOPS [Florian; #760651]
+* Allow resizing of tiled windows [Georges, Florian; #645153]
+* Export tiling information to clients [Georges; #751857]
+* Misc. bug fixes [Jonas, Florian, Jeremy, Rico; #787570, #787715, #787953,
+  #788049, #788199, #788292, #788197]
+
+Contributors:
+  Jonas Ådahl, Andrea Azzarone, Georges Basile Stavracas Neto, Hans de Goede,
+  Olivier Fourdan, Carlos Garnacho, Jason Gerecke, Vasilis Liaskovitis,
+  Rui Matos, Florian Müllner, Jeremy Soller, Marco Trevisan, Rico Tzschichholz
+
+Translations:
+  Matej Urbančič [sl], gogo [hr], Cheng-Chia Tseng [zh_TW]
+
+3.26.0
+======
+Contributors:
+  Florian Müllner
+
+Translations:
+  Trần Ngọc Quân [vi], Inaki Larranaga Murgoitio [eu], Jordi Mas [ca],
+  Anders Jonsson [sv], Alexander Shopov [bg], Ask Hjorth Larsen [da],
+  Jean-Baptiste Holcroft [fr], A S Alam [pa]
+
+3.25.92
+=======
+* Add screencast and remote desktop support [Jonas; #784199]
+* Support running with no attached monitors [Jonas; #730551]
+* Add a vertical gradient effect to background actor [Alessandro; #786618]
+* Misc. bug fixes [Mario, Daniel, Piotr, Jonas, Bastien; #786619, #786677,
+  #772218, #786918, #760670]
+
+Contributors:
+  Jonas Ådahl, Alessandro Bono, Piotr Drąg, Bastien Nocera,
+  Mario Sanchez Prada, Daniel Stone
+
+Translations:
+  Marek Cernocky [cs], Aurimas Černius [lt], Piotr Drąg [pl],
+  Fran Dieguez [gl], gogo [hr], Dušan Kazik [sk], Milo Casagrande [it],
+  Jordi Mas [ca], Cheng-Chia Tseng [zh_TW], Марко Костић [sr],
+  Милош Поповић [sr@latin], Rūdolfs Mazurs [lv], Matej Urbančič [sl],
+  Ask Hjorth Larsen [da], Piotr Drąg [it, lt], Jiri Grönroos [fi],
+  Emin Tufan Çetin [tr], Wolfgang Stöggl [de], Kukuh Syafaat [id],
+  Yuras Shumovich [be], Changwoo Ryu [ko], Alexander Shopov [bg],
+  Rafael Fontenelle [pt_BR], Balázs Úr [hu]
+
 3.25.91
 =======
 * Reduce memory use of suspended instances [Jonas; #786299]

clutter/clutter/clutter-mutter.h

@@ -40,6 +40,12 @@ gboolean        _clutter_get_sync_to_vblank     (void);
 CLUTTER_AVAILABLE_IN_MUTTER
 int64_t clutter_stage_get_frame_counter (ClutterStage *stage);
 
+CLUTTER_AVAILABLE_IN_MUTTER
+void clutter_stage_capture_into (ClutterStage          *stage,
+                                 gboolean               paint,
+                                 cairo_rectangle_int_t *rect,
+                                 uint8_t               *data);
+
 #undef __CLUTTER_H_INSIDE__
 
 #endif /* __CLUTTER_MUTTER_H__ */

clutter/clutter/clutter-stage-view.c

@@ -267,7 +267,6 @@ clutter_stage_view_set_property (GObject      *object,
       priv->layout = *layout;
       break;
     case PROP_FRAMEBUFFER:
-      g_clear_pointer (&priv->framebuffer, cogl_object_unref);
       priv->framebuffer = g_value_dup_boxed (value);
 #ifndef G_DISABLE_CHECKS
       if (priv->framebuffer)
@@ -285,7 +284,6 @@ clutter_stage_view_set_property (GObject      *object,
 #endif
       break;
     case PROP_OFFSCREEN:
-      g_clear_pointer (&priv->offscreen, cogl_object_unref);
       priv->offscreen = g_value_dup_boxed (value);
       break;
     case PROP_SCALE:
@@ -357,7 +355,7 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
                         "Framebuffer used as intermediate buffer",
                         COGL_TYPE_HANDLE,
                         G_PARAM_READWRITE |
-                        G_PARAM_CONSTRUCT |
+                        G_PARAM_CONSTRUCT_ONLY |
                         G_PARAM_STATIC_STRINGS);
 
   obj_props[PROP_SCALE] =

clutter/clutter/clutter-stage.c

@@ -4810,3 +4810,93 @@ clutter_stage_capture (ClutterStage          *stage,
 
   return TRUE;
 }
+
+static void
+capture_view_into (ClutterStage          *stage,
+                   gboolean               paint,
+                   ClutterStageView      *view,
+                   cairo_rectangle_int_t *rect,
+                   uint8_t               *data,
+                   int                    stride)
+{
+  CoglFramebuffer *framebuffer;
+  ClutterBackend *backend;
+  CoglContext *context;
+  CoglBitmap *bitmap;
+  cairo_rectangle_int_t view_layout;
+
+  framebuffer = clutter_stage_view_get_framebuffer (view);
+
+  if (paint)
+    {
+      _clutter_stage_maybe_setup_viewport (stage, view);
+      cogl_push_framebuffer (framebuffer);
+      clutter_stage_do_paint_view (stage, view, rect);
+    }
+
+  backend = clutter_get_default_backend ();
+  context = clutter_backend_get_cogl_context (backend);
+  bitmap = cogl_bitmap_new_for_data (context,
+                                     rect->width, rect->height,
+                                     CLUTTER_CAIRO_FORMAT_ARGB32,
+                                     stride,
+                                     data);
+
+  clutter_stage_view_get_layout (view, &view_layout);
+
+  cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
+                                            rect->x - view_layout.x,
+                                            rect->y - view_layout.y,
+                                            COGL_READ_PIXELS_COLOR_BUFFER,
+                                            bitmap);
+
+  if (paint)
+    cogl_pop_framebuffer ();
+
+  cogl_object_unref (bitmap);
+}
+
+static ClutterStageView *
+get_view_at_rect (ClutterStage          *stage,
+                  cairo_rectangle_int_t *rect)
+{
+  ClutterStagePrivate *priv = stage->priv;
+  GList *views = _clutter_stage_window_get_views (priv->impl);
+  GList *l;
+
+  for (l = views; l; l = l->next)
+    {
+      ClutterStageView *view = l->data;
+      cairo_rectangle_int_t view_layout;
+      cairo_region_t *region;
+      cairo_rectangle_int_t view_capture_rect;
+
+      clutter_stage_view_get_layout (view, &view_layout);
+      region = cairo_region_create_rectangle (&view_layout);
+      cairo_region_intersect_rectangle (region, rect);
+      cairo_region_get_extents (region, &view_capture_rect);
+      cairo_region_destroy (region);
+
+      if (view_capture_rect.width == 0 || view_capture_rect.height == 0)
+        continue;
+
+      g_assert (view_capture_rect.width == rect->width &&
+                view_capture_rect.height == rect->height);
+      return view;
+    }
+
+  return NULL;
+}
+
+void
+clutter_stage_capture_into (ClutterStage          *stage,
+                            gboolean               paint,
+                            cairo_rectangle_int_t *rect,
+                            uint8_t               *data)
+{
+  ClutterStageView *view;
+  int bpp = 4;
+
+  view = get_view_at_rect (stage, rect);
+  capture_view_into (stage, paint, view, rect, data, rect->width * bpp);
+}

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

@@ -115,6 +115,19 @@ clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virtual_d
   klass->notify_keyval (virtual_device, time_us, keyval, key_state);
 }
 
+void
+clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
+                                                     uint64_t                   time_us,
+                                                     ClutterScrollDirection     direction,
+                                                     ClutterScrollSource        scroll_source)
+{
+  ClutterVirtualInputDeviceClass *klass =
+    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
+
+  klass->notify_discrete_scroll (virtual_device, time_us,
+                                 direction, scroll_source);
+}
+
 /**
  * clutter_virtual_input_device_get_manager:
  * @virtual_device: a virtual device

clutter/clutter/clutter-virtual-input-device.h

@@ -76,6 +76,11 @@ struct _ClutterVirtualInputDeviceClass
                          uint64_t                   time_us,
                          uint32_t                   keyval,
                          ClutterKeyState            key_state);
+
+  void (*notify_discrete_scroll) (ClutterVirtualInputDevice *virtual_device,
+                                  uint64_t                   time_us,
+                                  ClutterScrollDirection     direction,
+                                  ClutterScrollSource        scroll_source);
 };
 
 CLUTTER_AVAILABLE_IN_ALL
@@ -108,6 +113,13 @@ void clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virt
                                                  uint32_t                   keyval,
                                                  ClutterKeyState            key_state);
 
+CLUTTER_AVAILABLE_IN_ALL
+void clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
+                                                          uint64_t                   time_us,
+                                                          ClutterScrollDirection     direction,
+                                                          ClutterScrollSource        scroll_source);
+
+
 CLUTTER_AVAILABLE_IN_ALL
 ClutterDeviceManager * clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_device);
 

clutter/clutter/evdev/clutter-device-manager-evdev.c

@@ -59,9 +59,6 @@
 
 #include "clutter-device-manager-evdev.h"
 
-#define DISCRETE_SCROLL_STEP 10.0
-
-
 /*
  * Clutter makes the assumption that two core devices have ID's 2 and 3 (core
  * pointer and core keyboard).
@@ -400,120 +397,6 @@ notify_relative_tool_motion (ClutterInputDevice *input_device,
   queue_event (event);
 }
 
-static ClutterScrollDirection
-discrete_to_direction (gdouble discrete_x,
-                       gdouble discrete_y)
-{
-  if (discrete_x > 0)
-    return CLUTTER_SCROLL_RIGHT;
-  else if (discrete_x < 0)
-    return CLUTTER_SCROLL_LEFT;
-  else if (discrete_y > 0)
-    return CLUTTER_SCROLL_DOWN;
-  else if (discrete_y < 0)
-    return CLUTTER_SCROLL_UP;
-  else
-    return CLUTTER_SCROLL_SMOOTH;
-}
-
-static void
-notify_discrete_scroll (ClutterInputDevice     *input_device,
-                        guint64                 time_us,
-                        ClutterScrollDirection  direction,
-                        ClutterScrollSource     scroll_source,
-                        gboolean                emulated)
-{
-  ClutterInputDeviceEvdev *device_evdev;
-  ClutterSeatEvdev *seat;
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-
-  if (direction == CLUTTER_SCROLL_SMOOTH)
-    return;
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  stage = _clutter_input_device_get_stage (input_device);
-  if (stage == NULL)
-    return;
-
-  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
-  seat = _clutter_input_device_evdev_get_seat (device_evdev);
-
-  event = clutter_event_new (CLUTTER_SCROLL);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->scroll.time = us2ms (time_us);
-  event->scroll.stage = CLUTTER_STAGE (stage);
-  event->scroll.device = seat->core_pointer;
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-
-  event->scroll.direction = direction;
-
-  event->scroll.x = seat->pointer_x;
-  event->scroll.y = seat->pointer_y;
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-  event->scroll.scroll_source = scroll_source;
-
-  _clutter_event_set_pointer_emulated (event, emulated);
-
-  queue_event (event);
-}
-
-static void
-notify_scroll (ClutterInputDevice       *input_device,
-               guint64                   time_us,
-               gdouble                   dx,
-               gdouble                   dy,
-               ClutterScrollSource       source,
-               ClutterScrollFinishFlags  flags,
-               gboolean                  emulated)
-{
-  ClutterInputDeviceEvdev *device_evdev;
-  ClutterSeatEvdev *seat;
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-  gdouble scroll_factor;
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  stage = _clutter_input_device_get_stage (input_device);
-  if (stage == NULL)
-    return;
-
-  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
-  seat = _clutter_input_device_evdev_get_seat (device_evdev);
-
-  event = clutter_event_new (CLUTTER_SCROLL);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->scroll.time = us2ms (time_us);
-  event->scroll.stage = CLUTTER_STAGE (stage);
-  event->scroll.device = seat->core_pointer;
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-
-  /* libinput pointer axis events are in pointer motion coordinate space.
-   * To convert to Xi2 discrete step coordinate space, multiply the factor
-   * 1/10. */
-  event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
-  scroll_factor = 1.0 / DISCRETE_SCROLL_STEP;
-  clutter_event_set_scroll_delta (event,
-                                  scroll_factor * dx,
-                                  scroll_factor * dy);
-
-  event->scroll.x = seat->pointer_x;
-  event->scroll.y = seat->pointer_y;
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-  event->scroll.scroll_source = source;
-  event->scroll.finish_flags = flags;
-
-  _clutter_event_set_pointer_emulated (event, emulated);
-
-  queue_event (event);
-}
-
 static void
 notify_touch_event (ClutterInputDevice *input_device,
 		    ClutterEventType    evtype,
@@ -1153,40 +1036,6 @@ process_base_event (ClutterDeviceManagerEvdev *manager_evdev,
   return handled;
 }
 
-static void
-check_notify_discrete_scroll (ClutterDeviceManagerEvdev *manager_evdev,
-                              ClutterInputDevice        *device,
-                              guint64                    time_us,
-                              ClutterScrollSource        scroll_source)
-{
-  ClutterInputDeviceEvdev *device_evdev =
-    CLUTTER_INPUT_DEVICE_EVDEV (device);
-  ClutterSeatEvdev *seat = _clutter_input_device_evdev_get_seat (device_evdev);
-  int i, n_xscrolls, n_yscrolls;
-
-  n_xscrolls = floor (fabs (seat->accum_scroll_dx) / DISCRETE_SCROLL_STEP);
-  n_yscrolls = floor (fabs (seat->accum_scroll_dy) / DISCRETE_SCROLL_STEP);
-
-  for (i = 0; i < n_xscrolls; i++)
-    {
-      notify_discrete_scroll (device, time_us,
-                              seat->accum_scroll_dx > 0 ?
-                              CLUTTER_SCROLL_RIGHT : CLUTTER_SCROLL_LEFT,
-                              scroll_source, TRUE);
-    }
-
-  for (i = 0; i < n_yscrolls; i++)
-    {
-      notify_discrete_scroll (device, time_us,
-                              seat->accum_scroll_dy > 0 ?
-                              CLUTTER_SCROLL_DOWN : CLUTTER_SCROLL_UP,
-                              scroll_source, TRUE);
-    }
-
-  seat->accum_scroll_dx = fmodf (seat->accum_scroll_dx, DISCRETE_SCROLL_STEP);
-  seat->accum_scroll_dy = fmodf (seat->accum_scroll_dy, DISCRETE_SCROLL_STEP);
-}
-
 static ClutterScrollSource
 translate_scroll_source (enum libinput_pointer_axis_source source)
 {
@@ -1334,6 +1183,68 @@ seat_from_device (ClutterInputDevice *device)
   return _clutter_input_device_evdev_get_seat (device_evdev);
 }
 
+static void
+notify_continuous_axis (ClutterSeatEvdev              *seat,
+                        ClutterInputDevice            *device,
+                        uint64_t                       time_us,
+                        ClutterScrollSource            scroll_source,
+                        struct libinput_event_pointer *axis_event)
+{
+  gdouble dx = 0.0, dy = 0.0;
+  ClutterScrollFinishFlags finish_flags = CLUTTER_SCROLL_FINISHED_NONE;
+
+  if (libinput_event_pointer_has_axis (axis_event,
+                                       LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+    {
+      dx = libinput_event_pointer_get_axis_value (
+          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+
+      if (fabs (dx) < DBL_EPSILON)
+        finish_flags |= CLUTTER_SCROLL_FINISHED_HORIZONTAL;
+    }
+  if (libinput_event_pointer_has_axis (axis_event,
+                                       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+    {
+      dy = libinput_event_pointer_get_axis_value (
+          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+
+      if (fabs (dy) < DBL_EPSILON)
+        finish_flags |= CLUTTER_SCROLL_FINISHED_VERTICAL;
+    }
+
+  clutter_seat_evdev_notify_scroll_continuous (seat, device, time_us,
+                                               dx, dy,
+                                               scroll_source, finish_flags);
+}
+
+static void
+notify_discrete_axis (ClutterSeatEvdev              *seat,
+                      ClutterInputDevice            *device,
+                      uint64_t                       time_us,
+                      ClutterScrollSource            scroll_source,
+                      struct libinput_event_pointer *axis_event)
+{
+  gdouble discrete_dx = 0.0, discrete_dy = 0.0;
+
+  if (libinput_event_pointer_has_axis (axis_event,
+                                       LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+    {
+      discrete_dx = libinput_event_pointer_get_axis_value_discrete (
+          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+    }
+  if (libinput_event_pointer_has_axis (axis_event,
+                                       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+    {
+      discrete_dy = libinput_event_pointer_get_axis_value_discrete (
+          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+    }
+
+  clutter_seat_evdev_notify_discrete_scroll (seat, device,
+                                             time_us,
+                                             discrete_dx, discrete_dy,
+                                             scroll_source);
+}
+
 static gboolean
 process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
                       struct libinput_event *event)
@@ -1460,17 +1371,12 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
 
     case LIBINPUT_EVENT_POINTER_AXIS:
       {
-        gdouble dx = 0.0, dy = 0.0;
-        gdouble discrete_x = 0.0, discrete_y = 0.0;
         guint64 time_us;
-        gboolean wheel = FALSE;
-        enum libinput_pointer_axis axis;
         enum libinput_pointer_axis_source source;
         struct libinput_event_pointer *axis_event =
           libinput_event_get_pointer_event (event);
         ClutterSeatEvdev *seat;
         ClutterScrollSource scroll_source;
-        ClutterScrollFinishFlags finish_flags = 0;
 
         device = libinput_device_get_user_data (libinput_device);
         seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));
@@ -1484,63 +1390,20 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
            backwards-compat with existing clients, we just send multiples of
            the click count. */
 
-        if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL)
-            wheel = TRUE;
-
-        axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL;
-        if (libinput_event_pointer_has_axis (axis_event, axis))
+        switch (scroll_source)
           {
-            discrete_y = libinput_event_pointer_get_axis_value_discrete (axis_event, axis);
-            dy = libinput_event_pointer_get_axis_value (axis_event, axis);
-
-            if (wheel)
-              seat->accum_scroll_dy = 0;
-            else if (fabs (dy) < DBL_EPSILON)
-              {
-                finish_flags |= CLUTTER_SCROLL_FINISHED_VERTICAL;
-                seat->accum_scroll_dy = 0;
-              }
-            else
-              seat->accum_scroll_dy += dy;
+          case CLUTTER_SCROLL_SOURCE_WHEEL:
+            notify_discrete_axis (seat, device, time_us, scroll_source,
+                                  axis_event);
+            break;
+          case CLUTTER_SCROLL_SOURCE_FINGER:
+          case CLUTTER_SCROLL_SOURCE_CONTINUOUS:
+          case CLUTTER_SCROLL_SOURCE_UNKNOWN:
+            notify_continuous_axis (seat, device, time_us, scroll_source,
+                                    axis_event);
+            break;
           }
-
-        axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL;
-        if (libinput_event_pointer_has_axis (axis_event, axis))
-          {
-            discrete_x = libinput_event_pointer_get_axis_value_discrete (axis_event, axis);
-            dx = libinput_event_pointer_get_axis_value (axis_event, axis);
-
-            if (wheel)
-              seat->accum_scroll_dx = 0;
-            else if (fabs (dx) < DBL_EPSILON)
-              {
-                finish_flags |= CLUTTER_SCROLL_FINISHED_HORIZONTAL;
-                seat->accum_scroll_dx = 0;
-              }
-            else
-              seat->accum_scroll_dx += dx;
-          }
-
-        if (wheel)
-          {
-            notify_scroll (device, time_us,
-                           discrete_x * DISCRETE_SCROLL_STEP,
-                           discrete_y * DISCRETE_SCROLL_STEP,
-                           scroll_source, finish_flags, TRUE);
-            notify_discrete_scroll (device, time_us,
-                                    discrete_to_direction (discrete_x, discrete_y),
-                                    scroll_source, FALSE);
-          }
-        else
-          {
-            notify_scroll (device, time_us, dx, dy,
-                           scroll_source, finish_flags, FALSE);
-            check_notify_discrete_scroll (manager_evdev, device,
-                                          time_us, scroll_source);
-          }
-
         break;
-
       }
 
     case LIBINPUT_EVENT_TOUCH_DOWN:

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

@@ -29,6 +29,7 @@
 #include "clutter-seat-evdev.h"
 
 #include <linux/input.h>
+#include <math.h>
 
 #include "clutter-event-private.h"
 #include "clutter-input-device-evdev.h"
@@ -42,6 +43,8 @@
 
 #define AUTOREPEAT_VALUE 2
 
+#define DISCRETE_SCROLL_STEP 10.0
+
 void
 clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
                                       struct libinput_seat *libinput_seat)
@@ -569,6 +572,194 @@ clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
   queue_event (event);
 }
 
+static void
+notify_scroll (ClutterInputDevice       *input_device,
+               guint64                   time_us,
+               gdouble                   dx,
+               gdouble                   dy,
+               ClutterScrollSource       scroll_source,
+               ClutterScrollFinishFlags  flags,
+               gboolean                  emulated)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+  gdouble scroll_factor;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  stage = _clutter_input_device_get_stage (input_device);
+  if (stage == NULL)
+    return;
+
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  event = clutter_event_new (CLUTTER_SCROLL);
+
+  _clutter_evdev_event_set_time_usec (event, time_us);
+  event->scroll.time = us2ms (time_us);
+  event->scroll.stage = CLUTTER_STAGE (stage);
+  event->scroll.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  /* libinput pointer axis events are in pointer motion coordinate space.
+   * To convert to Xi2 discrete step coordinate space, multiply the factor
+   * 1/10. */
+  event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
+  scroll_factor = 1.0 / DISCRETE_SCROLL_STEP;
+  clutter_event_set_scroll_delta (event,
+                                  scroll_factor * dx,
+                                  scroll_factor * dy);
+
+  event->scroll.x = seat->pointer_x;
+  event->scroll.y = seat->pointer_y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+  event->scroll.scroll_source = scroll_source;
+  event->scroll.finish_flags = flags;
+
+  _clutter_event_set_pointer_emulated (event, emulated);
+
+  queue_event (event);
+}
+
+static void
+notify_discrete_scroll (ClutterInputDevice     *input_device,
+                        uint64_t                time_us,
+                        ClutterScrollDirection  direction,
+                        ClutterScrollSource     scroll_source,
+                        gboolean                emulated)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+
+  if (direction == CLUTTER_SCROLL_SMOOTH)
+    return;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  stage = _clutter_input_device_get_stage (input_device);
+  if (stage == NULL)
+    return;
+
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  event = clutter_event_new (CLUTTER_SCROLL);
+
+  _clutter_evdev_event_set_time_usec (event, time_us);
+  event->scroll.time = us2ms (time_us);
+  event->scroll.stage = CLUTTER_STAGE (stage);
+  event->scroll.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  event->scroll.direction = direction;
+
+  event->scroll.x = seat->pointer_x;
+  event->scroll.y = seat->pointer_y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+  event->scroll.scroll_source = scroll_source;
+
+  _clutter_event_set_pointer_emulated (event, emulated);
+
+  queue_event (event);
+}
+
+static void
+check_notify_discrete_scroll (ClutterSeatEvdev   *seat,
+                              ClutterInputDevice *device,
+                              uint64_t            time_us,
+                              ClutterScrollSource scroll_source)
+{
+  int i, n_xscrolls, n_yscrolls;
+
+  n_xscrolls = floor (fabs (seat->accum_scroll_dx) / DISCRETE_SCROLL_STEP);
+  n_yscrolls = floor (fabs (seat->accum_scroll_dy) / DISCRETE_SCROLL_STEP);
+
+  for (i = 0; i < n_xscrolls; i++)
+    {
+      notify_discrete_scroll (device, time_us,
+                              seat->accum_scroll_dx > 0 ?
+                              CLUTTER_SCROLL_RIGHT : CLUTTER_SCROLL_LEFT,
+                              scroll_source, TRUE);
+    }
+
+  for (i = 0; i < n_yscrolls; i++)
+    {
+      notify_discrete_scroll (device, time_us,
+                              seat->accum_scroll_dy > 0 ?
+                              CLUTTER_SCROLL_DOWN : CLUTTER_SCROLL_UP,
+                              scroll_source, TRUE);
+    }
+
+  seat->accum_scroll_dx = fmodf (seat->accum_scroll_dx, DISCRETE_SCROLL_STEP);
+  seat->accum_scroll_dy = fmodf (seat->accum_scroll_dy, DISCRETE_SCROLL_STEP);
+}
+
+void
+clutter_seat_evdev_notify_scroll_continuous (ClutterSeatEvdev         *seat,
+                                             ClutterInputDevice       *input_device,
+                                             uint64_t                  time_us,
+                                             double                    dx,
+                                             double                    dy,
+                                             ClutterScrollSource       scroll_source,
+                                             ClutterScrollFinishFlags  finish_flags)
+{
+  if (finish_flags & CLUTTER_SCROLL_FINISHED_HORIZONTAL)
+    seat->accum_scroll_dx = 0;
+  else
+    seat->accum_scroll_dx += dx;
+
+  if (finish_flags & CLUTTER_SCROLL_FINISHED_VERTICAL)
+    seat->accum_scroll_dy = 0;
+  else
+    seat->accum_scroll_dy += dy;
+
+  notify_scroll (input_device, time_us, dx, dy, scroll_source,
+                 finish_flags, FALSE);
+  check_notify_discrete_scroll (seat, input_device, time_us, scroll_source);
+}
+
+static ClutterScrollDirection
+discrete_to_direction (double discrete_dx,
+                       double discrete_dy)
+{
+  if (discrete_dx > 0)
+    return CLUTTER_SCROLL_RIGHT;
+  else if (discrete_dx < 0)
+    return CLUTTER_SCROLL_LEFT;
+  else if (discrete_dy > 0)
+    return CLUTTER_SCROLL_DOWN;
+  else if (discrete_dy < 0)
+    return CLUTTER_SCROLL_UP;
+  else
+    g_assert_not_reached ();
+}
+
+void
+clutter_seat_evdev_notify_discrete_scroll (ClutterSeatEvdev    *seat,
+                                           ClutterInputDevice  *input_device,
+                                           uint64_t             time_us,
+                                           double               discrete_dx,
+                                           double               discrete_dy,
+                                           ClutterScrollSource  scroll_source)
+{
+  notify_scroll (input_device, time_us,
+                 discrete_dx * DISCRETE_SCROLL_STEP,
+                 discrete_dy * DISCRETE_SCROLL_STEP,
+                 scroll_source, CLUTTER_SCROLL_FINISHED_NONE,
+                 TRUE);
+  notify_discrete_scroll (input_device, time_us,
+                          discrete_to_direction (discrete_dx, discrete_dy),
+                          scroll_source, FALSE);
+
+}
+
 void
 clutter_seat_evdev_free (ClutterSeatEvdev *seat)
 {

clutter/clutter/evdev/clutter-seat-evdev.h

@@ -106,6 +106,21 @@ void clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
                                        uint32_t            button,
                                        uint32_t            state);
 
+void clutter_seat_evdev_notify_scroll_continuous (ClutterSeatEvdev         *seat,
+                                                  ClutterInputDevice       *input_device,
+                                                  uint64_t                  time_us,
+                                                  double                    dx,
+                                                  double                    dy,
+                                                  ClutterScrollSource       source,
+                                                  ClutterScrollFinishFlags  flags);
+
+void clutter_seat_evdev_notify_discrete_scroll (ClutterSeatEvdev    *seat,
+                                                ClutterInputDevice  *input_device,
+                                                uint64_t             time_us,
+                                                double               discrete_dx,
+                                                double               discrete_dy,
+                                                ClutterScrollSource  source);
+
 void clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
                                            struct libinput_seat *libinput_seat);
 

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

@@ -156,6 +156,9 @@ clutter_virtual_input_device_evdev_notify_relative_motion (ClutterVirtualInputDe
   ClutterVirtualInputDeviceEvdev *virtual_evdev =
     CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
 
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
   clutter_seat_evdev_notify_relative_motion (virtual_evdev->seat,
                                              virtual_evdev->device,
                                              time_us,
@@ -172,6 +175,9 @@ clutter_virtual_input_device_evdev_notify_absolute_motion (ClutterVirtualInputDe
   ClutterVirtualInputDeviceEvdev *virtual_evdev =
     CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
 
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
   clutter_seat_evdev_notify_absolute_motion (virtual_evdev->seat,
                                              virtual_evdev->device,
                                              time_us,
@@ -189,6 +195,9 @@ clutter_virtual_input_device_evdev_notify_button (ClutterVirtualInputDevice *vir
     CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
   int button_count;
 
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
   if (get_button_type (button) != EVDEV_BUTTON_TYPE_BUTTON)
     {
       g_warning ("Unknown/invalid virtual device button 0x%x pressed",
@@ -222,6 +231,9 @@ clutter_virtual_input_device_evdev_notify_key (ClutterVirtualInputDevice *virtua
     CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
   int key_count;
 
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
   if (get_button_type (key) != EVDEV_BUTTON_TYPE_KEY)
     {
       g_warning ("Unknown/invalid virtual device key 0x%x pressed\n", key);
@@ -343,6 +355,9 @@ clutter_virtual_input_device_evdev_notify_keyval (ClutterVirtualInputDevice *vir
   int key_count;
   guint keycode = 0, level = 0, evcode = 0;
 
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
   if (!pick_keycode_for_keyval_in_current_group (virtual_device,
                                                  keyval, &keycode, &level))
     {
@@ -382,6 +397,57 @@ clutter_virtual_input_device_evdev_notify_keyval (ClutterVirtualInputDevice *vir
     apply_level_modifiers (virtual_device, time_us, level, key_state);
 }
 
+static void
+direction_to_discrete (ClutterScrollDirection direction,
+                       double                *discrete_dx,
+                       double                *discrete_dy)
+{
+  switch (direction)
+    {
+    case CLUTTER_SCROLL_UP:
+      *discrete_dx = 0.0;
+      *discrete_dy = -1.0;
+      break;
+    case CLUTTER_SCROLL_DOWN:
+      *discrete_dx = 0.0;
+      *discrete_dy = 1.0;
+      break;
+    case CLUTTER_SCROLL_LEFT:
+      *discrete_dx = -1.0;
+      *discrete_dy = 0.0;
+      break;
+    case CLUTTER_SCROLL_RIGHT:
+      *discrete_dx = 1.0;
+      *discrete_dy = 0.0;
+      break;
+    case CLUTTER_SCROLL_SMOOTH:
+      g_assert_not_reached ();
+      break;
+    }
+}
+
+static void
+clutter_virtual_input_device_evdev_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
+                                                           uint64_t                   time_us,
+                                                           ClutterScrollDirection     direction,
+                                                           ClutterScrollSource        scroll_source)
+{
+  ClutterVirtualInputDeviceEvdev *virtual_evdev =
+    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
+  double discrete_dx = 0.0, discrete_dy = 0.0;
+
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
+  direction_to_discrete (direction, &discrete_dx, &discrete_dy);
+
+  clutter_seat_evdev_notify_discrete_scroll (virtual_evdev->seat,
+                                             virtual_evdev->device,
+                                             time_us,
+                                             discrete_dx, discrete_dy,
+                                             scroll_source);
+}
+
 static void
 clutter_virtual_input_device_evdev_get_property (GObject    *object,
                                                  guint       prop_id,
@@ -485,6 +551,7 @@ clutter_virtual_input_device_evdev_class_init (ClutterVirtualInputDeviceEvdevCla
   virtual_input_device_class->notify_button = clutter_virtual_input_device_evdev_notify_button;
   virtual_input_device_class->notify_key = clutter_virtual_input_device_evdev_notify_key;
   virtual_input_device_class->notify_keyval = clutter_virtual_input_device_evdev_notify_keyval;
+  virtual_input_device_class->notify_discrete_scroll = clutter_virtual_input_device_evdev_notify_discrete_scroll;
 
   obj_props[PROP_SEAT] = g_param_spec_pointer ("seat",
                                                P_("ClutterSeatEvdev"),

clutter/clutter/x11/clutter-settings-x11.h

@@ -14,7 +14,6 @@ static const struct {
   { "Xft/HintStyle",           "font-hint-style" },
   { "Xft/RGBA",                "font-subpixel-order" },
   { "Fontconfig/Timestamp",    "fontconfig-timestamp" },
-  { "Gdk/UnscaledDPI",         "unscaled-font-dpi" },
 };
 
 static const gint _n_clutter_settings_map = G_N_ELEMENTS (_clutter_settings_map);

cogl/cogl/cogl-mutter.h

@@ -43,6 +43,7 @@
 #include <cogl/winsys/cogl-winsys-private.h>
 
 void cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
-                                      CoglCustomWinsysVtableGetter winsys_vtable_getter);
+                                      CoglCustomWinsysVtableGetter winsys_vtable_getter,
+                                      void                        *user_data);
 
 #endif /* __COGL_MUTTER_H___ */

cogl/cogl/cogl-renderer-private.h

@@ -54,6 +54,7 @@ struct _CoglRenderer
   const CoglDriverVtable *driver_vtable;
   const CoglTextureDriver *texture_driver;
   const CoglWinsysVtable *winsys_vtable;
+  void *custom_winsys_user_data;
   CoglCustomWinsysVtableGetter custom_winsys_vtable_getter;
   CoglWinsysID winsys_id_override;
   GList *constraints;

cogl/cogl/cogl-renderer.c

@@ -566,8 +566,10 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
 
 void
 cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
-                                 CoglCustomWinsysVtableGetter winsys_vtable_getter)
+                                 CoglCustomWinsysVtableGetter winsys_vtable_getter,
+                                 void                        *user_data)
 {
+  renderer->custom_winsys_user_data = user_data;
   renderer->custom_winsys_vtable_getter = winsys_vtable_getter;
 }
 

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ(2.62)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [25])
-m4_define([mutter_micro_version], [91])
+m4_define([mutter_minor_version], [27])
+m4_define([mutter_micro_version], [1])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -80,6 +80,7 @@ CANBERRA_GTK_VERSION=0.26
 LIBWACOM_VERSION=0.13
 
 MUTTER_PC_MODULES="
+   gl
    egl
    gtk+-3.0 >= 3.19.8
    gio-unix-2.0 >= 2.35.1
@@ -225,10 +226,10 @@ AC_MSG_CHECKING([gudev])
 if test x$with_gudev = xno ; then
   AC_MSG_RESULT([disabled])
 else
-  if $PKG_CONFIG --exists gudev-1.0; then
+  if $PKG_CONFIG --exists "gudev-1.0 >= 232"; then
     have_gudev=yes
     AC_MSG_RESULT(yes)
-    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0"
+    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0 >= 232"
     AC_DEFINE([HAVE_LIBGUDEV], 1, [Building with gudev for device type detection])
   else
     AC_MSG_RESULT(no)
@@ -238,6 +239,21 @@ else
   fi
 fi
 
+AC_ARG_ENABLE(remote-desktop,
+  AS_HELP_STRING([--enable-remote-desktop], [enable support for remote desktop and screen cast]),
+  enable_remote_desktop=yes,
+  enable_remote_desktop=no
+)
+AS_IF([test "$enable_remote_desktop" = "yes"], [
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libpipewire-0.1 >= 0.1.4"
+  PKG_CHECK_EXISTS([libpipewire-0.1], [
+    pw_micro=`$PKG_CONFIG --modversion libpipewire-0.1 | cut -d. -f3`
+    AC_DEFINE_UNQUOTED([PIPEWIRE_VERSION_MICRO],[$pw_micro], [Pipewire micro version used])
+  ])
+  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"])
+
 INTROSPECTION_VERSION=0.9.5
 GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])
 
@@ -513,6 +529,7 @@ mutter-$VERSION
 	Wayland:                  ${have_wayland}
 	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/be.po

@@ -5,8 +5,8 @@ msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-04-21 21:33+0000\n"
-"PO-Revision-Date: 2017-04-23 16:56+0300\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-01 18:44+0300\n"
 "Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\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 ""
 "Каб уключыць эксперыментальныя функцыі, дадайце адпаведнае ключавое слова ў "
 "гэты ліст. Некаторыя функцыі могуць патрабаваць перазапуску кампазітара. "
@@ -418,16 +421,27 @@ msgstr ""
 "\"scale-monitor-framebuffer\" - прымушае mutter прадвызначана размяшчаць "
 "лагічныя маніторы ў лагічнай прасторы каардынат пікселаў, пры гэтым "
 "маштабаваць кадравы буфер, а не змесціва акна, для падтрымкі 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: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 "Перайсці ў віртуальны тэрмінал 1"
@@ -476,10 +490,14 @@ msgstr "Перайсці ў віртуальны тэрмінал 11"
 msgid "Switch to VT 12"
 msgstr "Перайсці ў віртуальны тэрмінал 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Уключыць назад клавіятурныя скароты"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1848
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Пераключыць рэжым (група %d)"
@@ -487,37 +505,37 @@ msgstr "Пераключыць рэжым (група %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1870
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Пераключыць манітор"
 
-#: src/backends/meta-input-settings.c:1872
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Паказаць экранную даведку"
 
-#: src/backends/meta-monitor-manager.c:783
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Убудаваны дысплей"
 
-#: src/backends/meta-monitor-manager.c:806
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Невядомы"
 
-#: src/backends/meta-monitor-manager.c:808
+#: src/backends/meta-monitor-manager.c:928
 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:816
+#: src/backends/meta-monitor-manager.c:936
 #, 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:474
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -528,31 +546,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Падзея з сігналам"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "\"%s\" не адказвае на запыты."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Праграма не адказвае на запыты."
-
-#: 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/delete.c:141
-msgid "_Force Quit"
-msgstr "_Змусіць да выхаду"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Пачакаць"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -594,6 +587,31 @@ msgstr "Запусціць у якасці ўложанага кампазіта
 msgid "Run as a full display server, rather than nested"
 msgstr "Запусціць у якасці паўнавартаснага сервера дысплея, я не як уложаны "
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "\"%s\" не адказвае на запыты."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Праграма не адказвае на запыты."
+
+#: 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:161
+msgid "_Force Quit"
+msgstr "_Змусіць да выхаду"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Пачакаць"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/ca.po

@@ -5,7 +5,7 @@
 # Jesús Moreno <jmmolas@wanadoo.es>, 2002.
 # Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005, 2006, 2007, 2008.
 # David Planella <david.planella@gmail.com>, 2008, 2009, 2011, 2012.
-# Jordi Serratosa <jordis@softcatala.cat>, 2012.
+# Jordi Serratosa <jordis@softcatala.cat>, 2012, 2017.
 # Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014, 2016.
 #
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: metacity 2.24\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-21 04:46+0000\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"
@@ -240,7 +240,7 @@ msgstr ""
 
 #: 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, o sinó baixa-la"
+msgstr "Alça la finestra si està coberta per una altra; altrament, baixa-la"
 
 #: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
@@ -306,7 +306,7 @@ msgstr ""
 #: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Habilita la tesselització a les vores en deixar anar les finestres a les "
+"Habilita la tessel·lització a les vores en deixar anar les finestres a les "
 "vores de la pantalla"
 
 #: data/org.gnome.mutter.gschema.xml.in:31
@@ -424,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"
 

po/cs.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: mutter\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-21 04:46+0000\n"
-"PO-Revision-Date: 2017-08-22 18:29+0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-31 00:11+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>>\n"
 "Language: cs\n"
@@ -413,32 +413,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 ""
 "Chcete-li povolit experimentální funkce, přidejte klíčové slovo funkce do "
 "seznamu. Zda funkce vyžaduje restartování kompozitoru, závisí na dané "
 "funkci. Ne u každé experimentální funkce je vyžadováno, aby byla stále "
 "dostupná nebo konfigurovatelná. Neočekávejte, že by bylo v tomto nastavení "
 "přidáno něco, co by do budoucna přineslo vylepšení. V současné době jsou "
-"možná tato klíčová slova: • „scale-monitor-framebuffer“ – zajistí, "
-"aby byl mutter výchozí pro logické uspořádání monitorů v logickém "
-"souřadnicovém prostoru pixelů, zatímco škáluje přímo v grafické vyrovnávací "
-"paměti, namísto v obsahu oken, aby se postaral o správu montorů s HiDPI. "
-"Nevyžaduje restart."
+"možná tato klíčová slova: • „scale-monitor-framebuffer“ – zajistí, aby byl "
+"mutter výchozí pro logické uspořádání monitorů v logickém souřadnicovém "
+"prostoru pixelů, zatímco škáluje přímo v grafické vyrovnávací paměti, "
+"namísto v obsahu oken, aby se postaral o správu montorů s HiDPI. Nevyžaduje "
+"restart. • „remote-desktop“ – zapne podporu pro vzdálenou pracovní plochu. "
+"Pro podporu vzdálené plochy se sdílením obrazovky musít být zapnuto také "
+"„screen-cast“. • „screen-cast“ – zapne podporu pro vysílání obsahu obrazovky."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Vybrat okno z překryvné nabídky tabulátoru"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Zrušit překryvné okno tabulátoru"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Přepnout nastavení monitoru"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Postupně mění vestavěná nastavení monitoru"
 

po/de.po

@@ -5,7 +5,7 @@
 # Hendrik Richter <hendrikr@gnome.org>, 2005, 2006, 2007, 2008.
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016-2017.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011, 2012.
-# Wolfgang Stöggl <c72578@yahoo.de> 2011.
+# Wolfgang Stöggl <c72578@yahoo.de> 2011, 2017.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
 #
 msgid ""
@@ -13,16 +13,16 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-05-10 19:07+0000\n"
-"PO-Revision-Date: 2017-05-12 17:35+0200\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-30 17:07+0200\n"
+"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\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.1\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -134,7 +134,7 @@ msgstr "Systemsteuerungen sofort umschalten"
 
 #: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
-msgstr "Direkt zur vorherigen Systemsteuerungen wechselen"
+msgstr "Direkt zur vorherigen Systemsteuerungen wechseln"
 
 #: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
@@ -412,7 +412,6 @@ msgid "Enable experimental features"
 msgstr "Experimentelle Funktionsmerkmale aktivieren"
 
 #: 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 "
@@ -421,23 +420,43 @@ 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 "
-"Compositor neu gestartet werden, um es zu aktivieren. Für diese "
-"experimentellen Funktionsmerkmale gilt, dass sie nicht unbedingt dauerhaft "
-"verfügbar sein werden, oder Einstellungen möglich sind. Derzeit mögliche "
-"Schlüsselwörter: • “scale-monitor-framebuffer” — "
+"Compositor neu gestartet werden, um es zu aktivieren, dies ist vom "
+"Funktionsmerkmal abhängig. Für diese experimentellen Funktionsmerkmale gilt, "
+"dass sie nicht unbedingt dauerhaft verfügbar sein werden, oder Einstellungen "
+"möglich sind. Derzeit mögliche Schlüsselwörter: • »scale-monitor-"
+"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. • »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: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:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Wechselt die Konfiguration des eingebauten Bildschirms"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Zum virtuellen Terminal 1 wechseln"
@@ -486,10 +505,14 @@ msgstr "Zum virtuellen Terminal 11 wechseln"
 msgid "Switch to VT 12"
 msgstr "Zum virtuellen Terminal 12 wechseln"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Tastenkombinationen erneut aktivieren"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1848
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Moduswechsel (Gruppe %d)"
@@ -497,37 +520,37 @@ msgstr "Moduswechsel (Gruppe %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1870
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Bildschirm wechseln"
 
-#: src/backends/meta-input-settings.c:1872
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Bildschirmhilfe anzeigen"
 
-#: src/backends/meta-monitor-manager.c:783
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Eingebaute Anzeige"
 
-#: src/backends/meta-monitor-manager.c:806
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/backends/meta-monitor-manager.c:808
+#: src/backends/meta-monitor-manager.c:928
 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:816
+#: src/backends/meta-monitor-manager.c:936
 #, 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:474
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -539,32 +562,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Klangereignis"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "»%s« antwortet nicht."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Die Anwendung antwortet nicht."
-
-#: 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 ""
-"Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
-"erzwingen."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Beenden erzwingen"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Warten"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -606,6 +603,32 @@ msgstr "Als eingebetteten Compositor ausführen"
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
 
+#. Translators: %s is a window title
+#: 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:149
+msgid "Application is not responding."
+msgstr "Die Anwendung antwortet nicht."
+
+#: 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 ""
+"Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
+"erzwingen."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Beenden erzwingen"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Warten"
+
 # CHECK
 # c-format
 #: src/core/mutter.c:39

po/eu.po

@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-16 22:07+0100\n"
+"POT-Creation-Date: 2017-08-21 04:46+0000\n"
+"PO-Revision-Date: 2017-08-27 16:47+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
@@ -270,11 +270,6 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Aldatzailea leihoak kudeatzeko eragiketa hedatuetan erabiltzeko"
 
 #: 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 "
@@ -320,10 +315,6 @@ msgid "Workspaces are managed dynamically"
 msgstr "Laneko areak dinamikoki kudeatzen dira"
 
 #: 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 "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -362,10 +353,6 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Atzeratu fokuaren aldaketa erakuslea mugitzeari utzi arte"
 
 #: 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 "
@@ -380,9 +367,6 @@ msgid "Draggable border width"
 msgstr "Ertz arrastragarriaren zabalera"
 
 #: 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 "
 "not enough, invisible borders will be added to meet this value."
@@ -414,14 +398,50 @@ msgstr ""
 "TRUE (egia) denean, leiho berriak beti jarriko dira monitorearen pantaila "
 "aktiboaren zentroan."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Gaitu eginbide esperimentalak"
+
+#: 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 ""
+"Eginbide esperimentalak gaitzeko, gehitu eginbidearen gakoa zerrendari. "
+"Eginbideak osatzailea berrabiaraztea behar duen edo ez emandako eginbidearen "
+"arabera dago. Ez da derrigorrezkoa edozer eginbide esperimental eskuragarri "
+"edo konfiguragarria egotea. Ez uste ezarpen honetan edozer gehitzeak "
+"etorkizuneko "
+"proba izango denik. Gako erabilgarriak: "
+"• “scale-monitor-framebuffer” — honek mutter monitoreen diseinu logikoetara "
+"lehenesten du espazioaren koordenatuko pixel logikoetan (leihoaren edukiaren "
+"ordez "
+"monitorearen framebufferra eskalatzean) HiDPI monitoreak kudeatzeko. Ez du "
+"berrabiaraztea eskatzen."
+
+#: data/org.gnome.mutter.gschema.xml.in:141
 msgid "Select window from tab popup"
 msgstr "Hautatu leihoa laster-fitxatik"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:146
 msgid "Cancel tab popup"
 msgstr "Utzi laster-fitxa"
 
+#: data/org.gnome.mutter.gschema.xml.in:151
+#| msgid "Switch monitor"
+msgid "Switch monitor configurations"
+msgstr "Aldatu monitorearen konfigurazioak"
+
+#: data/org.gnome.mutter.gschema.xml.in:156
+msgid "Rotates the built-in monitor configuration"
+msgstr "Biratu barneko monitorearen konfigurazioa"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Aldatu 1. TBra"
@@ -470,92 +490,65 @@ msgstr "Aldatu 11. TBra"
 msgid "Switch to VT 12"
 msgstr "Aldatu 12. TBra"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Gaitu berriro laster-teklak"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1759
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Modu aldaketa (%d taldea)"
 
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Aldatu monitorea"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Erakutsi pantailako laguntza"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Bertako pantaila"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Pantaila ezezaguna"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:936
 #, 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:471
+#: src/compositor/compositor.c:476
 #, 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”."
 msgstr ""
-"Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen “%2$s“ "
-"pantailako %1$i. monitorean."
+"Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen “%2$s“ pantailako "
+"%1$i. monitorean."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Soinuaren gertaera"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "'%s'(e)k ez du erantzuten."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Aplikazioak ez du erantzuten."
-
-#: 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 ""
-"Aukeratu piskatean zai egotea aplikazioak jarraitzeko edo derrigortu "
-"aplikazioa erabat ixtea."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Behartu ixtera"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Itxaron"
-
 #: src/core/display.c:608
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Huts egin du X Window sistemaren “%s“ pantaila irekitzean\n"
 
@@ -595,14 +588,34 @@ msgstr "Exekutatu habiaratutako konposatzaile gisa"
 msgid "Run as a full display server, rather than nested"
 msgstr "Exekutatu pantaila-zerbitzari oso bezala, habiaratuta baino"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "'%s'(e)k ez du erantzuten."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Aplikazioak ez du erantzuten."
+
+#: 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 ""
+"Aukeratu piskatean zai egotea aplikazioak jarraitzeko edo derrigortu "
+"aplikazioa erabat ixtea."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Behartu ixtera"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Itxaron"
+
 #: 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"
@@ -631,9 +644,6 @@ msgstr "%d. laneko area"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@@ -643,7 +653,6 @@ msgstr ""
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "“%2$s“ bistaratzeko %1$d pantaila ez da baliozkoa\n"
 
@@ -657,9 +666,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Modu aldaketa: %d modua"
 
 #: src/x11/session.c:1815
-#| 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."

po/fi.po

@@ -12,10 +12,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-13 11:15+0000\n"
-"PO-Revision-Date: 2015-03-13 17:52+0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-30 19:16+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <gnome-fi-laatu@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -24,282 +24,288 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-POT-Import-Date: 2012-02-19 15:25:23+0000\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/50-mutter-navigation.xml:6
 msgid "Navigation"
 msgstr "Navigointi"
 
-#: ../data/50-mutter-navigation.xml.in.h:2
+#: data/50-mutter-navigation.xml:9
 msgid "Move window to workspace 1"
 msgstr "Siirrä ikkuna työtilaan 1"
 
-#: ../data/50-mutter-navigation.xml.in.h:3
+#: data/50-mutter-navigation.xml:12
 msgid "Move window to workspace 2"
 msgstr "Siirrä ikkuna työtilaan 2"
 
-#: ../data/50-mutter-navigation.xml.in.h:4
+#: data/50-mutter-navigation.xml:15
 msgid "Move window to workspace 3"
 msgstr "Siirrä ikkuna työtilaan 3"
 
-#: ../data/50-mutter-navigation.xml.in.h:5
+#: data/50-mutter-navigation.xml:18
 msgid "Move window to workspace 4"
 msgstr "Siirrä ikkuna työtilaan 4"
 
-#: ../data/50-mutter-navigation.xml.in.h:6
+#: data/50-mutter-navigation.xml:21
 msgid "Move window to last workspace"
 msgstr "Siirrä ikkuna viimeiseen työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:7
+#: data/50-mutter-navigation.xml:24
 msgid "Move window one workspace to the left"
 msgstr "Siirrä ikkunaa yksi työtila vasemmalle"
 
-#: ../data/50-mutter-navigation.xml.in.h:8
+#: data/50-mutter-navigation.xml:27
 msgid "Move window one workspace to the right"
 msgstr "Siirrä ikkunaa yksi työtila oikealle"
 
-#: ../data/50-mutter-navigation.xml.in.h:9
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Siirrä ikkunaa yksi työtila ylös"
 
-#: ../data/50-mutter-navigation.xml.in.h:10
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Siirrä ikkunaa yksi työtila alas"
 
-#: ../data/50-mutter-navigation.xml.in.h:11
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Siirrä ikkuna yhden näytön verran vasemmalle"
 
-#: ../data/50-mutter-navigation.xml.in.h:12
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Siirrä ikkuna yhden näytön verran oikealle"
 
-#: ../data/50-mutter-navigation.xml.in.h:13
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Siirrä ikkuna yhden näytön verran ylös"
 
-#: ../data/50-mutter-navigation.xml.in.h:14
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Siirrä ikkuna yhden näytön verran alas"
 
-#: ../data/50-mutter-navigation.xml.in.h:15
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Vaihda sovelluksia"
 
-#: ../data/50-mutter-navigation.xml.in.h:16
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Vaihda edelliseen sovellukseen"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Vaihda ikkunoita"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Vaihda edelliseen ikkunaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Vaihda sovelluksen ikkunoiden välillä"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Vaihda sovelluksen edelliseen ikkunaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: data/50-mutter-navigation.xml:76
 #, fuzzy
 msgid "Switch system controls"
 msgstr "Vaihda järjestelmän kontrolleja"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: data/50-mutter-navigation.xml:81
 #, fuzzy
 msgid "Switch to previous system control"
 msgstr "Vaihda järjestelmän kontrolleja"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Vaihda ikkunoita suoraan"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Vaihda suoraan edelliseen ikkunaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Vaihda sovelluksen ikkunoiden välillä suoraan"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: data/50-mutter-navigation.xml:99
 #, fuzzy
 #| msgid "Switch windows of an application"
 msgid "Switch directly to previous window of an app"
 msgstr "Vaihda sovelluksen ikkunoiden välillä"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
+#: data/50-mutter-navigation.xml:103
 #, fuzzy
 msgid "Switch system controls directly"
 msgstr "Vaihda järjestelmän kontrolleja suoraan"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: data/50-mutter-navigation.xml:108
 #, fuzzy
 msgid "Switch directly to previous system control"
 msgstr "Vaihda järjestelmän kontrolleja"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Piilota kaikki tavalliset ikkunat"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Siirry työtilaan 1"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Siirry työtilaan 2"
 
-#: ../data/50-mutter-navigation.xml.in.h:32
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Siirry työtilaan 3"
 
-#: ../data/50-mutter-navigation.xml.in.h:33
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Siirry työtilaan 4"
 
-#: ../data/50-mutter-navigation.xml.in.h:34
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Siirry viimeiseen työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:35
+#: data/50-mutter-navigation.xml:129
 msgid "Move to workspace left"
 msgstr "Siirrä vasemmalla olevaan työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:36
+#: data/50-mutter-navigation.xml:132
 msgid "Move to workspace right"
 msgstr "Siirrä oikealla olevaan työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:37
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Siirrä yllä olevaan työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:38
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Siirrä alla olevaan työtilaan"
 
-#: ../data/50-mutter-system.xml.in.h:1
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Järjestelmä"
 
-#: ../data/50-mutter-system.xml.in.h:2
+#: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
 msgstr "Näytä komennonsuorituskehote"
 
-#: ../data/50-mutter-system.xml.in.h:3
+#: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
 msgstr "Näytä toimintojen yleisnäkymä"
 
-#: ../data/50-mutter-windows.xml.in.h:1
+#: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Ikkunat"
 
-#: ../data/50-mutter-windows.xml.in.h:2
+#: data/50-mutter-windows.xml:8
 msgid "Activate the window menu"
 msgstr "Aktivoi ikkunavalikko"
 
-#: ../data/50-mutter-windows.xml.in.h:3
+#: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
 msgstr "Vaihda koko näytön tilaan tai pois"
 
-#: ../data/50-mutter-windows.xml.in.h:4
+#: data/50-mutter-windows.xml:12
 #, fuzzy
 msgid "Toggle maximization state"
 msgstr "Vaihda suurennustilaa"
 
-#: ../data/50-mutter-windows.xml.in.h:5
+#: data/50-mutter-windows.xml:14
 msgid "Maximize window"
 msgstr "Suurenna ikkuna"
 
-#: ../data/50-mutter-windows.xml.in.h:6
+#: data/50-mutter-windows.xml:16
 msgid "Restore window"
 msgstr "Palauta ikkunan koko"
 
-#: ../data/50-mutter-windows.xml.in.h:7
+#: data/50-mutter-windows.xml:18
 #, fuzzy
 msgid "Toggle shaded state"
 msgstr "Vaihda rullaustilaa"
 
-#: ../data/50-mutter-windows.xml.in.h:8
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Sulje ikkuna"
 
-#: ../data/50-mutter-windows.xml.in.h:9
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Piilota ikkuna"
 
-#: ../data/50-mutter-windows.xml.in.h:10
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Siirrä ikkunaa"
 
-#: ../data/50-mutter-windows.xml.in.h:11
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Muuta ikkunan kokoa"
 
-#: ../data/50-mutter-windows.xml.in.h:12
+#: data/50-mutter-windows.xml:29
 #, fuzzy
 msgid "Toggle window on all workspaces or one"
 msgstr "Valitse onko ikkuna yhdessä vai kaikissa työtiloissa"
 
-#: ../data/50-mutter-windows.xml.in.h:13
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Nosta ikkuna, jos se on peittynyt, muuten laske se"
 
-#: ../data/50-mutter-windows.xml.in.h:14
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Nosta ikkuna muiden päälle"
 
-#: ../data/50-mutter-windows.xml.in.h:15
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Laske ikkuna muiden alle"
 
-#: ../data/50-mutter-windows.xml.in.h:16
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Suurenna ikkuna pystysuunnassa"
 
-#: ../data/50-mutter-windows.xml.in.h:17
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Suurenna ikkuna vaakasuunnassa"
 
-#: ../data/50-mutter-windows.xml.in.h:18
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr ""
 
-#: ../data/50-mutter-windows.xml.in.h:19
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr ""
 
-#: ../data/mutter.desktop.in.h:1
+#: data/mutter.desktop.in:4
 msgid "Mutter"
 msgstr "Mutter"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:7
 msgid "Modifier to use for extended window management operations"
 msgstr "Muunnosnäppäin laajennettuja ikkunoidenhallintatoimintoja varten"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:2
+#: data/org.gnome.mutter.gschema.xml.in:8
+#, fuzzy
+#| 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 ""
 "Tämä avain asettaa ”overlay”-tilan (peite), joka on yhdistelmä "
 "ikkunoidenhallintaa ja sovellusten käynnistämisjärjestelmää. Oletuksena "
 "käytetään ”Windows”-näppäintä PC-tietokoneissa. Odotuksena on, että tämä "
 "näppäinsidos on joko oletus tai sen arvona on tyhjä."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "Liitä modaalisia valintaikkunoita"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:4
+#: data/org.gnome.mutter.gschema.xml.in:21
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -309,33 +315,33 @@ msgstr ""
 "liitetään pääikkunan otsikkopalkkiin ja niitä siirretään yhdessä pääikkunan "
 "kanssa."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:5
+#: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:6
+#: data/org.gnome.mutter.gschema.xml.in:31
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "Työtilat hallitaan dynaamisesti"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:8
+#: 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 ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "Työtilat vain ensisijaisella"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:10
+#: data/org.gnome.mutter.gschema.xml.in:51
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@@ -343,222 +349,289 @@ msgstr ""
 "Määrittää tapahtuuko työtilan vaihto ikkunoille kaikilla näytöillä vaiko "
 "vain ikkunoille ensisijaisella näytöllä."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:12
+#: data/org.gnome.mutter.gschema.xml.in:60
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:13
+#: data/org.gnome.mutter.gschema.xml.in:68
 msgid "Delay focus changes until the pointer stops moving"
 msgstr ""
 "Viivästytä kohdistuksen vaihtumista, kunnes osoitin lopettaa liikkumisen"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:14
+#: 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 ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Raahattava reunaleveys"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:16
+#: data/org.gnome.mutter.gschema.xml.in:80
+#, fuzzy
+#| 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 ""
 "Raahattavien reunojen määrä yhteensä. Mikäli teeman näkyvät reunat eivät "
 "riitä, näkymätöntä reunaa lisätään täyttämään tämä arvo."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:17
+#: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:18
+#: data/org.gnome.mutter.gschema.xml.in:90
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:19
+#: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
 msgstr "Aseta uudet ikkunat keskelle näyttöä"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:20
+#: data/org.gnome.mutter.gschema.xml.in:99
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:21
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Ota käyttöön kokeelliset ominaisuudet"
+
+#: 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 ""
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 #, fuzzy
 msgid "Select window from tab popup"
 msgstr "Poista ikkuna päältä"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr ""
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:155
+#, fuzzy
+#| msgid "Switch applications"
+msgid "Switch monitor configurations"
+msgstr "Vaihda sovelluksia"
+
+#: 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 "Siirry virtuaalikonsoliin 1"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+#: data/org.gnome.mutter.wayland.gschema.xml.in:10
 msgid "Switch to VT 2"
 msgstr "Siirry virtuaalikonsoliin 2"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+#: data/org.gnome.mutter.wayland.gschema.xml.in:14
 msgid "Switch to VT 3"
 msgstr "Siirry virtuaalikonsoliin 3"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+#: data/org.gnome.mutter.wayland.gschema.xml.in:18
 msgid "Switch to VT 4"
 msgstr "Siirry virtuaalikonsoliin 4"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+#: data/org.gnome.mutter.wayland.gschema.xml.in:22
 msgid "Switch to VT 5"
 msgstr "Siirry virtuaalikonsoliin 5"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+#: data/org.gnome.mutter.wayland.gschema.xml.in:26
 msgid "Switch to VT 6"
 msgstr "Siirry virtuaalikonsoliin 6"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+#: data/org.gnome.mutter.wayland.gschema.xml.in:30
 msgid "Switch to VT 7"
 msgstr "Siirry virtuaalikonsoliin 7"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "Siirry virtuaalikonsoliin 8"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "Siirry virtuaalikonsoliin 9"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "Siirry virtuaalikonsoliin 10"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "Siirry virtuaalikonsoliin 11"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "Siirry virtuaalikonsoliin 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr ""
+
+#. TRANSLATORS: This string refers to a button that switches between
+#. * different modes.
+#.
+#: src/backends/meta-input-settings.c:2151
+#, c-format
+msgid "Mode Switch (Group %d)"
+msgstr ""
+
+#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
+#. * mapping through the available outputs.
+#.
+#: src/backends/meta-input-settings.c:2174
+#, fuzzy
+msgid "Switch monitor"
+msgstr "Vaihda järjestelmän kontrolleja"
+
+#: src/backends/meta-input-settings.c:2176
+msgid "Show on-screen help"
+msgstr ""
+
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Sisäänrakennettu näyttö"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Tuntematon näyttö"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: src/backends/meta-monitor-manager.c:936
 #, 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:456
-#, c-format
+#: src/compositor/compositor.c:476
+#, fuzzy, 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 ""
 "Näytön ”%2$s” ruudullä %1$d on jo käynnissä toinen ikkunoidenladontaohjelman."
 
-#: ../src/core/bell.c:185
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Äänimerkki"
 
-#: ../src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "X-ikkunointijärjestelmän näytön “%s” avaaminen epäonnistui\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "Estä yhteys sessionhallintaan"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "Vaihda käytössä oleva ikkunanhallinta"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "Anna sessionhallinnan ID"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Käytettävä X-näyttö"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "Alusta sessio tiedostosta"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "Käytä synkronisia X-kutsuja"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "Suorita wayland-koostajana"
+
+#: src/core/main.c:231
+#, fuzzy
+#| msgid "Run as a wayland compositor"
+msgid "Run as a nested compositor"
+msgstr "Suorita wayland-koostajana"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr ""
+
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "\"%s\" ei vastaa."
 
-#: ../src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Sovellus ei vastaa."
 
-#: ../src/core/delete.c:134
+#: 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 ""
 "Voit odottaa sovellusta vielä hetken tai sulkea sovelluksen väkisin heti."
 
-#: ../src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Odota"
-
-#: ../src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "Sulje _väkisin"
 
-#: ../src/core/display.c:562
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "X-ikkunointijärjestelmän näytön ”%s” avaaminen epäonnistui\n"
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Odota"
 
-#: ../src/core/main.c:176
-msgid "Disable connection to session manager"
-msgstr "Estä yhteys sessionhallintaan"
-
-#: ../src/core/main.c:182
-msgid "Replace the running window manager"
-msgstr "Vaihda käytössä oleva ikkunanhallinta"
-
-#: ../src/core/main.c:188
-msgid "Specify session management ID"
-msgstr "Anna sessionhallinnan ID"
-
-#: ../src/core/main.c:193
-msgid "X Display to use"
-msgstr "Käytettävä X-näyttö"
-
-#: ../src/core/main.c:199
-msgid "Initialize session from savefile"
-msgstr "Alusta sessio tiedostosta"
-
-#: ../src/core/main.c:205
-msgid "Make X calls synchronous"
-msgstr "Käytä synkronisia X-kutsuja"
-
-#: ../src/core/main.c:212
-msgid "Run as a wayland compositor"
-msgstr "Suorita wayland-koostajana"
-
-#: ../src/core/main.c:220
-msgid "Run as a full display server, rather than nested"
-msgstr ""
-
-#: ../src/core/mutter.c:39
-#, c-format
+#: src/core/mutter.c:39
+#, fuzzy, 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 (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 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"
@@ -569,49 +642,59 @@ msgstr ""
 "Ei MINKÄÄNLAISTA takuuta: ei edes takuuta MYYNTIKELPOISUUDESTA tai\n"
 "SOPIVUUDESTA JOHONKIN KÄYTTÖÖN.\n"
 
-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "Näytä versio"
 
-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Käytettävä Mutter-liitännäinen"
 
-#: ../src/core/prefs.c:2004
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Työtila %d"
 
-#: ../src/core/screen.c:525
-#, c-format
+#: src/core/screen.c:580
+#, fuzzy, c-format
 #| msgid ""
-#| "Screen %d on display \"%s\" already has a window manager; try using the --"
-#| "replace option to replace the current window manager.\n"
+#| "Display \"%s\" already has a window manager; try using the --replace "
+#| "option to replace the current window manager."
 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 ""
 "Näytöllä ”%s” on jo ikkunointiohjelma: kokeile valitsinta --replace, jos "
 "haluat korvata nykyisen ikkunointiohjelman."
 
-#: ../src/core/screen.c:607
-#, c-format
-msgid "Screen %d on display '%s' is invalid\n"
+#: src/core/screen.c:665
+#, fuzzy, c-format
+#| msgid "Screen %d on display '%s' is invalid\n"
+msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Näytön ”%2$s” ruutu %1$d ei ole kelvollinen\n"
 
-#: ../src/core/util.c:118
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter on käännetty ilman tukea monisanaisille ilmoituksille\n"
 
-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr ""
+
+#: src/x11/session.c:1815
+#, fuzzy
+#| 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 &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
 "Nämä ikkunat eivät ymmärrä ”tallenna nykyinen tila”-komentoa, ja ne täytyy "
 "käynnistää käsin uudelleen kun kirjaudut seuraavan kerran sisään."
 
-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s @ %s"

po/fr.po

@@ -14,19 +14,22 @@
 # Claude Paroz <claude@2xlibre.net>, 2008-2017.
 # Bruno Brouard <annoa.b@gmail.com>, 2011-12.
 # Charles Monzat <superboa@hotmail.fr>, 2016.
+# Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\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-13 15:47+0000\n"
-"PO-Revision-Date: 2017-08-15 09:16+0200\n"
-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\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-09-05 10:52+0100\n"
+"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
+"Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\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: Lokalize 2.0\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -34,19 +37,19 @@ msgstr "Navigation"
 
 #: data/50-mutter-navigation.xml:9
 msgid "Move window to workspace 1"
-msgstr "Déplacer la fenêtre vers l'espace de travail 1"
+msgstr "Déplacer la fenêtre vers l’espace de travail 1"
 
 #: data/50-mutter-navigation.xml:12
 msgid "Move window to workspace 2"
-msgstr "Déplacer la fenêtre vers l'espace de travail 2"
+msgstr "Déplacer la fenêtre vers l’espace de travail 2"
 
 #: data/50-mutter-navigation.xml:15
 msgid "Move window to workspace 3"
-msgstr "Déplacer la fenêtre vers l'espace de travail 3"
+msgstr "Déplacer la fenêtre vers l’espace de travail 3"
 
 #: data/50-mutter-navigation.xml:18
 msgid "Move window to workspace 4"
-msgstr "Déplacer la fenêtre vers l'espace de travail 4"
+msgstr "Déplacer la fenêtre vers l’espace de travail 4"
 
 #: data/50-mutter-navigation.xml:21
 msgid "Move window to last workspace"
@@ -54,43 +57,43 @@ msgstr "Déplacer la fenêtre vers le dernier espace de travail"
 
 #: data/50-mutter-navigation.xml:24
 msgid "Move window one workspace to the left"
-msgstr "Déplacer la fenêtre d'un espace de travail vers la gauche"
+msgstr "Déplacer la fenêtre d’un espace de travail vers la gauche"
 
 #: data/50-mutter-navigation.xml:27
 msgid "Move window one workspace to the right"
-msgstr "Déplacer la fenêtre d'un espace de travail vers la droite"
+msgstr "Déplacer la fenêtre d’un espace de travail vers la droite"
 
 #: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
-msgstr "Déplacer la fenêtre d'un espace de travail vers le haut"
+msgstr "Déplacer la fenêtre d’un espace de travail vers le haut"
 
 #: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
-msgstr "Déplacer la fenêtre d'un espace de travail vers le bas"
+msgstr "Déplacer la fenêtre d’un espace de travail vers le bas"
 
 #: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
-msgstr "Déplacer la fenêtre d'un écran vers la gauche"
+msgstr "Déplacer la fenêtre d’un écran vers la gauche"
 
 #: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
-msgstr "Déplacer la fenêtre d'un écran vers la droite"
+msgstr "Déplacer la fenêtre d’un écran vers la droite"
 
 #: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
-msgstr "Déplacer la fenêtre d'un écran vers le haut"
+msgstr "Déplacer la fenêtre d’un écran vers le haut"
 
 #: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
-msgstr "Déplacer la fenêtre d'un écran vers le bas"
+msgstr "Déplacer la fenêtre d’un écran vers le bas"
 
 #: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
-msgstr "Changer d'application"
+msgstr "Changer d’application"
 
 #: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
-msgstr "Passer à l'application précédente"
+msgstr "Passer à l’application précédente"
 
 #: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
@@ -102,11 +105,11 @@ msgstr "Passer à la fenêtre précédente"
 
 #: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
-msgstr "Changer de fenêtre d'une application"
+msgstr "Changer de fenêtre d’une application"
 
 #: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
-msgstr "Passer à la fenêtre précédente d'une application"
+msgstr "Passer à la fenêtre précédente d’une application"
 
 #: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
@@ -126,11 +129,11 @@ msgstr "Passer directement à la fenêtre précédente"
 
 #: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
-msgstr "Changer de fenêtre d'une application directement"
+msgstr "Changer de fenêtre d’une application directement"
 
 #: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
-msgstr "Passer directement à la fenêtre précédente d'une application"
+msgstr "Passer directement à la fenêtre précédente d’une application"
 
 #: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
@@ -146,19 +149,19 @@ msgstr "Masquer toutes les fenêtres normales"
 
 #: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
-msgstr "Passer à l'espace de travail 1"
+msgstr "Passer à l’espace de travail 1"
 
 #: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
-msgstr "Passer à l'espace de travail 2"
+msgstr "Passer à l’espace de travail 2"
 
 #: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
-msgstr "Passer à l'espace de travail 3"
+msgstr "Passer à l’espace de travail 3"
 
 #: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
-msgstr "Passer à l'espace de travail 4"
+msgstr "Passer à l’espace de travail 4"
 
 #: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
@@ -166,19 +169,19 @@ msgstr "Passer au dernier espace de travail"
 
 #: data/50-mutter-navigation.xml:129
 msgid "Move to workspace left"
-msgstr "Déplacer vers l'espace de travail de gauche"
+msgstr "Déplacer vers l’espace de travail de gauche"
 
 #: data/50-mutter-navigation.xml:132
 msgid "Move to workspace right"
-msgstr "Déplacer vers l'espace de travail de droite"
+msgstr "Déplacer vers l’espace de travail de droite"
 
 #: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
-msgstr "Déplacer vers l'espace de travail du dessus"
+msgstr "Déplacer vers l’espace de travail du dessus"
 
 #: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
-msgstr "Déplacer vers l'espace de travail du dessous"
+msgstr "Déplacer vers l’espace de travail du dessous"
 
 #: data/50-mutter-system.xml:6
 msgid "System"
@@ -190,7 +193,7 @@ msgstr "Afficher la fenêtre pour lancer une commande"
 
 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
-msgstr "Afficher l'aperçu des activités"
+msgstr "Afficher l’aperçu des activités"
 
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
@@ -206,7 +209,7 @@ msgstr "Basculer le mode plein écran"
 
 #: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
-msgstr "Basculer l'état d'agrandissement"
+msgstr "Basculer l’état d’agrandissement"
 
 #: data/50-mutter-windows.xml:14
 msgid "Maximize window"
@@ -218,7 +221,7 @@ msgstr "Restaurer la fenêtre"
 
 #: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
-msgstr "Basculer l'état de repli"
+msgstr "Basculer l’état de repli"
 
 #: data/50-mutter-windows.xml:20
 msgid "Close window"
@@ -243,7 +246,7 @@ msgstr "Placer la fenêtre sur tous les espaces de travail, ou sur un seul"
 #: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr ""
-"Mettre la fenêtre au premier plan si elle est cachée, sinon à l'arrière-plan"
+"Mettre la fenêtre au premier plan si elle est cachée, sinon à l’arrière-plan"
 
 #: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
@@ -284,8 +287,8 @@ msgid ""
 "key” on PC hardware. It’s expected that this binding either the default or "
 "set to the empty string."
 msgstr ""
-"Cette touche initie l'« overlay », une combinaison d'aperçu des fenêtres et "
-"d'un système de lancement d'applications. La touche par défaut sur le "
+"Cette touche initie l’« overlay », une combinaison d’aperçu des fenêtres et "
+"d’un système de lancement d’applications. La touche par défaut sur le "
 "matériel PC est la touche Windows. En principe, ce raccourci est configuré "
 "sur le réglage par défaut ou sur la chaîne vide."
 
@@ -299,13 +302,13 @@ msgid ""
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""
-"Si vrai, au lieu d'avoir des barres de titre indépendantes, les boîtes de "
+"Si vrai, au lieu d’avoir des barres de titre indépendantes, les boîtes de "
 "dialogue apparaissent attachées à la barre de titre de la fenêtre parente et "
 "sont déplacées ensembles avec elle."
 
 #: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Activer l'empilage des fenêtres déposées sur les bords de l'écran"
+msgstr "Activer l’empilage des fenêtres déposées sur les bords de l’écran"
 
 #: data/org.gnome.mutter.gschema.xml.in:31
 msgid ""
@@ -313,10 +316,10 @@ msgid ""
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"Si activé, le dépôt des fenêtres sur les bords verticaux de l'écran les "
+"Si activé, le dépôt des fenêtres sur les bords verticaux de l’écran les "
 "maximise verticalement et les redimensionne horizontalement pour recouvrir "
 "la moitié de la zone disponible. Le dépôt des fenêtres sur le bord supérieur "
-"de l'écran les maximise complètement."
+"de l’écran les maximise complètement."
 
 #: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
@@ -329,20 +332,20 @@ msgid ""
 "gnome.desktop.wm.preferences)."
 msgstr ""
 "Détermine si les espaces de travail sont gérés de manière dynamique ou si le "
-"nombre d'espaces de travail est fixe (déterminé par la clé num-workspaces "
+"nombre d’espaces de travail est fixe (déterminé par la clé num-workspaces "
 "dans org.gnome.desktop.wm.preferences)."
 
 #: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
-msgstr "Espaces de travail seulement sur l'écran principal"
+msgstr "Espaces de travail seulement sur l’écran principal"
 
 #: data/org.gnome.mutter.gschema.xml.in:51
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
 msgstr ""
-"Détermine si le changement d'espace de travail doit se produire pour les "
-"fenêtres de tous les écrans ou seulement pour les fenêtres de l'écran "
+"Détermine si le changement d’espace de travail doit se produire pour les "
+"fenêtres de tous les écrans ou seulement pour les fenêtres de l’écran "
 "principal."
 
 #: data/org.gnome.mutter.gschema.xml.in:59
@@ -354,12 +357,12 @@ msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
 msgstr ""
-"Détermine si l'utilisation de fenêtres surgissantes et de mise en valeur "
+"Détermine si l’utilisation de fenêtres surgissantes et de mise en valeur "
 "doit être désactivée pour la consultation des fenêtres."
 
 #: data/org.gnome.mutter.gschema.xml.in:68
 msgid "Delay focus changes until the pointer stops moving"
-msgstr "Attend l'arrêt du pointeur avant le changement de focus"
+msgstr "Attend l’arrêt du pointeur avant le changement de focus"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
@@ -369,7 +372,7 @@ msgid ""
 msgstr ""
 "Si défini à true et que le mode de focus est soit « sloppy » ou « souris », "
 "alors le focus ne sera pas changé immédiatement en passant sur une fenêtre, "
-"mais seulement après que le pointeur s'arrête."
+"mais seulement après que le pointeur s’arrête."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
@@ -380,7 +383,7 @@ 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."
 msgstr ""
-"La taille totale des bordures que l'on peut déplacer. Si les bordures "
+"La taille totale des bordures que l’on peut déplacer. Si les bordures "
 "visibles du thème ne sont pas suffisantes, des bordures invisibles sont "
 "ajoutées pour arriver à cette valeur."
 
@@ -388,15 +391,15 @@ msgstr ""
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""
 "Maximiser automatiquement les fenêtres dont la taille est proche de celle de "
-"l'écran"
+"l’écran"
 
 #: data/org.gnome.mutter.gschema.xml.in:90
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
 msgstr ""
-"Si activé, les nouvelles fenêtres qui ont presque la taille de l'écran à "
-"l'ouverture seront maximisées automatiquement."
+"Si activé, les nouvelles fenêtres qui ont presque la taille de l’écran à "
+"l’ouverture seront maximisées automatiquement."
 
 #: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
@@ -408,108 +411,120 @@ msgid ""
 "screen of the monitor."
 msgstr ""
 "Si true (vrai), les nouvelles fenêtres seront toujours placées au centre de "
-"l'écran actif du moniteur."
+"l’écran actif du moniteur."
 
 #: data/org.gnome.mutter.gschema.xml.in:107
 msgid "Enable experimental features"
 msgstr "Activer les fonctionnalités expérimentales"
 
 #: 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: • “monitor-config-"
+#| "manager” — use the new monitor configuration system, aimed to replace the "
+#| "old one. This enables a higher level configuration API to be used by "
+#| "configuration applications, as well as the ability to configure per "
+#| "logical monitor scale. • “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. Also enabling “monitor-config-"
+#| "manager” is required for this feature to be enabled."
 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: • “monitor-config-manager” — use the new "
-"monitor configuration system, aimed to replace the old one. This enables a "
-"higher level configuration API to be used by configuration applications, as "
-"well as the ability to configure per logical monitor scale. • “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. Also enabling "
-"“monitor-config-manager” is required for this feature to be enabled."
+"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 ""
 "Pour activer les fonctionnalités expérimentales, ajoutez le mot-clé de la "
-"fonctionnalité dans la liste. Selon la fonctionnalité, il peut être nécessaire "
-"de redémarrer le compositeur. Chaque fonctionnalité expérimentale peut "
-"disparaître ou ne plus être configurable. N'attendez pas à ce que le contenu de "
-"ce réglage soit stable dans le temps. Les mots-clés actuellement possibles "
-"sont : • « monitor-config-manager » — utiliser le nouveau système de "
-"configuration de moniteur qui remplacera l'ancien à terme. Cela active une "
-"API de configuration de plus haut niveau exploitable par les applications de "
-"configuration. Il permet aussi de configurer par échelle de moniteur logique. "
-"• « scale-monitor-framebuffer » — demande à 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. L'activation de « monitor-config-manager » est requis pour "
-"que cette fonctionnalité soit activée."
+"fonctionnalité dans la liste. Selon la fonctionnalité, il peut être "
+"nécessaire de redémarrer le compositeur. Chaque fonctionnalité expérimentale "
+"peut disparaître ou ne plus être configurable. Ne vous attendez pas à ce que"
+" le "
+"contenu de ce réglage soit stable dans le temps. Les mots-clés actuellement "
+"possibles sont : • « scale-monitor-framebuffer » — demande à 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. "
+"• « 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:151
+#: 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:156
+#: 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:161
+#: 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:166
+#: 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"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
-msgstr "Passer à l'émulateur de terminal 1"
+msgstr "Passer à l’émulateur de terminal 1"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:10
 msgid "Switch to VT 2"
-msgstr "Passer à l'émulateur de terminal 2"
+msgstr "Passer à l’émulateur de terminal 2"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:14
 msgid "Switch to VT 3"
-msgstr "Passer à l'émulateur de terminal 3"
+msgstr "Passer à l’émulateur de terminal 3"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:18
 msgid "Switch to VT 4"
-msgstr "Passer à l'émulateur de terminal 4"
+msgstr "Passer à l’émulateur de terminal 4"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:22
 msgid "Switch to VT 5"
-msgstr "Passer à l'émulateur de terminal 5"
+msgstr "Passer à l’émulateur de terminal 5"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:26
 msgid "Switch to VT 6"
-msgstr "Passer à l'émulateur de terminal 6"
+msgstr "Passer à l’émulateur de terminal 6"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:30
 msgid "Switch to VT 7"
-msgstr "Passer à l'émulateur de terminal 7"
+msgstr "Passer à l’émulateur de terminal 7"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
-msgstr "Passer à l'émulateur de terminal 8"
+msgstr "Passer à l’émulateur de terminal 8"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
-msgstr "Passer à l'émulateur de terminal 9"
+msgstr "Passer à l’émulateur de terminal 9"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
-msgstr "Passer à l'émulateur de terminal 10"
+msgstr "Passer à l’émulateur de terminal 10"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
-msgstr "Passer à l'émulateur de terminal 11"
+msgstr "Passer à l’émulateur de terminal 11"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
-msgstr "Passer à l'émulateur de terminal 12"
+msgstr "Passer à l’émulateur de terminal 12"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:54
 msgid "Re-enable shortcuts"
@@ -518,38 +533,38 @@ msgstr "Réactiver les raccourcis"
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2118
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Changement de mode (groupe %d)"
 
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
+#. TRANSLATORS: This string refers to an action, cycles drawing tablets’
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2141
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Changer de moniteur"
 
-#: src/backends/meta-input-settings.c:2143
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
-msgstr "Afficher l'aide à l'écran"
+msgstr "Afficher l’aide à l’écran"
 
-#: src/backends/meta-monitor-manager.c:927
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Affichage intégré"
 
-#: src/backends/meta-monitor-manager.c:950
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/backends/meta-monitor-manager.c:952
+#: src/backends/meta-monitor-manager.c:928
 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:960
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -561,8 +576,8 @@ msgstr "%s %s"
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
-"Un autre gestionnaire de composition est déjà lancé sur l'écran %i de "
-"l'affichage « %s »."
+"Un autre gestionnaire de composition est déjà lancé sur l’écran %i de "
+"l’affichage « %s »."
 
 #: src/core/bell.c:194
 msgid "Bell event"
@@ -571,7 +586,7 @@ msgstr "Évènement sonore"
 #: 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"
+msgstr "Impossible d’ouvrir l’affichage « %s » du système X Window\n"
 
 #: src/core/main.c:189
 msgid "Disable connection to session manager"
@@ -583,7 +598,7 @@ msgstr "Remplacer le gestionnaire de fenêtres en cours de fonctionnement"
 
 #: src/core/main.c:201
 msgid "Specify session management ID"
-msgstr "Indiquer l'ID de gestion de sessions"
+msgstr "Indiquer l’ID de gestion de sessions"
 
 #: src/core/main.c:206
 msgid "X Display to use"
@@ -607,7 +622,7 @@ msgstr "Lancer comme un compositeur imbriqué"
 
 #: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
-msgstr "Lancer comme un serveur d'affichage complet, plutôt qu'imbriqué"
+msgstr "Lancer comme un serveur d’affichage complet, plutôt qu’imbriqué"
 
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
@@ -617,14 +632,14 @@ msgstr "« %s » ne répond pas."
 
 #: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
-msgstr "L'application ne répond pas."
+msgstr "L’application ne répond pas."
 
 #: 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 ""
-"Vous pouvez patienter un instant pour continuer ou forcer l'application à "
+"Vous pouvez patienter un instant pour continuer ou forcer l’application à "
 "quitter définitivement."
 
 #: src/core/meta-close-dialog-default.c:161
@@ -648,8 +663,8 @@ msgstr ""
 "Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., et autres.\n"
 "Ceci est un logiciel libre ; consultez le code source pour les\n"
 "conditions de copie.\n"
-"Il n'y a AUCUNE garantie ; même pas de VALEUR MARCHANDE ou\n"
-"d'ADÉQUATION À UN USAGE PARTICULIER.\n"
+"Il n’y a AUCUNE garantie ; même pas de VALEUR MARCHANDE ou\n"
+"d’ADÉQUATION À UN USAGE PARTICULIER.\n"
 
 #: src/core/mutter.c:53
 msgid "Print version"
@@ -670,13 +685,13 @@ msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
 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."
+"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/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
-msgstr "L'écran %d sur l'affichage « %s » n'est pas valide\n"
+msgstr "L’écran %d sur l’affichage « %s » n’est pas valide\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
@@ -692,7 +707,7 @@ msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
 msgstr ""
-"Ces fenêtres ne prennent pas en charge « l'enregistrement de la "
+"Ces fenêtres ne prennent pas en charge « l’enregistrement de la "
 "configuration actuelle » et devront être redémarrées manuellement à la "
 "prochaine connexion."
 
@@ -700,3 +715,4 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (sur %s)"
+

po/gl.po

@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: gl\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-21 04:46+0000\n"
-"PO-Revision-Date: 2017-08-23 12:21+0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-30 22:29+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician\n"
 "Language: gl\n"
@@ -416,15 +416,11 @@ msgstr "Activar as características experimentais"
 #| "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: • “monitor-config-"
-#| "manager” — use the new monitor configuration system, aimed to replace the "
-#| "old one. This enables a higher level configuration API to be used by "
-#| "configuration applications, as well as the ability to configure per "
-#| "logical monitor scale. • “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. Also enabling “monitor-config-"
-#| "manager” is required for this feature to be enabled."
+#| "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."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -433,31 +429,38 @@ 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 as características experimentais, engada a palabra chave da "
 "característica á lista. Depende da característica que se deba reiniciar ou "
 "non o compositor. Calquera característica experimental pode non estar "
 "dispoñíbel ou ser configurábel. Non agarde que o que se engada neste "
 "escenario sirva como proba futura. As palabras chave actualmente dispoñíbeis "
-"son: “scale-monitor-framebuffer” — convirte a mutter na maneira "
-"predeterminada de dispor monitores lóxicos nun espacio lóxico de coordenadas "
-"de íxeles, a escalar framebuffers de monitores framebuffers no lugar do "
-"contido de xnalea, para administrar monitores HiDPI. Non require un reinicio."
+"son: «scale-monitor-framebuffer» — fai que mutter de maneira predeterminada "
+"dispoña os monitores lóxicos nun espacio lóxico de coordenadas de píxeles, "
+"mentres escala framebuffers de monitores no lugar do contido de xanela, para "
+"administrar monitores HiDPI. Non require un reinicio. «remote-desktop» — "
+"permite a compatibilidade con compartición de pantalla. Para admitir o "
+"escritorio remoto con compartición de pantalla tamén debe activar «screen-"
+"cast». • «screen-cast» — permite a compatibilidade coa retransmisió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 xanela da lapela emerxente"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Cancelar lapela emerxente"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Cambiar preferencias do 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 a configuración do monitor embebido"
 

po/hr.po

@@ -6,8 +6,8 @@ msgstr ""
 "Project-Id-Version: metacity 0\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-21 04:46+0000\n"
-"PO-Revision-Date: 2017-08-23 17:40+0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-22 20:51+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -193,15 +193,15 @@ msgstr "Aktiviraj izbornik prozora"
 
 #: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
-msgstr "Postavi preko cijelog zaslona"
+msgstr "Uklj/Isklj cjelozaslonski prikaz"
 
 #: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
-msgstr "Promijeni stanje maksimizacije"
+msgstr "Uklj/Isklj uvećanje prozora"
 
 #: data/50-mutter-windows.xml:14
 msgid "Maximize window"
-msgstr "Maksimiziraj prozor"
+msgstr "Uvećaj prozor"
 
 #: data/50-mutter-windows.xml:16
 msgid "Restore window"
@@ -209,7 +209,7 @@ msgstr "Vrati prozor"
 
 #: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
-msgstr "Promijeni stanje zasjenjenosti"
+msgstr "Uklj/Isklj stanje zasjenjenosti"
 
 #: data/50-mutter-windows.xml:20
 msgid "Close window"
@@ -233,7 +233,7 @@ msgstr "Uklj/Isklj prozor na svim radnim prostorima"
 
 #: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
-msgstr "Podigni prekriven prozor, inače smanji"
+msgstr "Podigni prekriven prozor, u suprotnome smanji"
 
 #: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
@@ -241,7 +241,7 @@ msgstr "Podigni prozor iznad ostalih prozora"
 
 #: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
-msgstr "Spustiti prozor ispod ostalih prozora"
+msgstr "Spusti prozor ispod ostalih prozora"
 
 #: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
@@ -407,7 +407,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 ""
 "Za omogućavanje eksperimentalnih značajki, dodajte ključnu riječ značajke na "
 "popis. Zahtijeva li značajka ponovno pokretanje kompozitora ovisi o zadanoj "
@@ -417,21 +420,24 @@ msgstr ""
 "monitor-framebuffer” — čini mutter zadanim izlazu logičkih zaslona u "
 "logičnom koordinatnom prostoru piksela, dok međuspremnik okvira mijenja "
 "veličinu zaslona umjesto sadržaja prozora, upravlja kako bi upravljao "
-"(HiDPI) zaslonima visoke razlučivosti. Ne zahtijeva ponovno pokretanje."
+"(HiDPI) zaslonima visoke razlučivosti. Ne zahtijeva ponovno pokretanje. • "
+"“remote-desktop” — omogućava podršku za udaljene radne površine. Za podršku "
+"udaljene radne površine s dijeljenjem zaslona, “screen-cast” mora isto biti "
+"omogućen. • “screen-cast” — omogućuje podršku emitiranja zaslona."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Odaberi prozor iz skočnog prozora"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Prekini skočni prozor"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Prebacivanje podešavanja zaslona"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Rotiraj ugrađeno podešavanje zaslona"
 

po/hu.po

@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: mutter master\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-02 10:05+0000\n"
-"PO-Revision-Date: 2017-08-09 08:51+0200\n"
-"Last-Translator: Meskó Balázs <meskobalazs@fedoraproject.org>\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-05 17:35+0200\n"
+"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.3\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: data/50-mutter-navigation.xml:6
@@ -404,48 +404,60 @@ msgid "Enable experimental features"
 msgstr "Kísérleti funkciók engedélyezése"
 
 #: 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: • “monitor-config-"
+#| "manager” — use the new monitor configuration system, aimed to replace the "
+#| "old one. This enables a higher level configuration API to be used by "
+#| "configuration applications, as well as the ability to configure per "
+#| "logical monitor scale. • “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. Also enabling “monitor-config-"
+#| "manager” is required for this feature to be enabled."
 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: • “monitor-config-manager” — use the new "
-"monitor configuration system, aimed to replace the old one. This enables a "
-"higher level configuration API to be used by configuration applications, as "
-"well as the ability to configure per logical monitor scale. • “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. Also enabling "
-"“monitor-config-manager” is required for this feature to be enabled."
+"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 ""
 "A kísérleti funkciók engedélyezéséhez adja hozzá a funkció kulcsszavát a "
-"listához. A funkció a betűszedő újraindítását igényelheti az adott "
-"funkciótól függően. Egyik kísérleti funkciónál sem szükséges, hogy továbbra "
-"is elérhető vagy beállítható legyen. Ne várja el azt, hogy ha bármit hozzáad "
-"ehhez a beállításhoz, akkor az a jövőben is elérhető lesz. Jelenleg "
-"lehetséges kulcsszavak: • „monitor-config-manager” – az új monitor "
-"konfigurációs rendszer használata, amely a régi leváltására készül. Ez egy "
-"magasabb szintű konfigurációs API-t biztosít a beállító alkalmazásoknak, "
-"valamint lehetővé teszi a logikai monitorok különálló méretezését. • „scale-"
-"monitor-framebuffer” — alapértelmezetté teszi a mutter programot a logikai "
-"monitorok elrendezéséhez egy logikai képpontkoordináta-térben, miközben "
-"átméretezi a monitor keretpufferét az ablaktartalom helyett azért, hogy "
-"kezelje a HiDPI monitorokat. Nem igényel újraindítást. Ezen funkció "
-"bekapcsolásához a „monitor-config-manager” engedélyezése is szükséges."
+"listához. A funkció a betűszedő újraindítását igényelheti az adott funkciótól "
+"függően. Egyik kísérleti funkciónál sem szükséges, hogy továbbra is elérhető "
+"vagy beállítható legyen. Ne várja el azt, hogy ha bármit hozzáad ehhez a "
+"beállításhoz, akkor az a jövőben is elérhető lesz. Jelenleg lehetséges "
+"kulcsszavak: • „scale-monitor-framebuffer” — alapértelmezetté teszi a mutter "
+"programot a logikai monitorok elrendezéséhez egy logikai "
+"képpontkoordináta-térben, miközben átméretezi a monitor keretpufferét az "
+"ablaktartalom helyett azért, hogy kezelje a HiDPI monitorokat. Nem igényel "
+"újraindítást. • „remote-desktop” — engedélyezi a távoli asztal támogatást. A "
+"távoli asztal képernyőmegosztással való támogatásához a „screen-cast” "
+"funkciónak is engedélyezve kell lennie. • „screen-cast” — engedélyezi a "
+"képernyőrögzítés támogatását."
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Ablakok kiválasztása tab billentyűre felugró ablakból"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Tab felugró kikapcsolása"
 
-#: data/org.gnome.mutter.gschema.xml.in:161
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Monitorkonfiguráció átváltása"
 
-#: data/org.gnome.mutter.gschema.xml.in:166
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Cserélgeti a beépített monitorkonfigurációkat"
 
@@ -504,7 +516,7 @@ msgstr "Gyorsbillentyűk újraengedélyezése"
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2118
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Módkapcsoló (%d. csoport)"
@@ -512,30 +524,30 @@ msgstr "Módkapcsoló (%d. csoport)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2141
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Monitorváltás"
 
-#: src/backends/meta-input-settings.c:2143
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Képernyősúgó megjelenítése"
 
-#: src/backends/meta-monitor-manager.c:927
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Beépített kijelző"
 
-#: src/backends/meta-monitor-manager.c:950
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/backends/meta-monitor-manager.c:952
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Ismeretlen kijelző"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:960
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -685,3 +697,4 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (ezen: %s)"
+

po/id.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: mutter master\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-21 04:46+0000\n"
-"PO-Revision-Date: 2017-08-21 13:42+0700\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-30 10:46+0700\n"
 "Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
 "Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id\n"
@@ -411,7 +411,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 ""
 "Untuk mengaktifkan fitur eksperimental, tambahkan kata kunci fitur ke dalam "
 "daftar. Apakah fitur memerlukan nyala ulang kompositor tergantung pada fitur "
@@ -421,21 +424,24 @@ msgstr ""
 "mungkin: • “scale-monitor-framebuffer” — membuat bawaan mutter untuk tata "
 "letak monitor logikal dalam ruang koordinat pixel logikal, sambil "
 "menskalakan framebuffer monitor alih-alih konten jendela, untuk mengelola "
-"monitor HiDPI. Tidak perlu mulai ulang."
+"monitor HiDPI. Tidak perlu mulai ulang. • “remote-desktop” — aktifkan "
+"dukungan destop jauh. Untuk mendukung destop jauh dengan berbagi layar, "
+"“screen-cast” juga harus diaktifkan. • “screen-cast” — aktifkan dukungan "
+"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 "Pilih jendela dari popup tab"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Batalkan popup tab"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Tukar konfigurasi monitor bawaan"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Memutar konfigurasi monitor bawaan"
 

po/it.po

@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: mutter\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-21 04:46+0000\n"
-"PO-Revision-Date: 2017-08-24 09:45+0200\n"
+"POT-Creation-Date: 2017-08-29 06:41+0000\n"
+"PO-Revision-Date: 2017-08-29 10:21+0200\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -423,7 +423,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 ""
 "Per abilitare le funzionalità sperimentali, aggiungere la parola chiave di "
 "tale funzionalità nella lista. Se la funzionalità desiderata richiede il "
@@ -434,21 +437,24 @@ msgstr ""
 "modo che mutter disponga gli schermi logici secondo uno spazio logico di "
 "coordinate pixel, applicando il ridimensionamento ai framebuffer invece che "
 "al contenuto della finestra, per gestire schermi HiDPI (non richiede il "
-"riavvio)."
+"riavvio). • \"remote-desktop\" — Abilita il supporto al desktop remoto. Per "
+"supportare il desktop remoto con la condivisione dello schermo, è necessario "
+"abilitare anche \"screen-cast\". • “screen-cast” — Abilita il supporto alla "
+"registrazione dello schermo."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Seleziona finestra dal tab popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Annulla tab popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Cambia le configurazioni 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 "Passa da una configurazione integrata all'altra del monitor"
 

po/ko.po

@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 06:20+0000\n"
-"PO-Revision-Date: 2017-03-04 03:25+0900\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-02 12:57+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: ko\n"
@@ -397,14 +397,50 @@ msgid ""
 "screen of the monitor."
 msgstr "참이면, 새로운 창은 항상 사용 중인 모니터 화면의 중앙에 놓습니다."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: 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 ""
+"실험적인 기능을 사용하려면, 해당 기능 키워드를 목록에 추가하십시오. 기능에 따"
+"라 컴포지터를 다시 시작해야 할 수도 있습니다. 실험적인 기능은 사용할 수 없을 "
+"수도 있고, 설정할 수 없을 수도 있습니다. 이 설정에 추가한 사항이 앞으로 버전"
+"에서도 동작할 거라고 기대하지 마십시오. 현재 가능한 값은: • “scale-monitor-"
+"framebuffer” — 머터에서 논리적인 모니터를 논리적인 픽셀 좌표계로 배치합니다. "
+"창의 내용의 크기를 조정하지 않고 모니터 프레임버퍼 크기를 조정합니다. 재시작"
+"은 필요하지 않습니다. • “remote-desktop” — 원격 데스크톱 기능을 사용합니다.  "
+"원격 데스크톱을 화면 공유와 같이 사용하려면, “screen-cast” 설정도 켜져 있어"
+"야 합니다. • “screen-cast” — 화면 전송 기능을 사용합니다."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "탭 팝업에서 창 선택"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "탭 팝업 취소"
 
+#: 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 "가상 터미널 1로 이동"
@@ -453,10 +489,14 @@ msgstr "가상 터미널 11로 이동"
 msgid "Switch to VT 12"
 msgstr "가상 터미널 12로 이동"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "바로 가기 다시 사용하기"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "모드 전환 (그룹 %d)"
@@ -464,37 +504,37 @@ msgstr "모드 전환 (그룹 %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "모니터 전환"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "화면 도움말 표시"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "내장 디스플레이"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 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:708
+#: src/backends/meta-monitor-manager.c:936
 #, 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -506,30 +546,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "삑소리 이벤트"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "“%s” 창이 반응하지 않습니다."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "프로그램이 반응하지 않습니다."
-
-#: 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/delete.c:141
-msgid "_Force Quit"
-msgstr "강제로 끝내기(_F)"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "기다리기(_W)"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -571,6 +587,30 @@ msgstr "내장 컴포지터로 실행합니다"
 msgid "Run as a full display server, rather than nested"
 msgstr "전체 디스플레이 서버로 실행, 내장 프로그램 아님"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "“%s” 창이 반응하지 않습니다."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "프로그램이 반응하지 않습니다."
+
+#: 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:161
+msgid "_Force Quit"
+msgstr "강제로 끝내기(_F)"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "기다리기(_W)"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/lt.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: lt\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-21 04:46+0000\n"
-"PO-Revision-Date: 2017-08-22 23:17+0300\n"
+"POT-Creation-Date: 2017-08-29 06:41+0000\n"
+"PO-Revision-Date: 2017-08-29 15:57+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -411,15 +411,11 @@ msgstr "Įjungti eksperimentines savybes"
 #| "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: • “monitor-config-"
-#| "manager” — use the new monitor configuration system, aimed to replace the "
-#| "old one. This enables a higher level configuration API to be used by "
-#| "configuration applications, as well as the ability to configure per "
-#| "logical monitor scale. • “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. Also enabling “monitor-config-"
-#| "manager” is required for this feature to be enabled."
+#| "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."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -428,7 +424,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 ""
 "Norėdami įjungti eksperimentines savybes, pridėkite į sąrašą raktinį žodį. "
 "Ar savybė reikalauja kompozitoriaus paleidimo iš naujo priklauso nuo "
@@ -438,21 +437,24 @@ msgstr ""
 "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"
 

po/lv.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
 "&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 06:20+0000\n"
-"PO-Revision-Date: 2017-03-18 12:09+0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-03 19:25+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -274,11 +274,6 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Modifikators, kuru lietot paplašinātām loga pārvaldības darbībām"
 
 #: 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 "
@@ -323,10 +318,6 @@ msgid "Workspaces are managed dynamically"
 msgstr "Darbvirsmas tiek pārvaldītas dinamiski"
 
 #: 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 "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -365,27 +356,20 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Aizkavēt fokusa izmaiņas, līdz rādītājs pārstāj kustēties"
 
 #: 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."
 msgstr ""
-"Ja patiess un fokusēšanas režīms ir vai nu “sloppy” (paviršs) vai “mouse”"
-" (pele), tad fokuss nemainīsies uzreiz pēc ieiešanas logā, bet tikai pēc tam,"
-" kad rādītājs beidzis kustēties."
+"Ja patiess un fokusēšanas režīms ir vai nu “sloppy” (paviršs) vai "
+"“mouse” (pele), tad fokuss nemainīsies uzreiz pēc ieiešanas logā, bet tikai "
+"pēc tam, kad rādītājs beidzis kustēties."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Velkams malas platums"
 
 #: 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 "
 "not enough, invisible borders will be added to meet this value."
@@ -416,14 +400,63 @@ msgid ""
 msgstr ""
 "Ja patiess, jaunie logi vienmēr tiks novietoti monitora aktīvā ekrāna vidū."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Ieslēgt eksperimentālās iespējas"
+
+#: 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."
+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 ""
+"Lai ieslēgtu eksperimentālās iespējas, pievienojiet iespējas atslēgvārdu "
+"sarakstam. Vai iespējai būs nepieciešama kompozitora pārstartēšana, būs "
+"atkarīga no dotās iespējas. Jebkura eksperimentāla iespēja var būt "
+"nepieejama vai nekonfigurējama. Negaidiet, ka jebkura no šīm iespējām "
+"nākotnē strādās. Pašlaik pieejamie atslēgvārdi: • “scale-monitor-"
+"framebuffer” — liek mutter pēc noklusējuma izkārtot loģiskos monitorus "
+"loģisko pikseļu koordināšu telpā, kamēr mērogo monitora kadru buferus, nevis "
+"loga saturu, lai pārvaldītu HiDPI monitorus. Pārstartēšana nav nepieciešama."
+" • “remote-desktop” — "
+"ieslēdz attālinātās darbvirsmas atbalstu. Lai atbalstītu attālināto"
+" darbvirsmu ar ekrāna koplietošanu, jābūt arī ieslēgtam “screen-cast”. •"
+" “screen-cast” — ieslēdz ekrānraides atbalstu."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Izvēlēties logu no tabulatora izvēlnes"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Atcelt logu rādīšanu"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Pārslēgt monitoru konfigurācijas"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Pagriež iebūvētā monitora konfigurāciju"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Pārslēgties uz VT 1"
@@ -472,53 +505,53 @@ msgstr "Pārslēgties uz VT 11"
 msgid "Switch to VT 12"
 msgstr "Pārslēgties uz VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Atkal ieslēdz saīsnes"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Režīma slēdzis (grupa %d)"
 
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Pārslēgt monitoru"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Rādīt palīdzību uz ekrāna"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Iebūvēts displejs"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Nezināms displejs"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:936
 #, 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:471
+#: src/compositor/compositor.c:476
 #, 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”."
 msgstr "Cits kompozīcijas pārvaldnieks jau darbojas ekrānā %d displejā “%s”."
@@ -527,35 +560,8 @@ msgstr "Cits kompozīcijas pārvaldnieks jau darbojas ekrānā %d displejā “%
 msgid "Bell event"
 msgstr "Zvana notikums"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "“%s” nereaģē."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Lietotne nereaģē."
-
-#: 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 ""
-"Var uzgaidīt neilgu brīdi, līdz tā atgūstas, vai arī aizvērt to piespiedu "
-"kārtā."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "Aizvērt _piespiedu kārtā"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Gaidīt"
-
 #: src/core/display.c:608
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Neizdevās atvērt X logu sistēmas displeju “%s”\n"
 
@@ -595,14 +601,34 @@ msgstr "Palaist kā ligzdotu kompozitoru"
 msgid "Run as a full display server, rather than nested"
 msgstr "Palaist kā pilnu attēlošanas serveri, nevis iegultu"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "“%s” nereaģē."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Lietotne nereaģē."
+
+#: 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 ""
+"Var uzgaidīt neilgu brīdi, līdz tā atgūstas, vai arī aizvērt to piespiedu "
+"kārtā."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "Aizvērt _piespiedu kārtā"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Gaidīt"
+
 #: 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"
@@ -631,9 +657,6 @@ msgstr "Darbvieta %d"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@@ -643,7 +666,6 @@ msgstr ""
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Ekrāna %d displejs “%s“ nav derīgs\n"
 
@@ -657,9 +679,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Režīma slēdzis: režīms %d"
 
 #: src/x11/session.c:1815
-#| 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."

po/pa.po

@@ -8,622 +8,709 @@
 # A S Alam <aalam@users.sf.net>, 2006.
 # A S Alam <aalam@users.sf.net>, 2007, 2009, 2010, 2011.
 # ASB <aalam@users.sf.net>, 2007.
-# Amanpreet Singh Alam <aalam@users.sf.net>, 2009, 2012, 2013, 2014, 2015.
+# Amanpreet Singh Alam <aalam@users.sf.net>, 2009, 2012, 2013, 2014, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.gnome-2-26\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-13 23:12+0000\n"
-"PO-Revision-Date: 2015-03-13 19:14-0500\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-09-10 18:24-0600\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
+"Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
 "Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/50-mutter-navigation.xml:6
 msgid "Navigation"
 msgstr "ਨੇਵੀਗੇਸ਼ਨ"
 
-#: ../data/50-mutter-navigation.xml.in.h:2
+#: data/50-mutter-navigation.xml:9
 msgid "Move window to workspace 1"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੧ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:3
+#: data/50-mutter-navigation.xml:12
 msgid "Move window to workspace 2"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੨ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:4
+#: data/50-mutter-navigation.xml:15
 msgid "Move window to workspace 3"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੩ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:5
+#: data/50-mutter-navigation.xml:18
 msgid "Move window to workspace 4"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੪ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:6
+#: data/50-mutter-navigation.xml:21
 msgid "Move window to last workspace"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਪਿਛਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:7
+#: data/50-mutter-navigation.xml:24
 msgid "Move window one workspace to the left"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਖੱਬੇ ਵੱਲ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:8
+#: data/50-mutter-navigation.xml:27
 msgid "Move window one workspace to the right"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਸੱਜੇ ਵੱਲ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:9
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਉੱਤੇ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:10
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਹੇਠਾਂ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:11
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਮਾਨੀਟਰ ਖੱਬੇ ਵੱਲ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:12
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਮਾਨੀਟਰ ਸੱਜੇ ਵੱਲ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:13
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਮਾਨੀਟਰ ਉੱਤੇ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:14
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਮਾਨੀਟਰ ਹੇਠਾਂ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:15
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:16
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "ਪਿਛਲੀ ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "ਵਿੰਡੋਜ਼ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "ਪਿਛਲੀ ਵਿੰਡੋ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦੀਆਂ ਵਿੰਡੋਜ਼ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਪਿਛਲੀ ਵਿੰਡੋ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "ਸਿਸਟਮ ਕੰਟਰੋਲ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "ਪਿਛਲੇ ਸਿਸਟਮ ਕੰਟਰੋਲ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "ਵਿੰਡੋਜ਼ ਸਿੱਧੀਆਂ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "ਸਿੱਧਾ ਪਿਛਲੀ ਵਿੰਡੋ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਵਿੰਡੋਜ਼ ਸਿੱਧੀ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "ਸਿੱਧਾ ਐਪ ਦੀ ਪਿਛਲੀ ਵਿੰਡੋ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "ਸਿਸਟਮ ਕੰਟਰੋਲ ਸਿੱਧੇ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "ਸਿੱਧਾ ਪਿਛਲੇ ਸਿਸਟਮ ਕੰਟਰੋਲ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "ਸਭ ਸਧਾਰਨ ਵਿੰਡੋਜ਼ ਓਹਲੇ ਕਰੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "ਵਰਕਸਪੇਸ ੧ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "ਵਰਕਸਪੇਸ ੨ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:32
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "ਵਰਕਸਪੇਸ ੩ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:33
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "ਵਰਕਸਪੇਸ ੪ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:34
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "ਪਿਛਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:35
+#: data/50-mutter-navigation.xml:129
 msgid "Move to workspace left"
 msgstr "ਖੱਬੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:36
+#: data/50-mutter-navigation.xml:132
 msgid "Move to workspace right"
 msgstr "ਸੱਜੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:37
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "ਉੱਤੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:38
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "ਹੇਠਾਂ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
 
-#: ../data/50-mutter-system.xml.in.h:1
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "ਸਿਸਟਮ"
 
-#: ../data/50-mutter-system.xml.in.h:2
+#: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
 msgstr "ਕਮਾਂਡ ਚਲਾਉ ਪਰੋਉਟ ਵੇਖੋ"
 
-#: ../data/50-mutter-system.xml.in.h:3
+#: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
 msgstr "ਸਰਗਰਮੀ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:1
+#: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "ਵਿੰਡੋਜ਼"
 
-#: ../data/50-mutter-windows.xml.in.h:2
+#: data/50-mutter-windows.xml:8
 msgid "Activate the window menu"
 msgstr "ਐਕਟਿਵੇਟ ਵਿੰਡੋ ਮੇਨੂ"
 
-#: ../data/50-mutter-windows.xml.in.h:3
+#: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
 msgstr "ਪੂਰੀ ਸਕਰੀਨ ਮੋਡ ਬਦਲੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:4
+#: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
 msgstr "ਅਧਿਕਤਮ ਸਥਿਤੀ ਬਦਲੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:5
+#: data/50-mutter-windows.xml:14
 msgid "Maximize window"
 msgstr "ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ"
 
-#: ../data/50-mutter-windows.xml.in.h:6
+#: data/50-mutter-windows.xml:16
 msgid "Restore window"
 msgstr "ਵਿੰਡੋ ਮੁੜ-ਸਟੋਰ"
 
-#: ../data/50-mutter-windows.xml.in.h:7
+#: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
 msgstr "ਰੰਗਤ ਸਥਿਤੀ ਬਦਲੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:8
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:9
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "ਵਿੰਡੋ ਓਹਲੇ"
 
-#: ../data/50-mutter-windows.xml.in.h:10
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "ਵਿੰਡੋ ਹਿਲਾਓ"
 
-#: ../data/50-mutter-windows.xml.in.h:11
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "ਵਿੰਡੋ ਮੁੜ-ਅਕਾਰ"
 
-#: ../data/50-mutter-windows.xml.in.h:12
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "ਵਿੰਡੋ ਸਭ ਵਰਕਸਪੇਸ ਜਾਂ ਇੱਕ ਵਿੱਚ ਬਦਲੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:13
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "ਵਿੰਡੋ ਉਭਾਰੋ, ਜੇ ਢੱਕੀ ਹੈ, ਨਹੀਂ ਤਾਂ ਹੇਠਾਂ ਭੇਜੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:14
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਹੋਰ ਵਿੰਡੋਜ਼ ਤੋਂ ਉੱਤੇ ਲਿਆਓ"
 
-#: ../data/50-mutter-windows.xml.in.h:15
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਹੋਰ ਵਿੰਡੋ ਤੋਂ ਹੇਠਾਂ ਲੈ ਜਾਉ"
 
-#: ../data/50-mutter-windows.xml.in.h:16
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "ਵਿੰਡੋ ਖੜਵੇਂ ਰੂਪ ਵਿੱਚ ਵੱਧੋ-ਵੱਧ"
 
-#: ../data/50-mutter-windows.xml.in.h:17
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "ਵਿੰਡੋ ਲੇਟਵੇਂ ਰੂਪ ਵਿੱਚ ਵੱਧੋ-ਵੱਧ"
 
-#: ../data/50-mutter-windows.xml.in.h:18
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "ਖੱਬੇ ਪਾਸੇ ਵੰਡ ਵੇਖੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:19
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "ਸੱਜੇ ਪਾਸੇ ਵੰਡ ਵੇਖੋ"
 
-#: ../data/mutter.desktop.in.h:1
+#: data/mutter.desktop.in:4
 msgid "Mutter"
 msgstr "ਮੱਟਰ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:7
 msgid "Modifier to use for extended window management operations"
 msgstr "ਵਾਧੂ ਵਿੰਡੋ ਪਰਬੰਧ ਓਪਰੇਸ਼ਨਾਂ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਮੋਡੀਫਾਇਰ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:2
+#: 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 ""
-"ਇਹ ਸਵਿੱਚ \"ਓਵਰਲੇ\" ਸ਼ੁਰੂ ਕਰਦੀ ਹੈ, ਜੋ ਕਿ ਵਿੰਡੋ ਸੰਖੇਪ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਉਣ ਸਿਸਟਮ "
-"ਦੀ ਜੋੜ ਹੈ। "
-"ਡਿਫਾਲਟ ਇਹ PC ਹਾਰਡਵੇਅਰ ਉੱਤੇ \"ਵਿੰਡੋਜ਼ ਸਵਿੱਚ\" ਨਾਲ ਵਰਤਣ ਲਈ ਹੈ। ਇਹ ਉਮੀਦ ਕੀਤੀ "
-"ਜਾਂਦੀ ਹੈ ਕਿ "
+"ਇਹ ਸਵਿੱਚ ”ਓਵਰਲੇ” ਸ਼ੁਰੂ ਕਰਦੀ ਹੈ, ਜੋ ਕਿ ਵਿੰਡੋ ਸੰਖੇਪ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਉਣ ਸਿਸਟਮ ਦੀ"
+" ਜੋੜ ਹੈ। "
+"ਡਿਫਾਲਟ ਇਹ PC ਹਾਰਡਵੇਅਰ ਉੱਤੇ ”ਵਿੰਡੋਜ਼ ਸਵਿੱਚ” ਨਾਲ ਵਰਤਣ ਲਈ ਹੈ। ਇਹ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ"
+" ਹੈ ਕਿ "
 "ਜਾਂ ਤਾਂ ਡਿਫਾਲਟ ਬਾਈਡਿੰਗ ਰੱਖੀ ਜਾਵੇ ਜਾਂ ਖਾਲੀ ਲਾਈਨ ਵਰਤੀ ਜਾਵੇ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "ਮਾਡਲ ਡਾਈਲਾਗ ਅਟੈਚਮੈਂਟ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:4
+#: data/org.gnome.mutter.gschema.xml.in:21
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""
-"ਜਦੋਂ ਸਹੀਂ ਹੋਵੇ ਤਾਂ ਵੱਖ ਵੱਖ ਟਾਈਟਲਬਾਰ ਦੀ ਬਜਾਏ, ਮਾਡਲ ਡਾਈਲਾਗ ਮੁੱਢਲੀ ਵਿੰਡੋ ਦੇ "
-"ਟਾਈਟਲ ਬਾਰ ਨਾਲ "
+"ਜਦੋਂ ਸਹੀਂ ਹੋਵੇ ਤਾਂ ਵੱਖ ਵੱਖ ਟਾਈਟਲਬਾਰ ਦੀ ਬਜਾਏ, ਮਾਡਲ ਡਾਈਲਾਗ ਮੁੱਢਲੀ ਵਿੰਡੋ ਦੇ"
+" ਟਾਈਟਲ ਬਾਰ ਨਾਲ "
 "ਜੁੜਿਆ ਉਭਰੇਗਾ ਤੇ ਮੁੱਢਲੀ ਵਿੰਡੋ ਨਾਲ ਹੀ ਹਿੱਲੇਗਾ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:5
+#: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "ਕੋਨਾ ਟਿਲਿੰਗ ਚਾਲੂ, ਜਦੋਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਸਕਰੀਨ ਕੋਨਿਆਂ ਤੋਂ ਡਰਾਪ ਕਰਨਾ ਹੋਵੇ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:6
+#: data/org.gnome.mutter.gschema.xml.in:31
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"ਜੇ ਚਾਲੂ ਕੀਤਾ ਤਾਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਖੜ੍ਹਵੀਂ ਸਕਰੀਨ ਬਾਹੀ ਉੱਤੇ ਲੈ ਜਾਣ ਨਾਲ ਉਹ ਖੜ੍ਹਵੇਂ "
-"ਰੂਪ ਵਿੱਚ ਵੱਧ ਤੋਂ ਵੱਧ "
-"ਕਰਦਾ ਹੈ ਅਤੇ ਖਿਤਿਜੀ (ਹਰੀਜੱਟਲ) ਰੂਪ ਵਿੱਚ ਉਪਲੱਬਧ ਖੇਤਰ ਵਿੱਚ ਅੱਧੇ ਥਾਂ ਲਈ ਮੁੜ-ਆਕਾਰ "
-"ਕਰਦਾ ਹੈ। ਵਿੰਡੋਜ਼ "
+"ਜੇ ਚਾਲੂ ਕੀਤਾ ਤਾਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਖੜ੍ਹਵੀਂ ਸਕਰੀਨ ਬਾਹੀ ਉੱਤੇ ਲੈ ਜਾਣ ਨਾਲ ਉਹ ਖੜ੍ਹਵੇਂ"
+" ਰੂਪ ਵਿੱਚ ਵੱਧ ਤੋਂ ਵੱਧ "
+"ਕਰਦਾ ਹੈ ਅਤੇ ਖਿਤਿਜੀ (ਹਰੀਜੱਟਲ) ਰੂਪ ਵਿੱਚ ਉਪਲੱਬਧ ਖੇਤਰ ਵਿੱਚ ਅੱਧੇ ਥਾਂ ਲਈ ਮੁੜ-ਆਕਾਰ"
+" ਕਰਦਾ ਹੈ। ਵਿੰਡੋਜ਼ "
 "ਨੂੰ ਉੱਤੇ ਸਕਰੀਨ ਬਾਹੀ ਵਿੱਚ ਲੈ ਕੇ ਜਾਣ ਨਾਲ ਉਹ ਪੂਰੀ ਤਰ੍ਹਾਂ ਵੱਧ ਤੋਂ ਵੱਧ ਹੁੰਦਾ ਹੈ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "ਵਰਕਸਪੇਸ ਦਾ ਪਰਬੰਧ ਚਲਵੇਂ ਰੂਪ ਵਿੱਚ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:8
+#: 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 ""
-"ਦੱਸੋ ਕਿ ਕੀ ਵਰਕਸਪੇਸ ਨੂੰ ਚਲਵੇਂ ਰੂਪ ਵਿੱਚ ਰੱਖਣਾ ਹੈ ਜਾਂ ਵਰਕਸਪੇਸ ਦੀ ਗਿਣਤੀ ਸਥਿਰ ਹੋਵੇ "
-"(ਜੋ ਕਿ org."
+"ਦੱਸੋ ਕਿ ਕੀ ਵਰਕਸਪੇਸ ਨੂੰ ਚਲਵੇਂ ਰੂਪ ਵਿੱਚ ਰੱਖਣਾ ਹੈ ਜਾਂ ਵਰਕਸਪੇਸ ਦੀ ਗਿਣਤੀ ਸਥਿਰ ਹੋਵੇ"
+" (ਜੋ ਕਿ org."
 "gnome.desktop.wm.preferences ਵਿੱਚ num-workspaces ਕੁੰਜੀ ਰਾਹੀਂ ਦੱਸੀ ਜਾਂਦੀ ਹੈ)।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "ਵਰਕਸਪੇਸ ਕੇਵਲ ਪ੍ਰਾਇਮਰੀ ਉੱਤੇ ਹੀ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:10
+#: data/org.gnome.mutter.gschema.xml.in:51
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
 msgstr ""
-"ਕੀ ਵਰਕਸਪੇਸ ਬਦਲਣਾ ਸਭ ਮਾਨੀਟਰ ਦੀਆਂ ਵਿੰਡੋ ਲਈ ਹੋਵੇ ਜਾਂ ਕੇਵਲ ਪ੍ਰਾਇਮਰੀ ਮਾਨੀਟਰ ਦੀਆਂ "
-"ਵਿੰਡੋ ਲਈ ਹੀ "
+"ਕੀ ਵਰਕਸਪੇਸ ਬਦਲਣਾ ਸਭ ਮਾਨੀਟਰ ਦੀਆਂ ਵਿੰਡੋ ਲਈ ਹੋਵੇ ਜਾਂ ਕੇਵਲ ਪ੍ਰਾਇਮਰੀ ਮਾਨੀਟਰ ਦੀਆਂ"
+" ਵਿੰਡੋ ਲਈ ਹੀ "
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr "ਕੋਈ ਟੈਬ ਪੋਪਅੱਪ ਨਹੀਂ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:12
+#: data/org.gnome.mutter.gschema.xml.in:60
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
 msgstr ""
-"ਜਾਣੋ ਕਿ ਕੀ ਪੋਪਅੱਪ ਅਤੇ ਹਾਈਲਾਈਟ ਫਰੇਮ ਦੀ ਵਰਤੋਂ ਨੂੰ ਵਿੰਡੋਜ਼ ਦੇ ਚੱਕਰ ਦੌਰਾਨ ਬੰਦ "
-"ਕਰਨਾ ਹੈ।"
+"ਜਾਣੋ ਕਿ ਕੀ ਪੋਪਅੱਪ ਅਤੇ ਹਾਈਲਾਈਟ ਫਰੇਮ ਦੀ ਵਰਤੋਂ ਨੂੰ ਵਿੰਡੋਜ਼ ਦੇ ਚੱਕਰ ਦੌਰਾਨ ਬੰਦ"
+" ਕਰਨਾ ਹੈ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:13
+#: data/org.gnome.mutter.gschema.xml.in:68
 msgid "Delay focus changes until the pointer stops moving"
 msgstr "ਪੁਆਇੰਟਰ ਦੇ ਰੁਕਣ ਤੱਕ ਫੋਕਸ ਬਦਲਣ ਨੂੰ ਰੋਕੋ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:14
+#: 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 ""
-"ਜੇ ਇਹ ਸਹੀਂ ਹੋਵੇ ਤਾਂ ਫੋਕਸ ਢੰਗ ਜਾਂ ਤਾਂ \"ਸਲੋਪੀ\" ਜਾਂ \"ਮਾਊਂਸ\" ਹੁੰਦਾ ਹੈ ਤਾਂ "
-"ਫੋਕਸ ਹੋਇਆ ਵਿੰਡੋ "
+"ਜੇ ਇਹ ਸਹੀਂ ਹੋਵੇ ਤਾਂ ਫੋਕਸ ਢੰਗ ਜਾਂ ਤਾਂ ”ਸਲੋਪੀ” ਜਾਂ ”ਮਾਊਂਸ” ਹੁੰਦਾ ਹੈ ਤਾਂ ਫੋਕਸ"
+" ਹੋਇਆ ਵਿੰਡੋ "
 "auto_raise_delay ਕੁੰਜੀ ਵਲੋਂ ਦਿੱਤੇ ਇੱਕ ਅੰਤਰਾਲ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਹੀ ਉਭਾਰਿਆ ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "ਡਰੈਗ ਹੋਣ ਯੋਗ ਬਾਰਡਰ ਚੌੜਾਈ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:16
+#: 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 ""
-"ਕੁੱਲ ਡਰੈਗ ਹੋਣ ਯੋਗ ਬਾਰਡਰ ਦੀ ਮਾਤਰਾ। ਜੇ ਥੀਮ ਦੇ ਦਿੱਖ ਬਾਰਡਰ ਲੋੜ ਮੁਤਾਬਕ ਨਾ ਹੋਣ ਤਾਂ "
-"ਅਦਿੱਖ ਬਾਰਡਰ "
+"ਕੁੱਲ ਡਰੈਗ ਹੋਣ ਯੋਗ ਬਾਰਡਰ ਦੀ ਮਾਤਰਾ। ਜੇ ਥੀਮ ਦੇ ਦਿੱਖ ਬਾਰਡਰ ਲੋੜ ਮੁਤਾਬਕ ਨਾ ਹੋਣ ਤਾਂ"
+" ਅਦਿੱਖ ਬਾਰਡਰ "
 "ਨੂੰ ਇਹ ਮੁੱਲ ਦੇ ਬਰਾਬਰ ਕਰਨ ਲਈ ਵਧਾਇਆ ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:17
+#: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
 msgstr "ਲਗਭਗ ਮਾਨੀਟਰ ਆਕਾਰ ਦੀਆਂ ਵਿੰਡੋਜ਼ ਆਪਣੇ-ਆਪ ਵੱਧੋ-ਵੱਧੋ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:18
+#: data/org.gnome.mutter.gschema.xml.in:90
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
 msgstr ""
-"ਜੇ ਚਾਲੂ ਕੀਤਾ ਤਾਂ ਨਵੀਆਂ ਵਿੰਡੋਜ਼, ਜੋ ਕਿ ਸ਼ੁਰੂ ਵਿੱਚ ਮਾਨੀਟਰ ਦੇ ਆਕਾਰ ਦੀਆਂ ਹੁੰਦੀਆਂ "
-"ਹਨ, ਆਪਣੇ-ਆਪ ਵੱਧ ਤੋਂ "
+"ਜੇ ਚਾਲੂ ਕੀਤਾ ਤਾਂ ਨਵੀਆਂ ਵਿੰਡੋਜ਼, ਜੋ ਕਿ ਸ਼ੁਰੂ ਵਿੱਚ ਮਾਨੀਟਰ ਦੇ ਆਕਾਰ ਦੀਆਂ ਹੁੰਦੀਆਂ"
+" ਹਨ, ਆਪਣੇ-ਆਪ ਵੱਧ ਤੋਂ "
 "ਵੱਧ ਹੋ ਜਾਣਗੀਆਂ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:19
+#: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
 msgstr "ਨਵੀਆਂ ਵਿੰਡੋ ਕੇਂਦਰ ਵਿੱਚ ਰੱਖੋ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:20
+#: data/org.gnome.mutter.gschema.xml.in:99
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
 msgstr ""
-"ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਨਵੀਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਹਮੇਸ਼ਾ ਮਾਨੀਟਰ ਦੀ ਸਰਗਰਮ ਸਕਰੀਮ ਦੇ ਕੇਂਦਰ ਵਿੱਚ "
-"ਰੱਖਿਆ ਜਾਵੇਗਾ।"
+"ਜੇ ਸਹੀਂ ਹੈ ਤਾਂ ਨਵੀਂ ਵਿੰਡੋਜ਼ ਨੂੰ ਹਮੇਸ਼ਾ ਮਾਨੀਟਰ ਦੀ ਸਰਗਰਮ ਸਕਰੀਮ ਦੇ ਕੇਂਦਰ ਵਿੱਚ"
+" ਰੱਖਿਆ ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:21
+#: 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 ""
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "ਟੈਬ ਪੋਪਅੱਪ ਤੋਂ ਵਿੰਡੋ ਚੁਣੋ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "ਟੈਬ ਪੋਪਅੱਪ ਰੱਦ ਕਰੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:155
+#| msgid "Switch applications"
+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 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+#: data/org.gnome.mutter.wayland.gschema.xml.in:10
 msgid "Switch to VT 2"
 msgstr "VT 2 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+#: data/org.gnome.mutter.wayland.gschema.xml.in:14
 msgid "Switch to VT 3"
 msgstr "VT 3 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+#: data/org.gnome.mutter.wayland.gschema.xml.in:18
 msgid "Switch to VT 4"
 msgstr "VT 4 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+#: data/org.gnome.mutter.wayland.gschema.xml.in:22
 msgid "Switch to VT 5"
 msgstr "VT 5 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+#: data/org.gnome.mutter.wayland.gschema.xml.in:26
 msgid "Switch to VT 6"
 msgstr "VT 6 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+#: data/org.gnome.mutter.wayland.gschema.xml.in:30
 msgid "Switch to VT 7"
 msgstr "VT 7 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "VT 8 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "VT 9 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "VT 10 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "VT 11 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "VT 12 ਲਈ ਬਦਲੋ"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "ਸ਼ਾਰਟਕੱਟ ਮੁੜ-ਸਮਰੱਥ ਕਰੋ"
+
+#. TRANSLATORS: This string refers to a button that switches between
+#. * different modes.
+#.
+#: src/backends/meta-input-settings.c:2151
+#, 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:2174
+#| msgid "Switch system controls"
+msgid "Switch monitor"
+msgstr "ਮਾਨੀਟਰ ਨੂੰ ਬਦਲੋ"
+
+#: src/backends/meta-input-settings.c:2176
+msgid "Show on-screen help"
+msgstr "ਆਨ-ਸਕਰੀਨ ਮਦਦ ਵੇਖੋ"
+
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "ਬਿਲਟ-ਇਨ ਡਿਸਪਲੇਅ"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: src/backends/meta-monitor-manager.c:928
 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:401
+#: src/backends/meta-monitor-manager.c:936
 #, 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:456
+#: src/compositor/compositor.c:476
 #, 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 ""
-"ਇੱਕ ਹੋਰ ਕੰਪੋਜ਼ਟਿੰਗ ਮੈਨੇਜਰ %i ਸਕਰੀਨ ਉੱਤੇ ਡਿਸਪਲੇਅ \"%s\" ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਚੱਲ "
-"ਰਿਹਾ ਹੈ।"
+"ਇੱਕ ਹੋਰ ਕੰਪੋਜ਼ਟਿੰਗ ਮੈਨੇਜਰ %i ਸਕਰੀਨ ਉੱਤੇ ਡਿਸਪਲੇਅ ”%s” ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ"
+" ਹੈ।"
 
-#: ../src/core/bell.c:185
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "ਘੰਟੀ ਈਵੈਂਟ"
 
-#: ../src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+#| msgid "Failed to open X Window System display '%s'\n"
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "X ਵਿੰਡੋ ਸਿਸਟਮ ਡਿਸਪਲੇਅ ”%s” ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਮਰਥ\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਅਯੋਗ"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "ਚੱਲ ਰਹੇ ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ ਬਦਲੋ"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧਨ ID ਦਿਓ"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "ਵਰਤਣ ਲਈ X ਡਿਸਪਲੇਅ"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "ਸੰਭਾਲੀ ਫਾਇਲ ਤੋਂ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "X ਕਾਲ ਸੈਕਰੋਨਸ ਬਣਾਓ"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "ਵੇਲੈਂਡ ਕੰਪੋਜ਼ਰ ਵਜੋਂ ਚਲਾਓ"
+
+#: src/core/main.c:231
+#| msgid "Run as a wayland compositor"
+msgid "Run as a nested compositor"
+msgstr "ਨੈਸਟਡ ਕੰਪੋਜ਼ਰ ਵਜੋਂ ਚਲਾਓ"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr "ਅੰਦਰੂਨੀ ਰੂਪ ਵਿੱਚ ਚਲਾਉਣ ਦੀ ਬਜਾਏ ਪੂਰੇ ਡਿਸਪਲੇਅ ਸਰਵਰ ਵਜੋਂ ਚਲਾਓ"
+
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "\"%s\" ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੀ ਹੈ।"
 
-#: ../src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੀ ਹੈ।"
 
-#: ../src/core/delete.c:134
+#: 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/delete.c:141
-msgid "_Wait"
-msgstr "ਉਡੀਕੋ(_W)"
-
-#: ../src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "ਧੱਕੇ ਨਾਲ ਬੰਦ(_F)"
 
-#: ../src/core/display.c:562
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "X ਵਿੰਡੋ ਸਿਸਟਮ ਡਿਸਪਲੇਅ '%s' ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਮਰਥ\n"
-
-#: ../src/core/main.c:176
-msgid "Disable connection to session manager"
-msgstr "ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਅਯੋਗ"
-
-#: ../src/core/main.c:182
-msgid "Replace the running window manager"
-msgstr "ਚੱਲ ਰਹੇ ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ ਬਦਲੋ"
-
-#: ../src/core/main.c:188
-msgid "Specify session management ID"
-msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧਨ ID ਦਿਓ"
-
-#: ../src/core/main.c:193
-msgid "X Display to use"
-msgstr "ਵਰਤਣ ਲਈ X ਡਿਸਪਲੇਅ"
-
-#: ../src/core/main.c:199
-msgid "Initialize session from savefile"
-msgstr "ਸੰਭਾਲੀ ਫਾਇਲ ਤੋਂ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ"
-
-#: ../src/core/main.c:205
-msgid "Make X calls synchronous"
-msgstr "X ਕਾਲ ਸੈਕਰੋਨਸ ਬਣਾਓ"
-
-#: ../src/core/main.c:212
-msgid "Run as a wayland compositor"
-msgstr "ਵੇਲੈਂਡ ਕੰਪੋਜ਼ਰ ਵਜੋਂ ਚਲਾਓ"
-
-#: ../src/core/main.c:220
-msgid "Run as a full display server, rather than nested"
-msgstr "ਅੰਦਰੂਨੀ ਰੂਪ ਵਿੱਚ ਚਲਾਉਣ ਦੀ ਬਜਾਏ ਪੂਰੇ ਡਿਸਪਲੇਅ ਸਰਵਰ ਵਜੋਂ ਚਲਾਓ"
-
-#: ../src/core/mutter.c:39
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "ਉਡੀਕੋ(_W)"
+
+#: 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 (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 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 ""
-"ਮੱਟਰ %s\n"
-"ਹੱਕ ਰਾਖਵੇਂ ਹਨ(C) ੨੦੦੧-%d ਹਾਵੇਨ ਪੈਨਿੰਗਟੋਨ, ਰੈੱਡ ਹੈੱਟ, ਅਤੇ ਹੋਰ\n"
+"ਮੁੱਟਰ %s\n"
+"ਹੱਕ ਰਾਖਵੇਂ ਹਨ ©  ੨੦੦੧-%d ਹਾਵੇਨ ਪੈਨਿੰਗਟੋਨ, ਰੈੱਡ ਹੈੱਟ, ਅਤੇ ਹੋਰ\n"
 "ਇਹ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ; ਉਤਾਰਾ ਹਾਲਤਾਂ ਲਈ ਸਰੋਤ ਵੇਖੋ।\n"
 "ਇਸ ਦੀ ਕੋਈ ਗਰੰਟੀ ਨਹੀ; ਇਥੋਂ ਤੱਕ ਕਿ ਖਰੀਦਦਾਰੀ ਜਾਂ ਖਾਸ ਮਕਸਦ ਦੀ ਪੂਰਤੀ ਲਈ ਵੀ।\n"
 
-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "ਵਰਜਨ ਛਾਪੋ"
 
-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "ਵਰਤਣ ਲਈ ਮੁੱਟਰ ਪਲੱਗਇਨ"
 
-#: ../src/core/prefs.c:2004
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "ਵਰਕਸਪੇਸ %d"
 
-#: ../src/core/screen.c:525
+#: src/core/screen.c:580
 #, c-format
 #| msgid ""
-#| "Screen %d on display \"%s\" already has a window manager; try using the --"
-#| "replace option to replace the current window manager.\n"
+#| "Display \"%s\" already has a window manager; try using the --replace "
+#| "option to replace the current window manager."
 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 ""
-"ਡਿਸਪਲੇਅ \"%s\" ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਵਿੰਡੋ ਮੈਨੇਜਰ ਮੌਜੂਦ ਹੈ; ਮੌਜੂਦਾ ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ "
-"ਬਦਲਣ ਲਈ --replace "
+"ਡਿਸਪਲੇਅ ”%s” ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਵਿੰਡੋ ਮੈਨੇਜਰ ਮੌਜੂਦ ਹੈ; ਮੌਜੂਦਾ ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ"
+" ਬਦਲਣ ਲਈ --replace "
 "ਚੋਣ ਵਰਤ ਕੇ ਦੇਖੋ।"
 
-#: ../src/core/screen.c:607
+#: src/core/screen.c:665
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "ਡਿਸਪਲੇਅ '%2$s' ਉੱਤੇ ਸਕਰੀਨ %1$d ਗਲਤ ਹੈ\n"
+#| 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:118
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "ਮੱਟਰ, ਵਰਬੋਜ਼ ਮੋਡ ਲਈ ਸਹਾਰੇ ਤੋਂ ਬਿਨਾਂ ਕੰਪਾਇਲ ਹੋਇਆ\n"
 
-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "ਮੋਡ ਬਦਲੋ: ਮੋਡ %d"
+
+#: src/x11/session.c:1815
+#| 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 &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
-"ਇਹ ਵਿੰਡੋ &quot;ਮੌਜੂਦਾ ਸੈਟਅੱਪ ਸੰਭਾਲੋ&quot; ਵਾਸਤੇ ਸਹਾਇਕ ਨਹੀਂ ਅਤੇ ਅਗਲੀ ਵਾਰ ਜਦੋਂ "
-"ਤੁਸੀਂ ਲਾਗਇਨ "
+"ਇਹ ਵਿੰਡੋ ”ਮੌਜੂਦਾ ਸੈਟਅੱਪ ਸੰਭਾਲੋ” ਵਾਸਤੇ ਸਹਾਇਕ ਨਹੀਂ ਅਤੇ ਅਗਲੀ ਵਾਰ ਜਦੋਂ ਤੁਸੀਂ"
+" ਲਾਗਇਨ "
 "ਕਰੋਗੇ ਤਾਂ ਮੁੜ ਸ਼ੁਰੂ ਕਰਨਾ ਪਵੇਗਾ।"
 
-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s ਉੱਤੇ)"

po/pl.po

@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: mutter\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-21 04:46+0000\n"
-"PO-Revision-Date: 2017-08-23 04:15+0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-29 18:14+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -422,7 +422,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. "
@@ -431,21 +434,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"
 

po/pt_BR.po

@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
 "&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-22 19:28+0000\n"
-"PO-Revision-Date: 2017-02-25 17:53-0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-03 11:06-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -33,6 +33,250 @@ msgstr ""
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Project-Style: gnome\n"
 
+#: data/50-mutter-navigation.xml:6
+msgid "Navigation"
+msgstr "Navegação"
+
+#: data/50-mutter-navigation.xml:9
+msgid "Move window to workspace 1"
+msgstr "Mover a janela para o espaço de trabalho 1"
+
+#: data/50-mutter-navigation.xml:12
+msgid "Move window to workspace 2"
+msgstr "Mover a janela para o espaço de trabalho 2"
+
+#: data/50-mutter-navigation.xml:15
+msgid "Move window to workspace 3"
+msgstr "Mover a janela para o espaço de trabalho 3"
+
+#: data/50-mutter-navigation.xml:18
+msgid "Move window to workspace 4"
+msgstr "Mover a janela para o espaço de trabalho 4"
+
+#: data/50-mutter-navigation.xml:21
+msgid "Move window to last workspace"
+msgstr "Mover a janela para o último espaço de trabalho"
+
+#: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Mover a janela um espaço de trabalho à esquerda"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Mover a janela um espaço de trabalho à direita"
+
+#: data/50-mutter-navigation.xml:30
+msgid "Move window one workspace up"
+msgstr "Mover a janela um espaço de trabalho acima"
+
+#: data/50-mutter-navigation.xml:33
+msgid "Move window one workspace down"
+msgstr "Mover a janela um espaço de trabalho abaixo"
+
+# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
+#: data/50-mutter-navigation.xml:36
+msgid "Move window one monitor to the left"
+msgstr "Mover janela para o monitor da esquerda"
+
+# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
+#: data/50-mutter-navigation.xml:39
+msgid "Move window one monitor to the right"
+msgstr "Mover janela para o monitor da direita"
+
+# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
+#: data/50-mutter-navigation.xml:42
+msgid "Move window one monitor up"
+msgstr "Mover janela para o monitor acima"
+
+# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
+#: data/50-mutter-navigation.xml:45
+msgid "Move window one monitor down"
+msgstr "Mover janela para o monitor abaixo"
+
+#: data/50-mutter-navigation.xml:49
+msgid "Switch applications"
+msgstr "Alternar aplicativos"
+
+#: data/50-mutter-navigation.xml:54
+msgid "Switch to previous application"
+msgstr "Alternar para o aplicativo anterior"
+
+#: data/50-mutter-navigation.xml:58
+msgid "Switch windows"
+msgstr "Alternar janelas"
+
+#: data/50-mutter-navigation.xml:63
+msgid "Switch to previous window"
+msgstr "Alternar para a janela anterior"
+
+#: data/50-mutter-navigation.xml:67
+msgid "Switch windows of an application"
+msgstr "Alternar as janelas de um aplicativo"
+
+#: data/50-mutter-navigation.xml:72
+msgid "Switch to previous window of an application"
+msgstr "Alternar para a janela anterior de um aplicativo"
+
+#: data/50-mutter-navigation.xml:76
+msgid "Switch system controls"
+msgstr "Alternar controles do sistema"
+
+#: data/50-mutter-navigation.xml:81
+msgid "Switch to previous system control"
+msgstr "Alternar para o controle de sistema anterior"
+
+#: data/50-mutter-navigation.xml:85
+msgid "Switch windows directly"
+msgstr "Alternar as janelas diretamente"
+
+#: data/50-mutter-navigation.xml:90
+msgid "Switch directly to previous window"
+msgstr "Alternar diretamente para a janela anterior"
+
+#: data/50-mutter-navigation.xml:94
+msgid "Switch windows of an app directly"
+msgstr "Alternar as janelas de um aplicativo diretamente"
+
+#: data/50-mutter-navigation.xml:99
+msgid "Switch directly to previous window of an app"
+msgstr "Alternar diretamente para a janela anterior de um aplicativo"
+
+#: data/50-mutter-navigation.xml:103
+msgid "Switch system controls directly"
+msgstr "Alternar os controles de sistema diretamente"
+
+#: data/50-mutter-navigation.xml:108
+msgid "Switch directly to previous system control"
+msgstr "Alternar diretamente para o controle de sistema anterior"
+
+#: data/50-mutter-navigation.xml:111
+msgid "Hide all normal windows"
+msgstr "Ocultar todas as janelas normais"
+
+#: data/50-mutter-navigation.xml:114
+msgid "Switch to workspace 1"
+msgstr "Trocar para o espaço de trabalho 1"
+
+#: data/50-mutter-navigation.xml:117
+msgid "Switch to workspace 2"
+msgstr "Trocar para o espaço de trabalho 2"
+
+#: data/50-mutter-navigation.xml:120
+msgid "Switch to workspace 3"
+msgstr "Trocar para o espaço de trabalho 3"
+
+#: data/50-mutter-navigation.xml:123
+msgid "Switch to workspace 4"
+msgstr "Trocar para o espaço de trabalho 4"
+
+#: data/50-mutter-navigation.xml:126
+msgid "Switch to last workspace"
+msgstr "Trocar para o último espaço de trabalho"
+
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Move para o espaço de trabalho à esquerda"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Move para o espaço de trabalho à direita"
+
+#: data/50-mutter-navigation.xml:135
+msgid "Move to workspace above"
+msgstr "Mover para o espaço de trabalho acima"
+
+#: data/50-mutter-navigation.xml:138
+msgid "Move to workspace below"
+msgstr "Mover para o espaço de trabalho abaixo"
+
+#: data/50-mutter-system.xml:6
+msgid "System"
+msgstr "Sistema"
+
+#: data/50-mutter-system.xml:8
+msgid "Show the run command prompt"
+msgstr "Mostrar o prompt de comando de execução"
+
+#: data/50-mutter-system.xml:10
+msgid "Show the activities overview"
+msgstr "Mostrar o panorama de atividades"
+
+#: data/50-mutter-windows.xml:6
+msgid "Windows"
+msgstr "Janelas"
+
+#: data/50-mutter-windows.xml:8
+msgid "Activate the window menu"
+msgstr "Ativar o menu da janela"
+
+#: data/50-mutter-windows.xml:10
+msgid "Toggle fullscreen mode"
+msgstr "Alternar modo de tela inteira"
+
+#: data/50-mutter-windows.xml:12
+msgid "Toggle maximization state"
+msgstr "Alternar estado de maximização"
+
+#: data/50-mutter-windows.xml:14
+msgid "Maximize window"
+msgstr "Maximizar a janela"
+
+#: data/50-mutter-windows.xml:16
+msgid "Restore window"
+msgstr "Restaurar janela"
+
+#: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Alternar estado sombreado"
+
+#: data/50-mutter-windows.xml:20
+msgid "Close window"
+msgstr "Fechar janela"
+
+#: data/50-mutter-windows.xml:22
+msgid "Hide window"
+msgstr "Ocultar janela"
+
+#: data/50-mutter-windows.xml:24
+msgid "Move window"
+msgstr "Mover janela"
+
+#: data/50-mutter-windows.xml:26
+msgid "Resize window"
+msgstr "Redimensionar janela"
+
+#: data/50-mutter-windows.xml:29
+msgid "Toggle window on all workspaces or one"
+msgstr "Alternar a janela em todos os espaços de trabalho ou em apenas um"
+
+#: data/50-mutter-windows.xml:31
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Elevar a janela se estiver coberta; caso contrário, a abaixa"
+
+#: data/50-mutter-windows.xml:33
+msgid "Raise window above other windows"
+msgstr "Elevar a janela para frente das outras"
+
+#: data/50-mutter-windows.xml:35
+msgid "Lower window below other windows"
+msgstr "Colocar a janela atrás das outras"
+
+#: data/50-mutter-windows.xml:37
+msgid "Maximize window vertically"
+msgstr "Maximizar a janela verticalmente"
+
+#: data/50-mutter-windows.xml:39
+msgid "Maximize window horizontally"
+msgstr "Maximizar a janela horizontalmente"
+
+#: data/50-mutter-windows.xml:43
+msgid "View split on left"
+msgstr "Visualizar divisão à esquerda"
+
+#: data/50-mutter-windows.xml:47
+msgid "View split on right"
+msgstr "Visualizar divisão à direita"
+
 #: data/mutter.desktop.in:4
 msgid "Mutter"
 msgstr "Mutter"
@@ -43,11 +287,6 @@ msgstr ""
 "Modificador a ser usado para operações de gerenciamento de janelas estendido"
 
 #: 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 "
@@ -55,8 +294,8 @@ msgid ""
 "set to the empty string."
 msgstr ""
 "Esta chave irá iniciar a “sobreposição”, que é a combinação de visão de "
-"janela e sistema de lançamento de aplicativos. O padrão pretendido é a “"
-"tecla Windows” no hardware do computador. É esperada para esta associação "
+"janela e sistema de lançamento de aplicativos. O padrão pretendido é a "
+"“tecla Windows” no hardware do computador. É esperada para esta associação "
 "tanto o padrão quanto a definição de uma string vazia."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
@@ -94,10 +333,6 @@ msgid "Workspaces are managed dynamically"
 msgstr "Áreas de trabalho são gerenciadas dinamicamente"
 
 #: 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 "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -136,10 +371,6 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Atrasar alterações de foco até que o ponteiro pare de mover"
 
 #: 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 "
@@ -154,9 +385,6 @@ msgid "Draggable border width"
 msgstr "Largura da borda arrastável"
 
 #: 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 "
 "not enough, invisible borders will be added to meet this value."
@@ -189,14 +417,54 @@ msgstr ""
 "Quando verdadeiro, as novas janelas serão sempre colocadas no centro da tela "
 "ativa do monitor."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Habilitar recursos experimentais"
+
+#: 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 ""
+"Para habilitar recursos experimentais, adicione a palavra-chave do recurso à "
+"lista. Se o recurso exige ou não reiniciar o compositor, depende do recurso "
+"dado. Qualquer recurso experimental não precisa estar disponível ou ser "
+"configurável. Não espere que adicionar alguma coisa nesta configuração seja "
+"a prova de futuro. Atualmente, palavras-chaves possíveis: • “scale-monitor-"
+"framebuffer” — torna o mutter padrão para a disposição de monitores lógicos "
+"em um espaço lógico coordenado por pixels, ao dimensionar buffers de quadros "
+"de monitor em vez de conteúdo de janela, para gerenciar monitores HiDPI. Não "
+"exige uma reinicialização. • “remote-desktop” — habilita suporte remoto. "
+"Para oferecer suporte a desktop remoto com compartilhamento de tela, “screen-"
+"cast” também deve estar habilitado. • “screen-cast” — habilita suporte a "
+"gravação de tela."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Selecione a janela a partir da aba instantânea"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Cancelar aba instantânea"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+#| msgid "Switch monitor"
+msgid "Switch monitor configurations"
+msgstr "Trocar configurações de monitor"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Gira a configuração de monitor embutido"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Trocar para o VT 1"
@@ -245,53 +513,53 @@ msgstr "Trocar para o VT 11"
 msgid "Switch to VT 12"
 msgstr "Trocar para o VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Reabilita atalhos"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Alternador de modo (Grupo %d)"
 
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Trocar monitor"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostrar ajuda na tela"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Tela embutida"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Monitor desconhecido"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s de %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:471
+#: src/compositor/compositor.c:476
 #, 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”."
 msgstr "Outro compositor de janelas está em execução na tela %i na área “%s”."
@@ -300,35 +568,8 @@ msgstr "Outro compositor de janelas está em execução na tela %i na área “%
 msgid "Bell event"
 msgstr "Evento de som"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "“%s” não está respondendo."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "O aplicativo não está respondendo."
-
-#: 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 ""
-"Você pode escolher aguardar um pouco e continuar ou forçar o aplicativo a "
-"sair completamente."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Forçar sair"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Esperar"
-
 #: src/core/display.c:608
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Falha ao abrir a exibição “%s” do sistema de janelas X\n"
 
@@ -368,14 +609,34 @@ msgstr "Executar como um compositor aninhado"
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como um servidor de tela cheia, ao invés de aninhado"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "“%s” não está respondendo."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "O aplicativo não está respondendo."
+
+#: 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 ""
+"Você pode escolher aguardar um pouco e continuar ou forçar o aplicativo a "
+"sair completamente."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Forçar sair"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Esperar"
+
 #: 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"
@@ -405,9 +666,6 @@ msgstr "Espaço de trabalho %d"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@@ -417,7 +675,6 @@ msgstr ""
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "A tela %d na exibição “%s” é inválida\n"
 
@@ -431,9 +688,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Alternador de modo: Modo %d"
 
 #: src/x11/session.c:1815
-#| 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."
@@ -446,191 +700,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (em %s)"
 
-#~ msgid "Navigation"
-#~ msgstr "Navegação"
-
-#~ msgid "Move window to workspace 1"
-#~ msgstr "Mover a janela para o espaço de trabalho 1"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "Mover a janela para o espaço de trabalho 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "Mover a janela para o espaço de trabalho 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "Mover a janela para o espaço de trabalho 4"
-
-#~ msgid "Move window to last workspace"
-#~ msgstr "Mover a janela para o último espaço de trabalho"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mover a janela um espaço de trabalho à esquerda"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mover a janela um espaço de trabalho à direita"
-
-#~ msgid "Move window one workspace up"
-#~ msgstr "Mover a janela um espaço de trabalho acima"
-
-#~ msgid "Move window one workspace down"
-#~ msgstr "Mover a janela um espaço de trabalho abaixo"
-
-# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
-#~ msgid "Move window one monitor to the left"
-#~ msgstr "Mover janela para o monitor da esquerda"
-
-# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
-#~ msgid "Move window one monitor to the right"
-#~ msgstr "Mover janela para o monitor da direita"
-
-# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
-#~ msgid "Move window one monitor up"
-#~ msgstr "Mover janela para o monitor acima"
-
-# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
-#~ msgid "Move window one monitor down"
-#~ msgstr "Mover janela para o monitor abaixo"
-
-#~ msgid "Switch applications"
-#~ msgstr "Alternar aplicativos"
-
-#~ msgid "Switch to previous application"
-#~ msgstr "Alternar para o aplicativo anterior"
-
-#~ msgid "Switch windows"
-#~ msgstr "Alternar janelas"
-
-#~ msgid "Switch to previous window"
-#~ msgstr "Alternar para a janela anterior"
-
-#~ msgid "Switch windows of an application"
-#~ msgstr "Alternar as janelas de um aplicativo"
-
-#~ msgid "Switch to previous window of an application"
-#~ msgstr "Alternar para a janela anterior de um aplicativo"
-
-#~| msgid "Switch system controls directly"
-#~ msgid "Switch system controls"
-#~ msgstr "Alternar controles do sistema"
-
-#~ msgid "Switch to previous system control"
-#~ msgstr "Alternar para o controle de sistema anterior"
-
-#~ msgid "Switch windows directly"
-#~ msgstr "Alternar as janelas diretamente"
-
-#~ msgid "Switch directly to previous window"
-#~ msgstr "Alternar diretamente para a janela anterior"
-
-#~ msgid "Switch windows of an app directly"
-#~ msgstr "Alternar as janelas de um aplicativo diretamente"
-
-#~ msgid "Switch directly to previous window of an app"
-#~ msgstr "Alternar diretamente para a janela anterior de um aplicativo"
-
-#~ msgid "Switch system controls directly"
-#~ msgstr "Alternar os controles de sistema diretamente"
-
-#~ msgid "Switch directly to previous system control"
-#~ msgstr "Alternar diretamente para o controle de sistema anterior"
-
-#~ msgid "Hide all normal windows"
-#~ msgstr "Ocultar todas as janelas normais"
-
-#~ msgid "Switch to workspace 1"
-#~ msgstr "Trocar para o espaço de trabalho 1"
-
-#~ msgid "Switch to workspace 2"
-#~ msgstr "Trocar para o espaço de trabalho 2"
-
-#~ msgid "Switch to workspace 3"
-#~ msgstr "Trocar para o espaço de trabalho 3"
-
-#~ msgid "Switch to workspace 4"
-#~ msgstr "Trocar para o espaço de trabalho 4"
-
-#~ msgid "Switch to last workspace"
-#~ msgstr "Trocar para o último espaço de trabalho"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Move para o espaço de trabalho à esquerda"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Move para o espaço de trabalho à direita"
-
-#~ msgid "Move to workspace above"
-#~ msgstr "Mover para o espaço de trabalho acima"
-
-#~ msgid "Move to workspace below"
-#~ msgstr "Mover para o espaço de trabalho abaixo"
-
-#~ msgid "System"
-#~ msgstr "Sistema"
-
-#~ msgid "Show the run command prompt"
-#~ msgstr "Mostrar o prompt de comando de execução"
-
-#~ msgid "Show the activities overview"
-#~ msgstr "Mostrar o panorama de atividades"
-
-#~ msgid "Windows"
-#~ msgstr "Janelas"
-
-#~ msgid "Activate the window menu"
-#~ msgstr "Ativar o menu da janela"
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "Alternar modo de tela inteira"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "Alternar estado de maximização"
-
-#~ msgid "Maximize window"
-#~ msgstr "Maximizar a janela"
-
-#~ msgid "Restore window"
-#~ msgstr "Restaurar janela"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Alternar estado sombreado"
-
-#~ msgid "Close window"
-#~ msgstr "Fechar janela"
-
-#~ msgid "Hide window"
-#~ msgstr "Ocultar janela"
-
-#~ msgid "Move window"
-#~ msgstr "Mover janela"
-
-#~ msgid "Resize window"
-#~ msgstr "Redimensionar janela"
-
-#~ msgid "Toggle window on all workspaces or one"
-#~ msgstr "Alternar a janela em todos os espaços de trabalho ou em apenas um"
-
-#~ msgid "Raise window if covered, otherwise lower it"
-#~ msgstr "Elevar a janela se estiver coberta; caso contrário, a abaixa"
-
-#~ msgid "Raise window above other windows"
-#~ msgstr "Elevar a janela para frente das outras"
-
-#~ msgid "Lower window below other windows"
-#~ msgstr "Colocar a janela atrás das outras"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximizar a janela verticalmente"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximizar a janela horizontalmente"
-
-#~ msgid "View split on left"
-#~ msgstr "Visualizar divisão à esquerda"
-
-#~ msgid "View split on right"
-#~ msgstr "Visualizar divisão à direita"
-
 #~ msgid "background texture could not be created from file"
 #~ msgstr "textura de plano de fundo não pôde ser criado de arquivo"
 

po/sl.po

@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: mutter master\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-07 10:01+0200\n"
-"PO-Revision-Date: 2017-08-07 10:02+0200\n"
+"POT-Creation-Date: 2017-09-08 11:30+0200\n"
+"PO-Revision-Date: 2017-09-08 11:36+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"
@@ -409,40 +409,38 @@ msgid ""
 "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: • “monitor-config-manager” — use the new "
-"monitor configuration system, aimed to replace the old one. This enables a "
-"higher level configuration API to be used by configuration applications, as "
-"well as the ability to configure per logical monitor scale. • “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. Also enabling "
-"“monitor-config-manager” is required for this feature to be enabled."
+"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 ""
-"Za omogočanje preizkusnih možnosti, dodajte ključno besedo možnosti na "
-"seznam. Ali zahteva možnost ponovni zagon sestavljalnika, je odvisno od "
-"posamezne možnosti. Te možnosti niso zahtevane niti nastavljive. Trenutno so "
-"na voljo ključne besede: • »monitor-config-manager« – uporablja nov sistem "
-"nastavitev, ki naj bi zamenjal obstoječega. Omogoča večjo nastavljivost API, "
-"za uporabo pri prigramih za nastavitve lastnosti zaslona. • »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. Za omogočanje te možnosti, mora biti omogočena tudi možnost »monitor-"
-"config-manager«."
+"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. • »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:151
+#: 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:156
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Prekliči pojavni zavihek"
 
-#: data/org.gnome.mutter.gschema.xml.in:161
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Nastavitve nadzornika preklopa"
 
-#: data/org.gnome.mutter.gschema.xml.in:166
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Zavrti vgrajene nastavitve zaslona"
 
@@ -501,7 +499,7 @@ msgstr "Ponovno omogoči tipkovne bližnjice"
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2118
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Preklop načina (skupina %d)"
@@ -509,30 +507,30 @@ msgstr "Preklop načina (skupina %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2141
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Nadzornik preklopa"
 
-#: src/backends/meta-input-settings.c:2143
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Pokaži zaslonsko pomoč"
 
-#: src/backends/meta-monitor-manager.c:927
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Vgrajen zaslon"
 
-#: src/backends/meta-monitor-manager.c:950
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Neznano"
 
-#: src/backends/meta-monitor-manager.c:952
+#: src/backends/meta-monitor-manager.c:928
 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:960
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

po/sr.po

@@ -9,19 +9,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\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-13 15:47+0000\n"
-"PO-Revision-Date: 2017-08-15 20:40+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\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-29 20:46+0200\n"
+"Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n"
 "Language-Team: српски <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -181,7 +182,7 @@ msgstr "Систем"
 
 #: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
-msgstr "Приказује промпт за покретање наредбе"
+msgstr "Приказује упит за извршавање наредбе"
 
 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
@@ -197,11 +198,11 @@ msgstr "Активира мени прозора"
 
 #: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
-msgstr "Искључује/укључује приказ преко целог екрана"
+msgstr "Искључује или укључује приказ преко целог екрана"
 
 #: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
-msgstr "Искључује/укључује стање увећања"
+msgstr "Искључује или укључује стање увећања"
 
 #: data/50-mutter-windows.xml:14
 msgid "Maximize window"
@@ -213,7 +214,7 @@ msgstr "Враћа величину прозора"
 
 #: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
-msgstr "Искључује/укључује стање засенчености"
+msgstr "Искључује или укључује стање засенчености"
 
 #: data/50-mutter-windows.xml:20
 msgid "Close window"
@@ -410,43 +411,40 @@ msgid ""
 "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: • “monitor-config-manager” — use the new "
-"monitor configuration system, aimed to replace the old one. This enables a "
-"higher level configuration API to be used by configuration applications, as "
-"well as the ability to configure per logical monitor scale. • “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. Also enabling "
-"“monitor-config-manager” is required for this feature to be enabled."
+"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“ — "
-"користи нови систем подешавања монитора, који треба да замени стари. Ово "
-"омогућава да АПИ подешавања вишег нивоа буде коришћен програмима подешавања, "
-"као и могућност подешавања скале монитора на нивоу логике. • „scale-monitor-"
-"framebuffer“ — чини да матер пређе на распоред логичких монитора у логичком "
-"координатном простору пиксела, док врши сразмеравање оквира монитора уместо "
-"садржаја прозора, за управљање ХиДПИ мониторима. Не захтева поновно "
-"покретање. Такође је потребно укључити „monitor-config-manager“ да би ова "
-"функција била укључена."
+"Да укључите пробне функције, додајте кључну реч функције на списак. Да ли "
+"функција захтева поновно покретање састављача зависи од дате функције. Није "
+"потребно да нека пробна могућност буде и даље доступна или подесива. Немојте "
+"очекивати да додавање било чега у овом подешавању буде отпорно на будуће "
+"измене. Тренутно могуће кључне речи су: • „scale-monitor-framebuffer“ — чини "
+"да матер подразумевано распоређује логичке екране у логичком координантном "
+"простору пиксела, приликом промене величине спремишта кадрова екрана уместо "
+"садржаја прозора, зарад управљања екранима високе резолуције. Не захтева "
+"поновно покретање. • “remote-desktop” — омогућава удаљену техничку подршку. "
+"Да бисте подржали удаљену техничку подршку са дељењем екрана, “screen-cast” "
+"такође мора бити омогућен. • “screen-cast” — омогућава подршку за "
+"пројектовање екрана."
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Бира прозор из језичка искакања"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Отказивање језичка искакања"
 
-#: data/org.gnome.mutter.gschema.xml.in:161
-#| msgid "Switch monitor"
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Мења подешавања монитора"
 
-#: data/org.gnome.mutter.gschema.xml.in:166
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Заокреће уграђена подешавања монитора"
 
@@ -505,7 +503,7 @@ msgstr "Поново укључивање пречица"
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2118
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Режим прекидача (група %d)"
@@ -513,30 +511,30 @@ msgstr "Режим прекидача (група %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2141
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Промени монитор"
 
-#: src/backends/meta-input-settings.c:2143
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Прикажи помоћ на екрану"
 
-#: src/backends/meta-monitor-manager.c:927
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Уграђени дисплеј"
 
-#: src/backends/meta-monitor-manager.c:950
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/backends/meta-monitor-manager.c:952
+#: src/backends/meta-monitor-manager.c:928
 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:960
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

po/sr@latin.po

@@ -9,19 +9,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\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-13 15:47+0000\n"
-"PO-Revision-Date: 2017-08-15 20:40+0200\n"
-"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\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:15+0000\n"
+"PO-Revision-Date: 2017-08-29 20:46+0200\n"
+"Last-Translator: Marko M. Kostić <marko.m.kostic@gmail.com>\n"
 "Language-Team: srpski <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -181,7 +182,7 @@ msgstr "Sistem"
 
 #: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
-msgstr "Prikazuje prompt za pokretanje naredbe"
+msgstr "Prikazuje upit za izvršavanje naredbe"
 
 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
@@ -197,11 +198,11 @@ msgstr "Aktivira meni prozora"
 
 #: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
-msgstr "Isključuje/uključuje prikaz preko celog ekrana"
+msgstr "Isključuje ili uključuje prikaz preko celog ekrana"
 
 #: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
-msgstr "Isključuje/uključuje stanje uvećanja"
+msgstr "Isključuje ili uključuje stanje uvećanja"
 
 #: data/50-mutter-windows.xml:14
 msgid "Maximize window"
@@ -213,7 +214,7 @@ msgstr "Vraća veličinu prozora"
 
 #: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
-msgstr "Isključuje/uključuje stanje zasenčenosti"
+msgstr "Isključuje ili uključuje stanje zasenčenosti"
 
 #: data/50-mutter-windows.xml:20
 msgid "Close window"
@@ -410,43 +411,40 @@ msgid ""
 "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: • “monitor-config-manager” — use the new "
-"monitor configuration system, aimed to replace the old one. This enables a "
-"higher level configuration API to be used by configuration applications, as "
-"well as the ability to configure per logical monitor scale. • “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. Also enabling "
-"“monitor-config-manager” is required for this feature to be enabled."
+"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 ""
-"Da uključite eksperimentalne funkcije, dodajte ključnu reč funkcije na spisak. "
-"Da li funkcija zahteva ponovno pokretanje sastavljača zavisi od date funkcije. "
-"Nije potrebno da neka eksperimentalna funkcija bude i dalje dostupna ili "
-"podesiva. Nemojte očekivati da dodavanje bilo čega u ovom podešavanju bude "
-"budući dokaz. Trenutno moguće ključne reči su: • „monitor-config-manager“ — "
-"koristi novi sistem podešavanja monitora, koji treba da zameni stari. Ovo "
-"omogućava da API podešavanja višeg nivoa bude korišćen programima podešavanja, "
-"kao i mogućnost podešavanja skale monitora na nivou logike. • „scale-monitor-"
-"framebuffer“ — čini da mater pređe na raspored logičkih monitora u logičkom "
-"koordinatnom prostoru piksela, dok vrši srazmeravanje okvira monitora umesto "
-"sadržaja prozora, za upravljanje HiDPI monitorima. Ne zahteva ponovno "
-"pokretanje. Takođe je potrebno uključiti „monitor-config-manager“ da bi ova "
-"funkcija bila uključena."
+"Da uključite probne funkcije, dodajte ključnu reč funkcije na spisak. Da li "
+"funkcija zahteva ponovno pokretanje sastavljača zavisi od date funkcije. Nije "
+"potrebno da neka probna mogućnost bude i dalje dostupna ili podesiva. Nemojte "
+"očekivati da dodavanje bilo čega u ovom podešavanju bude otporno na buduće "
+"izmene. Trenutno moguće ključne reči su: • „scale-monitor-framebuffer“ — čini "
+"da mater podrazumevano raspoređuje logičke ekrane u logičkom koordinantnom "
+"prostoru piksela, prilikom promene veličine spremišta kadrova ekrana umesto "
+"sadržaja prozora, zarad upravljanja ekranima visoke rezolucije. Ne zahteva "
+"ponovno pokretanje. • “remote-desktop” — omogućava udaljenu tehničku podršku. "
+"Da biste podržali udaljenu tehničku podršku sa deljenjem ekrana, “screen-cast” "
+"takođe mora biti omogućen. • “screen-cast” — omogućava podršku za "
+"projektovanje ekrana."
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Bira prozor iz jezička iskakanja"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Otkazivanje jezička iskakanja"
 
-#: data/org.gnome.mutter.gschema.xml.in:161
-#| msgid "Switch monitor"
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Menja podešavanja monitora"
 
-#: data/org.gnome.mutter.gschema.xml.in:166
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Zaokreće ugrađena podešavanja monitora"
 
@@ -505,7 +503,7 @@ msgstr "Ponovo uključivanje prečica"
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2118
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Režim prekidača (grupa %d)"
@@ -513,30 +511,30 @@ msgstr "Režim prekidača (grupa %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2141
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Promeni monitor"
 
-#: src/backends/meta-input-settings.c:2143
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Prikaži pomoć na ekranu"
 
-#: src/backends/meta-monitor-manager.c:927
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Ugrađeni displej"
 
-#: src/backends/meta-monitor-manager.c:950
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/backends/meta-monitor-manager.c:952
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Nepoznat displej"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:960
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

po/sv.po

@@ -9,17 +9,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 21:09+0000\n"
-"PO-Revision-Date: 2017-02-21 01:20+0100\n"
+"POT-Creation-Date: 2017-09-04 14:39+0000\n"
+"PO-Revision-Date: 2017-09-05 00:14+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -397,14 +397,54 @@ msgstr ""
 "När satt till \"true\", kommer nya fönster alltid att placeras centrerat på "
 "den aktiva skärmen."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Aktivera experimentella funktioner"
+
+#: 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 ""
+"För att aktivera experimentella funktioner, lägg till funktionens nyckelord "
+"till listan. Huruvida funktionen kräver att kompositionshanteraren startas "
+"om beror på den angivna funktionen. En experimentell funktion har inget krav "
+"på sig att fortfarande vara tillgänglig eller konfigurerbar. Förvänta dig "
+"inte att något som läggs till i denna inställning garanterat kommer att "
+"fungera i framtiden. För närvarande möjliga nyckelord: • ”scale-monitor-"
+"framebuffer” — gör så att mutter som standard använder en layout med logiska "
+"skärmar i en rymd av logiska bildpunktskoordinater, medan skärmars "
+"rambuffert skalas i stället för fönsterinnehållet, för att hantera HiDPI-"
+"skärmar. Kräver inte en omstart. • ”remote-desktop” — aktiverar stöd för "
+"fjärrskrivbord. För stöd för fjärrskrivbord med skärmdelning måste “screen-"
+"cast” också vara aktiverat. • “screen-cast” — aktiverar stöd för "
+"skärminspelning."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Välj fönster från flik-popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Avbryt flik-popup"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Växla skärmkonfiguration"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Roterar den inbyggda skärmkonfigurationen"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Växla till VT 1"
@@ -453,10 +493,14 @@ msgstr "Växla till VT 11"
 msgid "Switch to VT 12"
 msgstr "Växla till VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Återaktivera genvägar"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Lägesväxel (grupp %d)"
@@ -464,37 +508,37 @@ msgstr "Lägesväxel (grupp %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Växla skärm"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Visa hjälp på skärmen"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Inbyggd display"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Okänd display"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:936
 #, 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -504,32 +548,6 @@ msgstr "En annan kompositionshanterare körs redan på skärm %i på display ”
 msgid "Bell event"
 msgstr "Ljudsignalhändelse"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "”%s” svarar inte."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Programmet svarar inte."
-
-#: 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 ""
-"Du kan välja att vänta en kort stund på det för att fortsätta eller tvinga "
-"programmet att helt avslutas."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Tvinga avslut"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Vänta"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -571,6 +589,32 @@ msgstr "Kör som en nästlad kompositionshanterare"
 msgid "Run as a full display server, rather than nested"
 msgstr "Kör som en full display-tjänst, i stället för nästlad"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "”%s” svarar inte."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Programmet svarar inte."
+
+#: 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 ""
+"Du kan välja att vänta en kort stund på det för att fortsätta eller tvinga "
+"programmet att helt avslutas."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Tvinga avslut"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Vänta"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/tr.po

@@ -7,18 +7,18 @@
 # İlker DAĞLI <ilker@ilkerdagli.info>, 2011.
 # Muhammed EKEN <gnome@m-eken.com>, 2011.
 # Furkan Ahmet Kara <furkanahmetkara.fk@gmail.com>, 2017.
-# Emin Tufan Çetin <etcetin@gmail.com>, 2017.
 # Muhammet Kara <muhammetk@gmail.com>, 2011, 2012, 2014, 2015, 2016, 2017.
+# Emin Tufan Çetin <etcetin@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\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-13 15:47+0000\n"
-"PO-Revision-Date: 2017-08-13 18:55+0300\n"
-"Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
-"Language-Team: Turkish <gnometurk@gnome.org>\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-29 23:17+0300\n"
+"Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
+"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -386,15 +386,15 @@ msgstr ""
 
 #: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
-msgstr "Ekran boyutuna yakın pencereleri otomatik ekranı kaplat"
+msgstr "Ekran boyutuna yakın pencereleri kendiliğinden ekranı kaplattır"
 
 #: data/org.gnome.mutter.gschema.xml.in:90
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
 msgstr ""
-"Etkinleştirildiğinde ekran boyutunda başlayan yeni pencereler otomatik "
-"olarak ekranı kaplar."
+"Etkinleştirildiğinde ekran boyutunda başlayan yeni pencereler kendiliğinden "
+"ekranı kaplar."
 
 #: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
@@ -413,19 +413,32 @@ 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: • “monitor-config-"
+#| "manager” — use the new monitor configuration system, aimed to replace the "
+#| "old one. This enables a higher level configuration API to be used by "
+#| "configuration applications, as well as the ability to configure per "
+#| "logical monitor scale. • “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. Also enabling “monitor-config-"
+#| "manager” is required for this feature to be enabled."
 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: • “monitor-config-manager” — use the new "
-"monitor configuration system, aimed to replace the old one. This enables a "
-"higher level configuration API to be used by configuration applications, as "
-"well as the ability to configure per logical monitor scale. • “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. Also enabling "
-"“monitor-config-manager” is required for this feature to be enabled."
+"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 ""
 "Deneysel özellikleri etkinleştirmek için özelliğin anahtar sözcüğünü listeye "
 "ekleyin. Özelliğin yeniden başlatmayı gerektirip gerektirmeyeceği verilen "
@@ -435,26 +448,29 @@ msgstr ""
 "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 "
+"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."
+"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:151
+#: 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:156
+#: 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:161
+#: 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:166
-#| msgid "Switch monitor configurations"
+#: 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"
 
@@ -508,12 +524,12 @@ msgstr "VT 12’ye geç"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:54
 msgid "Re-enable shortcuts"
-msgstr ""
+msgstr "Kısayolları yeniden etkinleştir"
 
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2118
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Kip anahtarı (Group %d)"
@@ -521,30 +537,30 @@ msgstr "Kip anahtarı (Group %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2141
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Monitör değiştir"
 
-#: src/backends/meta-input-settings.c:2143
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Ekranda yardımı göster"
 
-#: src/backends/meta-monitor-manager.c:927
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Yerleşik ekran"
 
-#: src/backends/meta-monitor-manager.c:950
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/backends/meta-monitor-manager.c:952
+#: src/backends/meta-monitor-manager.c:928
 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:960
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -612,19 +628,19 @@ msgstr "“%s” yanıt vermiyor."
 
 #: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
-msgstr "Uygulama cevap vermiyor"
+msgstr "Uygulama yanıt vermiyor"
 
 #: 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 ""
-"Uygulamanın devam etmesi için bir müddet bekleyi seçebilirsiniz ya da "
-"uygulamanın tamamen çıkması için onu zorlayabilirsiniz."
+"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:161
 msgid "_Force Quit"
-msgstr "_Sonlandır"
+msgstr "_Zorla Çık"
 
 #: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
@@ -688,7 +704,7 @@ msgid ""
 "restarted manually next time you log in."
 msgstr ""
 "Bu pencereler, “geçerli ayarları kaydet” özelliğini desteklemiyor ve bir "
-"dahaki girişinizde elle yeniden başlatılmak zorunda."
+"dahaki girişinizde elle yeniden başlatılmak zorundadır."
 
 #: src/x11/window-props.c:559
 #, c-format

po/vi.po

@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the Metacity package.
 # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2002-2004, 2007, 2008, 2011-2013.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-08 21:37+0000\n"
-"PO-Revision-Date: 2016-09-09 08:14+0700\n"
+"POT-Creation-Date: 2017-09-07 15:44+0000\n"
+"PO-Revision-Date: 2017-09-09 08:26+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
 "Language: vi\n"
@@ -59,7 +59,7 @@ msgstr "Chuyển cửa sổ lên một không gian làm việc"
 
 #: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
-msgstr "Chuyển cửa sổ xuống vùng một làm việc"
+msgstr "Chuyển cửa sổ xuống một không gian làm việc"
 
 #: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
@@ -271,14 +271,14 @@ msgstr "Phím bổ trợ dùng cho chức năng quản lý cửa sổ mở rộn
 
 #: 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 ""
-"Phím này kích hoạt \"overlay\", một tổ hợp tổng quát cửa sổ và hệ thống chạy "
-"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Chứa một tổ hợp "
-"phím, hoặc mặc định, hoặc chuỗi rỗng."
+"Phím này khởi tạo “overlay”, nơi mà tổ hợp tổng quát cửa sổ và hệ thống chạy "
+"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Nó được kỳ vọng "
+"rằng tổ hợp hoặc là mặc định, hoặc chuỗi rỗng."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
@@ -314,13 +314,13 @@ msgstr "Không gian làm việc được quản lý động"
 
 #: 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 ""
 "Xác định không gian làm việc được quản lý động, hay cố định số không gian "
-"làm việc, xác định bởi khóa num-workspaces trong org.gnome.desktop.wm."
-"preferences."
+"làm việc (xác định bởi khóa num-workspaces trong org.gnome.desktop.wm."
+"preferences)."
 
 #: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
@@ -350,13 +350,13 @@ msgstr "Khoảng chờ con trỏ dừng di chuyển trước khi thay đổi ti
 
 #: 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 ""
-"Nếu bật, và chế độ tiêu điểm là \"sloppy\" hay \"mouse\" thì cửa sổ có tiêu "
-"điểm sẽ được thay đổi tức thì khi vào cửa sổ, nhưng chỉ sau khi chuột ngừng "
-"di chuyển."
+"Nếu bật, và chế độ kích hoạt là “sloppy” hay “mouse” thì sự kích hoạt sẽ "
+"không thay đổi tức thì khi vào cửa sổ, mà chỉ sau khi con trỏ ngừng di "
+"chuyển."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
@@ -364,7 +364,7 @@ msgstr "Độ rộng biên có thể kéo"
 
 #: 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 ""
 "Kích thước biên có thể kéo. Nếu biên thấy được của chủ đề không đủ, biên vô "
@@ -389,17 +389,55 @@ msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
 msgstr ""
-"Nếu đúng, các cửa sổ mới sẽ luôn được đặt tại trung tâm của màn hình đang "
+"Nếu chọn, các cửa sổ mới sẽ luôn được đặt tại trung tâm của màn hình đang "
 "hoạt động của màn hình."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Bật các tính băng thử nghiệm"
+
+#: 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 ""
+"Để bật các tính năng thử nghiệm, thêm các từ khóa tính năng vào danh sách. "
+"Việc tính năng mới có yêu cầu khởi động lại hay không là phụ thuộc vào tính "
+"năng đã cho. Bất kỳ tính năng thử nghiệp nào không được yêu cầu vẫn sẵn "
+"sàng, hoặc cấu hình được. Đừng cho rằng thêm bất kỳ thứ gì trong cài đặt này "
+"thử nghiệm trong tương lai. Các từ khóa hiện có thể là: • “scale-monitor-"
+"framebuffer” — làm cho mutter default to layout logical monitors trong một "
+"không gian tọa độ điểm ảnh lôgíc, trong khi while scaling monitor "
+"framebuffers instead of window content, để quản lý các màn hình HiDPI. Không "
+"yêu cầu khởi động lại. • “remote-desktop” — cho phép điều khiển màn hình từ "
+"xa. Để hỗ trợ điều khiển màn hình từ xa bằng cách chia sẻ màn hình, “screen-"
+"cast” cũng phải được bật. • “screen-cast” — bật hỗ trợ chia sẻ màn hình."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Chọn cửa sổ từ thanh nổi lên"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Hủy thanh nổi lên"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Chuyển các cấu hình màn hình"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Quay cấu hình màn hình tích hợp"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Chuyển sang VT 1"
@@ -448,58 +486,114 @@ msgstr "Chuyển sang VT 11"
 msgid "Switch to VT 12"
 msgstr "Chuyển sang VT 12"
 
-#: src/backends/meta-input-settings.c:1707
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Bật-lại phím tắt"
+
+#. TRANSLATORS: This string refers to a button that switches between
+#. * different modes.
+#.
+#: src/backends/meta-input-settings.c:2151
+#, c-format
+msgid "Mode Switch (Group %d)"
+msgstr "Chuyển chế độ(Nhóm %d)"
+
+#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
+#. * mapping through the available outputs.
+#.
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Chuyển màn hình"
 
-#: src/backends/meta-input-settings.c:1709
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Hiển thị trợ giúp trên-màn-hình"
 
-#: src/backends/meta-monitor-manager.c:514
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Màn hình tích hợp"
 
-#: src/backends/meta-monitor-manager.c:537
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: src/backends/meta-monitor-manager.c:539
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Không hiểu màn hình"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:547
+#: src/backends/meta-monitor-manager.c:936
 #, 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:463
+#: src/compositor/compositor.c:476
 #, 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 ""
-"Bộ quản lý cửa sổ đã đang chạy trên Màn hình %i trên bộ trình bày \"%s\"."
+"Bộ quản lý cửa sổ đã đang chạy trên Màn hình %i trên bộ trình bày “%s”."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Sự kiện chuông"
 
-#: src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Gặp lỗi khi mở bộ trình bày Hệ thống Cửa sổ X “%s”\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "Vô hiệu hóa kết nối với bộ quản lý phiên làm việc"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "Thay thế bộ quản lý cửa sổ đang chạy"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "Ghi rõ mã số quản lý phiên làm việc"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Bộ trình bày X cần dùng"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "Khởi động phiên làm việc từ tập tin lưu"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "Khiến các cú gọi X đồng bộ với nhau"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "Chạy như là một “wayland compositor”"
+
+#: src/core/main.c:231
+msgid "Run as a nested compositor"
+msgstr "Chạy như là một “nested compositor”"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr "Chạy như là một dịch vụ hiển thị đầy đủ, thay cho lồng nhau"
+
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” không trả lời."
 
-#: src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Ứng dụng không trả lời."
 
-#: src/core/delete.c:134
+#: 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."
@@ -507,60 +601,19 @@ msgstr ""
 "Bạn có thể chọn chờ một lúc cho nó tiếp tục hoặc buộc chấm dứt hoàn toàn ứng "
 "dụng."
 
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Chờ"
-
-#: src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Buộc thoát"
 
-#: src/core/display.c:590
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "Gặp lỗi khi mở bộ trình bày Hệ thống Cửa sổ X \"%s\".\n"
-
-#: src/core/main.c:182
-msgid "Disable connection to session manager"
-msgstr "Vô hiệu hóa kết nối với bộ quản lý phiên làm việc"
-
-#: src/core/main.c:188
-msgid "Replace the running window manager"
-msgstr "Thay thế bộ quản lý cửa sổ đang chạy"
-
-#: src/core/main.c:194
-msgid "Specify session management ID"
-msgstr "Ghi rõ mã số quản lý phiên làm việc"
-
-#: src/core/main.c:199
-msgid "X Display to use"
-msgstr "Bộ trình bày X cần dùng"
-
-#: src/core/main.c:205
-msgid "Initialize session from savefile"
-msgstr "Khởi động phiên làm việc từ tập tin lưu"
-
-#: src/core/main.c:211
-msgid "Make X calls synchronous"
-msgstr "Khiến các cú gọi X đồng bộ với nhau"
-
-#: src/core/main.c:218
-msgid "Run as a wayland compositor"
-msgstr "Chạy như là một “wayland compositor”"
-
-#: src/core/main.c:224
-msgid "Run as a nested compositor"
-msgstr "Chạy như là một “nested compositor”"
-
-#: src/core/main.c:232
-msgid "Run as a full display server, rather than nested"
-msgstr "Chạy như là một dịch vụ hiển thị đầy đủ, thay cho lồng nhau"
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Chờ"
 
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 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"
@@ -585,38 +638,38 @@ msgstr "Phần bổ sung Mutter cần dùng"
 msgid "Workspace %d"
 msgstr "Không gian làm việc %d"
 
-#: src/core/screen.c:521
+#: src/core/screen.c:580
 #, 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 ""
-"Màn hình \"%s\" đã có bộ quản lý cửa sổ rồi; hãy thử dùng tùy chọn “--"
-"replace” để thay thế bộ quản lý cửa sổ đang dùng."
+"Màn hình “%s” đã có bộ quản lý cửa sổ rồi; hãy thử dùng tùy chọn --replace "
+"để thay thế bộ quản lý cửa sổ đang dùng."
 
-#: src/core/screen.c:606
+#: src/core/screen.c:665
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Màn hình %d trên bộ trình bày \"%s\" không hợp lệ.\n"
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "Màn hình %d trên bộ trình bày “%s” không hợp lệ.\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter đã được biên dịch không hỗ trợ chế độ chi tiết\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:595
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Chuyển chế độ: Chế độ %d"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
-"Những cửa sổ này không hỗ trợ &quot;lưu cài đặt hiện thời&quot; và sẽ phải "
-"khởi động lại bằng tay lần kế bạn đăng nhập."
+"Những cửa sổ này không hỗ trợ “lưu cài đặt hiện tại” và sẽ phải khởi động "
+"lại bằng tay lần kế bạn đăng nhập."
 
-#: src/x11/window-props.c:548
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (trên %s)"

po/zh_TW.po

@@ -10,16 +10,16 @@ msgstr ""
 "Project-Id-Version: metacity 3.3.4\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 06:20+0000\n"
-"PO-Revision-Date: 2017-03-01 10:24+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
+"POT-Creation-Date: 2017-09-29 14:36+0000\n"
+"PO-Revision-Date: 2017-10-01 22:57+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.12\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -383,14 +383,48 @@ msgid ""
 "screen of the monitor."
 msgstr "當設定為「true」時，新視窗會永遠置於使用中螢幕畫面的正中央。"
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: 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 ""
+"若要啟用實驗性功能，請將功能關鍵字加入列表中。置於該功能是否須要重新啟動混成"
+"器則視給予的功能而定。任何實驗性功能不一定能用、或是可以調整設定。請不要預期"
+"在此設定中加入的任何東西未來都能存在。目前可用的關鍵字有： • “scale-monitor-"
+"framebuffer” — 讓 mutter 預設採用邏輯像素座標空間的配置邏輯螢幕，而縮放螢幕 "
+"framebuffer 則取代視窗內容以管理 HiDPI 螢幕。不須要重新啟動。 • “remote-"
+"desktop” — 啟用遠端桌面支援。若要支援遠端桌面的螢幕分享，則必須也啟用“screen-"
+"cast”。• “screen-cast” — 啟用螢幕投放支援。"
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "從分頁彈出項選擇視窗"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "取消分頁彈出項"
 
+#: 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"
@@ -439,10 +473,14 @@ 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 "重新啟用快捷鍵"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2157
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "模式切換( 群組 %d)"
@@ -450,30 +488,30 @@ msgstr "模式切換( 群組 %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2180
 msgid "Switch monitor"
-msgstr "切換監視器"
+msgstr "切換螢幕"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2182
 msgid "Show on-screen help"
 msgstr "顯示螢幕求助"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:894
 msgid "Built-in display"
 msgstr "內建顯示"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:917
 msgid "Unknown"
 msgstr "不明"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:919
 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:708
+#: src/backends/meta-monitor-manager.c:927
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -481,7 +519,7 @@ msgstr "%s %s"
 # FIXME: I'm still unclear about the meaning of XGetSelectionOwner -- Abel
 #. 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -491,30 +529,6 @@ msgstr "在畫面「%2$s」中的第 %1$i 個螢幕中已啟動另一個組合
 msgid "Bell event"
 msgstr "響鈴事件"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "“%s”沒有回應。"
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "應用程式沒有回應。"
-
-#: 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/delete.c:141
-msgid "_Force Quit"
-msgstr "強制結束(_F)"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "等待(_W)"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -556,6 +570,30 @@ msgstr "以巢狀組合器執行"
 msgid "Run as a full display server, rather than nested"
 msgstr "以完全顯示伺服器執行，而非巢狀"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "「%s」沒有回應。"
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "應用程式沒有回應。"
+
+#: 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:161
+msgid "_Force Quit"
+msgstr "強制退出(_F)"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "等待(_W)"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
@@ -566,8 +604,8 @@ msgid ""
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"版權所有 (C) 2001-%d Havoc Pennington, Red Hat, Inc. 及其它開發者\n"
-"本程式是自由軟體；有關版權的詳情請參考源程式碼。\n"
+"著作權所有 (C) 2001-%d Havoc Pennington, Red Hat, Inc. 及其它開發者\n"
+"本程式是自由軟體；有關著作權的詳情請參考源始程式碼。\n"
 "本程式不負任何擔保責任；亦無對適售性或特定目的適用性所為的默示性擔保。\n"
 
 #: src/core/mutter.c:53
@@ -584,7 +622,7 @@ msgstr "要使用的 Mutter 外掛程式"
 msgid "Workspace %d"
 msgstr "工作區 %d"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:582
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -593,7 +631,7 @@ msgstr ""
 "畫面「%s」已經有了視窗管理員；請嘗試使用 --replace 選項來替換目前的視窗管理"
 "員。"
 
-#: src/core/screen.c:665
+#: src/core/screen.c:667
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "畫面「%2$s」中的第 %1$d 個螢幕無效\n"

src/Makefile-tests.am

@@ -2,6 +2,13 @@
 
 if HAVE_WAYLAND
 
+test_programs = \
+	mutter-test-client \
+	mutter-test-runner \
+	mutter-test-unit-tests \
+	mutter-test-headless-start-test \
+	$(NULL)
+
 if BUILDOPT_INSTALL_TESTS
 stackingdir = $(pkgdatadir)/tests/stacking
 dist_stacking_DATA =				\
@@ -19,9 +26,9 @@ installedtestsdir = $(datadir)/installed-tests/mutter
 installedtests_DATA = mutter-all.test
 
 installedtestsbindir = $(libexecdir)/installed-tests/mutter
-installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner mutter-test-unit-tests
+installedtestsbin_PROGRAMS = $(test_programs)
 else
-noinst_PROGRAMS += mutter-test-client mutter-test-runner mutter-test-unit-tests
+noinst_PROGRAMS += $(test_programs)
 endif
 
 EXTRA_DIST += tests/mutter-all.test.in
@@ -29,10 +36,15 @@ EXTRA_DIST += tests/mutter-all.test.in
 mutter_test_client_SOURCES = tests/test-client.c
 mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
 
-mutter_test_runner_SOURCES = tests/test-runner.c
+mutter_test_runner_SOURCES = \
+	tests/test-utils.c \
+	tests/test-utils.h \
+	tests/test-runner.c
 mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
 
 mutter_test_unit_tests_SOURCES = \
+	tests/test-utils.c \
+	tests/test-utils.h \
 	tests/unit-tests.c \
 	tests/meta-backend-test.c \
 	tests/meta-backend-test.h \
@@ -49,7 +61,16 @@ mutter_test_unit_tests_SOURCES = \
 	$(NULL)
 mutter_test_unit_tests_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
 
-.PHONY: run-tests run-test-runner-tests run-unit-tests
+mutter_test_headless_start_test_SOURCES = \
+	tests/headless-start-test.c \
+	tests/meta-backend-test.c \
+	tests/meta-backend-test.h \
+	tests/meta-monitor-manager-test.c \
+	tests/meta-monitor-manager-test.h \
+	$(NULL)
+mutter_test_headless_start_test_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
+
+.PHONY: run-tests run-test-runner-tests run-unit-tests run-headless-start-test
 
 run-test-runner-tests: mutter-test-client mutter-test-runner
 	./mutter-test-runner $(dist_stacking_DATA)
@@ -57,7 +78,10 @@ run-test-runner-tests: mutter-test-client mutter-test-runner
 run-unit-tests: mutter-test-unit-tests
 	./mutter-test-unit-tests
 
-run-tests: run-test-runner-tests run-unit-tests
+run-headless-start-test: mutter-test-headless-start-test
+	./mutter-test-headless-start-test
+
+run-tests: run-test-runner-tests run-unit-tests run-headless-start-test
 
 endif
 

src/Makefile.am

@@ -53,6 +53,13 @@ mutter_built_sources = \
 	meta-enum-types.c			\
 	$(NULL)
 
+if HAVE_REMOTE_DESKTOP
+mutter_built_sources += \
+	$(dbus_remote_desktop_built_sources)	\
+	$(dbus_screen_cast_built_sources)	\
+	$(NULL)
+endif
+
 if HAVE_WAYLAND
 mutter_built_sources += \
 	pointer-gestures-unstable-v1-protocol.c				\
@@ -90,6 +97,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-backend-private.h		\
 	backends/meta-barrier.c			\
 	backends/meta-barrier-private.h		\
+	backends/meta-crtc.c			\
+	backends/meta-crtc.h			\
 	backends/meta-cursor.c			\
 	backends/meta-cursor.h			\
 	backends/meta-cursor-tracker.c		\
@@ -100,6 +109,11 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-egl.c			\
 	backends/meta-egl.h			\
 	backends/meta-egl-ext.h			\
+	backends/meta-gles3.c			\
+	backends/meta-gles3.h			\
+	backends/meta-gles3-table.h		\
+	backends/meta-gpu.c			\
+	backends/meta-gpu.h			\
 	backends/meta-display-config-shared.h	\
 	backends/meta-idle-monitor.c		\
 	backends/meta-idle-monitor-private.h	\
@@ -124,6 +138,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-monitor-manager-dummy.h	\
 	backends/meta-orientation-manager.c	\
 	backends/meta-orientation-manager.h	\
+	backends/meta-output.c			\
+	backends/meta-output.h			\
 	backends/meta-pointer-constraint.c	\
 	backends/meta-pointer-constraint.h	\
 	backends/meta-settings.c		\
@@ -142,8 +158,12 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/x11/meta-barrier-x11.h			\
 	backends/x11/meta-clutter-backend-x11.c		\
 	backends/x11/meta-clutter-backend-x11.h		\
+	backends/x11/meta-crtc-xrandr.c			\
+	backends/x11/meta-crtc-xrandr.h			\
 	backends/x11/meta-cursor-renderer-x11.c		\
 	backends/x11/meta-cursor-renderer-x11.h		\
+	backends/x11/meta-gpu-xrandr.c			\
+	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-renderer-x11-cm.c		\
@@ -160,6 +180,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/x11/meta-input-settings-x11.h		\
 	backends/x11/meta-monitor-manager-xrandr.c	\
 	backends/x11/meta-monitor-manager-xrandr.h	\
+	backends/x11/meta-output-xrandr.c		\
+	backends/x11/meta-output-xrandr.h		\
 	backends/x11/meta-renderer-x11.c		\
 	backends/x11/meta-renderer-x11.h		\
 	backends/x11/meta-stage-x11-nested.c		\
@@ -174,6 +196,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	meta/boxes.h				\
 	core/meta-border.c			\
 	core/meta-border.h			\
+	core/meta-fraction.c			\
+	core/meta-fraction.h			\
 	compositor/clutter-utils.c		\
 	compositor/clutter-utils.h		\
 	compositor/cogl-utils.c			\
@@ -311,6 +335,29 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	x11/mutter-Xatomtype.h			\
 	$(NULL)
 
+if HAVE_REMOTE_DESKTOP
+libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
+	backends/meta-dbus-session-watcher.c	\
+	backends/meta-dbus-session-watcher.h	\
+	backends/meta-remote-desktop.c		\
+	backends/meta-remote-desktop.h		\
+	backends/meta-remote-desktop-session.c	\
+	backends/meta-remote-desktop-session.h	\
+	backends/meta-screen-cast.c		\
+	backends/meta-screen-cast.h		\
+	backends/meta-screen-cast-monitor-stream.c	\
+	backends/meta-screen-cast-monitor-stream.h	\
+	backends/meta-screen-cast-monitor-stream-src.c	\
+	backends/meta-screen-cast-monitor-stream-src.h	\
+	backends/meta-screen-cast-session.c	\
+	backends/meta-screen-cast-session.h	\
+	backends/meta-screen-cast-stream.c	\
+	backends/meta-screen-cast-stream.h	\
+	backends/meta-screen-cast-stream-src.c	\
+	backends/meta-screen-cast-stream-src.h	\
+	$(NULL)
+endif
+
 if HAVE_WAYLAND
 libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
 	compositor/meta-surface-actor-wayland.c	\
@@ -408,11 +455,15 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=		\
 	backends/native/meta-backend-native-private.h	\
 	backends/native/meta-barrier-native.c		\
 	backends/native/meta-barrier-native.h		\
+	backends/native/meta-crtc-kms.c			\
+	backends/native/meta-crtc-kms.h			\
 	backends/native/meta-clutter-backend-native.c	\
 	backends/native/meta-clutter-backend-native.h	\
 	backends/native/meta-cursor-renderer-native.c	\
 	backends/native/meta-cursor-renderer-native.h	\
 	backends/native/meta-default-modes.h		\
+	backends/native/meta-gpu-kms.c			\
+	backends/native/meta-gpu-kms.h			\
 	backends/native/meta-idle-monitor-native.c	\
 	backends/native/meta-idle-monitor-native.h	\
 	backends/native/meta-input-settings-native.c	\
@@ -421,8 +472,12 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=		\
 	backends/native/meta-monitor-manager-kms.h	\
 	backends/native/meta-launcher.c			\
 	backends/native/meta-launcher.h			\
+	backends/native/meta-output-kms.c		\
+	backends/native/meta-output-kms.h		\
 	backends/native/meta-renderer-native.c		\
 	backends/native/meta-renderer-native.h		\
+	backends/native/meta-renderer-native-gles3.c	\
+	backends/native/meta-renderer-native-gles3.h	\
 	backends/native/meta-stage-native.c		\
 	backends/native/meta-stage-native.h		\
 	backends/native/dbus-utils.c			\
@@ -579,6 +634,8 @@ EXTRA_DIST +=					\
 	org.freedesktop.login1.xml		\
 	org.gnome.Mutter.DisplayConfig.xml	\
 	org.gnome.Mutter.IdleMonitor.xml	\
+	org.gnome.Mutter.RemoteDesktop.xml	\
+	org.gnome.Mutter.ScreenCast.xml	\
 	backends/native/gen-default-modes.py	\
 	$(NULL)
 
@@ -627,6 +684,26 @@ $(dbus_idle_built_sources) : Makefile.am org.gnome.Mutter.IdleMonitor.xml
 		--c-generate-autocleanup all						\
 		$(srcdir)/org.gnome.Mutter.IdleMonitor.xml
 
+if HAVE_REMOTE_DESKTOP
+dbus_remote_desktop_built_sources = meta-dbus-remote-desktop.c meta-dbus-remote-desktop.h
+
+$(dbus_remote_desktop_built_sources) : Makefile.am org.gnome.Mutter.RemoteDesktop.xml
+	$(AM_V_GEN)gdbus-codegen							\
+		--interface-prefix org.gnome.Mutter					\
+		--c-namespace MetaDBus							\
+		--generate-c-code meta-dbus-remote-desktop				\
+		$(srcdir)/org.gnome.Mutter.RemoteDesktop.xml
+
+dbus_screen_cast_built_sources = meta-dbus-screen-cast.c meta-dbus-screen-cast.h
+
+$(dbus_screen_cast_built_sources) : Makefile.am org.gnome.Mutter.ScreenCast.xml
+	$(AM_V_GEN)gdbus-codegen							\
+		--interface-prefix org.gnome.Mutter					\
+		--c-namespace MetaDBus							\
+		--generate-c-code meta-dbus-screen-cast					\
+		$(srcdir)/org.gnome.Mutter.ScreenCast.xml
+endif
+
 dbus_login1_built_sources = meta-dbus-login1.c meta-dbus-login1.h
 
 $(dbus_login1_built_sources) : Makefile.am org.freedesktop.login1.xml

src/backends/meta-backend-private.h

@@ -38,6 +38,9 @@
 #include "meta-input-settings-private.h"
 #include "backends/meta-egl.h"
 #include "backends/meta-pointer-constraint.h"
+#ifdef HAVE_REMOTE_DESKTOP
+#include "backends/meta-remote-desktop.h"
+#endif
 #include "backends/meta-renderer.h"
 #include "backends/meta-settings-private.h"
 #include "core/util-private.h"
@@ -58,9 +61,11 @@ struct _MetaBackendClass
 
   MetaIdleMonitor * (* create_idle_monitor) (MetaBackend *backend,
                                              int          device_id);
-  MetaMonitorManager * (* create_monitor_manager) (MetaBackend *backend);
+  MetaMonitorManager * (* create_monitor_manager) (MetaBackend *backend,
+                                                   GError     **error);
   MetaCursorRenderer * (* create_cursor_renderer) (MetaBackend *backend);
-  MetaRenderer * (* create_renderer) (MetaBackend *backend);
+  MetaRenderer * (* create_renderer) (MetaBackend *backend,
+                                      GError     **error);
   MetaInputSettings * (* create_input_settings) (MetaBackend *backend);
 
   gboolean (* grab_device) (MetaBackend *backend,
@@ -120,6 +125,10 @@ MetaRenderer * meta_backend_get_renderer (MetaBackend *backend);
 MetaEgl * meta_backend_get_egl (MetaBackend *backend);
 MetaSettings * meta_backend_get_settings (MetaBackend *backend);
 
+#ifdef HAVE_REMOTE_DESKTOP
+MetaRemoteDesktop * meta_backend_get_remote_desktop (MetaBackend *backend);
+#endif
+
 gboolean meta_backend_grab_device (MetaBackend *backend,
                                    int          device_id,
                                    uint32_t     timestamp);

src/backends/meta-backend.c

@@ -29,13 +29,19 @@
 #include <clutter/clutter-mutter.h>
 #include <meta/meta-backend.h>
 #include <meta/main.h>
+#include <meta/util.h>
 #include "meta-backend-private.h"
 #include "meta-input-settings-private.h"
-
 #include "backends/x11/meta-backend-x11.h"
 #include "meta-cursor-tracker-private.h"
 #include "meta-stage.h"
 
+#ifdef HAVE_REMOTE_DESKTOP
+#include "backends/meta-dbus-session-watcher.h"
+#include "backends/meta-screen-cast.h"
+#include "backends/meta-remote-desktop.h"
+#endif
+
 #ifdef HAVE_NATIVE_BACKEND
 #include "backends/native/meta-backend-native.h"
 #endif
@@ -85,10 +91,17 @@ struct _MetaBackendPrivate
   MetaRenderer *renderer;
   MetaEgl *egl;
   MetaSettings *settings;
+#ifdef HAVE_REMOTE_DESKTOP
+  MetaDbusSessionWatcher *dbus_session_watcher;
+  MetaScreenCast *screen_cast;
+  MetaRemoteDesktop *remote_desktop;
+#endif
 
   ClutterBackend *clutter_backend;
   ClutterActor *stage;
 
+  gboolean is_pointer_position_initialized;
+
   guint device_update_idle_id;
 
   GHashTable *device_monitors;
@@ -117,6 +130,11 @@ meta_backend_finalize (GObject *object)
   g_clear_object (&priv->monitor_manager);
   g_clear_object (&priv->orientation_manager);
   g_clear_object (&priv->input_settings);
+#ifdef HAVE_REMOTE_DESKTOP
+  g_clear_object (&priv->remote_desktop);
+  g_clear_object (&priv->screen_cast);
+  g_clear_object (&priv->dbus_session_watcher);
+#endif
 
   if (priv->device_update_idle_id)
     g_source_remove (priv->device_update_idle_id);
@@ -169,13 +187,17 @@ meta_backend_monitors_changed (MetaBackend *backend)
   if (clutter_input_device_get_coords (device, NULL, &point))
     {
       /* If we're outside all monitors, warp the pointer back inside */
-      if (!meta_monitor_manager_get_logical_monitor_at (monitor_manager,
-                                                        point.x, point.y) &&
+      if ((!meta_monitor_manager_get_logical_monitor_at (monitor_manager,
+                                                         point.x, point.y) ||
+           !priv->is_pointer_position_initialized) &&
           !meta_monitor_manager_is_headless (monitor_manager))
-        center_pointer (backend);
+        {
+          center_pointer (backend);
+          priv->is_pointer_position_initialized = TRUE;
+        }
     }
 
-  meta_settings_update_ui_scaling_factor (priv->settings);
+  meta_cursor_renderer_force_update (priv->cursor_renderer);
 }
 
 void
@@ -333,15 +355,6 @@ on_device_removed (ClutterDeviceManager *device_manager,
     }
 }
 
-static MetaMonitorManager *
-create_monitor_manager (MetaBackend *backend)
-{
-  if (g_getenv ("META_DUMMY_MONITORS"))
-    return g_object_new (META_TYPE_MONITOR_MANAGER_DUMMY, NULL);
-
-  return META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend);
-}
-
 static void
 create_device_monitors (MetaBackend          *backend,
                         ClutterDeviceManager *device_manager)
@@ -387,6 +400,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)
 {
@@ -397,7 +432,7 @@ meta_backend_real_post_init (MetaBackend *backend)
   clutter_actor_realize (priv->stage);
   META_BACKEND_GET_CLASS (backend)->select_stage_events (backend);
 
-  priv->monitor_manager = create_monitor_manager (backend);
+  meta_monitor_manager_setup (priv->monitor_manager);
 
   meta_backend_sync_screen_size (backend);
 
@@ -418,7 +453,19 @@ meta_backend_real_post_init (MetaBackend *backend)
 
   priv->input_settings = meta_backend_create_input_settings (backend);
 
-  center_pointer (backend);
+#ifdef HAVE_REMOTE_DESKTOP
+  priv->dbus_session_watcher = g_object_new (META_TYPE_DBUS_SESSION_WATCHER, NULL);
+  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))
+    {
+      center_pointer (backend);
+      priv->is_pointer_position_initialized = TRUE;
+    }
 }
 
 static MetaCursorRenderer *
@@ -503,6 +550,44 @@ meta_backend_class_init (MetaBackendClass *klass)
   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)
+{
+  if (g_getenv ("META_DUMMY_MONITORS"))
+    return g_object_new (META_TYPE_MONITOR_MANAGER_DUMMY, NULL);
+
+  return META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend,
+                                                                   error);
+}
+
+static MetaRenderer *
+meta_backend_create_renderer (MetaBackend *backend,
+                              GError     **error)
+{
+  return META_BACKEND_GET_CLASS (backend)->create_renderer (backend, error);
+}
+
 static gboolean
 meta_backend_initable_init (GInitable     *initable,
                             GCancellable  *cancellable,
@@ -512,24 +597,26 @@ 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);
 
-  priv->renderer = META_BACKEND_GET_CLASS (backend)->create_renderer (backend);
+  priv->orientation_manager = g_object_new (META_TYPE_ORIENTATION_MANAGER, NULL);
+
+  priv->monitor_manager = meta_backend_create_monitor_manager (backend, error);
+  if (!priv->monitor_manager)
+    return FALSE;
+
+  priv->renderer = meta_backend_create_renderer (backend, error);
   if (!priv->renderer)
-    {
-      g_set_error (error, G_IO_ERROR,
-                   G_IO_ERROR_FAILED,
-                   "Failed to create MetaRenderer");
-      return FALSE;
-    }
+    return FALSE;
 
   priv->cursor_tracker = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
 
   priv->dnd = g_object_new (META_TYPE_DND, NULL);
 
-  priv->orientation_manager = g_object_new (META_TYPE_ORIENTATION_MANAGER, NULL);
-
   return TRUE;
 }
 
@@ -641,6 +728,19 @@ meta_backend_get_settings (MetaBackend *backend)
   return priv->settings;
 }
 
+#ifdef HAVE_REMOTE_DESKTOP
+/**
+ * meta_backend_get_remote_desktop: (skip)
+ */
+MetaRemoteDesktop *
+meta_backend_get_remote_desktop (MetaBackend *backend)
+{
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+
+  return priv->remote_desktop;
+}
+#endif /* HAVE_REMOTE_DESKTOP */
+
 /**
  * meta_backend_grab_device: (skip)
  */

src/backends/meta-crtc.c

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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-crtc.h"
+
+G_DEFINE_TYPE (MetaCrtc, meta_crtc, G_TYPE_OBJECT)
+
+G_DEFINE_TYPE (MetaCrtcMode, meta_crtc_mode, G_TYPE_OBJECT)
+
+MetaGpu *
+meta_crtc_get_gpu (MetaCrtc *crtc)
+{
+  return crtc->gpu;
+}
+
+static void
+meta_crtc_finalize (GObject *object)
+{
+  MetaCrtc *crtc = META_CRTC (object);
+
+  if (crtc->driver_notify)
+    crtc->driver_notify (crtc);
+
+  G_OBJECT_CLASS (meta_crtc_parent_class)->finalize (object);
+}
+
+static void
+meta_crtc_init (MetaCrtc *crtc)
+{
+}
+
+static void
+meta_crtc_class_init (MetaCrtcClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_crtc_finalize;
+}
+
+static void
+meta_crtc_mode_finalize (GObject *object)
+{
+  MetaCrtcMode *crtc_mode = META_CRTC_MODE (object);
+
+  if (crtc_mode->driver_notify)
+    crtc_mode->driver_notify (crtc_mode);
+
+  G_OBJECT_CLASS (meta_crtc_mode_parent_class)->finalize (object);
+}
+
+static void
+meta_crtc_mode_init (MetaCrtcMode *crtc_mode)
+{
+}
+
+static void
+meta_crtc_mode_class_init (MetaCrtcModeClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_crtc_mode_finalize;
+}

src/backends/meta-crtc.h

@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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_CRTC_H
+#define META_CRTC_H
+
+#include <glib-object.h>
+
+#include "backends/meta-gpu.h"
+
+/* Same as KMS mode flags and X11 randr flags */
+typedef enum _MetaCrtcModeFlag
+{
+  META_CRTC_MODE_FLAG_NONE = 0,
+  META_CRTC_MODE_FLAG_PHSYNC = (1 << 0),
+  META_CRTC_MODE_FLAG_NHSYNC = (1 << 1),
+  META_CRTC_MODE_FLAG_PVSYNC = (1 << 2),
+  META_CRTC_MODE_FLAG_NVSYNC = (1 << 3),
+  META_CRTC_MODE_FLAG_INTERLACE = (1 << 4),
+  META_CRTC_MODE_FLAG_DBLSCAN = (1 << 5),
+  META_CRTC_MODE_FLAG_CSYNC = (1 << 6),
+  META_CRTC_MODE_FLAG_PCSYNC = (1 << 7),
+  META_CRTC_MODE_FLAG_NCSYNC = (1 << 8),
+  META_CRTC_MODE_FLAG_HSKEW = (1 << 9),
+  META_CRTC_MODE_FLAG_BCAST = (1 << 10),
+  META_CRTC_MODE_FLAG_PIXMUX = (1 << 11),
+  META_CRTC_MODE_FLAG_DBLCLK = (1 << 12),
+  META_CRTC_MODE_FLAG_CLKDIV2 = (1 << 13),
+
+  META_CRTC_MODE_FLAG_MASK = 0x3fff
+} MetaCrtcModeFlag;
+
+struct _MetaCrtc
+{
+  GObject parent;
+
+  MetaGpu *gpu;
+
+  glong crtc_id;
+  MetaRectangle rect;
+  MetaCrtcMode *current_mode;
+  MetaMonitorTransform transform;
+  unsigned int all_transforms;
+
+  MetaLogicalMonitor *logical_monitor;
+
+  /* Used when changing configuration */
+  gboolean is_dirty;
+
+  /* Used by cursor renderer backend */
+  void *cursor_renderer_private;
+
+  gpointer driver_private;
+  GDestroyNotify driver_notify;
+};
+
+struct _MetaCrtcMode
+{
+  GObject parent;
+
+  /* The low-level ID of this mode, used to apply back configuration */
+  glong mode_id;
+  char *name;
+
+  int width;
+  int height;
+  float refresh_rate;
+  MetaCrtcModeFlag flags;
+
+  gpointer driver_private;
+  GDestroyNotify driver_notify;
+};
+
+#define META_TYPE_CRTC (meta_crtc_get_type ())
+G_DECLARE_FINAL_TYPE (MetaCrtc, meta_crtc, META, CRTC, GObject)
+
+#define META_TYPE_CRTC_MODE (meta_crtc_mode_get_type ())
+G_DECLARE_FINAL_TYPE (MetaCrtcMode, meta_crtc_mode, META, CRTC_MODE, GObject)
+
+MetaGpu * meta_crtc_get_gpu (MetaCrtc *crtc);
+
+#endif /* META_CRTC_H */

src/backends/meta-dbus-session-watcher.c

@@ -0,0 +1,235 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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-dbus-session-watcher.h"
+
+#include <gio/gio.h>
+
+enum
+{
+  SESSION_SIGNAL_SESSION_CLOSED,
+
+  N_SESSION_SIGNALS
+};
+
+static guint session_signals[N_SESSION_SIGNALS];
+
+G_DEFINE_INTERFACE (MetaDbusSession, meta_dbus_session, G_TYPE_OBJECT)
+
+struct _MetaDbusSessionWatcher
+{
+  GObject parent;
+
+  GHashTable *clients;
+};
+
+G_DEFINE_TYPE (MetaDbusSessionWatcher,
+               meta_dbus_session_watcher,
+               G_TYPE_OBJECT)
+
+typedef struct _MetaDbusSessionClient
+{
+  MetaDbusSessionWatcher *session_watcher;
+  MetaDbusSession *session;
+  char *dbus_name;
+  guint name_watcher_id;
+  GList *sessions;
+} MetaDbusSessionClient;
+
+static void
+meta_dbus_session_client_vanished (MetaDbusSession *session)
+{
+  META_DBUS_SESSION_GET_IFACE (session)->client_vanished (session);
+}
+
+static void
+meta_dbus_session_client_destroy (MetaDbusSessionClient *client)
+{
+  while (TRUE)
+    {
+      GList *l;
+      MetaDbusSession *session;
+
+      l = client->sessions;
+      if (!l)
+        break;
+
+      session = l->data;
+
+      /*
+       * This will invoke on_session_closed which removes the session from the
+       * list.
+       */
+      meta_dbus_session_client_vanished (session);
+    }
+
+  if (client->name_watcher_id)
+    g_bus_unwatch_name (client->name_watcher_id);
+
+  g_free (client->dbus_name);
+  g_free (client);
+}
+
+static void
+meta_dbus_session_watcher_destroy_client (MetaDbusSessionWatcher *session_watcher,
+                                          MetaDbusSessionClient  *client)
+{
+  g_hash_table_remove (session_watcher->clients, client->dbus_name);
+}
+
+static void
+name_vanished_callback (GDBusConnection *connection,
+                        const char      *name,
+                        gpointer         user_data)
+{
+  MetaDbusSessionClient *client = user_data;
+
+  g_warning ("D-Bus client with active sessions vanished");
+
+  client->name_watcher_id = 0;
+
+  meta_dbus_session_watcher_destroy_client (client->session_watcher, client);
+}
+
+static MetaDbusSessionClient *
+meta_dbus_session_client_new (MetaDbusSessionWatcher *session_watcher,
+                              MetaDbusSession        *session,
+                              const char             *dbus_name)
+{
+  GDBusInterfaceSkeleton *interface_skeleton =
+    G_DBUS_INTERFACE_SKELETON (session);
+  GDBusConnection *connection =
+    g_dbus_interface_skeleton_get_connection (interface_skeleton);
+  MetaDbusSessionClient *client;
+
+  client = g_new0 (MetaDbusSessionClient, 1);
+  client->session_watcher = session_watcher;
+  client->session = session;
+  client->dbus_name = g_strdup (dbus_name);
+
+  client->name_watcher_id =
+    g_bus_watch_name_on_connection (connection,
+                                    dbus_name,
+                                    G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                    NULL,
+                                    name_vanished_callback,
+                                    client,
+                                    NULL);
+
+  return client;
+}
+
+static void
+on_session_closed (MetaDbusSession       *session,
+                   MetaDbusSessionClient *client)
+{
+  client->sessions = g_list_remove (client->sessions, session);
+
+  if (!client->sessions)
+    meta_dbus_session_watcher_destroy_client (client->session_watcher, client);
+}
+
+static void
+meta_dbus_session_client_add_session (MetaDbusSessionClient *client,
+                                      MetaDbusSession       *session)
+{
+  client->sessions = g_list_append (client->sessions, session);
+
+  g_signal_connect (session, "session-closed",
+                    G_CALLBACK (on_session_closed),
+                    client);
+}
+
+static MetaDbusSessionClient *
+meta_dbus_session_watcher_get_client (MetaDbusSessionWatcher *session_watcher,
+                                      const char             *dbus_name)
+{
+  return g_hash_table_lookup (session_watcher->clients, dbus_name);
+}
+
+void
+meta_dbus_session_watcher_watch_session (MetaDbusSessionWatcher *session_watcher,
+                                         const char             *client_dbus_name,
+                                         MetaDbusSession        *session)
+{
+  MetaDbusSessionClient *client;
+
+  client = meta_dbus_session_watcher_get_client (session_watcher,
+                                                 client_dbus_name);
+  if (!client)
+    {
+      client = meta_dbus_session_client_new (session_watcher,
+                                             session,
+                                             client_dbus_name);
+      g_hash_table_insert (session_watcher->clients,
+                           g_strdup (client_dbus_name),
+                           client);
+    }
+
+  meta_dbus_session_client_add_session (client, session);
+}
+
+void
+meta_dbus_session_notify_closed (MetaDbusSession *session)
+{
+  g_signal_emit (session, session_signals[SESSION_SIGNAL_SESSION_CLOSED], 0);
+}
+
+static void
+meta_dbus_session_default_init (MetaDbusSessionInterface *iface)
+{
+  session_signals[SESSION_SIGNAL_SESSION_CLOSED] =
+    g_signal_new ("session-closed",
+                  G_TYPE_FROM_INTERFACE (iface),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+}
+
+static void
+meta_dbus_session_watcher_finalize (GObject *object)
+{
+  MetaDbusSessionWatcher *session_watcher = META_DBUS_SESSION_WATCHER (object);
+
+  g_hash_table_destroy (session_watcher->clients);
+}
+
+static void
+meta_dbus_session_watcher_init (MetaDbusSessionWatcher *session_watcher)
+{
+  session_watcher->clients =
+    g_hash_table_new_full (g_str_hash,
+                           g_str_equal,
+                           g_free,
+                           (GDestroyNotify) meta_dbus_session_client_destroy);
+}
+
+static void
+meta_dbus_session_watcher_class_init (MetaDbusSessionWatcherClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_dbus_session_watcher_finalize;
+}

src/backends/meta-dbus-session-watcher.h

@@ -0,0 +1,52 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 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_DBUS_SESSION_WATCHER_H
+#define META_DBUS_SESSION_WATCHER_H
+
+#include <glib-object.h>
+
+#define META_TYPE_DBUS_SESSION (meta_dbus_session_get_type ())
+G_DECLARE_INTERFACE (MetaDbusSession, meta_dbus_session,
+                     META, DBUS_SESSION,
+                     GObject)
+
+struct _MetaDbusSessionInterface
+{
+  GTypeInterface parent_iface;
+
+  void (* client_vanished) (MetaDbusSession *session);
+};
+
+#define META_TYPE_DBUS_SESSION_WATCHER (meta_dbus_session_watcher_get_type ())
+G_DECLARE_FINAL_TYPE (MetaDbusSessionWatcher,
+                      meta_dbus_session_watcher,
+                      META, DBUS_SESSION_WATCHER,
+                      GObject)
+
+void meta_dbus_session_watcher_watch_session (MetaDbusSessionWatcher *session_watcher,
+                                              const char             *client_dbus_name,
+                                              MetaDbusSession        *session);
+
+void meta_dbus_session_notify_closed (MetaDbusSession *session);
+
+#endif /* META_DBUS_SESSION_WATCHER_H */

src/backends/meta-egl.c

@@ -160,11 +160,11 @@ set_egl_error (GError **error)
                        error_str);
 }
 
-static gboolean
-extensions_string_has_extensions_valist (const char *extensions_str,
-                                         char     ***missing_extensions,
-                                         char       *first_extension,
-                                         va_list     var_args)
+gboolean
+meta_extensions_string_has_extensions_valist (const char *extensions_str,
+                                              char     ***missing_extensions,
+                                              char       *first_extension,
+                                              va_list     var_args)
 {
   char **extensions;
   char *extension;
@@ -222,10 +222,11 @@ meta_egl_has_extensions (MetaEgl   *egl,
     }
 
   va_start (var_args, first_extension);
-  has_extensions = extensions_string_has_extensions_valist (extensions_str,
-                                                            missing_extensions,
-                                                            first_extension,
-                                                            var_args);
+  has_extensions =
+    meta_extensions_string_has_extensions_valist (extensions_str,
+                                                  missing_extensions,
+                                                  first_extension,
+                                                  var_args);
   va_end (var_args);
 
   return has_extensions;
@@ -245,6 +246,25 @@ meta_egl_initialize (MetaEgl   *egl,
   return TRUE;
 }
 
+gpointer
+meta_egl_get_proc_address (MetaEgl    *egl,
+                           const char *procname,
+                           GError    **error)
+{
+  gpointer func;
+
+  func = (gpointer) eglGetProcAddress (procname);
+  if (!func)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "Could not load symbol '%s': Not found",
+                   procname);
+      return NULL;
+    }
+
+  return func;
+}
+
 gboolean
 meta_egl_choose_config (MetaEgl      *egl,
                         EGLDisplay    display,
@@ -289,6 +309,27 @@ meta_egl_choose_config (MetaEgl      *egl,
   return TRUE;
 }
 
+EGLSurface
+meta_egl_create_window_surface (MetaEgl            *egl,
+                                EGLDisplay          display,
+                                EGLConfig           config,
+                                EGLNativeWindowType native_window_type,
+                                const EGLint       *attrib_list,
+                                GError            **error)
+{
+  EGLSurface surface;
+
+  surface = eglCreateWindowSurface (display, config,
+                                    native_window_type, attrib_list);
+  if (surface == EGL_NO_SURFACE)
+    {
+      set_egl_error (error);
+      return EGL_NO_SURFACE;
+    }
+
+  return surface;
+}
+
 EGLSurface
 meta_egl_create_pbuffer_surface (MetaEgl      *egl,
                                  EGLDisplay    display,
@@ -308,6 +349,21 @@ meta_egl_create_pbuffer_surface (MetaEgl      *egl,
   return surface;
 }
 
+gboolean
+meta_egl_destroy_surface (MetaEgl   *egl,
+                          EGLDisplay display,
+                          EGLSurface surface,
+                          GError   **error)
+{
+  if (!eglDestroySurface (display, surface))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
 static gboolean
 is_egl_proc_valid_real (void       *proc,
                         const char *proc_name,
@@ -352,6 +408,55 @@ meta_egl_get_platform_display (MetaEgl      *egl,
   return display;
 }
 
+gboolean
+meta_egl_terminate (MetaEgl   *egl,
+                    EGLDisplay display,
+                    GError   **error)
+{
+  if (!eglTerminate (display))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+EGLContext
+meta_egl_create_context (MetaEgl      *egl,
+                         EGLDisplay    display,
+                         EGLConfig     config,
+                         EGLContext    share_context,
+                         const EGLint *attrib_list,
+                         GError      **error)
+{
+  EGLContext context;
+
+  context = eglCreateContext (display, config, share_context, attrib_list);
+  if (context == EGL_NO_CONTEXT)
+    {
+      set_egl_error (error);
+      return EGL_NO_CONTEXT;
+    }
+
+  return context;
+}
+
+gboolean
+meta_egl_destroy_context (MetaEgl   *egl,
+                          EGLDisplay display,
+                          EGLContext context,
+                          GError   **error)
+{
+  if (!eglDestroyContext (display, context))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
 EGLImageKHR
 meta_egl_create_image (MetaEgl        *egl,
                        EGLDisplay      display,
@@ -395,6 +500,38 @@ meta_egl_destroy_image (MetaEgl    *egl,
   return TRUE;
 }
 
+gboolean
+meta_egl_make_current (MetaEgl   *egl,
+                       EGLDisplay display,
+                       EGLSurface draw,
+                       EGLSurface read,
+                       EGLContext context,
+                       GError   **error)
+{
+  if (!eglMakeCurrent (display, draw, read, context))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+meta_egl_swap_buffers (MetaEgl   *egl,
+                       EGLDisplay display,
+                       EGLSurface surface,
+                       GError   **error)
+{
+  if (!eglSwapBuffers (display, surface))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
 gboolean
 meta_egl_query_wayland_buffer (MetaEgl            *egl,
                                EGLDisplay          display,
@@ -479,10 +616,11 @@ meta_egl_egl_device_has_extensions (MetaEgl     *egl,
     }
 
   va_start (var_args, first_extension);
-  has_extensions = extensions_string_has_extensions_valist (extensions_str,
-                                                            missing_extensions,
-                                                            first_extension,
-                                                            var_args);
+  has_extensions =
+    meta_extensions_string_has_extensions_valist (extensions_str,
+                                                  missing_extensions,
+                                                  first_extension,
+                                                  var_args);
   va_end (var_args);
 
   return has_extensions;

src/backends/meta-egl.h

@@ -36,6 +36,12 @@ G_DECLARE_FINAL_TYPE (MetaEgl, meta_egl, META, EGL, GObject)
 
 GQuark meta_egl_error_quark (void);
 
+gboolean
+meta_extensions_string_has_extensions_valist (const char *extensions_str,
+                                              char     ***missing_extensions,
+                                              char       *first_extension,
+                                              va_list     var_args);
+
 gboolean meta_egl_has_extensions (MetaEgl   *egl,
                                   EGLDisplay display,
                                   char    ***missing_extensions,
@@ -46,12 +52,28 @@ gboolean meta_egl_initialize (MetaEgl   *egl,
                               EGLDisplay display,
                               GError   **error);
 
+gpointer meta_egl_get_proc_address (MetaEgl    *egl,
+                                    const char *procname,
+                                    GError    **error);
+
 gboolean meta_egl_choose_config (MetaEgl      *egl,
                                  EGLDisplay    display,
                                  const EGLint *attrib_list,
                                  EGLConfig    *chosen_config,
                                  GError      **error);
 
+EGLContext meta_egl_create_context (MetaEgl      *egl,
+                                    EGLDisplay    display,
+                                    EGLConfig     config,
+                                    EGLContext    share_context,
+                                    const EGLint *attrib_list,
+                                    GError      **error);
+
+gboolean meta_egl_destroy_context (MetaEgl   *egl,
+                                   EGLDisplay display,
+                                   EGLContext context,
+                                   GError   **error);
+
 EGLImageKHR meta_egl_create_image (MetaEgl        *egl,
                                    EGLDisplay      display,
                                    EGLContext      context,
@@ -65,18 +87,46 @@ gboolean meta_egl_destroy_image (MetaEgl    *egl,
                                  EGLImageKHR image,
                                  GError    **error);
 
+EGLSurface meta_egl_create_window_surface (MetaEgl            *egl,
+                                           EGLDisplay          display,
+                                           EGLConfig           config,
+                                           EGLNativeWindowType native_window_type,
+                                           const EGLint       *attrib_list,
+                                           GError            **error);
+
 EGLSurface meta_egl_create_pbuffer_surface (MetaEgl      *egl,
                                             EGLDisplay    display,
                                             EGLConfig     config,
                                             const EGLint *attrib_list,
                                             GError      **error);
 
+gboolean meta_egl_destroy_surface (MetaEgl   *egl,
+                                   EGLDisplay display,
+                                   EGLSurface surface,
+                                   GError   **error);
+
 EGLDisplay meta_egl_get_platform_display (MetaEgl      *egl,
                                           EGLenum       platform,
                                           void         *native_display,
                                           const EGLint *attrib_list,
                                           GError      **error);
 
+gboolean meta_egl_terminate (MetaEgl   *egl,
+                             EGLDisplay display,
+                             GError   **error);
+
+gboolean meta_egl_make_current (MetaEgl   *egl,
+                                EGLDisplay display,
+                                EGLSurface draw,
+                                EGLSurface read,
+                                EGLContext context,
+                                GError   **error);
+
+gboolean meta_egl_swap_buffers (MetaEgl   *egl,
+                                EGLDisplay display,
+                                EGLSurface surface,
+                                GError   **error);
+
 gboolean meta_egl_query_wayland_buffer (MetaEgl            *egl,
                                         EGLDisplay          display,
                                         struct wl_resource *buffer,

src/backends/meta-gles3-table.h

@@ -0,0 +1,36 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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_GLES3_TABLE_H
+#define META_GLES3_TABLE_H
+
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <GLES3/gl3.h>
+
+typedef struct _MetaGles3Table
+{
+  void (* glEGLImageTargetTexture2DOES) (GLenum        target,
+                                         GLeglImageOES image);
+} MetaGles3Table;
+
+#endif /* META_GLES3_TABLE */

src/backends/meta-gles3.c

@@ -0,0 +1,163 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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 <stdio.h>
+
+#include "config.h"
+
+#include "backends/meta-gles3.h"
+
+#include <dlfcn.h>
+#include <gio/gio.h>
+
+#include "backends/meta-gles3-table.h"
+
+struct _MetaGles3
+{
+  GObject parent;
+
+  MetaEgl *egl;
+
+  MetaGles3Table table;
+};
+
+G_DEFINE_TYPE (MetaGles3, meta_gles3, G_TYPE_OBJECT)
+
+MetaGles3Table *
+meta_gles3_get_table (MetaGles3 *gles3)
+{
+  return &gles3->table;
+}
+
+void
+meta_gles3_ensure_loaded (MetaGles3  *gles3,
+                          gpointer   *func,
+                          const char *name)
+{
+  GError *error = NULL;
+
+  if (*func)
+    return;
+
+  *func = meta_egl_get_proc_address (gles3->egl, name, &error);
+  if (!*func)
+    g_error ("Failed to load GLES3 symbol: %s", error->message);
+}
+
+static const char *
+get_gl_error_str (GLenum gl_error)
+{
+  switch (gl_error)
+    {
+    case GL_NO_ERROR:
+      return "No error has been recorded.";
+    case GL_INVALID_ENUM:
+      return "An unacceptable value is specified for an enumerated argument.";
+    case GL_INVALID_VALUE:
+        return "A numeric argument is out of range.";
+    case GL_INVALID_OPERATION:
+        return "The specified operation is not allowed in the current state.";
+    case GL_INVALID_FRAMEBUFFER_OPERATION:
+        return "The framebuffer object is not complete.";
+    case GL_OUT_OF_MEMORY:
+        return "There is not enough memory left to execute the command.";
+    default:
+        return "Unknown error";
+    }
+}
+
+void
+meta_gles3_clear_error (MetaGles3 *gles3)
+{
+  while (TRUE)
+    {
+      GLenum gl_error = glGetError ();
+
+      if (gl_error == GL_NO_ERROR)
+        break;
+    }
+}
+
+gboolean
+meta_gles3_validate (MetaGles3 *gles3,
+                     GError   **error)
+{
+  GLenum gl_error;
+
+  gl_error = glGetError ();
+  if (gl_error != GL_NO_ERROR)
+    {
+      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                           get_gl_error_str (gl_error));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+meta_gles3_has_extensions (MetaGles3 *gles3,
+                           char    ***missing_extensions,
+                           char      *first_extension,
+                           ...)
+{
+  va_list var_args;
+  const char *extensions_str;
+  gboolean has_extensions;
+
+  extensions_str = (const char *) glGetString (GL_EXTENSIONS);
+  if (!extensions_str)
+    {
+      g_warning ("Failed to get string: %s", get_gl_error_str (glGetError ()));
+      return FALSE;
+    }
+
+  va_start (var_args, first_extension);
+  has_extensions =
+    meta_extensions_string_has_extensions_valist (extensions_str,
+                                                  missing_extensions,
+                                                  first_extension,
+                                                  var_args);
+  va_end (var_args);
+
+  return has_extensions;
+}
+
+MetaGles3 *
+meta_gles3_new (MetaEgl *egl)
+{
+  MetaGles3 *gles3;
+
+  gles3 = g_object_new (META_TYPE_GLES3, NULL);
+  gles3->egl = egl;
+
+  return gles3;
+}
+
+static void
+meta_gles3_init (MetaGles3 *gles3)
+{
+}
+
+static void
+meta_gles3_class_init (MetaGles3Class *klass)
+{
+}

src/backends/meta-gles3.h

@@ -0,0 +1,83 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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_GLES3_H
+#define META_GLES3_H
+
+#include <glib-object.h>
+
+#include "backends/meta-egl.h"
+
+typedef struct _MetaGles3Table MetaGles3Table;
+
+#define META_TYPE_GLES3 (meta_gles3_get_type ())
+G_DECLARE_FINAL_TYPE (MetaGles3, meta_gles3, META, GLES3, GObject)
+
+MetaGles3Table * meta_gles3_get_table (MetaGles3 *gles3);
+
+void meta_gles3_clear_error (MetaGles3 *gles3);
+
+gboolean meta_gles3_validate (MetaGles3 *gles3,
+                              GError   **error);
+
+void meta_gles3_ensure_loaded (MetaGles3  *gles,
+                               gpointer   *func,
+                               const char *name);
+
+gboolean meta_gles3_has_extensions (MetaGles3 *gles3,
+                                    char    ***missing_extensions,
+                                    char      *first_extension,
+                                    ...);
+
+MetaGles3 * meta_gles3_new (MetaEgl *egl);
+
+#define GLBAS(gles3, func, args)                                               \
+{                                                                              \
+  GError *_error = NULL;                                                       \
+                                                                               \
+  func args;                                                                   \
+                                                                               \
+  if (!meta_gles3_validate (gles3, &_error))                                   \
+    {                                                                          \
+      g_warning ("%s %s failed: %s", #func, #args, _error->message);           \
+      g_error_free (_error);                                                   \
+    }                                                                          \
+}
+
+#define GLEXT(gles3, func, args)                                               \
+{                                                                              \
+  GError *_error = NULL;                                                       \
+  MetaGles3Table *table;                                                       \
+                                                                               \
+  table = meta_gles3_get_table (gles3);                                        \
+  meta_gles3_ensure_loaded (gles3, (gpointer *) &table->func, #func);          \
+                                                                               \
+  table->func args;                                                            \
+                                                                               \
+  if (!meta_gles3_validate (gles3, &_error))                                   \
+    {                                                                          \
+      g_warning ("%s %s failed: %s", #func, #args, _error->message);           \
+      g_error_free (_error);                                                   \
+    }                                                                          \
+}
+
+#endif /* META_GLES3_H */

src/backends/meta-gpu.c

@@ -0,0 +1,224 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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-gpu.h"
+
+#include "backends/meta-output.h"
+
+enum
+{
+  PROP_0,
+
+  PROP_MONITOR_MANAGER,
+
+  PROP_LAST
+};
+
+static GParamSpec *obj_props[PROP_LAST];
+
+typedef struct _MetaGpuPrivate
+{
+  MetaMonitorManager *monitor_manager;
+
+  GList *outputs;
+  GList *crtcs;
+  GList *modes;
+} MetaGpuPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaGpu, meta_gpu, G_TYPE_OBJECT)
+
+gboolean
+meta_gpu_has_hotplug_mode_update (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+  GList *l;
+
+  for (l = priv->outputs; l; l = l->next)
+    {
+      MetaOutput *output = l->data;
+
+      if (output->hotplug_mode_update)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+meta_gpu_read_current (MetaGpu  *gpu,
+                       GError  **error)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+  gboolean ret;
+  GList *old_outputs;
+  GList *old_crtcs;
+  GList *old_modes;
+
+  /* TODO: Get rid of this when objects incref:s what they need instead */
+  old_outputs = priv->outputs;
+  old_crtcs = priv->crtcs;
+  old_modes = priv->modes;
+
+  ret = META_GPU_GET_CLASS (gpu)->read_current (gpu, error);
+
+  g_list_free_full (old_outputs, g_object_unref);
+  g_list_free_full (old_modes, g_object_unref);
+  g_list_free_full (old_crtcs, g_object_unref);
+
+  return ret;
+}
+
+MetaMonitorManager *
+meta_gpu_get_monitor_manager (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  return priv->monitor_manager;
+}
+
+GList *
+meta_gpu_get_outputs (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  return priv->outputs;
+}
+
+GList *
+meta_gpu_get_crtcs (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  return priv->crtcs;
+}
+
+GList *
+meta_gpu_get_modes (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  return priv->modes;
+}
+
+void
+meta_gpu_take_outputs (MetaGpu *gpu,
+                       GList   *outputs)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  priv->outputs = outputs;
+}
+
+void
+meta_gpu_take_crtcs (MetaGpu *gpu,
+                    GList   *crtcs)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  priv->crtcs = crtcs;
+}
+
+void
+meta_gpu_take_modes (MetaGpu *gpu,
+                     GList   *modes)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  priv->modes = modes;
+}
+
+static void
+meta_gpu_set_property (GObject      *object,
+                       guint         prop_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
+{
+  MetaGpu *gpu = META_GPU (object);
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  switch (prop_id)
+    {
+    case PROP_MONITOR_MANAGER:
+      priv->monitor_manager = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_gpu_get_property (GObject    *object,
+                       guint       prop_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
+{
+  MetaGpu *gpu = META_GPU (object);
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  switch (prop_id)
+    {
+    case PROP_MONITOR_MANAGER:
+      g_value_set_object (value, priv->monitor_manager);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_gpu_finalize (GObject *object)
+{
+  MetaGpu *gpu = META_GPU (object);
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  g_list_free_full (priv->outputs, g_object_unref);
+  g_list_free_full (priv->modes, g_object_unref);
+  g_list_free_full (priv->crtcs, g_object_unref);
+
+  G_OBJECT_CLASS (meta_gpu_parent_class)->finalize (object);
+}
+
+static void
+meta_gpu_init (MetaGpu *gpu)
+{
+}
+
+static void
+meta_gpu_class_init (MetaGpuClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = meta_gpu_set_property;
+  object_class->get_property = meta_gpu_get_property;
+  object_class->finalize = meta_gpu_finalize;
+
+  obj_props[PROP_MONITOR_MANAGER] =
+    g_param_spec_object ("monitor-manager",
+                         "monitor-manager",
+                         "MetaMonitorManager",
+                         META_TYPE_MONITOR_MANAGER,
+                         G_PARAM_READWRITE |
+                         G_PARAM_CONSTRUCT_ONLY |
+                         G_PARAM_STATIC_STRINGS);
+  g_object_class_install_properties (object_class, PROP_LAST, obj_props);
+}

src/backends/meta-gpu.h

@@ -0,0 +1,66 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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_GPU_H
+#define META_GPU_H
+
+#include <glib-object.h>
+
+#include "backends/meta-monitor-manager-private.h"
+
+#define META_TYPE_GPU (meta_gpu_get_type ())
+G_DECLARE_DERIVABLE_TYPE (MetaGpu, meta_gpu, META, GPU, GObject)
+
+struct _MetaGpuClass
+{
+  GObjectClass parent_class;
+
+  gboolean (* read_current) (MetaGpu  *gpu,
+                             GError  **error);
+};
+
+int meta_gpu_get_kms_fd (MetaGpu *gpu);
+
+const char * meta_gpu_get_kms_file_path (MetaGpu *gpu);
+
+gboolean meta_gpu_read_current (MetaGpu  *gpu,
+                                GError  **error);
+
+gboolean meta_gpu_has_hotplug_mode_update (MetaGpu *gpu);
+
+MetaMonitorManager * meta_gpu_get_monitor_manager (MetaGpu *gpu);
+
+GList * meta_gpu_get_outputs (MetaGpu *gpu);
+
+GList * meta_gpu_get_crtcs (MetaGpu *gpu);
+
+GList * meta_gpu_get_modes (MetaGpu *gpu);
+
+void meta_gpu_take_outputs (MetaGpu *gpu,
+                            GList   *outputs);
+
+void meta_gpu_take_crtcs (MetaGpu *gpu,
+                          GList   *crtcs);
+
+void meta_gpu_take_modes (MetaGpu *gpu,
+                          GList   *modes);
+
+#endif /* META_GPU_H */

src/backends/meta-input-settings.c

@@ -801,6 +801,7 @@ meta_input_settings_find_logical_monitor (MetaInputSettings  *input_settings,
 {
   MetaInputSettingsPrivate *priv;
   MetaMonitorManager *monitor_manager;
+  MetaLogicalMonitor *ret = NULL;
   guint n_values;
   GList *logical_monitors;
   GList *l;
@@ -815,11 +816,11 @@ meta_input_settings_find_logical_monitor (MetaInputSettings  *input_settings,
       g_warning ("EDID configuration for device '%s' "
                  "is incorrect, must have 3 values",
                  clutter_input_device_get_device_name (device));
-      return NULL;
+      goto out;
     }
 
   if (!*edid[0] && !*edid[1] && !*edid[2])
-    return NULL;
+    goto out;
 
   monitor_manager = priv->monitor_manager;
   logical_monitors =
@@ -833,10 +834,15 @@ meta_input_settings_find_logical_monitor (MetaInputSettings  *input_settings,
                                        edid[0],
                                        edid[1],
                                        edid[2]))
-        return logical_monitor;
+        {
+          ret = logical_monitor;
+          break;
+        }
     }
 
-  return NULL;
+out:
+  g_strfreev (edid);
+  return ret;
 }
 
 static void
@@ -1302,8 +1308,18 @@ check_add_mappable_device (MetaInputSettings  *input_settings,
 {
   MetaInputSettingsPrivate *priv;
   DeviceMappingInfo *info;
+  ClutterInputDeviceType device_type;
   GSettings *settings;
 
+  device_type = clutter_input_device_get_device_type (device);
+
+  if ((device_type == CLUTTER_TABLET_DEVICE ||
+       device_type == CLUTTER_PEN_DEVICE ||
+       device_type == CLUTTER_ERASER_DEVICE ||
+       device_type == CLUTTER_PAD_DEVICE) &&
+      g_getenv ("MUTTER_DISABLE_WACOM_CONFIGURATION") != NULL)
+    return FALSE;
+
   settings = lookup_device_settings (device);
 
   if (!settings)
@@ -1317,8 +1333,8 @@ check_add_mappable_device (MetaInputSettings  *input_settings,
   info->settings = settings;
 
 #ifdef HAVE_LIBWACOM
-  if (clutter_input_device_get_device_type (device) == CLUTTER_TABLET_DEVICE ||
-      clutter_input_device_get_device_type (device) == CLUTTER_PAD_DEVICE)
+  if (device_type == CLUTTER_TABLET_DEVICE ||
+      device_type == CLUTTER_PAD_DEVICE)
     {
       WacomError *error = libwacom_error_new ();
 
@@ -1336,7 +1352,7 @@ check_add_mappable_device (MetaInputSettings  *input_settings,
     }
 #endif
 
-  if (clutter_input_device_get_device_type (device) == CLUTTER_PAD_DEVICE)
+  if (device_type == CLUTTER_PAD_DEVICE)
     {
       info->group_modes =
         g_new0 (guint, clutter_input_device_get_n_mode_groups (device));
@@ -1601,7 +1617,7 @@ meta_input_settings_init (MetaInputSettings *settings)
     g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) device_mapping_info_free);
 
   priv->monitor_manager = g_object_ref (meta_monitor_manager_get ());
-  g_signal_connect (priv->monitor_manager, "monitors-changed",
+  g_signal_connect (priv->monitor_manager, "monitors-changed-internal",
                     G_CALLBACK (monitors_changed_cb), settings);
 
 #ifdef HAVE_LIBWACOM

src/backends/meta-logical-monitor.c

@@ -21,9 +21,12 @@
 
 #include "config.h"
 
-#include "backends/meta-backend-private.h"
 #include "backends/meta-logical-monitor.h"
 
+#include "backends/meta-backend-private.h"
+#include "backends/meta-crtc.h"
+#include "backends/meta-output.h"
+
 G_DEFINE_TYPE (MetaLogicalMonitor, meta_logical_monitor, G_TYPE_OBJECT)
 
 static MetaMonitor *
@@ -199,6 +202,51 @@ meta_logical_monitor_get_monitors (MetaLogicalMonitor *logical_monitor)
   return logical_monitor->monitors;
 }
 
+typedef struct _ForeachCrtcData
+{
+  MetaLogicalMonitor *logical_monitor;
+  MetaLogicalMonitorCrtcFunc func;
+  gpointer user_data;
+} ForeachCrtcData;
+
+static gboolean
+foreach_crtc (MetaMonitor         *monitor,
+              MetaMonitorMode     *mode,
+              MetaMonitorCrtcMode *monitor_crtc_mode,
+              gpointer             user_data,
+              GError             **error)
+{
+  ForeachCrtcData *data = user_data;
+
+  data->func (data->logical_monitor,
+              monitor_crtc_mode->output->crtc,
+              data->user_data);
+
+  return TRUE;
+}
+
+void
+meta_logical_monitor_foreach_crtc (MetaLogicalMonitor        *logical_monitor,
+                                   MetaLogicalMonitorCrtcFunc func,
+                                   gpointer                   user_data)
+{
+  GList *l;
+
+  for (l = logical_monitor->monitors; l; l = l->next)
+    {
+      MetaMonitor *monitor = l->data;
+      MetaMonitorMode *mode;
+      ForeachCrtcData data = {
+        .logical_monitor = logical_monitor,
+        .func = func,
+        .user_data = user_data
+      };
+
+      mode = meta_monitor_get_current_mode (monitor);
+      meta_monitor_mode_foreach_crtc (monitor, mode, foreach_crtc, &data, NULL);
+    }
+}
+
 static void
 meta_logical_monitor_init (MetaLogicalMonitor *logical_monitor)
 {

src/backends/meta-logical-monitor.h

@@ -61,6 +61,10 @@ G_DECLARE_FINAL_TYPE (MetaLogicalMonitor, meta_logical_monitor,
                       META, LOGICAL_MONITOR,
                       GObject)
 
+typedef void (* MetaLogicalMonitorCrtcFunc) (MetaLogicalMonitor *logical_monitor,
+                                             MetaCrtc           *crtc,
+                                             gpointer            user_data);
+
 MetaLogicalMonitor * meta_logical_monitor_new (MetaMonitorManager       *monitor_manager,
                                                MetaLogicalMonitorConfig *logical_monitor_config,
                                                int                       monitor_number);
@@ -90,4 +94,8 @@ 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,
+                                        gpointer                   user_data);
+
 #endif /* META_LOGICAL_MONITOR_H */

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

@@ -26,6 +26,7 @@
 #include "backends/meta-monitor-config-migration.h"
 #include "backends/meta-monitor-config-store.h"
 #include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-output.h"
 #include "core/boxes-private.h"
 
 #define CONFIG_HISTORY_MAX_SIZE 3
@@ -612,7 +613,9 @@ meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_mana
       x += logical_monitor_config->layout.width;
     }
 
-  return meta_monitors_config_new (logical_monitor_configs, layout_mode,
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
                                    META_MONITORS_CONFIG_FLAG_NONE);
 }
 
@@ -641,7 +644,9 @@ meta_monitor_config_manager_create_fallback (MetaMonitorConfigManager *config_ma
   logical_monitor_configs = g_list_append (NULL,
                                            primary_logical_monitor_config);
 
-  return meta_monitors_config_new (logical_monitor_configs, layout_mode,
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
                                    META_MONITORS_CONFIG_FLAG_NONE);
 }
 
@@ -717,7 +722,9 @@ meta_monitor_config_manager_create_suggested (MetaMonitorConfigManager *config_m
   if (!logical_monitor_configs)
     return NULL;
 
-  return meta_monitors_config_new (logical_monitor_configs, layout_mode,
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
                                    META_MONITORS_CONFIG_FLAG_NONE);
 }
 
@@ -726,8 +733,11 @@ create_for_builtin_display_rotation (MetaMonitorConfigManager *config_manager,
                                      gboolean                  rotate,
                                      MetaMonitorTransform      transform)
 {
+  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
   MetaLogicalMonitorConfig *logical_monitor_config;
   MetaLogicalMonitorConfig *current_logical_monitor_config;
+  GList *logical_monitor_configs;
+  MetaLogicalMonitorLayoutMode layout_mode;
   MetaMonitorConfig *monitor_config;
   MetaMonitorConfig *current_monitor_config;
 
@@ -764,8 +774,19 @@ create_for_builtin_display_rotation (MetaMonitorConfigManager *config_manager,
   logical_monitor_config->monitor_configs = g_list_append (NULL, monitor_config);
   logical_monitor_config->transform = transform;
 
-  return meta_monitors_config_new (g_list_append (NULL, logical_monitor_config),
-                                   config_manager->current_config->layout_mode,
+  if (meta_monitor_transform_is_rotated (current_logical_monitor_config->transform) !=
+      meta_monitor_transform_is_rotated (logical_monitor_config->transform))
+    {
+      int temp = logical_monitor_config->layout.width;
+      logical_monitor_config->layout.width = logical_monitor_config->layout.height;
+      logical_monitor_config->layout.height = temp;
+    }
+
+  logical_monitor_configs = g_list_append (NULL, logical_monitor_config);
+  layout_mode = config_manager->current_config->layout_mode;
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
                                    META_MONITORS_CONFIG_FLAG_NONE);
 }
 
@@ -788,6 +809,7 @@ create_for_switch_config_all_mirror (MetaMonitorConfigManager *config_manager)
   MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
   MetaLogicalMonitorLayoutMode layout_mode;
   MetaLogicalMonitorConfig *logical_monitor_config = NULL;
+  GList *logical_monitor_configs;
   GList *monitor_configs = NULL;
   gint common_mode_w = 0, common_mode_h = 0;
   float best_scale = 1.0;
@@ -885,8 +907,10 @@ create_for_switch_config_all_mirror (MetaMonitorConfigManager *config_manager)
     .monitor_configs = monitor_configs
   };
 
+  logical_monitor_configs = g_list_append (NULL, logical_monitor_config);
   layout_mode = meta_monitor_manager_get_default_layout_mode (monitor_manager);
-  return meta_monitors_config_new (g_list_append (NULL, logical_monitor_config),
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
                                    layout_mode,
                                    META_MONITORS_CONFIG_FLAG_NONE);
 }
@@ -927,7 +951,9 @@ create_for_switch_config_external (MetaMonitorConfigManager *config_manager)
       x += logical_monitor_config->layout.width;
     }
 
-  return meta_monitors_config_new (logical_monitor_configs, layout_mode,
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
                                    META_MONITORS_CONFIG_FLAG_NONE);
 }
 
@@ -956,7 +982,9 @@ create_for_switch_config_builtin (MetaMonitorConfigManager *config_manager)
   logical_monitor_configs = g_list_append (NULL,
                                            primary_logical_monitor_config);
 
-  return meta_monitors_config_new (logical_monitor_configs, layout_mode,
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
                                    META_MONITORS_CONFIG_FLAG_NONE);
 }
 
@@ -1079,7 +1107,8 @@ meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor_conf
 }
 
 static MetaMonitorsConfigKey *
-meta_monitors_config_key_new (GList *logical_monitor_configs)
+meta_monitors_config_key_new (GList *logical_monitor_configs,
+                              GList *disabled_monitor_specs)
 {
   MetaMonitorsConfigKey *config_key;
   GList *monitor_specs;
@@ -1101,6 +1130,14 @@ meta_monitors_config_key_new (GList *logical_monitor_configs)
         }
     }
 
+  for (l = disabled_monitor_specs; l; l = l->next)
+    {
+      MetaMonitorSpec *monitor_spec = l->data;
+
+      monitor_spec = meta_monitor_spec_clone (monitor_spec);
+      monitor_specs = g_list_prepend (monitor_specs, monitor_spec);
+    }
+
   monitor_specs = g_list_sort (monitor_specs,
                                (GCompareFunc) meta_monitor_spec_compare);
 
@@ -1167,21 +1204,56 @@ meta_monitors_config_key_equal (gconstpointer data_a,
 }
 
 MetaMonitorsConfig *
-meta_monitors_config_new (GList                       *logical_monitor_configs,
-                          MetaLogicalMonitorLayoutMode layout_mode,
-                          MetaMonitorsConfigFlag       flags)
+meta_monitors_config_new_full (GList                        *logical_monitor_configs,
+                               GList                        *disabled_monitor_specs,
+                               MetaLogicalMonitorLayoutMode  layout_mode,
+                               MetaMonitorsConfigFlag        flags)
 {
   MetaMonitorsConfig *config;
 
   config = g_object_new (META_TYPE_MONITORS_CONFIG, NULL);
   config->logical_monitor_configs = logical_monitor_configs;
-  config->key = meta_monitors_config_key_new (logical_monitor_configs);
+  config->disabled_monitor_specs = disabled_monitor_specs;
+  config->key = meta_monitors_config_key_new (logical_monitor_configs,
+                                              disabled_monitor_specs);
   config->layout_mode = layout_mode;
   config->flags = flags;
 
   return config;
 }
 
+MetaMonitorsConfig *
+meta_monitors_config_new (MetaMonitorManager           *monitor_manager,
+                          GList                        *logical_monitor_configs,
+                          MetaLogicalMonitorLayoutMode  layout_mode,
+                          MetaMonitorsConfigFlag        flags)
+{
+  GList *disabled_monitor_specs = NULL;
+  GList *monitors;
+  GList *l;
+
+  monitors = meta_monitor_manager_get_monitors (monitor_manager);
+  for (l = monitors; l; l = l->next)
+    {
+      MetaMonitor *monitor = l->data;
+      MetaMonitorSpec *monitor_spec;
+
+      monitor_spec = meta_monitor_get_spec (monitor);
+      if (meta_logical_monitor_configs_have_monitor (logical_monitor_configs,
+                                                     monitor_spec))
+        continue;
+
+      disabled_monitor_specs =
+        g_list_prepend (disabled_monitor_specs,
+                        meta_monitor_spec_clone (monitor_spec));
+    }
+
+  return meta_monitors_config_new_full (logical_monitor_configs,
+                                        disabled_monitor_specs,
+                                        layout_mode,
+                                        flags);
+}
+
 static void
 meta_monitors_config_finalize (GObject *object)
 {
@@ -1190,6 +1262,10 @@ meta_monitors_config_finalize (GObject *object)
   meta_monitors_config_key_free (config->key);
   g_list_free_full (config->logical_monitor_configs,
                     (GDestroyNotify) meta_logical_monitor_config_free);
+  g_list_free_full (config->disabled_monitor_specs,
+                    (GDestroyNotify) meta_monitor_spec_free);
+
+  G_OBJECT_CLASS (meta_monitors_config_parent_class)->finalize (object);
 }
 
 static void
@@ -1365,6 +1441,38 @@ has_adjecent_neighbour (MetaMonitorsConfig       *config,
   return FALSE;
 }
 
+gboolean
+meta_logical_monitor_configs_have_monitor (GList           *logical_monitor_configs,
+                                           MetaMonitorSpec *monitor_spec)
+{
+  GList *l;
+
+  for (l = logical_monitor_configs; l; l = l->next)
+    {
+      MetaLogicalMonitorConfig *logical_monitor_config = l->data;
+      GList *k;
+
+      for (k = logical_monitor_config->monitor_configs; k; k = k->next)
+        {
+          MetaMonitorConfig *monitor_config = k->data;
+
+          if (meta_monitor_spec_equals (monitor_spec,
+                                        monitor_config->monitor_spec))
+            return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+meta_monitors_config_is_monitor_enabled (MetaMonitorsConfig *config,
+                                         MetaMonitorSpec    *monitor_spec)
+{
+  return meta_logical_monitor_configs_have_monitor (config->logical_monitor_configs,
+                                                    monitor_spec);
+}
+
 gboolean
 meta_verify_monitors_config (MetaMonitorsConfig *config,
                              MetaMonitorManager *monitor_manager,
@@ -1446,6 +1554,18 @@ meta_verify_monitors_config (MetaMonitorsConfig *config,
 
   g_list_free (region);
 
+  for (l = config->disabled_monitor_specs; l; l = l->next)
+    {
+      MetaMonitorSpec *monitor_spec = l->data;
+
+      if (meta_monitors_config_is_monitor_enabled (config, monitor_spec))
+        {
+          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                       "Assigned monitor explicitly disabled");
+          return FALSE;
+        }
+    }
+
   if (min_x != 0 || min_y != 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,

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

@@ -64,6 +64,8 @@ struct _MetaMonitorsConfig
   MetaMonitorsConfigKey *key;
   GList *logical_monitor_configs;
 
+  GList *disabled_monitor_specs;
+
   MetaMonitorsConfigFlag flags;
 
   MetaLogicalMonitorLayoutMode layout_mode;
@@ -112,9 +114,15 @@ void meta_monitor_config_manager_clear_history (MetaMonitorConfigManager *config
 
 void meta_monitor_config_manager_save_current (MetaMonitorConfigManager *config_manager);
 
-MetaMonitorsConfig * meta_monitors_config_new (GList                       *logical_monitor_configs,
-                                               MetaLogicalMonitorLayoutMode layout_mode,
-                                               MetaMonitorsConfigFlag       flags);
+MetaMonitorsConfig * meta_monitors_config_new_full (GList                        *logical_monitor_configs,
+                                                    GList                        *disabled_monitors,
+                                                    MetaLogicalMonitorLayoutMode  layout_mode,
+                                                    MetaMonitorsConfigFlag        flags);
+
+MetaMonitorsConfig * meta_monitors_config_new (MetaMonitorManager           *monitor_manager,
+                                               GList                        *logical_monitor_configs,
+                                               MetaLogicalMonitorLayoutMode  layout_mode,
+                                               MetaMonitorsConfigFlag        flags);
 
 unsigned int meta_monitors_config_key_hash (gconstpointer config_key);
 
@@ -127,6 +135,9 @@ void meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor
 
 void meta_monitor_config_free (MetaMonitorConfig *monitor_config);
 
+gboolean meta_logical_monitor_configs_have_monitor (GList           *logical_monitor_configs,
+                                                    MetaMonitorSpec *monitor_spec);
+
 gboolean meta_verify_monitor_mode_spec (MetaMonitorModeSpec *monitor_mode_spec,
                                         GError             **error);
 

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

@@ -652,6 +652,7 @@ load_config_file (GFile   *file,
         g_array_free (parser.output_array, TRUE);
 
       free_output_key (&parser.key);
+      g_free (parser.output_field);
       g_hash_table_destroy (parser.configs);
 
       return NULL;
@@ -949,7 +950,6 @@ derive_logical_monitor_configs (MetaLegacyMonitorsConfig *config,
                                 GError                  **error)
 {
   GList *logical_monitor_configs = NULL;
-  GList *monitor_configs = NULL;
   unsigned int i;
 
   for (i = 0; i < config->n_outputs; i++)
@@ -994,8 +994,8 @@ derive_logical_monitor_configs (MetaLegacyMonitorsConfig *config,
                 }
               else
                 {
-                  g_list_free_full (monitor_configs,
-                                    (GDestroyNotify) meta_monitor_config_free);
+                  g_list_free_full (logical_monitor_configs,
+                                    (GDestroyNotify) meta_logical_monitor_config_free);
                   return NULL;
                 }
             }
@@ -1008,8 +1008,8 @@ derive_logical_monitor_configs (MetaLegacyMonitorsConfig *config,
 
       if (!monitor_config)
         {
-          g_list_free_full (monitor_configs,
-                            (GDestroyNotify) meta_monitor_config_free);
+          g_list_free_full (logical_monitor_configs,
+                            (GDestroyNotify) meta_logical_monitor_config_free);
           return NULL;
         }
 
@@ -1056,6 +1056,35 @@ generate_config_name (MetaLegacyMonitorsConfig *config)
   return key_name;
 }
 
+static GList *
+find_disabled_monitor_specs (MetaLegacyMonitorsConfig *legacy_config)
+{
+  GList *disabled_monitors = NULL;
+  unsigned int i;
+
+  for (i = 0; i < legacy_config->n_outputs; i++)
+    {
+      MetaOutputKey *output_key = &legacy_config->keys[i];
+      MetaOutputConfig *output_config = &legacy_config->outputs[i];
+      MetaMonitorSpec *monitor_spec;
+
+      if (output_config->enabled)
+        continue;
+
+      monitor_spec = g_new0 (MetaMonitorSpec, 1);
+      *monitor_spec = (MetaMonitorSpec) {
+        .connector = output_key->connector,
+        .vendor = output_key->vendor,
+        .product = output_key->product,
+        .serial = output_key->serial
+      };
+
+      disabled_monitors = g_list_prepend (disabled_monitors, monitor_spec);
+    }
+
+  return disabled_monitors;
+}
+
 static void
 migrate_config (gpointer key,
                 gpointer value,
@@ -1068,6 +1097,7 @@ migrate_config (gpointer key,
   GList *logical_monitor_configs;
   MetaLogicalMonitorLayoutMode layout_mode;
   GError *error = NULL;
+  GList *disabled_monitor_specs;
   MetaMonitorsConfig *config;
 
   logical_monitor_configs = derive_logical_monitor_configs (legacy_config,
@@ -1083,9 +1113,13 @@ migrate_config (gpointer key,
       return;
     }
 
+  disabled_monitor_specs = find_disabled_monitor_specs (legacy_config);
+
   layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL;
-  config = meta_monitors_config_new (logical_monitor_configs, layout_mode,
-                                     META_MONITORS_CONFIG_FLAG_MIGRATED);
+  config = meta_monitors_config_new_full (logical_monitor_configs,
+                                          disabled_monitor_specs,
+                                          layout_mode,
+                                          META_MONITORS_CONFIG_FLAG_MIGRATED);
   if (!meta_verify_monitors_config (config, monitor_manager, &error))
     {
       g_autofree char *config_name = NULL;
@@ -1112,7 +1146,6 @@ meta_migrate_old_monitors_config (MetaMonitorConfigStore *config_store,
     return FALSE;
 
   g_hash_table_foreach (configs, migrate_config, config_store);
-  g_hash_table_destroy (configs);
 
   return TRUE;
 }
@@ -1175,6 +1208,13 @@ meta_finish_monitors_config_migration (MetaMonitorManager *monitor_manager,
       monitor_mode_spec = monitor_config->mode_spec;
       monitor_mode = meta_monitor_get_mode_from_spec (monitor,
                                                       monitor_mode_spec);
+      if (!monitor_mode)
+        {
+          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                       "Mode not available on monitor");
+          return FALSE;
+        }
+
       scale = meta_monitor_calculate_mode_scale (monitor, monitor_mode);
 
       logical_monitor_config->scale = scale;

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

@@ -83,6 +83,14 @@
  *       </monitor>
  *       <presentation>yes</presentation>
  *     </logicalmonitor>
+ *     <disabled>
+ *       <monitorspec>
+ *         <connector>LVDS3</connector>
+ *         <vendor>Vendor C</vendor>
+ *         <product>Product C</product>
+ *         <serial>Serial C</serial>
+ *       </monitorspec>
+ *     </disabled>
  *   </configuration>
  * </monitors>
  *
@@ -151,7 +159,8 @@ typedef enum
   STATE_MONITOR_MODE_HEIGHT,
   STATE_MONITOR_MODE_RATE,
   STATE_MONITOR_MODE_FLAG,
-  STATE_MONITOR_UNDERSCANNING
+  STATE_MONITOR_UNDERSCANNING,
+  STATE_DISABLED,
 } ParserState;
 
 typedef struct
@@ -159,6 +168,8 @@ typedef struct
   ParserState state;
   MetaMonitorConfigStore *config_store;
 
+  ParserState monitor_spec_parent_state;
+
   gboolean current_was_migrated;
   GList *current_logical_monitor_configs;
   MetaMonitorSpec *current_monitor_spec;
@@ -167,6 +178,7 @@ typedef struct
   MetaMonitorModeSpec *current_monitor_mode_spec;
   MetaMonitorConfig *current_monitor_config;
   MetaLogicalMonitorConfig *current_logical_monitor_config;
+  GList *current_disabled_monitor_specs;
 } ConfigParser;
 
 G_DEFINE_TYPE (MetaMonitorConfigStore, meta_monitor_config_store,
@@ -254,6 +266,10 @@ handle_start_element (GMarkupParseContext  *context,
 
             parser->state = STATE_MIGRATED;
           }
+        else if (g_str_equal (element_name, "disabled"))
+          {
+            parser->state = STATE_DISABLED;
+          }
         else
           {
             g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
@@ -351,7 +367,7 @@ handle_start_element (GMarkupParseContext  *context,
         if (g_str_equal (element_name, "monitorspec"))
           {
             parser->current_monitor_spec = g_new0 (MetaMonitorSpec, 1);
-
+            parser->monitor_spec_parent_state = STATE_MONITOR;
             parser->state = STATE_MONITOR_SPEC;
           }
         else if (g_str_equal (element_name, "mode"))
@@ -456,6 +472,22 @@ handle_start_element (GMarkupParseContext  *context,
                      "Invalid element '%s' under underscanning", element_name);
         return;
       }
+
+    case STATE_DISABLED:
+      {
+        if (!g_str_equal (element_name, "monitorspec"))
+          {
+            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
+                         "Invalid element '%s' under disabled", element_name);
+            return;
+          }
+
+        parser->current_monitor_spec = g_new0 (MetaMonitorSpec, 1);
+        parser->monitor_spec_parent_state = STATE_DISABLED;
+        parser->state = STATE_MONITOR_SPEC;
+
+        return;
+      }
     }
 }
 
@@ -513,6 +545,34 @@ derive_logical_monitor_layout (MetaLogicalMonitorConfig    *logical_monitor_conf
   return TRUE;
 }
 
+static void
+finish_monitor_spec (ConfigParser *parser)
+{
+  switch (parser->monitor_spec_parent_state)
+    {
+    case STATE_MONITOR:
+      {
+        parser->current_monitor_config->monitor_spec =
+          parser->current_monitor_spec;
+        parser->current_monitor_spec = NULL;
+
+        return;
+      }
+    case STATE_DISABLED:
+      {
+        parser->current_disabled_monitor_specs =
+          g_list_prepend (parser->current_disabled_monitor_specs,
+                          parser->current_monitor_spec);
+        parser->current_monitor_spec = NULL;
+
+        return;
+      }
+
+    default:
+      g_assert_not_reached ();
+    }
+}
+
 static void
 handle_end_element (GMarkupParseContext  *context,
                     const char           *element_name,
@@ -575,11 +635,9 @@ handle_end_element (GMarkupParseContext  *context,
         if (!meta_verify_monitor_spec (parser->current_monitor_spec, error))
           return;
 
-        parser->current_monitor_config->monitor_spec =
-          parser->current_monitor_spec;
-        parser->current_monitor_spec = NULL;
+        finish_monitor_spec (parser);
 
-        parser->state = STATE_MONITOR;
+        parser->state = parser->monitor_spec_parent_state;
         return;
       }
 
@@ -665,6 +723,14 @@ handle_end_element (GMarkupParseContext  *context,
         return;
       }
 
+    case STATE_DISABLED:
+      {
+        g_assert (g_str_equal (element_name, "disabled"));
+
+        parser->state = STATE_CONFIGURATION;
+        return;
+      }
+
     case STATE_CONFIGURATION:
       {
         MetaMonitorConfigStore *store = parser->config_store;
@@ -701,11 +767,13 @@ handle_end_element (GMarkupParseContext  *context,
           config_flags |= META_MONITORS_CONFIG_FLAG_MIGRATED;
 
         config =
-          meta_monitors_config_new (parser->current_logical_monitor_configs,
-                                    layout_mode,
-                                    config_flags);
+          meta_monitors_config_new_full (parser->current_logical_monitor_configs,
+                                         parser->current_disabled_monitor_specs,
+                                         layout_mode,
+                                         config_flags);
 
         parser->current_logical_monitor_configs = NULL;
+        parser->current_disabled_monitor_specs = NULL;
 
         if (!meta_verify_monitors_config (config, store->monitor_manager,
                                           error))
@@ -849,6 +917,7 @@ handle_text (GMarkupParseContext *context,
     case STATE_MONITOR_SPEC:
     case STATE_MONITOR_MODE:
     case STATE_TRANSFORM:
+    case STATE_DISABLED:
       {
         if (!is_all_whitespace (text, text_len))
           g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -1058,6 +1127,27 @@ meta_monitor_config_store_lookup (MetaMonitorConfigStore *config_store,
                                                     key));
 }
 
+static void
+append_monitor_spec (GString         *buffer,
+                     MetaMonitorSpec *monitor_spec,
+                     const char      *indentation)
+{
+  g_string_append_printf (buffer, "%s<monitorspec>\n", indentation);
+  g_string_append_printf (buffer, "%s  <connector>%s</connector>\n",
+                          indentation,
+                          monitor_spec->connector);
+  g_string_append_printf (buffer, "%s  <vendor>%s</vendor>\n",
+                          indentation,
+                          monitor_spec->vendor);
+  g_string_append_printf (buffer, "%s  <product>%s</product>\n",
+                          indentation,
+                          monitor_spec->product);
+  g_string_append_printf (buffer, "%s  <serial>%s</serial>\n",
+                          indentation,
+                          monitor_spec->serial);
+  g_string_append_printf (buffer, "%s</monitorspec>\n", indentation);
+}
+
 static void
 append_monitors (GString *buffer,
                  GList   *monitor_configs)
@@ -1073,16 +1163,7 @@ append_monitors (GString *buffer,
                       monitor_config->mode_spec->refresh_rate);
 
       g_string_append (buffer, "      <monitor>\n");
-      g_string_append (buffer, "        <monitorspec>\n");
-      g_string_append_printf (buffer, "          <connector>%s</connector>\n",
-                              monitor_config->monitor_spec->connector);
-      g_string_append_printf (buffer, "          <vendor>%s</vendor>\n",
-                              monitor_config->monitor_spec->vendor);
-      g_string_append_printf (buffer, "          <product>%s</product>\n",
-                              monitor_config->monitor_spec->product);
-      g_string_append_printf (buffer, "          <serial>%s</serial>\n",
-                              monitor_config->monitor_spec->serial);
-      g_string_append (buffer, "        </monitorspec>\n");
+      append_monitor_spec (buffer, monitor_config->monitor_spec, "        ");
       g_string_append (buffer, "        <mode>\n");
       g_string_append_printf (buffer, "          <width>%d</width>\n",
                               monitor_config->mode_spec->width);
@@ -1205,6 +1286,18 @@ generate_config_xml (MetaMonitorConfigStore *config_store)
           append_logical_monitor_xml (buffer, config, logical_monitor_config);
         }
 
+      if (config->disabled_monitor_specs)
+        {
+          g_string_append (buffer, "    <disabled>\n");
+          for (l = config->disabled_monitor_specs; l; l = l->next)
+            {
+              MetaMonitorSpec *monitor_spec = l->data;
+
+              append_monitor_spec (buffer, monitor_spec, "      ");
+            }
+          g_string_append (buffer, "    </disabled>\n");
+        }
+
       g_string_append (buffer, "  </configuration>\n");
     }
 
@@ -1230,9 +1323,10 @@ saved_cb (GObject      *object,
   if (!g_file_replace_contents_finish (G_FILE (object), result, NULL, &error))
     {
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning ("Saving monitor configuration failed: %s\n", error->message);
-      else
-        g_clear_object (&data->config_store->save_cancellable);
+        {
+          g_warning ("Saving monitor configuration failed: %s\n", error->message);
+          g_clear_object (&data->config_store->save_cancellable);
+        }
 
       g_error_free (error);
     }
@@ -1246,6 +1340,37 @@ saved_cb (GObject      *object,
   g_free (data);
 }
 
+static void
+meta_monitor_config_store_save_sync (MetaMonitorConfigStore *config_store)
+{
+  GError *error = NULL;
+  GFile *file;
+  GString *buffer;
+
+  if (config_store->custom_write_file)
+    file = config_store->custom_write_file;
+  else
+    file = config_store->user_file;
+
+  buffer = generate_config_xml (config_store);
+
+  if (!g_file_replace_contents (file,
+                                buffer->str, buffer->len,
+                                NULL,
+                                FALSE,
+                                G_FILE_CREATE_REPLACE_DESTINATION,
+                                NULL,
+                                NULL,
+                                &error))
+    {
+      g_warning ("Saving monitor configuration failed: %s\n",
+                 error->message);
+      g_error_free (error);
+    }
+
+  g_string_free (buffer, TRUE);
+}
+
 static void
 meta_monitor_config_store_save (MetaMonitorConfigStore *config_store)
 {
@@ -1258,6 +1383,17 @@ meta_monitor_config_store_save (MetaMonitorConfigStore *config_store)
       g_clear_object (&config_store->save_cancellable);
     }
 
+  /*
+   * Custom write file is only ever used by the test suite, and the test suite
+   * will want to have be able to read back the content immediately, so for
+   * custom write files, do the content replacement synchronously.
+   */
+  if (config_store->custom_write_file)
+    {
+      meta_monitor_config_store_save_sync (config_store);
+      return;
+    }
+
   config_store->save_cancellable = g_cancellable_new ();
 
   buffer = generate_config_xml (config_store);
@@ -1268,31 +1404,6 @@ meta_monitor_config_store_save (MetaMonitorConfigStore *config_store)
     .buffer = buffer
   };
 
-  /*
-   * Custom write file is only ever used by the test suite, and the test suite
-   * will want to have be able to read back the content immediately, so for
-   * custom write files, do the content replacement synchronously.
-   */
-  if (config_store->custom_write_file)
-    {
-      GError *error = NULL;
-
-      if (!g_file_replace_contents (config_store->custom_write_file,
-                                    buffer->str, buffer->len,
-                                    NULL,
-                                    FALSE,
-                                    G_FILE_CREATE_REPLACE_DESTINATION,
-                                    NULL,
-                                    NULL,
-                                    &error))
-        {
-          g_warning ("Saving monitor configuration failed: %s\n",
-                     error->message);
-          g_error_free (error);
-        }
-      return;
-    }
-
   g_file_replace_contents_async (config_store->user_file,
                                  buffer->str, buffer->len,
                                  NULL,
@@ -1407,6 +1518,8 @@ meta_monitor_config_store_constructed (GObject *object)
     }
 
   g_free (user_file_path);
+
+  G_OBJECT_CLASS (meta_monitor_config_store_parent_class)->constructed (object);
 }
 
 static void
@@ -1414,6 +1527,14 @@ meta_monitor_config_store_dispose (GObject *object)
 {
   MetaMonitorConfigStore *config_store = META_MONITOR_CONFIG_STORE (object);
 
+  if (config_store->save_cancellable)
+    {
+      g_cancellable_cancel (config_store->save_cancellable);
+      g_clear_object (&config_store->save_cancellable);
+
+      meta_monitor_config_store_save_sync (config_store);
+    }
+
   g_clear_pointer (&config_store->configs, g_hash_table_destroy);
 
   g_clear_object (&config_store->user_file);

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

@@ -31,8 +31,10 @@
 
 #include <meta/util.h>
 #include "backends/meta-backend-private.h"
+#include "backends/meta-crtc.h"
 #include "backends/meta-monitor.h"
 #include "backends/meta-monitor-config-manager.h"
+#include "backends/meta-output.h"
 
 #define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
 
@@ -45,6 +47,8 @@ struct _MetaMonitorManagerDummy
 {
   MetaMonitorManager parent_instance;
 
+  MetaGpu *gpu;
+
   gboolean is_transform_handled;
 };
 
@@ -60,19 +64,49 @@ typedef struct _MetaOutputDummy
 
 G_DEFINE_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy, META_TYPE_MONITOR_MANAGER);
 
+struct _MetaGpuDummy
+{
+  MetaGpu parent;
+};
+
+G_DEFINE_TYPE (MetaGpuDummy, meta_gpu_dummy, META_TYPE_GPU)
+
 static void
 meta_output_dummy_notify_destroy (MetaOutput *output);
 
-#define array_last(a, t) \
-  g_array_index (a, t, a->len - 1)
+typedef struct _CrtcModeSpec
+{
+  int width;
+  int height;
+  float refresh_rate;
+} CrtcModeSpec;
+
+static MetaCrtcMode *
+create_mode (CrtcModeSpec *spec,
+             long          mode_id)
+{
+  MetaCrtcMode *mode;
+
+  mode = g_object_new (META_TYPE_CRTC_MODE, NULL);
+
+  mode->mode_id = mode_id;
+  mode->width = spec->width;
+  mode->height = spec->height;
+  mode->refresh_rate = spec->refresh_rate;
+
+  return mode;
+}
 
 static void
-append_monitor (GArray *modes,
-                GArray *crtcs,
-                GArray *outputs,
-                float   scale)
+append_monitor (MetaMonitorManager *manager,
+                GList             **modes,
+                GList             **crtcs,
+                GList             **outputs,
+                float               scale)
 {
-  MetaCrtcMode modes_decl[] = {
+  MetaMonitorManagerDummy *manager_dummy = META_MONITOR_MANAGER_DUMMY (manager);
+  MetaGpu *gpu = manager_dummy->gpu;
+  CrtcModeSpec mode_specs[] = {
     {
       .width = 800,
       .height = 600,
@@ -84,65 +118,84 @@ append_monitor (GArray *modes,
       .refresh_rate = 60.0
     }
   };
-  MetaCrtc crtc;
+  GList *new_modes = NULL;
+  MetaCrtc *crtc;
   MetaOutputDummy *output_dummy;
-  MetaOutput output;
+  MetaOutput *output;
   unsigned int i;
+  unsigned int number;
+  GList *l;
 
-  for (i = 0; i < G_N_ELEMENTS (modes_decl); i++)
-    modes_decl[i].mode_id = modes->len + i;
-  g_array_append_vals (modes, modes_decl, G_N_ELEMENTS (modes_decl));
+  for (i = 0; i < G_N_ELEMENTS (mode_specs); i++)
+    {
+      long mode_id;
+      MetaCrtcMode *mode;
 
-  crtc = (MetaCrtc) {
-    .crtc_id = crtcs->len + 1,
-    .all_transforms = ALL_TRANSFORMS,
-  };
-  g_array_append_val (crtcs, crtc);
+      mode_id = g_list_length (*modes) + i + 1;
+      mode = create_mode (&mode_specs[i], mode_id);
+
+      new_modes = g_list_append (new_modes, mode);
+    }
+  *modes = g_list_concat (*modes, new_modes);
+
+  crtc = g_object_new (META_TYPE_CRTC, NULL);
+  crtc->crtc_id = g_list_length (*crtcs) + 1;
+  crtc->all_transforms = ALL_TRANSFORMS;
+  *crtcs = g_list_append (*crtcs, crtc);
+
+  output = g_object_new (META_TYPE_OUTPUT, NULL);
 
   output_dummy = g_new0 (MetaOutputDummy, 1);
   *output_dummy = (MetaOutputDummy) {
     .scale = scale
   };
 
-  output = (MetaOutput) {
-    .winsys_id = outputs->len + 1,
-    .name = g_strdup_printf ("LVDS%d", outputs->len + 1),
-    .vendor = g_strdup ("MetaProducts Inc."),
-    .product = g_strdup ("MetaMonitor"),
-    .serial = g_strdup_printf ("0xC0FFEE-%d", outputs->len + 1),
-    .suggested_x = -1,
-    .suggested_y = -1,
-    .width_mm = 222,
-    .height_mm = 125,
-    .subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN,
-    .preferred_mode = &array_last (modes, MetaCrtcMode),
-    .n_possible_clones = 0,
-    .backlight = -1,
-    .connector_type = META_CONNECTOR_TYPE_LVDS,
-    .driver_private = output_dummy,
-    .driver_notify =
-      (GDestroyNotify) meta_output_dummy_notify_destroy
-  };
+  number = g_list_length (*outputs) + 1;
 
-  output.modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (modes_decl));
-  for (i = 0; i < G_N_ELEMENTS (modes_decl); i++)
-    output.modes[i] = &g_array_index (modes, MetaCrtcMode,
-                                      modes->len - (i + 1));
-  output.n_modes = G_N_ELEMENTS (modes_decl);
-  output.possible_crtcs = g_new0 (MetaCrtc *, 1);
-  output.possible_crtcs[0] = &array_last (crtcs, MetaCrtc);
-  output.n_possible_crtcs = 1;
+  output->gpu = gpu;
+  output->winsys_id = number;
+  output->name = g_strdup_printf ("LVDS%d", number);
+  output->vendor = g_strdup ("MetaProducts Inc.");
+  output->product = g_strdup ("MetaMonitor");
+  output->serial = g_strdup_printf ("0xC0FFEE-%d", number);
+  output->suggested_x = -1;
+  output->suggested_y = -1;
+  output->width_mm = 222;
+  output->height_mm = 125;
+  output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
+  output->preferred_mode = g_list_last (*modes)->data;
+  output->n_possible_clones = 0;
+  output->backlight = -1;
+  output->connector_type = META_CONNECTOR_TYPE_LVDS;
+  output->driver_private = output_dummy;
+  output->driver_notify =
+    (GDestroyNotify) meta_output_dummy_notify_destroy;
 
-  g_array_append_val (outputs, output);
+  output->modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (mode_specs));
+  for (l = new_modes, i = 0; l; l = l->next, i++)
+    {
+      MetaCrtcMode *mode = l->data;
+
+      output->modes[i] = mode;
+    }
+  output->n_modes = G_N_ELEMENTS (mode_specs);
+  output->possible_crtcs = g_new0 (MetaCrtc *, 1);
+  output->possible_crtcs[0] = g_list_last (*crtcs)->data;
+  output->n_possible_crtcs = 1;
+
+  *outputs = g_list_append (*outputs, output);
 }
 
 static void
-append_tiled_monitor (GArray *modes,
-                      GArray *crtcs,
-                      GArray *outputs,
-                      int     scale)
+append_tiled_monitor (MetaMonitorManager *manager,
+                      GList             **modes,
+                      GList             **crtcs,
+                      GList             **outputs,
+                      int                 scale)
 {
-  MetaCrtcMode modes_decl[] = {
+  MetaMonitorManagerDummy *manager_dummy = META_MONITOR_MANAGER_DUMMY (manager);
+  MetaGpu *gpu = manager_dummy->gpu;
+  CrtcModeSpec mode_specs[] = {
     {
       .width = 800,
       .height = 600,
@@ -154,81 +207,105 @@ append_tiled_monitor (GArray *modes,
       .refresh_rate = 60.0
     }
   };
-  MetaCrtc crtcs_decl[] = {
-    {
-      .all_transforms = ALL_TRANSFORMS,
-    },
-    {
-      .all_transforms = ALL_TRANSFORMS,
-    },
-  };
-  MetaOutput output;
+  unsigned int n_tiles = 2;
+  GList *new_modes = NULL;
+  GList *new_crtcs = NULL;
+  MetaOutput *output;
   unsigned int i;
   uint32_t tile_group_id;
 
-  for (i = 0; i < G_N_ELEMENTS (modes_decl); i++)
-    modes_decl[i].mode_id = modes->len + i;
-  g_array_append_vals (modes, modes_decl, G_N_ELEMENTS (modes_decl));
+  for (i = 0; i < G_N_ELEMENTS (mode_specs); i++)
+    {
+      long mode_id;
+      MetaCrtcMode *mode;
 
-  for (i = 0; i < G_N_ELEMENTS (crtcs_decl); i++)
-    crtcs_decl[i].crtc_id = crtcs->len + i + 1;
-  g_array_append_vals (crtcs, crtcs_decl, G_N_ELEMENTS (crtcs_decl));
+      mode_id = g_list_length (*modes) + i + 1;
+      mode = create_mode (&mode_specs[i], mode_id);
 
-  tile_group_id = outputs->len + 1;
-  for (i = 0; i < G_N_ELEMENTS (crtcs_decl); i++)
+      new_modes = g_list_append (new_modes, mode);
+    }
+  *modes = g_list_concat (*modes, new_modes);
+
+  for (i = 0; i < n_tiles; i++)
+    {
+      MetaCrtc *crtc;
+
+      crtc = g_object_new (META_TYPE_CRTC, NULL);
+      crtc->gpu = gpu;
+      crtc->crtc_id = g_list_length (*crtcs) + i + 1;
+      crtc->all_transforms = ALL_TRANSFORMS;
+      new_crtcs = g_list_append (new_crtcs, crtc);
+    }
+  *crtcs = g_list_concat (*crtcs, new_crtcs);
+
+  tile_group_id = g_list_length (*outputs) + 1;
+  for (i = 0; i < n_tiles; i++)
     {
       MetaOutputDummy *output_dummy;
       MetaCrtcMode *preferred_mode;
       unsigned int j;
+      unsigned int number;
+      GList *l;
 
       output_dummy = g_new0 (MetaOutputDummy, 1);
       *output_dummy = (MetaOutputDummy) {
         .scale = scale
       };
 
-      preferred_mode = &array_last (modes, MetaCrtcMode),
-      output = (MetaOutput) {
-        .winsys_id = outputs->len + 1,
-        .name = g_strdup_printf ("LVDS%d", outputs->len + 1),
-        .vendor = g_strdup ("MetaProducts Inc."),
-        .product = g_strdup ("MetaMonitor"),
-        .serial = g_strdup_printf ("0xC0FFEE-%d", outputs->len + 1),
-        .suggested_x = -1,
-        .suggested_y = -1,
-        .width_mm = 222,
-        .height_mm = 125,
-        .subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN,
-        .preferred_mode = preferred_mode,
-        .n_possible_clones = 0,
-        .backlight = -1,
-        .connector_type = META_CONNECTOR_TYPE_LVDS,
-        .tile_info = (MetaTileInfo) {
-          .group_id = tile_group_id,
-          .max_h_tiles = G_N_ELEMENTS (crtcs_decl),
-          .max_v_tiles = 1,
-          .loc_h_tile = i,
-          .loc_v_tile = 0,
-          .tile_w = preferred_mode->width,
-          .tile_h = preferred_mode->height
-        },
-        .driver_private = output_dummy,
-        .driver_notify =
-          (GDestroyNotify) meta_output_dummy_notify_destroy
-      };
+      /* Arbitrary ID unique for this output */
+      number = g_list_length (*outputs) + 1;
 
-      output.modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (modes_decl));
-      for (j = 0; j < G_N_ELEMENTS (modes_decl); j++)
-        output.modes[j] = &g_array_index (modes, MetaCrtcMode,
-                                          modes->len - (j + 1));
-      output.n_modes = G_N_ELEMENTS (modes_decl);
+      preferred_mode = g_list_last (*modes)->data;
 
-      output.possible_crtcs = g_new0 (MetaCrtc *, G_N_ELEMENTS (crtcs_decl));
-      for (j = 0; j < G_N_ELEMENTS (crtcs_decl); j++)
-        output.possible_crtcs[j] = &g_array_index (crtcs, MetaCrtc,
-                                                   crtcs->len - (j + 1));
-      output.n_possible_crtcs = G_N_ELEMENTS (crtcs_decl);
+      output = g_object_new (META_TYPE_OUTPUT, NULL);
 
-      g_array_append_val (outputs, output);
+      output->gpu = gpu;
+      output->winsys_id = number;
+      output->name = g_strdup_printf ("LVDS%d", number);
+      output->vendor = g_strdup ("MetaProducts Inc.");
+      output->product = g_strdup ("MetaMonitor");
+      output->serial = g_strdup_printf ("0xC0FFEE-%d", number);
+      output->suggested_x = -1;
+      output->suggested_y = -1;
+      output->width_mm = 222;
+      output->height_mm = 125;
+      output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
+      output->preferred_mode = preferred_mode;
+      output->n_possible_clones = 0;
+      output->backlight = -1;
+      output->connector_type = META_CONNECTOR_TYPE_LVDS;
+      output->tile_info = (MetaTileInfo) {
+        .group_id = tile_group_id,
+        .max_h_tiles = n_tiles,
+        .max_v_tiles = 1,
+        .loc_h_tile = i,
+        .loc_v_tile = 0,
+        .tile_w = preferred_mode->width,
+        .tile_h = preferred_mode->height
+      },
+      output->driver_private = output_dummy;
+      output->driver_notify =
+        (GDestroyNotify) meta_output_dummy_notify_destroy;
+
+      output->modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (mode_specs));
+      for (l = new_modes, j = 0; l; l = l->next, j++)
+        {
+          MetaCrtcMode *mode = l->data;
+
+          output->modes[j] = mode;
+        }
+      output->n_modes = G_N_ELEMENTS (mode_specs);
+
+      output->possible_crtcs = g_new0 (MetaCrtc *, n_tiles);
+      for (l = new_crtcs, j = 0; l; l = l->next, j++)
+        {
+          MetaCrtc *crtc = l->data;
+
+          output->possible_crtcs[j] = crtc;
+        }
+      output->n_possible_crtcs = n_tiles;
+
+      *outputs = g_list_append (*outputs, output);
     }
 }
 
@@ -241,6 +318,8 @@ meta_output_dummy_notify_destroy (MetaOutput *output)
 static void
 meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
 {
+  MetaMonitorManagerDummy *manager_dummy = META_MONITOR_MANAGER_DUMMY (manager);
+  MetaGpu *gpu = manager_dummy->gpu;
   unsigned int num_monitors = 1;
   float *monitor_scales = NULL;
   const char *num_monitors_str;
@@ -248,9 +327,9 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
   const char *tiled_monitors_str;
   gboolean tiled_monitors;
   unsigned int i;
-  GArray *outputs;
-  GArray *crtcs;
-  GArray *modes;
+  GList *outputs;
+  GList *crtcs;
+  GList *modes;
 
   /* To control what monitor configuration is generated, there are two available
    * environmental variables that can be used:
@@ -319,28 +398,22 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
   tiled_monitors_str = g_getenv ("MUTTER_DEBUG_TILED_DUMMY_MONITORS");
   tiled_monitors = g_strcmp0 (tiled_monitors_str, "1") == 0;
 
-  modes = g_array_sized_new (FALSE, TRUE, sizeof (MetaCrtcMode), MAX_MODES);
-  crtcs = g_array_sized_new (FALSE, TRUE, sizeof (MetaCrtc), MAX_CRTCS);
-  outputs = g_array_sized_new (FALSE, TRUE, sizeof (MetaOutput), MAX_OUTPUTS);
+  modes = NULL;
+  crtcs = NULL;
+  outputs = NULL;
 
   for (i = 0; i < num_monitors; i++)
     {
       if (tiled_monitors)
-        append_tiled_monitor (modes, crtcs, outputs, monitor_scales[i]);
+        append_tiled_monitor (manager,
+                              &modes, &crtcs, &outputs, monitor_scales[i]);
       else
-        append_monitor (modes, crtcs, outputs, monitor_scales[i]);
+        append_monitor (manager, &modes, &crtcs, &outputs, monitor_scales[i]);
     }
 
-  manager->modes = (MetaCrtcMode *) modes->data;
-  manager->n_modes = modes->len;
-  manager->crtcs = (MetaCrtc *) crtcs->data;
-  manager->n_crtcs = crtcs->len;
-  manager->outputs = (MetaOutput *) outputs->data;
-  manager->n_outputs = outputs->len;
-
-  g_array_free (modes, FALSE);
-  g_array_free (crtcs, FALSE);
-  g_array_free (outputs, FALSE);
+  meta_gpu_take_modes (gpu, modes);
+  meta_gpu_take_crtcs (gpu, crtcs);
+  meta_gpu_take_outputs (gpu, outputs);
 }
 
 static void
@@ -353,12 +426,7 @@ meta_monitor_manager_dummy_ensure_initial_config (MetaMonitorManager *manager)
   if (meta_is_stage_views_enabled ())
     meta_monitor_manager_update_logical_state (manager, config);
   else
-    {
-      MetaMonitorManagerDeriveFlag flags =
-        META_MONITOR_MANAGER_DERIVE_FLAG_NONE;
-
-      meta_monitor_manager_update_logical_state_derived (manager, flags);
-    }
+    meta_monitor_manager_update_logical_state_derived (manager, NULL);
 }
 
 static void
@@ -368,6 +436,8 @@ apply_crtc_assignments (MetaMonitorManager *manager,
                         MetaOutputInfo    **outputs,
                         unsigned int        n_outputs)
 {
+  MetaMonitorManagerDummy *manager_dummy = META_MONITOR_MANAGER_DUMMY (manager);
+  GList *l;
   unsigned i;
 
   for (i = 0; i < n_crtcs; i++)
@@ -431,9 +501,9 @@ apply_crtc_assignments (MetaMonitorManager *manager,
     }
 
   /* Disable CRTCs not mentioned in the list */
-  for (i = 0; i < manager->n_crtcs; i++)
+  for (l = meta_gpu_get_crtcs (manager_dummy->gpu); l; l = l->next)
     {
-      MetaCrtc *crtc = &manager->crtcs[i];
+      MetaCrtc *crtc = l->data;
 
       crtc->logical_monitor = NULL;
 
@@ -451,9 +521,9 @@ apply_crtc_assignments (MetaMonitorManager *manager,
     }
 
   /* Disable outputs not mentioned in the list */
-  for (i = 0; i < manager->n_outputs; i++)
+  for (l = meta_gpu_get_outputs (manager_dummy->gpu); l; l = l->next)
     {
-      MetaOutput *output = &manager->outputs[i];
+      MetaOutput *output = l->data;
 
       if (output->is_dirty)
         {
@@ -506,10 +576,11 @@ meta_monitor_manager_dummy_apply_monitors_config (MetaMonitorManager      *manag
 
   if (!config)
     {
-      manager->screen_width = 0;
-      manager->screen_height = 0;
+      manager->screen_width = META_MONITOR_MANAGER_MIN_SCREEN_WIDTH;
+      manager->screen_height = META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT;
 
       meta_monitor_manager_rebuild (manager, NULL);
+      return TRUE;
     }
 
   if (!meta_monitor_config_manager_assign (manager, config,
@@ -647,7 +718,6 @@ meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass)
 {
   MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_CLASS (klass);
 
-  manager_class->read_current = meta_monitor_manager_dummy_read_current;
   manager_class->ensure_initial_config = meta_monitor_manager_dummy_ensure_initial_config;
   manager_class->apply_monitors_config = meta_monitor_manager_dummy_apply_monitors_config;
   manager_class->is_transform_handled = meta_monitor_manager_dummy_is_transform_handled;
@@ -659,14 +729,44 @@ meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass)
 }
 
 static void
-meta_monitor_manager_dummy_init (MetaMonitorManagerDummy *manager)
+meta_monitor_manager_dummy_init (MetaMonitorManagerDummy *manager_dummy)
 {
+  MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_dummy);
   const char *nested_offscreen_transform;
 
   nested_offscreen_transform =
     g_getenv ("MUTTER_DEBUG_NESTED_OFFSCREEN_TRANSFORM");
   if (g_strcmp0 (nested_offscreen_transform, "1") == 0)
-    manager->is_transform_handled = FALSE;
+    manager_dummy->is_transform_handled = FALSE;
   else
-    manager->is_transform_handled = TRUE;
+    manager_dummy->is_transform_handled = TRUE;
+
+  manager_dummy->gpu = g_object_new (META_TYPE_GPU_DUMMY,
+                                     "monitor-manager", manager,
+                                     NULL);
+  meta_monitor_manager_add_gpu (manager, manager_dummy->gpu);
+}
+
+static gboolean
+meta_gpu_dummy_read_current (MetaGpu  *gpu,
+                             GError  **error)
+{
+  MetaMonitorManager *manager = meta_gpu_get_monitor_manager (gpu);
+
+  meta_monitor_manager_dummy_read_current (manager);
+
+  return TRUE;
+}
+
+static void
+meta_gpu_dummy_init (MetaGpuDummy *gpu_dummy)
+{
+}
+
+static void
+meta_gpu_dummy_class_init (MetaGpuDummyClass *klass)
+{
+  MetaGpuClass *gpu_class = META_GPU_CLASS (klass);
+
+  gpu_class->read_current = meta_gpu_dummy_read_current;
 }

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

@@ -24,17 +24,13 @@
 #define META_MONITOR_MANAGER_DUMMY_H
 
 #include "meta-monitor-manager-private.h"
+#include "backends/meta-gpu.h"
 
-#define META_TYPE_MONITOR_MANAGER_DUMMY            (meta_monitor_manager_dummy_get_type ())
-#define META_MONITOR_MANAGER_DUMMY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))
-#define META_MONITOR_MANAGER_DUMMY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummyClass))
-#define META_IS_MONITOR_MANAGER_DUMMY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_MANAGER_DUMMY))
-#define META_IS_MONITOR_MANAGER_DUMMY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_MANAGER_DUMMY))
-#define META_MONITOR_MANAGER_DUMMY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummyClass))
+#define META_TYPE_MONITOR_MANAGER_DUMMY (meta_monitor_manager_dummy_get_type ())
+G_DECLARE_FINAL_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy,
+                      META, MONITOR_MANAGER_DUMMY, MetaMonitorManager)
 
-typedef struct _MetaMonitorManagerDummyClass    MetaMonitorManagerDummyClass;
-typedef struct _MetaMonitorManagerDummy         MetaMonitorManagerDummy;
-
-GType meta_monitor_manager_dummy_get_type (void);
+#define META_TYPE_GPU_DUMMY (meta_gpu_dummy_get_type ())
+G_DECLARE_FINAL_TYPE (MetaGpuDummy, meta_gpu_dummy, META, GPU_DUMMY, MetaGpu)
 
 #endif /* META_MONITOR_MANAGER_DUMMY_H */

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

@@ -60,6 +60,8 @@ typedef struct _MetaLogicalMonitor MetaLogicalMonitor;
 
 typedef struct _MetaMonitorMode MetaMonitorMode;
 
+typedef struct _MetaGpu MetaGpu;
+
 typedef struct _MetaCrtc MetaCrtc;
 typedef struct _MetaOutput MetaOutput;
 typedef struct _MetaCrtcMode MetaCrtcMode;
@@ -67,6 +69,9 @@ typedef struct _MetaCrtcInfo MetaCrtcInfo;
 typedef struct _MetaOutputInfo MetaOutputInfo;
 typedef struct _MetaTileInfo MetaTileInfo;
 
+#define META_MONITOR_MANAGER_MIN_SCREEN_WIDTH 640
+#define META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT 480
+
 typedef enum _MetaMonitorManagerCapability
 {
   META_MONITOR_MANAGER_CAPABILITY_NONE = 0,
@@ -90,12 +95,6 @@ typedef enum _MetaLogicalMonitorLayoutMode
   META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL = 2
 } MetaLogicalMonitorLayoutMode;
 
-typedef enum _MetaMonitorManagerDeriveFlag
-{
-  META_MONITOR_MANAGER_DERIVE_FLAG_NONE = 0,
-  META_MONITOR_MANAGER_DERIVE_FLAG_CONFIGURED_SCALE = (1 << 0)
-} MetaMonitorManagerDeriveFlag;
-
 typedef enum
 {
   META_MONITOR_TRANSFORM_NORMAL,
@@ -108,156 +107,6 @@ typedef enum
   META_MONITOR_TRANSFORM_FLIPPED_270,
 } MetaMonitorTransform;
 
-/* This matches the values in drm_mode.h */
-typedef enum
-{
-  META_CONNECTOR_TYPE_Unknown = 0,
-  META_CONNECTOR_TYPE_VGA = 1,
-  META_CONNECTOR_TYPE_DVII = 2,
-  META_CONNECTOR_TYPE_DVID = 3,
-  META_CONNECTOR_TYPE_DVIA = 4,
-  META_CONNECTOR_TYPE_Composite = 5,
-  META_CONNECTOR_TYPE_SVIDEO = 6,
-  META_CONNECTOR_TYPE_LVDS = 7,
-  META_CONNECTOR_TYPE_Component = 8,
-  META_CONNECTOR_TYPE_9PinDIN = 9,
-  META_CONNECTOR_TYPE_DisplayPort = 10,
-  META_CONNECTOR_TYPE_HDMIA = 11,
-  META_CONNECTOR_TYPE_HDMIB = 12,
-  META_CONNECTOR_TYPE_TV = 13,
-  META_CONNECTOR_TYPE_eDP = 14,
-  META_CONNECTOR_TYPE_VIRTUAL = 15,
-  META_CONNECTOR_TYPE_DSI = 16,
-} MetaConnectorType;
-
-/* Same as KMS mode flags and X11 randr flags */
-typedef enum
-{
-  META_CRTC_MODE_FLAG_NONE = 0,
-  META_CRTC_MODE_FLAG_PHSYNC = (1 << 0),
-  META_CRTC_MODE_FLAG_NHSYNC = (1 << 1),
-  META_CRTC_MODE_FLAG_PVSYNC = (1 << 2),
-  META_CRTC_MODE_FLAG_NVSYNC = (1 << 3),
-  META_CRTC_MODE_FLAG_INTERLACE = (1 << 4),
-  META_CRTC_MODE_FLAG_DBLSCAN = (1 << 5),
-  META_CRTC_MODE_FLAG_CSYNC = (1 << 6),
-  META_CRTC_MODE_FLAG_PCSYNC = (1 << 7),
-  META_CRTC_MODE_FLAG_NCSYNC = (1 << 8),
-  META_CRTC_MODE_FLAG_HSKEW = (1 << 9),
-  META_CRTC_MODE_FLAG_BCAST = (1 << 10),
-  META_CRTC_MODE_FLAG_PIXMUX = (1 << 11),
-  META_CRTC_MODE_FLAG_DBLCLK = (1 << 12),
-  META_CRTC_MODE_FLAG_CLKDIV2 = (1 << 13),
-
-  META_CRTC_MODE_FLAG_MASK = 0x3fff
-} MetaCrtcModeFlag;
-
-struct _MetaTileInfo
-{
-  guint32 group_id;
-  guint32 flags;
-  guint32 max_h_tiles;
-  guint32 max_v_tiles;
-  guint32 loc_h_tile;
-  guint32 loc_v_tile;
-  guint32 tile_w;
-  guint32 tile_h;
-};
-
-struct _MetaOutput
-{
-  /* The CRTC driving this output, NULL if the output is not enabled */
-  MetaCrtc *crtc;
-  /* The low-level ID of this output, used to apply back configuration */
-  glong winsys_id;
-  char *name;
-  char *vendor;
-  char *product;
-  char *serial;
-  int width_mm;
-  int height_mm;
-  CoglSubpixelOrder subpixel_order;
-
-  MetaConnectorType connector_type;
-
-  MetaCrtcMode *preferred_mode;
-  MetaCrtcMode **modes;
-  unsigned int n_modes;
-
-  MetaCrtc **possible_crtcs;
-  unsigned int n_possible_crtcs;
-
-  MetaOutput **possible_clones;
-  unsigned int n_possible_clones;
-
-  int backlight;
-  int backlight_min;
-  int backlight_max;
-
-  /* Used when changing configuration */
-  gboolean is_dirty;
-
-  /* The low-level bits used to build the high-level info
-     in MetaLogicalMonitor
-
-     XXX: flags maybe?
-     There is a lot of code that uses MonitorInfo->is_primary,
-     but nobody uses MetaOutput yet
-  */
-  gboolean is_primary;
-  gboolean is_presentation;
-  gboolean is_underscanning;
-  gboolean supports_underscanning;
-
-  gpointer driver_private;
-  GDestroyNotify driver_notify;
-
-  /* get a new preferred mode on hotplug events, to handle dynamic guest resizing */
-  gboolean hotplug_mode_update;
-  gint suggested_x;
-  gint suggested_y;
-
-  MetaTileInfo tile_info;
-};
-
-struct _MetaCrtc
-{
-  glong crtc_id;
-  MetaRectangle rect;
-  MetaCrtcMode *current_mode;
-  MetaMonitorTransform transform;
-  unsigned int all_transforms;
-
-  /* Only used to build the logical configuration
-     from the HW one
-  */
-  MetaLogicalMonitor *logical_monitor;
-
-  /* Used when changing configuration */
-  gboolean is_dirty;
-
-  /* Used by cursor renderer backend */
-  void *cursor_renderer_private;
-
-  gpointer driver_private;
-  GDestroyNotify driver_notify;
-};
-
-struct _MetaCrtcMode
-{
-  /* The low-level ID of this mode, used to apply back configuration */
-  glong mode_id;
-  char *name;
-
-  int width;
-  int height;
-  float refresh_rate;
-  MetaCrtcModeFlag flags;
-
-  gpointer driver_private;
-  GDestroyNotify driver_notify;
-};
-
 /*
  * MetaCrtcInfo:
  *
@@ -301,6 +150,8 @@ struct _MetaMonitorManager
 {
   MetaDBusDisplayConfigSkeleton parent_instance;
 
+  MetaBackend *backend;
+
   /* XXX: this structure is very badly
      packed, but I like the logical organization
      of fields */
@@ -315,19 +166,7 @@ struct _MetaMonitorManager
   int screen_width;
   int screen_height;
 
-  /* Outputs refer to physical screens,
-     CRTCs refer to stuff that can drive outputs
-     (like encoders, but less tied to the HW),
-     while logical_monitors refer to logical ones.
-  */
-  MetaOutput *outputs;
-  unsigned int n_outputs;
-
-  MetaCrtcMode *modes;
-  unsigned int n_modes;
-
-  MetaCrtc *crtcs;
-  unsigned int n_crtcs;
+  GList *gpus;
 
   GList *monitors;
 
@@ -352,8 +191,6 @@ struct _MetaMonitorManagerClass
 {
   MetaDBusDisplayConfigSkeletonClass parent_class;
 
-  void (*read_current) (MetaMonitorManager *);
-
   char* (*get_edid_file) (MetaMonitorManager *,
                           MetaOutput         *);
   GBytes* (*read_edid) (MetaMonitorManager *,
@@ -417,10 +254,14 @@ struct _MetaMonitorManagerClass
   MetaLogicalMonitorLayoutMode (*get_default_layout_mode) (MetaMonitorManager *);
 };
 
+MetaBackend *       meta_monitor_manager_get_backend (MetaMonitorManager *manager);
+
+void                meta_monitor_manager_setup (MetaMonitorManager *manager);
+
 void                meta_monitor_manager_rebuild (MetaMonitorManager *manager,
                                                   MetaMonitorsConfig *config);
-void                meta_monitor_manager_rebuild_derived (MetaMonitorManager          *manager,
-                                                          MetaMonitorManagerDeriveFlag flags);
+void                meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager,
+                                                          MetaMonitorsConfig *config);
 
 int                 meta_monitor_manager_get_num_logical_monitors (MetaMonitorManager *manager);
 
@@ -449,18 +290,15 @@ MetaMonitor *       meta_monitor_manager_get_laptop_panel (MetaMonitorManager *m
 MetaMonitor *       meta_monitor_manager_get_monitor_from_spec (MetaMonitorManager *manager,
                                                                 MetaMonitorSpec    *monitor_spec);
 
+MetaMonitor *       meta_monitor_manager_get_monitor_from_connector (MetaMonitorManager *manager,
+                                                                     const char         *connector);
+
 GList *             meta_monitor_manager_get_monitors      (MetaMonitorManager *manager);
 
-MetaOutput         *meta_monitor_manager_get_outputs       (MetaMonitorManager *manager,
-							    unsigned int       *n_outputs);
+void                meta_monitor_manager_add_gpu (MetaMonitorManager *manager,
+                                                  MetaGpu            *gpu);
 
-void                meta_monitor_manager_get_resources     (MetaMonitorManager  *manager,
-                                                            MetaCrtcMode       **modes,
-                                                            unsigned int        *n_modes,
-                                                            MetaCrtc           **crtcs,
-                                                            unsigned int        *n_crtcs,
-                                                            MetaOutput         **outputs,
-                                                            unsigned int        *n_outputs);
+GList *             meta_monitor_manager_get_gpus (MetaMonitorManager *manager);
 
 void                meta_monitor_manager_get_screen_size   (MetaMonitorManager *manager,
                                                             int                *width,
@@ -494,8 +332,8 @@ MetaMonitorsConfig * meta_monitor_manager_ensure_configured (MetaMonitorManager
 
 void               meta_monitor_manager_update_logical_state (MetaMonitorManager *manager,
                                                               MetaMonitorsConfig *config);
-void               meta_monitor_manager_update_logical_state_derived (MetaMonitorManager          *manager,
-                                                                      MetaMonitorManagerDeriveFlag flags);
+void               meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager,
+                                                                      MetaMonitorsConfig *config);
 
 gboolean           meta_monitor_manager_is_lid_closed (MetaMonitorManager *manager);
 
@@ -529,6 +367,9 @@ gboolean           meta_monitor_manager_get_max_screen_size (MetaMonitorManager
 MetaLogicalMonitorLayoutMode
                    meta_monitor_manager_get_default_layout_mode (MetaMonitorManager *manager);
 
+MetaMonitorConfigManager *
+                   meta_monitor_manager_get_config_manager (MetaMonitorManager *manager);
+
 void meta_monitor_manager_rotate_monitor (MetaMonitorManager *manager);
 
 void meta_monitor_manager_clear_output (MetaOutput *output);

src/backends/meta-monitor-manager.c

@@ -36,16 +36,30 @@
 #include "util-private.h"
 #include <meta/errors.h>
 #include "edid.h"
+#include "backends/meta-crtc.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor.h"
 #include "backends/meta-monitor-config-manager.h"
 #include "backends/meta-orientation-manager.h"
+#include "backends/meta-output.h"
 #include "backends/x11/meta-monitor-manager-xrandr.h"
 #include "meta-backend-private.h"
 
 #define DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT 20
 
+enum
+{
+  PROP_0,
+
+  PROP_BACKEND,
+
+  PROP_LAST
+};
+
+static GParamSpec *obj_props[PROP_LAST];
+
 enum {
+  MONITORS_CHANGED_INTERNAL,
   CONFIRM_DISPLAY_CHANGE,
   SIGNALS_LAST
 };
@@ -75,6 +89,12 @@ static gboolean
 meta_monitor_manager_is_config_complete (MetaMonitorManager *manager,
                                          MetaMonitorsConfig *config);
 
+MetaBackend *
+meta_monitor_manager_get_backend (MetaMonitorManager *manager)
+{
+  return manager->backend;
+}
+
 static void
 meta_monitor_manager_init (MetaMonitorManager *manager)
 {
@@ -153,15 +173,11 @@ meta_monitor_manager_rebuild_logical_monitors (MetaMonitorManager *manager,
 }
 
 static float
-derive_configured_global_scale (MetaMonitorManager *manager)
+derive_configured_global_scale (MetaMonitorManager *manager,
+                                MetaMonitorsConfig *config)
 {
-  MetaMonitorsConfig *config;
   MetaLogicalMonitorConfig *logical_monitor_config;
 
-  config = meta_monitor_config_manager_get_current (manager->config_manager);
-  if (!config)
-    return 1.0;
-
   logical_monitor_config = config->logical_monitor_configs->data;
 
   return logical_monitor_config->scale;
@@ -193,12 +209,11 @@ derive_calculated_global_scale (MetaMonitorManager *manager)
 
 static float
 derive_scale_from_config (MetaMonitorManager *manager,
+                          MetaMonitorsConfig *config,
                           MetaRectangle      *layout)
 {
-  MetaMonitorsConfig *config;
   GList *l;
 
-  config = meta_monitor_config_manager_get_current (manager->config_manager);
   for (l = config->logical_monitor_configs; l; l = l->next)
     {
       MetaLogicalMonitorConfig *logical_monitor_config = l->data;
@@ -212,14 +227,13 @@ derive_scale_from_config (MetaMonitorManager *manager,
 }
 
 static void
-meta_monitor_manager_rebuild_logical_monitors_derived (MetaMonitorManager          *manager,
-                                                       MetaMonitorManagerDeriveFlag flags)
+meta_monitor_manager_rebuild_logical_monitors_derived (MetaMonitorManager *manager,
+                                                       MetaMonitorsConfig *config)
 {
   GList *logical_monitors = NULL;
   GList *l;
   int monitor_number;
   MetaLogicalMonitor *primary_logical_monitor = NULL;
-  gboolean use_configured_scale;
   gboolean use_global_scale;
   float global_scale = 0.0;
   MetaMonitorManagerCapability capabilities;
@@ -230,13 +244,10 @@ meta_monitor_manager_rebuild_logical_monitors_derived (MetaMonitorManager
   use_global_scale =
     !!(capabilities & META_MONITOR_MANAGER_CAPABILITY_GLOBAL_SCALE_REQUIRED);
 
-  use_configured_scale =
-    !!(flags & META_MONITOR_MANAGER_DERIVE_FLAG_CONFIGURED_SCALE);
-
   if (use_global_scale)
     {
-      if (use_configured_scale)
-        global_scale = derive_configured_global_scale (manager);
+      if (config)
+        global_scale = derive_configured_global_scale (manager, config);
       else
         global_scale = derive_calculated_global_scale (manager);
     }
@@ -263,8 +274,8 @@ meta_monitor_manager_rebuild_logical_monitors_derived (MetaMonitorManager
 
           if (use_global_scale)
             scale = global_scale;
-          else if (use_configured_scale)
-            scale = derive_scale_from_config (manager, &layout);
+          else if (config)
+            scale = derive_scale_from_config (manager, config, &layout);
           else
             scale = calculate_monitor_scale (manager, monitor);
 
@@ -355,7 +366,7 @@ meta_monitor_manager_is_lid_closed (MetaMonitorManager *manager)
 gboolean
 meta_monitor_manager_is_headless (MetaMonitorManager *manager)
 {
-  return !manager->monitors;
+  return !manager->logical_monitors;
 }
 
 float
@@ -455,13 +466,13 @@ meta_monitor_manager_apply_monitors_config (MetaMonitorManager      *manager,
 gboolean
 meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager)
 {
-  unsigned int i;
+  GList *l;
 
-  for (i = 0; i < manager->n_outputs; i++)
+  for (l = manager->gpus; l; l = l->next)
     {
-      MetaOutput *output = &manager->outputs[i];
+      MetaGpu *gpu = l->data;
 
-      if (output->hotplug_mode_update)
+      if (meta_gpu_has_hotplug_mode_update (gpu))
         return TRUE;
     }
 
@@ -683,13 +694,27 @@ experimental_features_changed (MetaSettings           *settings,
   meta_settings_update_ui_scaling_factor (settings);
 }
 
+void
+meta_monitor_manager_setup (MetaMonitorManager *manager)
+{
+  manager->in_init = TRUE;
+
+  manager->config_manager = meta_monitor_config_manager_new (manager);
+
+  meta_monitor_manager_read_current_state (manager);
+
+  meta_monitor_manager_ensure_initial_config (manager);
+
+  manager->in_init = FALSE;
+}
+
 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 = meta_get_backend ();
+  MetaBackend *backend = manager->backend;
   MetaSettings *settings = meta_backend_get_settings (backend);
 
   manager->experimental_features_changed_handler_id =
@@ -714,90 +739,8 @@ meta_monitor_manager_constructed (GObject *object)
                            manager, 0);
 
   manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
-  manager->in_init = TRUE;
-
-  manager->config_manager = meta_monitor_config_manager_new (manager);
-
-  meta_monitor_manager_read_current_state (manager);
-
-  meta_monitor_manager_ensure_initial_config (manager);
 
   initialize_dbus_interface (manager);
-
-  manager->in_init = FALSE;
-}
-
-void
-meta_monitor_manager_clear_output (MetaOutput *output)
-{
-  g_free (output->name);
-  g_free (output->vendor);
-  g_free (output->product);
-  g_free (output->serial);
-  g_free (output->modes);
-  g_free (output->possible_crtcs);
-  g_free (output->possible_clones);
-
-  if (output->driver_notify)
-    output->driver_notify (output);
-
-  memset (output, 0, sizeof (*output));
-}
-
-static void
-meta_monitor_manager_free_output_array (MetaOutput *old_outputs,
-                                        int         n_old_outputs)
-{
-  int i;
-
-  for (i = 0; i < n_old_outputs; i++)
-    meta_monitor_manager_clear_output (&old_outputs[i]);
-
-  g_free (old_outputs);
-}
-
-void
-meta_monitor_manager_clear_mode (MetaCrtcMode *mode)
-{
-  g_free (mode->name);
-
-  if (mode->driver_notify)
-    mode->driver_notify (mode);
-
-  memset (mode, 0, sizeof (*mode));
-}
-
-static void
-meta_monitor_manager_free_mode_array (MetaCrtcMode *old_modes,
-                                      int           n_old_modes)
-{
-  int i;
-
-  for (i = 0; i < n_old_modes; i++)
-    meta_monitor_manager_clear_mode (&old_modes[i]);
-
-  g_free (old_modes);
-}
-
-void
-meta_monitor_manager_clear_crtc (MetaCrtc *crtc)
-{
-  if (crtc->driver_notify)
-    crtc->driver_notify (crtc);
-
-  memset (crtc, 0, sizeof (*crtc));
-}
-
-static void
-meta_monitor_manager_free_crtc_array (MetaCrtc *old_crtcs,
-                                      int       n_old_crtcs)
-{
-  int i;
-
-  for (i = 0; i < n_old_crtcs; i++)
-    meta_monitor_manager_clear_crtc (&old_crtcs[i]);
-
-  g_free (old_crtcs);
 }
 
 static void
@@ -805,12 +748,10 @@ meta_monitor_manager_finalize (GObject *object)
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (object);
 
-  meta_monitor_manager_free_output_array (manager->outputs, manager->n_outputs);
-  meta_monitor_manager_free_mode_array (manager->modes, manager->n_modes);
-  meta_monitor_manager_free_crtc_array (manager->crtcs, manager->n_crtcs);
+  g_list_free_full (manager->gpus, g_object_unref);
   g_list_free_full (manager->logical_monitors, g_object_unref);
 
-  g_signal_handler_disconnect (meta_get_backend (),
+  g_signal_handler_disconnect (manager->backend,
                                manager->experimental_features_changed_handler_id);
 
   G_OBJECT_CLASS (meta_monitor_manager_parent_class)->finalize (object);
@@ -847,6 +788,42 @@ meta_monitor_manager_real_get_edid_file (MetaMonitorManager *manager,
   return NULL;
 }
 
+static void
+meta_monitor_manager_set_property (GObject      *object,
+                                   guint         prop_id,
+                                   const GValue *value,
+                                   GParamSpec   *pspec)
+{
+  MetaMonitorManager *manager = META_MONITOR_MANAGER (object);
+
+  switch (prop_id)
+    {
+    case PROP_BACKEND:
+      manager->backend = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_monitor_manager_get_property (GObject    *object,
+                                   guint       prop_id,
+                                   GValue     *value,
+                                   GParamSpec *pspec)
+{
+  MetaMonitorManager *manager = META_MONITOR_MANAGER (object);
+
+  switch (prop_id)
+    {
+    case PROP_BACKEND:
+      g_value_set_object (value, manager->backend);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
 static void
 meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
 {
@@ -855,11 +832,21 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
   object_class->constructed = meta_monitor_manager_constructed;
   object_class->dispose = meta_monitor_manager_dispose;
   object_class->finalize = meta_monitor_manager_finalize;
+  object_class->get_property = meta_monitor_manager_get_property;
+  object_class->set_property = meta_monitor_manager_set_property;
 
   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",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+
   signals[CONFIRM_DISPLAY_CHANGE] =
     g_signal_new ("confirm-display-change",
 		  G_TYPE_FROM_CLASS (object_class),
@@ -867,6 +854,16 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass)
 		  0,
                   NULL, NULL, NULL,
 		  G_TYPE_NONE, 0);
+
+  obj_props[PROP_BACKEND] =
+    g_param_spec_object ("backend",
+                         "backend",
+                         "MetaBackend",
+                         META_TYPE_BACKEND,
+                         G_PARAM_READWRITE |
+                         G_PARAM_CONSTRUCT_ONLY |
+                         G_PARAM_STATIC_STRINGS);
+  g_object_class_install_properties (object_class, PROP_LAST, obj_props);
 }
 
 static const double known_diagonals[] = {
@@ -967,31 +964,61 @@ get_connector_type_name (MetaConnectorType connector_type)
     }
 }
 
+static GList *
+combine_gpu_lists (MetaMonitorManager    *manager,
+                   GList              * (*list_getter) (MetaGpu *gpu))
+{
+  GList *list = NULL;
+  GList *l;
+
+  for (l = manager->gpus; l; l = l->next)
+    {
+      MetaGpu *gpu = l->data;
+
+      list = g_list_concat (list, g_list_copy (list_getter (gpu)));
+    }
+
+  return list;
+}
+
 static gboolean
 meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                                            GDBusMethodInvocation *invocation)
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
   MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_GET_CLASS (skeleton);
+  GList *combined_modes;
+  GList *combined_outputs;
+  GList *combined_crtcs;
   GVariantBuilder crtc_builder, output_builder, mode_builder;
+  GList *l;
   unsigned int i, j;
   int max_screen_width;
   int max_screen_height;
 
+  combined_modes = combine_gpu_lists (manager, meta_gpu_get_modes);
+  combined_outputs = combine_gpu_lists (manager, meta_gpu_get_outputs);
+  combined_crtcs = combine_gpu_lists (manager, meta_gpu_get_crtcs);
+
   g_variant_builder_init (&crtc_builder, G_VARIANT_TYPE ("a(uxiiiiiuaua{sv})"));
   g_variant_builder_init (&output_builder, G_VARIANT_TYPE ("a(uxiausauaua{sv})"));
   g_variant_builder_init (&mode_builder, G_VARIANT_TYPE ("a(uxuudu)"));
 
-  for (i = 0; i < manager->n_crtcs; i++)
+  for (l = combined_crtcs, i = 0; l; l = l->next, i++)
     {
-      MetaCrtc *crtc = &manager->crtcs[i];
+      MetaCrtc *crtc = l->data;
       GVariantBuilder transforms;
+      int current_mode_index;
 
       g_variant_builder_init (&transforms, G_VARIANT_TYPE ("au"));
       for (j = 0; j <= META_MONITOR_TRANSFORM_FLIPPED_270; j++)
         if (crtc->all_transforms & (1 << j))
           g_variant_builder_add (&transforms, "u", j);
 
+      if (crtc->current_mode)
+        current_mode_index = g_list_index (combined_modes, crtc->current_mode);
+      else
+        current_mode_index = -1;
       g_variant_builder_add (&crtc_builder, "(uxiiiiiuaua{sv})",
                              i, /* ID */
                              (gint64)crtc->crtc_id,
@@ -999,33 +1026,48 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                              (int)crtc->rect.y,
                              (int)crtc->rect.width,
                              (int)crtc->rect.height,
-                             (int)(crtc->current_mode ? crtc->current_mode - manager->modes : -1),
+                             current_mode_index,
                              (guint32)crtc->transform,
                              &transforms,
                              NULL /* properties */);
     }
 
-  for (i = 0; i < manager->n_outputs; i++)
+  for (l = combined_outputs; l; l = l->next)
     {
-      MetaOutput *output = &manager->outputs[i];
+      MetaOutput *output = l->data;
       GVariantBuilder crtcs, modes, clones, properties;
       GBytes *edid;
       char *edid_file;
+      int crtc_index;
 
       g_variant_builder_init (&crtcs, G_VARIANT_TYPE ("au"));
       for (j = 0; j < output->n_possible_crtcs; j++)
-        g_variant_builder_add (&crtcs, "u",
-                               (unsigned)(output->possible_crtcs[j] - manager->crtcs));
+        {
+          MetaCrtc *possible_crtc = output->possible_crtcs[j];
+          unsigned possible_crtc_index;
+
+          possible_crtc_index = g_list_index (combined_crtcs, possible_crtc);
+          g_variant_builder_add (&crtcs, "u", possible_crtc_index);
+        }
 
       g_variant_builder_init (&modes, G_VARIANT_TYPE ("au"));
       for (j = 0; j < output->n_modes; j++)
-        g_variant_builder_add (&modes, "u",
-                               (unsigned)(output->modes[j] - manager->modes));
+        {
+          unsigned mode_index;
+
+          mode_index = g_list_index (combined_modes, output->modes[j]);
+          g_variant_builder_add (&modes, "u", mode_index);
+        }
 
       g_variant_builder_init (&clones, G_VARIANT_TYPE ("au"));
       for (j = 0; j < output->n_possible_clones; j++)
-        g_variant_builder_add (&clones, "u",
-                               (unsigned)(output->possible_clones[j] - manager->outputs));
+        {
+          unsigned int possible_clone_index;
+
+          possible_clone_index = g_list_index (combined_outputs,
+                                               output->possible_clones[j]);
+          g_variant_builder_add (&clones, "u", possible_clone_index);
+        }
 
       g_variant_builder_init (&properties, G_VARIANT_TYPE ("a{sv}"));
       g_variant_builder_add (&properties, "{sv}", "vendor",
@@ -1089,10 +1131,12 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                                                 output->tile_info.tile_h));
         }
 
+      crtc_index = output->crtc ? g_list_index (combined_crtcs, output->crtc)
+                                : -1;
       g_variant_builder_add (&output_builder, "(uxiausauaua{sv})",
                              i, /* ID */
                              (gint64)output->winsys_id,
-                             (int)(output->crtc ? output->crtc - manager->crtcs : -1),
+                             crtc_index,
                              &crtcs,
                              output->name,
                              &modes,
@@ -1100,9 +1144,9 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                              &properties);
     }
 
-  for (i = 0; i < manager->n_modes; i++)
+  for (l = combined_modes, i = 0; l; l = l->next, i++)
     {
-      MetaCrtcMode *mode = &manager->modes[i];
+      MetaCrtcMode *mode = l->data;
 
       g_variant_builder_add (&mode_builder, "(uxuudu)",
                              i, /* ID */
@@ -1130,6 +1174,11 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
                                                    g_variant_builder_end (&mode_builder),
                                                    max_screen_width,
                                                    max_screen_height);
+
+  g_list_free (combined_modes);
+  g_list_free (combined_outputs);
+  g_list_free (combined_crtcs);
+
   return TRUE;
 }
 
@@ -1221,12 +1270,14 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
                                                GDBusMethodInvocation *invocation)
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
+  MetaSettings *settings = meta_backend_get_settings (manager->backend);
   GVariantBuilder monitors_builder;
   GVariantBuilder logical_monitors_builder;
   GVariantBuilder properties_builder;
   GList *l;
   int i;
   MetaMonitorManagerCapability capabilities;
+  int ui_scaling_factor;
   int max_screen_width, max_screen_height;
 
   g_variant_builder_init (&monitors_builder,
@@ -1404,6 +1455,11 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
                              g_variant_new_boolean (TRUE));
     }
 
+  ui_scaling_factor = meta_settings_get_ui_scaling_factor (settings);
+  g_variant_builder_add (&properties_builder, "{sv}",
+                         "legacy-ui-scaling-factor",
+                         g_variant_new_int32 (ui_scaling_factor));
+
   if (meta_monitor_manager_get_max_screen_size (manager,
                                                 &max_screen_width,
                                                 &max_screen_height))
@@ -1943,7 +1999,9 @@ meta_monitor_manager_handle_apply_monitors_config (MetaDBusDisplayConfig *skelet
                                                logical_monitor_config);
     }
 
-  config = meta_monitors_config_new (logical_monitor_configs, layout_mode,
+  config = meta_monitors_config_new (manager,
+                                     logical_monitor_configs,
+                                     layout_mode,
                                      META_MONITORS_CONFIG_FLAG_NONE);
   if (!meta_verify_monitors_config (config, manager, &error))
     {
@@ -2027,6 +2085,7 @@ meta_monitor_manager_handle_change_backlight  (MetaDBusDisplayConfig *skeleton,
                                                gint                   value)
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
+  GList *combined_outputs;
   MetaOutput *output;
 
   if (serial != manager->serial)
@@ -2037,14 +2096,18 @@ meta_monitor_manager_handle_change_backlight  (MetaDBusDisplayConfig *skeleton,
       return TRUE;
     }
 
-  if (output_index >= manager->n_outputs)
+  combined_outputs = combine_gpu_lists (manager, meta_gpu_get_outputs);
+
+  if (output_index >= g_list_length (combined_outputs))
     {
+      g_list_free (combined_outputs);
       g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                              G_DBUS_ERROR_INVALID_ARGS,
                                              "Invalid output id");
       return TRUE;
     }
-  output = &manager->outputs[output_index];
+  output = g_list_nth_data (combined_outputs, output_index);
+  g_list_free (combined_outputs);
 
   if (value < 0 || value > 100)
     {
@@ -2077,6 +2140,7 @@ meta_monitor_manager_handle_get_crtc_gamma  (MetaDBusDisplayConfig *skeleton,
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
   MetaMonitorManagerClass *klass;
+  GList *combined_crtcs;
   MetaCrtc *crtc;
   gsize size;
   unsigned short *red;
@@ -2093,14 +2157,18 @@ meta_monitor_manager_handle_get_crtc_gamma  (MetaDBusDisplayConfig *skeleton,
       return TRUE;
     }
 
-  if (crtc_id >= manager->n_crtcs)
+  combined_crtcs = combine_gpu_lists (manager, meta_gpu_get_crtcs);
+  if (crtc_id >= g_list_length (combined_crtcs))
     {
+      g_list_free (combined_crtcs);
       g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                              G_DBUS_ERROR_INVALID_ARGS,
                                              "Invalid crtc id");
       return TRUE;
     }
-  crtc = &manager->crtcs[crtc_id];
+
+  crtc = g_list_nth_data (combined_crtcs, crtc_id);
+  g_list_free (combined_crtcs);
 
   klass = META_MONITOR_MANAGER_GET_CLASS (manager);
   if (klass->get_crtc_gamma)
@@ -2140,6 +2208,7 @@ meta_monitor_manager_handle_set_crtc_gamma  (MetaDBusDisplayConfig *skeleton,
 {
   MetaMonitorManager *manager = META_MONITOR_MANAGER (skeleton);
   MetaMonitorManagerClass *klass;
+  GList *combined_crtcs;
   MetaCrtc *crtc;
   gsize size, dummy;
   unsigned short *red;
@@ -2155,14 +2224,19 @@ meta_monitor_manager_handle_set_crtc_gamma  (MetaDBusDisplayConfig *skeleton,
       return TRUE;
     }
 
-  if (crtc_id >= manager->n_crtcs)
+  combined_crtcs = combine_gpu_lists (manager, meta_gpu_get_crtcs);
+
+  if (crtc_id >= g_list_length (combined_crtcs))
     {
+      g_list_free (combined_crtcs);
       g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                              G_DBUS_ERROR_INVALID_ARGS,
                                              "Invalid crtc id");
       return TRUE;
     }
-  crtc = &manager->crtcs[crtc_id];
+
+  crtc = g_list_nth_data (combined_crtcs, crtc_id);
+  g_list_free (combined_crtcs);
 
   red_bytes = g_variant_get_data_as_bytes (red_v);
   green_bytes = g_variant_get_data_as_bytes (green_v);
@@ -2271,7 +2345,7 @@ MetaLogicalMonitor *
 meta_monitor_manager_get_logical_monitor_from_number (MetaMonitorManager *manager,
                                                       int                 number)
 {
-  g_assert ((unsigned int) number < g_list_length (manager->logical_monitors));
+  g_return_val_if_fail ((unsigned int) number < g_list_length (manager->logical_monitors), NULL);
 
   return g_list_nth (manager->logical_monitors, number)->data;
 }
@@ -2313,6 +2387,24 @@ meta_monitor_manager_get_laptop_panel (MetaMonitorManager *manager)
   return find_monitor (manager, meta_monitor_is_laptop_panel);
 }
 
+MetaMonitor *
+meta_monitor_manager_get_monitor_from_connector (MetaMonitorManager *manager,
+                                                 const char         *connector)
+{
+  GList *l;
+
+  for (l = manager->monitors; l; l = l->next)
+    {
+      MetaMonitor *monitor = l->data;
+
+      if (g_str_equal (meta_monitor_get_connector (monitor),
+                       connector))
+        return monitor;
+    }
+
+  return NULL;
+}
+
 MetaMonitor *
 meta_monitor_manager_get_monitor_from_spec (MetaMonitorManager *manager,
                                             MetaMonitorSpec    *monitor_spec)
@@ -2414,38 +2506,17 @@ meta_monitor_manager_get_monitors (MetaMonitorManager *manager)
   return manager->monitors;
 }
 
-MetaOutput *
-meta_monitor_manager_get_outputs (MetaMonitorManager *manager,
-                                  unsigned int       *n_outputs)
+void
+meta_monitor_manager_add_gpu (MetaMonitorManager *manager,
+                              MetaGpu            *gpu)
 {
-  *n_outputs = manager->n_outputs;
-  return manager->outputs;
+  manager->gpus = g_list_append (manager->gpus, gpu);
 }
 
-void
-meta_monitor_manager_get_resources (MetaMonitorManager  *manager,
-                                    MetaCrtcMode       **modes,
-                                    unsigned int        *n_modes,
-                                    MetaCrtc           **crtcs,
-                                    unsigned int        *n_crtcs,
-                                    MetaOutput         **outputs,
-                                    unsigned int        *n_outputs)
+GList *
+meta_monitor_manager_get_gpus (MetaMonitorManager *manager)
 {
-  if (modes)
-    {
-      *modes = manager->modes;
-      *n_modes = manager->n_modes;
-    }
-  if (crtcs)
-    {
-      *crtcs = manager->crtcs;
-      *n_crtcs = manager->n_crtcs;
-    }
-  if (outputs)
-    {
-      *outputs = manager->outputs;
-      *n_outputs = manager->n_outputs;
-    }
+  return manager->gpus;
 }
 
 void
@@ -2460,7 +2531,7 @@ meta_monitor_manager_get_screen_size (MetaMonitorManager *manager,
 static void
 rebuild_monitors (MetaMonitorManager *manager)
 {
-  unsigned int i;
+  GList *l;
 
   if (manager->monitors)
     {
@@ -2468,28 +2539,34 @@ rebuild_monitors (MetaMonitorManager *manager)
       manager->monitors = NULL;
     }
 
-  for (i = 0; i < manager->n_outputs; i++)
+  for (l = manager->gpus; l; l = l->next)
     {
-      MetaOutput *output = &manager->outputs[i];
+      MetaGpu *gpu = l->data;
+      GList *k;
 
-      if (output->tile_info.group_id)
+      for (k = meta_gpu_get_outputs (gpu); k; k = k->next)
         {
-          if (is_main_tiled_monitor_output (output))
+          MetaOutput *output = k->data;
+
+          if (output->tile_info.group_id)
             {
-              MetaMonitorTiled *monitor_tiled;
+              if (is_main_tiled_monitor_output (output))
+                {
+                  MetaMonitorTiled *monitor_tiled;
 
-              monitor_tiled = meta_monitor_tiled_new (manager, output);
-              manager->monitors = g_list_append (manager->monitors,
-                                                 monitor_tiled);
+                  monitor_tiled = meta_monitor_tiled_new (gpu, output);
+                  manager->monitors = g_list_append (manager->monitors,
+                                                     monitor_tiled);
+                }
             }
-        }
-      else
-        {
-          MetaMonitorNormal *monitor_normal;
+          else
+            {
+              MetaMonitorNormal *monitor_normal;
 
-          monitor_normal = meta_monitor_normal_new (manager, output);
-          manager->monitors = g_list_append (manager->monitors,
-                                             monitor_normal);
+              monitor_normal = meta_monitor_normal_new (gpu, output);
+              manager->monitors = g_list_append (manager->monitors,
+                                                 monitor_normal);
+            }
         }
     }
 }
@@ -2530,39 +2607,33 @@ meta_monitor_manager_is_transform_handled (MetaMonitorManager  *manager,
 void
 meta_monitor_manager_read_current_state (MetaMonitorManager *manager)
 {
-  MetaOutput *old_outputs;
-  MetaCrtc *old_crtcs;
-  MetaCrtcMode *old_modes;
-  unsigned int n_old_outputs, n_old_crtcs, n_old_modes;
-
-  /* Some implementations of read_current use the existing information
-   * we have available, so don't free the old configuration until after
-   * read_current finishes. */
-  old_outputs = manager->outputs;
-  n_old_outputs = manager->n_outputs;
-  old_crtcs = manager->crtcs;
-  n_old_crtcs = manager->n_crtcs;
-  old_modes = manager->modes;
-  n_old_modes = manager->n_modes;
+  GList *l;
 
   manager->serial++;
-  META_MONITOR_MANAGER_GET_CLASS (manager)->read_current (manager);
+
+  for (l = manager->gpus; l; l = l->next)
+    {
+      MetaGpu *gpu = l->data;
+      GError *error = NULL;
+
+      if (!meta_gpu_read_current (gpu, &error))
+        {
+          g_warning ("Failed to read current KMS state: %s", error->message);
+          g_clear_error (&error);
+        }
+    }
 
   rebuild_monitors (manager);
-
-  meta_monitor_manager_free_output_array (old_outputs, n_old_outputs);
-  meta_monitor_manager_free_mode_array (old_modes, n_old_modes);
-  meta_monitor_manager_free_crtc_array (old_crtcs, n_old_crtcs);
 }
 
 static void
 meta_monitor_manager_notify_monitors_changed (MetaMonitorManager *manager)
 {
-  MetaBackend *backend = meta_get_backend ();
-
   manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN;
 
-  meta_backend_monitors_changed (backend);
+  meta_backend_monitors_changed (manager->backend);
+
+  g_signal_emit (manager, signals[MONITORS_CHANGED_INTERNAL], 0);
   g_signal_emit_by_name (manager, "monitors-changed");
 }
 
@@ -2658,17 +2729,17 @@ meta_monitor_manager_update_monitor_modes_derived (MetaMonitorManager *manager)
 }
 
 void
-meta_monitor_manager_update_logical_state_derived (MetaMonitorManager          *manager,
-                                                   MetaMonitorManagerDeriveFlag flags)
+meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager,
+                                                   MetaMonitorsConfig *config)
 {
   manager->layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL;
 
-  meta_monitor_manager_rebuild_logical_monitors_derived (manager, flags);
+  meta_monitor_manager_rebuild_logical_monitors_derived (manager, config);
 }
 
 void
-meta_monitor_manager_rebuild_derived (MetaMonitorManager          *manager,
-                                      MetaMonitorManagerDeriveFlag flags)
+meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager,
+                                      MetaMonitorsConfig *config)
 {
   GList *old_logical_monitors;
 
@@ -2679,7 +2750,7 @@ meta_monitor_manager_rebuild_derived (MetaMonitorManager          *manager,
 
   old_logical_monitors = manager->logical_monitors;
 
-  meta_monitor_manager_update_logical_state_derived (manager, flags);
+  meta_monitor_manager_update_logical_state_derived (manager, config);
 
   meta_monitor_manager_notify_monitors_changed (manager);
 
@@ -2805,40 +2876,6 @@ meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,
   return TRUE;
 }
 
-/**
- * meta_monitor_manager_get_monitor_for_output:
- * @manager: A #MetaMonitorManager
- * @id: A valid #MetaOutput id
- *
- * Returns: The monitor index or -1 if @id isn't valid or the output
- * isn't associated with a logical monitor.
- */
-gint
-meta_monitor_manager_get_monitor_for_output (MetaMonitorManager *manager,
-                                             guint               id)
-{
-  MetaOutput *output;
-  GList *l;
-
-  g_return_val_if_fail (META_IS_MONITOR_MANAGER (manager), -1);
-  g_return_val_if_fail (id < manager->n_outputs, -1);
-
-  output = &manager->outputs[id];
-  if (!output || !output->crtc)
-    return -1;
-
-  for (l = manager->logical_monitors; l; l = l->next)
-    {
-      MetaLogicalMonitor *logical_monitor = l->data;
-
-      if (meta_rectangle_contains_rect (&logical_monitor->rect,
-                                        &output->crtc->rect))
-        return logical_monitor->number;
-    }
-
-  return -1;
-}
-
 /**
  * meta_monitor_manager_get_monitor_for_connector:
  * @manager: A #MetaMonitorManager
@@ -2948,3 +2985,9 @@ meta_monitor_manager_get_switch_config (MetaMonitorManager *manager)
 {
   return manager->current_switch_config;
 }
+
+MetaMonitorConfigManager *
+meta_monitor_manager_get_config_manager (MetaMonitorManager *manager)
+{
+  return manager->config_manager;
+}

src/backends/meta-monitor.c

@@ -24,14 +24,18 @@
 #include "backends/meta-monitor.h"
 
 #include "backends/meta-backend-private.h"
+#include "backends/meta-crtc.h"
+#include "backends/meta-gpu.h"
 #include "backends/meta-monitor-manager-private.h"
 #include "backends/meta-settings-private.h"
+#include "backends/meta-output.h"
 
 #define SCALE_FACTORS_PER_INTEGER 4
 #define MINIMUM_SCALE_FACTOR 1.0f
 #define MAXIMUM_SCALE_FACTOR 4.0f
 #define MINIMUM_LOGICAL_WIDTH 800
 #define MINIMUM_LOGICAL_HEIGHT 600
+#define MAXIMUM_REFRESH_RATE_DIFF 0.001
 
 #define HANDLED_CRTC_MODE_FLAGS (META_CRTC_MODE_FLAG_INTERLACE)
 
@@ -51,7 +55,7 @@ typedef struct _MetaMonitorModeTiled
 
 typedef struct _MetaMonitorPrivate
 {
-  MetaMonitorManager *monitor_manager;
+  MetaGpu *gpu;
 
   GList *outputs;
   GList *modes;
@@ -176,6 +180,14 @@ meta_monitor_generate_spec (MetaMonitor *monitor)
   priv->spec = monitor_spec;
 }
 
+MetaGpu *
+meta_monitor_get_gpu (MetaMonitor *monitor)
+{
+  MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
+
+  return priv->gpu;
+}
+
 GList *
 meta_monitor_get_outputs (MetaMonitor *monitor)
 {
@@ -248,6 +260,18 @@ meta_monitor_is_laptop_panel (MetaMonitor *monitor)
     }
 }
 
+gboolean
+meta_monitor_is_same_as (MetaMonitor *monitor,
+                         MetaMonitor *other_monitor)
+{
+  MetaMonitorPrivate *priv =
+    meta_monitor_get_instance_private (monitor);
+  MetaMonitorPrivate *other_priv =
+    meta_monitor_get_instance_private (other_monitor);
+
+  return priv->winsys_id == other_priv->winsys_id;
+}
+
 void
 meta_monitor_get_current_resolution (MetaMonitor *monitor,
                                      int         *width,
@@ -342,6 +366,8 @@ meta_monitor_finalize (GObject *object)
   g_list_free_full (priv->modes, (GDestroyNotify) meta_monitor_mode_free);
   g_clear_pointer (&priv->outputs, g_list_free);
   meta_monitor_spec_free (priv->spec);
+
+  G_OBJECT_CLASS (meta_monitor_parent_class)->finalize (object);
 }
 
 static void
@@ -433,8 +459,8 @@ meta_monitor_normal_generate_modes (MetaMonitorNormal *monitor_normal)
 }
 
 MetaMonitorNormal *
-meta_monitor_normal_new (MetaMonitorManager *monitor_manager,
-                         MetaOutput         *output)
+meta_monitor_normal_new (MetaGpu    *gpu,
+                         MetaOutput *output)
 {
   MetaMonitorNormal *monitor_normal;
   MetaMonitor *monitor;
@@ -444,7 +470,7 @@ meta_monitor_normal_new (MetaMonitorManager *monitor_manager,
   monitor = META_MONITOR (monitor_normal);
   monitor_priv = meta_monitor_get_instance_private (monitor);
 
-  monitor_priv->monitor_manager = monitor_manager;
+  monitor_priv->gpu = gpu;
 
   monitor_priv->outputs = g_list_append (NULL, output);
   monitor_priv->winsys_id = output->winsys_id;
@@ -540,16 +566,18 @@ meta_monitor_get_suggested_position (MetaMonitor *monitor,
 }
 
 static void
-add_tiled_monitor_outputs (MetaMonitorManager *monitor_manager,
-                           MetaMonitorTiled   *monitor_tiled)
+add_tiled_monitor_outputs (MetaGpu          *gpu,
+                           MetaMonitorTiled *monitor_tiled)
 {
   MetaMonitorPrivate *monitor_priv =
     meta_monitor_get_instance_private (META_MONITOR (monitor_tiled));
-  unsigned int i;
+  GList *outputs;
+  GList *l;
 
-  for (i = 0; i < monitor_manager->n_outputs; i++)
+  outputs = meta_gpu_get_outputs (gpu);
+  for (l = outputs; l; l = l->next)
     {
-      MetaOutput *output = &monitor_manager->outputs[i];
+      MetaOutput *output = l->data;
 
       if (output->tile_info.group_id != monitor_tiled->tile_group_id)
         continue;
@@ -1065,9 +1093,10 @@ meta_monitor_tiled_generate_modes (MetaMonitorTiled *monitor_tiled)
 }
 
 MetaMonitorTiled *
-meta_monitor_tiled_new (MetaMonitorManager *monitor_manager,
-                        MetaOutput         *output)
+meta_monitor_tiled_new (MetaGpu    *gpu,
+                        MetaOutput *output)
 {
+  MetaMonitorManager *monitor_manager;
   MetaMonitorTiled *monitor_tiled;
   MetaMonitor *monitor;
   MetaMonitorPrivate *monitor_priv;
@@ -1076,18 +1105,19 @@ meta_monitor_tiled_new (MetaMonitorManager *monitor_manager,
   monitor = META_MONITOR (monitor_tiled);
   monitor_priv = meta_monitor_get_instance_private (monitor);
 
-  monitor_priv->monitor_manager = monitor_manager;
+  monitor_priv->gpu = gpu;
 
   monitor_tiled->tile_group_id = output->tile_info.group_id;
   monitor_priv->winsys_id = output->winsys_id;
 
   monitor_tiled->origin_output = output;
-  add_tiled_monitor_outputs (monitor_manager, monitor_tiled);
+  add_tiled_monitor_outputs (gpu, monitor_tiled);
 
   monitor_tiled->main_output = find_untiled_output (monitor_tiled);
 
   meta_monitor_generate_spec (monitor);
 
+  monitor_manager = meta_gpu_get_monitor_manager (gpu);
   meta_monitor_manager_tiled_monitor_added (monitor_manager,
                                             META_MONITOR (monitor_tiled));
 
@@ -1174,9 +1204,13 @@ meta_monitor_tiled_finalize (GObject *object)
   MetaMonitor *monitor = META_MONITOR (object);
   MetaMonitorPrivate *monitor_priv =
     meta_monitor_get_instance_private (monitor);
+  MetaMonitorManager *monitor_manager;
 
-  meta_monitor_manager_tiled_monitor_removed (monitor_priv->monitor_manager,
+  monitor_manager = meta_gpu_get_monitor_manager (monitor_priv->gpu);
+  meta_monitor_manager_tiled_monitor_removed (monitor_manager,
                                               monitor);
+
+  G_OBJECT_CLASS (meta_monitor_tiled_parent_class)->finalize (object);
 }
 
 static void
@@ -1240,8 +1274,8 @@ meta_monitor_mode_spec_equals (MetaMonitorModeSpec *monitor_mode_spec,
 {
   return (monitor_mode_spec->width == other_monitor_mode_spec->width &&
           monitor_mode_spec->height == other_monitor_mode_spec->height &&
-          (monitor_mode_spec->refresh_rate ==
-           other_monitor_mode_spec->refresh_rate) &&
+          ABS (monitor_mode_spec->refresh_rate -
+               other_monitor_mode_spec->refresh_rate) < MAXIMUM_REFRESH_RATE_DIFF &&
           monitor_mode_spec->flags == other_monitor_mode_spec->flags);
 }
 
@@ -1533,6 +1567,14 @@ meta_monitor_calculate_supported_scales (MetaMonitor                *monitor,
         }
     }
 
+  if (supported_scales->len == 0)
+    {
+      float fallback_scale;
+
+      fallback_scale = 1.0;
+      g_array_append_val (supported_scales, fallback_scale);
+    }
+
   *n_supported_scales = supported_scales->len;
   return (float *) g_array_free (supported_scales, FALSE);
 }
@@ -1582,6 +1624,32 @@ meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
   GList *l;
   int i;
 
+  for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++)
+    {
+      MetaMonitorCrtcMode *monitor_crtc_mode = &mode->crtc_modes[i];
+
+      if (!monitor_crtc_mode->crtc_mode)
+        continue;
+
+      if (!func (monitor, mode, monitor_crtc_mode, user_data, error))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
+                                  MetaMonitorMode    *mode,
+                                  MetaMonitorModeFunc func,
+                                  gpointer            user_data,
+                                  GError            **error)
+{
+  MetaMonitorPrivate *monitor_priv =
+    meta_monitor_get_instance_private (monitor);
+  GList *l;
+  int i;
+
   for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++)
     {
       MetaMonitorCrtcMode *monitor_crtc_mode = &mode->crtc_modes[i];

src/backends/meta-monitor.h

@@ -24,7 +24,9 @@
 
 #include <glib-object.h>
 
+#include "backends/meta-crtc.h"
 #include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-output.h"
 
 typedef struct _MetaMonitorSpec
 {
@@ -91,14 +93,16 @@ G_DECLARE_FINAL_TYPE (MetaMonitorTiled, meta_monitor_tiled,
                       META, MONITOR_TILED,
                       MetaMonitor)
 
-MetaMonitorTiled * meta_monitor_tiled_new (MetaMonitorManager *monitor_manager,
-                                           MetaOutput         *main_output);
+MetaMonitorTiled * meta_monitor_tiled_new (MetaGpu    *gpu,
+                                           MetaOutput *output);
 
-MetaMonitorNormal * meta_monitor_normal_new (MetaMonitorManager *monitor_manager,
-                                             MetaOutput         *output);
+MetaMonitorNormal * meta_monitor_normal_new (MetaGpu    *gpu,
+                                             MetaOutput *output);
 
 MetaMonitorSpec * meta_monitor_get_spec (MetaMonitor *monitor);
 
+MetaGpu * meta_monitor_get_gpu (MetaMonitor *monitor);
+
 gboolean meta_monitor_is_active (MetaMonitor *monitor);
 
 MetaOutput * meta_monitor_get_main_output (MetaMonitor *monitor);
@@ -111,6 +115,9 @@ gboolean meta_monitor_is_underscanning (MetaMonitor *monitor);
 
 gboolean meta_monitor_is_laptop_panel (MetaMonitor *monitor);
 
+gboolean meta_monitor_is_same_as (MetaMonitor *monitor,
+                                  MetaMonitor *other_monitor);
+
 GList * meta_monitor_get_outputs (MetaMonitor *monitor);
 
 void meta_monitor_get_current_resolution (MetaMonitor *monitor,
@@ -194,6 +201,12 @@ gboolean meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
                                          gpointer            user_data,
                                          GError            **error);
 
+gboolean meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
+                                           MetaMonitorMode    *mode,
+                                           MetaMonitorModeFunc func,
+                                           gpointer            user_data,
+                                           GError            **error);
+
 MetaMonitorSpec * meta_monitor_spec_clone (MetaMonitorSpec *monitor_id);
 
 gboolean meta_monitor_spec_equals (MetaMonitorSpec *monitor_id,

src/backends/meta-output.c

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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-output.h"
+
+G_DEFINE_TYPE (MetaOutput, meta_output, G_TYPE_OBJECT)
+
+MetaGpu *
+meta_output_get_gpu (MetaOutput *output)
+{
+  return output->gpu;
+}
+
+static void
+meta_output_finalize (GObject *object)
+{
+  MetaOutput *output = META_OUTPUT (object);
+
+  g_free (output->name);
+  g_free (output->vendor);
+  g_free (output->product);
+  g_free (output->serial);
+  g_free (output->modes);
+  g_free (output->possible_crtcs);
+  g_free (output->possible_clones);
+
+  if (output->driver_notify)
+    output->driver_notify (output);
+
+  G_OBJECT_CLASS (meta_output_parent_class)->finalize (object);
+}
+
+static void
+meta_output_init (MetaOutput *output)
+{
+}
+
+static void
+meta_output_class_init (MetaOutputClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_output_finalize;
+}

src/backends/meta-output.h

@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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_OUTPUT_H
+#define META_OUTPUT_H
+
+#include <glib-object.h>
+
+#include "backends/meta-gpu.h"
+
+struct _MetaTileInfo
+{
+  guint32 group_id;
+  guint32 flags;
+  guint32 max_h_tiles;
+  guint32 max_v_tiles;
+  guint32 loc_h_tile;
+  guint32 loc_v_tile;
+  guint32 tile_w;
+  guint32 tile_h;
+};
+
+/* This matches the values in drm_mode.h */
+typedef enum
+{
+  META_CONNECTOR_TYPE_Unknown = 0,
+  META_CONNECTOR_TYPE_VGA = 1,
+  META_CONNECTOR_TYPE_DVII = 2,
+  META_CONNECTOR_TYPE_DVID = 3,
+  META_CONNECTOR_TYPE_DVIA = 4,
+  META_CONNECTOR_TYPE_Composite = 5,
+  META_CONNECTOR_TYPE_SVIDEO = 6,
+  META_CONNECTOR_TYPE_LVDS = 7,
+  META_CONNECTOR_TYPE_Component = 8,
+  META_CONNECTOR_TYPE_9PinDIN = 9,
+  META_CONNECTOR_TYPE_DisplayPort = 10,
+  META_CONNECTOR_TYPE_HDMIA = 11,
+  META_CONNECTOR_TYPE_HDMIB = 12,
+  META_CONNECTOR_TYPE_TV = 13,
+  META_CONNECTOR_TYPE_eDP = 14,
+  META_CONNECTOR_TYPE_VIRTUAL = 15,
+  META_CONNECTOR_TYPE_DSI = 16,
+} MetaConnectorType;
+
+struct _MetaOutput
+{
+  GObject parent;
+
+  MetaGpu *gpu;
+
+  /* The CRTC driving this output, NULL if the output is not enabled */
+  MetaCrtc *crtc;
+
+  /* The low-level ID of this output, used to apply back configuration */
+  glong winsys_id;
+  char *name;
+  char *vendor;
+  char *product;
+  char *serial;
+  int width_mm;
+  int height_mm;
+  CoglSubpixelOrder subpixel_order;
+
+  MetaConnectorType connector_type;
+
+  MetaCrtcMode *preferred_mode;
+  MetaCrtcMode **modes;
+  unsigned int n_modes;
+
+  MetaCrtc **possible_crtcs;
+  unsigned int n_possible_crtcs;
+
+  MetaOutput **possible_clones;
+  unsigned int n_possible_clones;
+
+  int backlight;
+  int backlight_min;
+  int backlight_max;
+
+  /* Used when changing configuration */
+  gboolean is_dirty;
+
+  gboolean is_primary;
+  gboolean is_presentation;
+
+  gboolean is_underscanning;
+  gboolean supports_underscanning;
+
+  gpointer driver_private;
+  GDestroyNotify driver_notify;
+
+  /*
+   * Get a new preferred mode on hotplug events, to handle dynamic guest
+   * resizing.
+   */
+  gboolean hotplug_mode_update;
+  gint suggested_x;
+  gint suggested_y;
+
+  MetaTileInfo tile_info;
+};
+
+#define META_TYPE_OUTPUT (meta_output_get_type ())
+G_DECLARE_FINAL_TYPE (MetaOutput, meta_output, META, OUTPUT, GObject)
+
+MetaGpu * meta_output_get_gpu (MetaOutput *output);
+
+#endif /* META_OUTPUT_H */

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

@@ -0,0 +1,505 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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-desktop-session.h"
+
+#include <linux/input.h>
+#include <xkbcommon/xkbcommon.h>
+
+#include "backends/meta-dbus-session-watcher.h"
+#include "backends/meta-screen-cast-session.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"
+
+struct _MetaRemoteDesktopSession
+{
+  MetaDBusRemoteDesktopSessionSkeleton parent;
+
+  char *peer_name;
+
+  char *session_id;
+  char *object_path;
+
+  MetaScreenCastSession *screen_cast_session;
+  gulong screen_cast_session_closed_handler_id;
+
+  ClutterVirtualInputDevice *virtual_pointer;
+  ClutterVirtualInputDevice *virtual_keyboard;
+};
+
+static void
+meta_remote_desktop_session_init_iface (MetaDBusRemoteDesktopSessionIface *iface);
+
+static void
+meta_dbus_session_init_iface (MetaDbusSessionInterface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MetaRemoteDesktopSession,
+                         meta_remote_desktop_session,
+                         META_DBUS_TYPE_REMOTE_DESKTOP_SESSION_SKELETON,
+                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_REMOTE_DESKTOP_SESSION,
+                                                meta_remote_desktop_session_init_iface)
+                         G_IMPLEMENT_INTERFACE (META_TYPE_DBUS_SESSION,
+                                                meta_dbus_session_init_iface))
+
+static gboolean
+meta_remote_desktop_session_is_running (MetaRemoteDesktopSession *session)
+{
+  return !!session->virtual_pointer;
+}
+
+static gboolean
+meta_remote_desktop_session_start (MetaRemoteDesktopSession *session,
+                                   GError                  **error)
+{
+  ClutterDeviceManager *device_manager =
+    clutter_device_manager_get_default ();
+
+  g_assert (!session->virtual_pointer && !session->virtual_keyboard);
+
+  if (session->screen_cast_session)
+    {
+      if (!meta_screen_cast_session_start (session->screen_cast_session, error))
+        return FALSE;
+    }
+
+  session->virtual_pointer =
+    clutter_device_manager_create_virtual_device (device_manager,
+                                                  CLUTTER_POINTER_DEVICE);
+  session->virtual_keyboard =
+    clutter_device_manager_create_virtual_device (device_manager,
+                                                  CLUTTER_KEYBOARD_DEVICE);
+
+  return TRUE;
+}
+
+void
+meta_remote_desktop_session_close (MetaRemoteDesktopSession *session)
+{
+  MetaDBusRemoteDesktopSession *skeleton =
+    META_DBUS_REMOTE_DESKTOP_SESSION (session);
+
+  if (session->screen_cast_session)
+    {
+      g_signal_handler_disconnect (session->screen_cast_session,
+                                   session->screen_cast_session_closed_handler_id);
+      meta_screen_cast_session_close (session->screen_cast_session);
+      session->screen_cast_session = NULL;
+    }
+
+  g_clear_object (&session->virtual_pointer);
+  g_clear_object (&session->virtual_keyboard);
+
+  meta_dbus_session_notify_closed (META_DBUS_SESSION (session));
+  meta_dbus_remote_desktop_session_emit_closed (skeleton);
+  g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (session));
+
+  g_object_unref (session);
+}
+
+char *
+meta_remote_desktop_session_get_object_path (MetaRemoteDesktopSession *session)
+{
+  return session->object_path;
+}
+
+char *
+meta_remote_desktop_session_get_session_id (MetaRemoteDesktopSession *session)
+{
+  return session->session_id;
+}
+
+static void
+on_screen_cast_session_closed (MetaScreenCastSession    *screen_cast_session,
+                               MetaRemoteDesktopSession *session)
+{
+  session->screen_cast_session = NULL;
+  meta_remote_desktop_session_close (session);
+}
+
+gboolean
+meta_remote_desktop_session_register_screen_cast (MetaRemoteDesktopSession  *session,
+                                                  MetaScreenCastSession     *screen_cast_session,
+                                                  GError                   **error)
+{
+  if (session->screen_cast_session)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "Remote desktop session already have an associated "
+                   "screen cast session");
+      return FALSE;
+    }
+
+  session->screen_cast_session = screen_cast_session;
+  session->screen_cast_session_closed_handler_id =
+    g_signal_connect (screen_cast_session, "session-closed",
+                      G_CALLBACK (on_screen_cast_session_closed),
+                      session);
+
+  return TRUE;
+}
+
+MetaRemoteDesktopSession *
+meta_remote_desktop_session_new (MetaRemoteDesktop  *remote_desktop,
+                                 const char         *peer_name,
+                                 GError            **error)
+{
+  GDBusInterfaceSkeleton *interface_skeleton;
+  MetaRemoteDesktopSession *session;
+  GDBusConnection *connection;
+
+  session = g_object_new (META_TYPE_REMOTE_DESKTOP_SESSION, NULL);
+
+  session->peer_name = g_strdup (peer_name);
+
+  interface_skeleton = G_DBUS_INTERFACE_SKELETON (session);
+  connection = meta_remote_desktop_get_connection (remote_desktop);
+  if (!g_dbus_interface_skeleton_export (interface_skeleton,
+                                         connection,
+                                         session->object_path,
+                                         error))
+    {
+      g_object_unref (session);
+      return NULL;
+    }
+
+  return session;
+}
+
+static gboolean
+check_permission (MetaRemoteDesktopSession *session,
+                  GDBusMethodInvocation    *invocation)
+{
+  return g_strcmp0 (session->peer_name,
+                    g_dbus_method_invocation_get_sender (invocation)) == 0;
+}
+
+static gboolean
+handle_start (MetaDBusRemoteDesktopSession *skeleton,
+              GDBusMethodInvocation        *invocation)
+{
+  MetaRemoteDesktopSession *session = META_REMOTE_DESKTOP_SESSION (skeleton);
+  GError *error = NULL;
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  if (!meta_remote_desktop_session_start (session, &error))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Failed to start remote desktop: %s",
+                                             error->message);
+      g_error_free (error);
+
+      meta_remote_desktop_session_close (session);
+
+      return TRUE;
+    }
+
+  meta_dbus_remote_desktop_session_complete_start (skeleton, invocation);
+
+  return TRUE;
+}
+
+static gboolean
+handle_stop (MetaDBusRemoteDesktopSession *skeleton,
+             GDBusMethodInvocation        *invocation)
+{
+  MetaRemoteDesktopSession *session = META_REMOTE_DESKTOP_SESSION (skeleton);
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  meta_remote_desktop_session_close (session);
+
+  meta_dbus_remote_desktop_session_complete_stop (skeleton, invocation);
+
+  return TRUE;
+}
+
+static gboolean
+handle_notify_keyboard_keysym (MetaDBusRemoteDesktopSession *skeleton,
+                               GDBusMethodInvocation        *invocation,
+                               unsigned int                  keysym,
+                               gboolean                      pressed)
+{
+  MetaRemoteDesktopSession *session = META_REMOTE_DESKTOP_SESSION (skeleton);
+  ClutterKeyState state;
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  if (pressed)
+    state = CLUTTER_KEY_STATE_PRESSED;
+  else
+    state = CLUTTER_KEY_STATE_RELEASED;
+
+  clutter_virtual_input_device_notify_keyval (session->virtual_keyboard,
+                                              CLUTTER_CURRENT_TIME,
+                                              keysym,
+                                              state);
+
+  meta_dbus_remote_desktop_session_complete_notify_keyboard_keysym (skeleton,
+                                                                    invocation);
+  return TRUE;
+}
+
+/* Translation taken from the clutter evdev backend. */
+static int
+translate_to_clutter_button (int button)
+{
+  switch (button)
+    {
+    case BTN_LEFT:
+      return CLUTTER_BUTTON_PRIMARY;
+    case BTN_RIGHT:
+      return CLUTTER_BUTTON_SECONDARY;
+    case BTN_MIDDLE:
+      return CLUTTER_BUTTON_MIDDLE;
+    default:
+      /*
+       * For compatibility reasons, all additional buttons go after the old
+       * 4-7 scroll ones.
+       */
+      return button - (BTN_LEFT - 1) + 4;
+    }
+}
+
+static gboolean
+handle_notify_pointer_button (MetaDBusRemoteDesktopSession *skeleton,
+                              GDBusMethodInvocation        *invocation,
+                              int                           button_code,
+                              gboolean                      pressed)
+{
+  MetaRemoteDesktopSession *session = META_REMOTE_DESKTOP_SESSION (skeleton);
+  uint32_t button;
+  ClutterButtonState state;
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  button = translate_to_clutter_button (button_code);
+
+  if (pressed)
+    state = CLUTTER_BUTTON_STATE_PRESSED;
+  else
+    state = CLUTTER_BUTTON_STATE_RELEASED;
+
+  clutter_virtual_input_device_notify_button (session->virtual_pointer,
+                                              CLUTTER_CURRENT_TIME,
+                                              button,
+                                              state);
+
+  meta_dbus_remote_desktop_session_complete_notify_pointer_button (skeleton,
+                                                                   invocation);
+
+  return TRUE;
+}
+
+static ClutterScrollDirection
+discrete_steps_to_scroll_direction (unsigned int axis,
+                                    int          steps)
+{
+  if (axis == 0 && steps < 0)
+    return CLUTTER_SCROLL_UP;
+  if (axis == 0 && steps > 0)
+    return CLUTTER_SCROLL_DOWN;
+  if (axis == 1 && steps < 0)
+    return CLUTTER_SCROLL_LEFT;
+  if (axis == 1 && steps > 0)
+    return CLUTTER_SCROLL_RIGHT;
+
+  g_assert_not_reached ();
+}
+
+static gboolean
+handle_notify_pointer_axis_discrete (MetaDBusRemoteDesktopSession *skeleton,
+                                     GDBusMethodInvocation        *invocation,
+                                     unsigned int                  axis,
+                                     int                           steps)
+{
+  MetaRemoteDesktopSession *session = META_REMOTE_DESKTOP_SESSION (skeleton);
+  ClutterScrollDirection direction;
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  if (axis <= 1)
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Invalid axis value");
+      return TRUE;
+    }
+
+  if (steps == 0)
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Invalid axis steps value");
+      return TRUE;
+    }
+
+  if (steps != -1 || steps != 1)
+    g_warning ("Multiple steps at at once not yet implemented, treating as one.");
+
+  /*
+   * We don't have the actual scroll source, but only know they should be
+   * considered as discrete steps. The device that produces such scroll events
+   * is the scroll wheel, so pretend that is the scroll source.
+   */
+  direction = discrete_steps_to_scroll_direction (axis, steps);
+  clutter_virtual_input_device_notify_discrete_scroll (session->virtual_pointer,
+                                                       CLUTTER_CURRENT_TIME,
+                                                       direction,
+                                                       CLUTTER_SCROLL_SOURCE_WHEEL);
+
+  meta_dbus_remote_desktop_session_complete_notify_pointer_axis_discrete (skeleton,
+                                                                          invocation);
+
+  return TRUE;
+}
+
+static gboolean
+handle_notify_pointer_motion_absolute (MetaDBusRemoteDesktopSession *skeleton,
+                                       GDBusMethodInvocation        *invocation,
+                                       const char                   *stream_path,
+                                       double                        x,
+                                       double                        y)
+{
+  MetaRemoteDesktopSession *session = META_REMOTE_DESKTOP_SESSION (skeleton);
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  clutter_virtual_input_device_notify_absolute_motion (session->virtual_pointer,
+                                                       CLUTTER_CURRENT_TIME,
+                                                       x, y);
+
+  meta_dbus_remote_desktop_session_complete_notify_pointer_motion_absolute (skeleton,
+                                                                            invocation);
+
+  return TRUE;
+}
+
+static void
+meta_remote_desktop_session_init_iface (MetaDBusRemoteDesktopSessionIface *iface)
+{
+  iface->handle_start = handle_start;
+  iface->handle_stop = handle_stop;
+  iface->handle_notify_keyboard_keysym = handle_notify_keyboard_keysym;
+  iface->handle_notify_pointer_button = handle_notify_pointer_button;
+  iface->handle_notify_pointer_axis_discrete = handle_notify_pointer_axis_discrete;
+  iface->handle_notify_pointer_motion_absolute = handle_notify_pointer_motion_absolute;
+}
+
+static void
+meta_remote_desktop_session_client_vanished (MetaDbusSession *dbus_session)
+{
+  meta_remote_desktop_session_close (META_REMOTE_DESKTOP_SESSION (dbus_session));
+}
+
+static void
+meta_dbus_session_init_iface (MetaDbusSessionInterface *iface)
+{
+  iface->client_vanished = meta_remote_desktop_session_client_vanished;
+}
+
+static void
+meta_remote_desktop_session_finalize (GObject *object)
+{
+  MetaRemoteDesktopSession *session = META_REMOTE_DESKTOP_SESSION (object);
+
+  g_assert (!meta_remote_desktop_session_is_running (session));
+
+  g_free (session->peer_name);
+  g_free (session->session_id);
+  g_free (session->object_path);
+
+  G_OBJECT_CLASS (meta_remote_desktop_session_parent_class)->finalize (object);
+}
+
+static void
+meta_remote_desktop_session_init (MetaRemoteDesktopSession *session)
+{
+  MetaDBusRemoteDesktopSession *skeleton =
+    META_DBUS_REMOTE_DESKTOP_SESSION  (session);
+  GRand *rand;
+  static unsigned int global_session_number = 0;
+
+  rand = g_rand_new ();
+  session->session_id = meta_generate_random_id (rand, 32);
+  g_rand_free (rand);
+
+  meta_dbus_remote_desktop_session_set_session_id (skeleton, session->session_id);
+
+  session->object_path =
+    g_strdup_printf (META_REMOTE_DESKTOP_SESSION_DBUS_PATH "/u%u",
+                     ++global_session_number);
+}
+
+static void
+meta_remote_desktop_session_class_init (MetaRemoteDesktopSessionClass *klass)
+{
+
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_remote_desktop_session_finalize;
+}

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

@@ -0,0 +1,50 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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_DESKTOP_SESSION_H
+#define META_REMOTE_DESKTOP_SESSION_H
+
+#include <glib-object.h>
+
+#include "backends/meta-remote-desktop.h"
+#include "backends/meta-screen-cast-session.h"
+
+#define META_TYPE_REMOTE_DESKTOP_SESSION (meta_remote_desktop_session_get_type ())
+G_DECLARE_FINAL_TYPE (MetaRemoteDesktopSession, meta_remote_desktop_session,
+                      META, REMOTE_DESKTOP_SESSION,
+                      MetaDBusRemoteDesktopSessionSkeleton)
+
+char * meta_remote_desktop_session_get_object_path (MetaRemoteDesktopSession *session);
+
+char * meta_remote_desktop_session_get_session_id (MetaRemoteDesktopSession *session);
+
+gboolean meta_remote_desktop_session_register_screen_cast (MetaRemoteDesktopSession  *session,
+                                                           MetaScreenCastSession     *screen_cast_session,
+                                                           GError                   **error);
+
+void meta_remote_desktop_session_close (MetaRemoteDesktopSession *session);
+
+MetaRemoteDesktopSession * meta_remote_desktop_session_new (MetaRemoteDesktop  *remote_desktop,
+                                                            const char         *peer_name,
+                                                            GError            **error);
+
+#endif /* META_REMOTE_DESKTOP_SESSION_H */

src/backends/meta-remote-desktop.c

@@ -0,0 +1,240 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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.
+ *
+ */
+
+#define _GNU_SOURCE
+
+#include "config.h"
+
+#include "backends/meta-remote-desktop.h"
+
+#include <errno.h>
+#include <glib.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "meta-dbus-remote-desktop.h"
+#include "backends/meta-backend-private.h"
+#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"
+#define META_REMOTE_DESKTOP_DBUS_PATH "/org/gnome/Mutter/RemoteDesktop"
+
+struct _MetaRemoteDesktop
+{
+  MetaDBusRemoteDesktopSkeleton parent;
+
+  int dbus_name_id;
+
+  GHashTable *sessions;
+
+  MetaDbusSessionWatcher *session_watcher;
+};
+
+static void
+meta_remote_desktop_init_iface (MetaDBusRemoteDesktopIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MetaRemoteDesktop,
+                         meta_remote_desktop,
+                         META_DBUS_TYPE_REMOTE_DESKTOP_SKELETON,
+                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_REMOTE_DESKTOP,
+                                                meta_remote_desktop_init_iface));
+
+GDBusConnection *
+meta_remote_desktop_get_connection (MetaRemoteDesktop *remote_desktop)
+{
+  GDBusInterfaceSkeleton *interface_skeleton =
+    G_DBUS_INTERFACE_SKELETON (remote_desktop);
+
+  return g_dbus_interface_skeleton_get_connection (interface_skeleton);
+}
+
+MetaRemoteDesktopSession *
+meta_remote_desktop_get_session (MetaRemoteDesktop *remote_desktop,
+                                 const char        *session_id)
+{
+  return g_hash_table_lookup (remote_desktop->sessions, session_id);
+}
+
+static void
+on_session_closed (MetaRemoteDesktopSession *session,
+                   MetaRemoteDesktop        *remote_desktop)
+{
+  char *session_id;
+
+  session_id = meta_remote_desktop_session_get_session_id (session);
+  g_hash_table_remove (remote_desktop->sessions, session_id);
+}
+
+static gboolean
+handle_create_session (MetaDBusRemoteDesktop *skeleton,
+                       GDBusMethodInvocation *invocation)
+{
+  MetaRemoteDesktop *remote_desktop = META_REMOTE_DESKTOP (skeleton);
+  const char *peer_name;
+  MetaRemoteDesktopSession *session;
+  GError *error = NULL;
+  char *session_id;
+  char *session_path;
+  const char *client_dbus_name;
+
+  peer_name = g_dbus_method_invocation_get_sender (invocation);
+  session = meta_remote_desktop_session_new (remote_desktop,
+                                             peer_name,
+                                             &error);
+  if (!session)
+    {
+      g_warning ("Failed to create remote desktop session: %s",
+                 error->message);
+
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Failed to create session: %s",
+                                             error->message);
+      g_error_free (error);
+
+      return TRUE;
+    }
+
+  session_id = meta_remote_desktop_session_get_session_id (session);
+  g_hash_table_insert (remote_desktop->sessions,
+                       session_id,
+                       session);
+
+  client_dbus_name = g_dbus_method_invocation_get_sender (invocation);
+  meta_dbus_session_watcher_watch_session (remote_desktop->session_watcher,
+                                           client_dbus_name,
+                                           META_DBUS_SESSION (session));
+
+  session_path = meta_remote_desktop_session_get_object_path (session);
+  meta_dbus_remote_desktop_complete_create_session (skeleton,
+                                                    invocation,
+                                                    session_path);
+
+  g_signal_connect (session, "session-closed",
+                    G_CALLBACK (on_session_closed),
+                    remote_desktop);
+
+  return TRUE;
+}
+
+static void
+meta_remote_desktop_init_iface (MetaDBusRemoteDesktopIface *iface)
+{
+  iface->handle_create_session = handle_create_session;
+}
+
+static void
+on_bus_acquired (GDBusConnection *connection,
+                 const char      *name,
+                 gpointer         user_data)
+{
+  MetaRemoteDesktop *remote_desktop = user_data;
+  GDBusInterfaceSkeleton *interface_skeleton =
+    G_DBUS_INTERFACE_SKELETON (remote_desktop);
+  GError *error = NULL;
+
+  if (!g_dbus_interface_skeleton_export (interface_skeleton,
+                                         connection,
+                                         META_REMOTE_DESKTOP_DBUS_PATH,
+                                         &error))
+    g_warning ("Failed to export remote desktop object: %s\n", error->message);
+}
+
+static void
+on_name_acquired (GDBusConnection *connection,
+                  const char      *name,
+                  gpointer         user_data)
+{
+  g_info ("Acquired name %s\n", name);
+}
+
+static void
+on_name_lost (GDBusConnection *connection,
+              const char      *name,
+              gpointer         user_data)
+{
+  g_warning ("Lost or failed to acquire name %s\n", name);
+}
+
+static void
+meta_remote_desktop_constructed (GObject *object)
+{
+  MetaRemoteDesktop *remote_desktop = META_REMOTE_DESKTOP (object);
+
+  remote_desktop->dbus_name_id =
+    g_bus_own_name (G_BUS_TYPE_SESSION,
+                    META_REMOTE_DESKTOP_DBUS_SERVICE,
+                    G_BUS_NAME_OWNER_FLAGS_NONE,
+                    on_bus_acquired,
+                    on_name_acquired,
+                    on_name_lost,
+                    remote_desktop,
+                    NULL);
+}
+
+static void
+meta_remote_desktop_finalize (GObject *object)
+{
+  MetaRemoteDesktop *remote_desktop = META_REMOTE_DESKTOP (object);
+  GList *sessions;
+
+  if (remote_desktop->dbus_name_id != 0)
+    g_bus_unown_name (remote_desktop->dbus_name_id);
+
+  sessions = g_list_copy (g_hash_table_get_values (remote_desktop->sessions));
+  g_list_free_full (sessions,
+                    (GDestroyNotify) meta_remote_desktop_session_close);
+  g_hash_table_destroy (remote_desktop->sessions);
+
+  G_OBJECT_CLASS (meta_remote_desktop_parent_class)->finalize (object);
+}
+
+MetaRemoteDesktop *
+meta_remote_desktop_new (MetaDbusSessionWatcher *session_watcher)
+{
+  MetaRemoteDesktop *remote_desktop;
+
+  remote_desktop = g_object_new (META_TYPE_REMOTE_DESKTOP, NULL);
+  remote_desktop->session_watcher = session_watcher;
+
+  return remote_desktop;
+}
+
+static void
+meta_remote_desktop_init (MetaRemoteDesktop *remote_desktop)
+{
+  remote_desktop->sessions = g_hash_table_new (g_str_hash, g_str_equal);
+}
+
+static void
+meta_remote_desktop_class_init (MetaRemoteDesktopClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = meta_remote_desktop_constructed;
+  object_class->finalize = meta_remote_desktop_finalize;
+}

src/backends/meta-remote-desktop.h

@@ -0,0 +1,45 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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_DESKTOP_H
+#define META_REMOTE_DESKTOP_H
+
+#include <glib-object.h>
+
+#include "backends/meta-dbus-session-watcher.h"
+#include "meta-dbus-remote-desktop.h"
+
+typedef struct _MetaRemoteDesktopSession MetaRemoteDesktopSession;
+
+#define META_TYPE_REMOTE_DESKTOP (meta_remote_desktop_get_type ())
+G_DECLARE_FINAL_TYPE (MetaRemoteDesktop, meta_remote_desktop,
+                      META, REMOTE_DESKTOP,
+                      MetaDBusRemoteDesktopSkeleton)
+
+MetaRemoteDesktopSession * meta_remote_desktop_get_session (MetaRemoteDesktop *remote_desktop,
+                                                            const char        *session_id);
+
+GDBusConnection * meta_remote_desktop_get_connection (MetaRemoteDesktop *remote_desktop);
+
+MetaRemoteDesktop * meta_remote_desktop_new (MetaDbusSessionWatcher *session_watcher);
+
+#endif /* META_REMOTE_DESKTOP_H */

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

@@ -0,0 +1,172 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 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-screen-cast-monitor-stream-src.h"
+
+#include "backends/meta-backend-private.h"
+#include "backends/meta-screen-cast-monitor-stream.h"
+#include "backends/meta-logical-monitor.h"
+#include "backends/meta-monitor.h"
+#include "clutter/clutter.h"
+#include "clutter/clutter-mutter.h"
+
+struct _MetaScreenCastMonitorStreamSrc
+{
+  MetaScreenCastStreamSrc parent;
+
+  gulong stage_painted_handler_id;
+};
+
+G_DEFINE_TYPE (MetaScreenCastMonitorStreamSrc,
+               meta_screen_cast_monitor_stream_src,
+               META_TYPE_SCREEN_CAST_STREAM_SRC)
+
+static ClutterStage *
+get_stage (MetaScreenCastMonitorStreamSrc *monitor_src)
+{
+  MetaScreenCastStreamSrc *src;
+  MetaScreenCastStream *stream;
+  MetaScreenCastMonitorStream *monitor_stream;
+
+  src = META_SCREEN_CAST_STREAM_SRC (monitor_src);
+  stream = meta_screen_cast_stream_src_get_stream (src);
+  monitor_stream = META_SCREEN_CAST_MONITOR_STREAM (stream);
+
+  return meta_screen_cast_monitor_stream_get_stage (monitor_stream);
+}
+
+static MetaMonitor *
+get_monitor (MetaScreenCastMonitorStreamSrc *monitor_src)
+{
+  MetaScreenCastStreamSrc *src;
+  MetaScreenCastStream *stream;
+  MetaScreenCastMonitorStream *monitor_stream;
+
+  src = META_SCREEN_CAST_STREAM_SRC (monitor_src);
+  stream = meta_screen_cast_stream_src_get_stream (src);
+  monitor_stream = META_SCREEN_CAST_MONITOR_STREAM (stream);
+
+  return meta_screen_cast_monitor_stream_get_monitor (monitor_stream);
+}
+
+static void
+meta_screen_cast_monitor_stream_src_get_specs (MetaScreenCastStreamSrc *src,
+                                               int                     *width,
+                                               int                     *height,
+                                               float                   *frame_rate)
+{
+  MetaScreenCastMonitorStreamSrc *monitor_src =
+    META_SCREEN_CAST_MONITOR_STREAM_SRC (src);
+  MetaMonitor *monitor;
+  MetaLogicalMonitor *logical_monitor;
+  float scale;
+  MetaMonitorMode *mode;
+
+  monitor = get_monitor (monitor_src);
+  logical_monitor = meta_monitor_get_logical_monitor (monitor);
+  mode = meta_monitor_get_current_mode (monitor);
+
+  scale = logical_monitor->scale;
+  *width = (int) roundf (logical_monitor->rect.width * scale);
+  *height = (int) roundf (logical_monitor->rect.height * scale);
+  *frame_rate = meta_monitor_mode_get_refresh_rate (mode);
+}
+
+static void
+stage_painted (ClutterActor                   *actor,
+               MetaScreenCastMonitorStreamSrc *monitor_src)
+{
+  MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (monitor_src);
+
+  meta_screen_cast_stream_src_maybe_record_frame (src);
+}
+
+static void
+meta_screen_cast_monitor_stream_src_enable (MetaScreenCastStreamSrc *src)
+{
+  MetaScreenCastMonitorStreamSrc *monitor_src =
+    META_SCREEN_CAST_MONITOR_STREAM_SRC (src);
+  ClutterStage *stage;
+
+  stage = get_stage (monitor_src);
+  monitor_src->stage_painted_handler_id =
+    g_signal_connect_after (stage, "paint",
+                            G_CALLBACK (stage_painted),
+                            monitor_src);
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stage));
+}
+
+static void
+meta_screen_cast_monitor_stream_src_disable (MetaScreenCastStreamSrc *src)
+{
+  MetaScreenCastMonitorStreamSrc *monitor_src =
+    META_SCREEN_CAST_MONITOR_STREAM_SRC (src);
+  ClutterStage *stage;
+
+  stage = get_stage (monitor_src);
+  g_signal_handler_disconnect (stage, monitor_src->stage_painted_handler_id);
+  monitor_src->stage_painted_handler_id = 0;
+}
+
+static void
+meta_screen_cast_monitor_stream_src_record_frame (MetaScreenCastStreamSrc *src,
+                                                  uint8_t                 *data)
+{
+  MetaScreenCastMonitorStreamSrc *monitor_src =
+    META_SCREEN_CAST_MONITOR_STREAM_SRC (src);
+  ClutterStage *stage;
+  MetaMonitor *monitor;
+  MetaLogicalMonitor *logical_monitor;
+
+  stage = get_stage (monitor_src);
+  monitor = get_monitor (monitor_src);
+  logical_monitor = meta_monitor_get_logical_monitor (monitor);
+  clutter_stage_capture_into (stage, FALSE, &logical_monitor->rect, data);
+}
+
+MetaScreenCastMonitorStreamSrc *
+meta_screen_cast_monitor_stream_src_new (MetaScreenCastMonitorStream  *monitor_stream,
+                                         GError                      **error)
+{
+  return g_initable_new (META_TYPE_SCREEN_CAST_MONITOR_STREAM_SRC, NULL, error,
+                         "stream", monitor_stream,
+                         NULL);
+}
+
+static void
+meta_screen_cast_monitor_stream_src_init (MetaScreenCastMonitorStreamSrc *monitor_src)
+{
+}
+
+static void
+meta_screen_cast_monitor_stream_src_class_init (MetaScreenCastMonitorStreamSrcClass *klass)
+{
+  MetaScreenCastStreamSrcClass *src_class =
+    META_SCREEN_CAST_STREAM_SRC_CLASS (klass);
+
+  src_class->get_specs = meta_screen_cast_monitor_stream_src_get_specs;
+  src_class->enable = meta_screen_cast_monitor_stream_src_enable;
+  src_class->disable = meta_screen_cast_monitor_stream_src_disable;
+  src_class->record_frame = meta_screen_cast_monitor_stream_src_record_frame;
+}

src/backends/meta-screen-cast-monitor-stream-src.h

@@ -0,0 +1,40 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 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_SCREEN_CAST_MONITOR_STREAM_SRC_H
+#define META_SCREEN_CAST_MONITOR_STREAM_SRC_H
+
+#include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-screen-cast-stream-src.h"
+
+typedef struct _MetaScreenCastMonitorStream MetaScreenCastMonitorStream;
+
+#define META_TYPE_SCREEN_CAST_MONITOR_STREAM_SRC (meta_screen_cast_monitor_stream_src_get_type ())
+G_DECLARE_FINAL_TYPE (MetaScreenCastMonitorStreamSrc,
+                      meta_screen_cast_monitor_stream_src,
+                      META, SCREEN_CAST_MONITOR_STREAM_SRC,
+                      MetaScreenCastStreamSrc)
+
+MetaScreenCastMonitorStreamSrc * meta_screen_cast_monitor_stream_src_new (MetaScreenCastMonitorStream *monitor_stream,
+                                                                          GError                     **error);
+
+#endif /* META_SCREEN_CAST_MONITOR_STREAM_SRC_H */

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

@@ -0,0 +1,260 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 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-screen-cast-monitor-stream.h"
+
+#include "backends/meta-logical-monitor.h"
+#include "backends/meta-screen-cast-monitor-stream-src.h"
+
+enum
+{
+  PROP_0,
+
+  PROP_MONITOR,
+};
+
+struct _MetaScreenCastMonitorStream
+{
+  MetaScreenCastStream parent;
+
+  ClutterStage *stage;
+
+  MetaMonitor *monitor;
+  MetaLogicalMonitor *logical_monitor;
+};
+
+G_DEFINE_TYPE (MetaScreenCastMonitorStream,
+               meta_screen_cast_monitor_stream,
+               META_TYPE_SCREEN_CAST_STREAM)
+
+static gboolean
+update_monitor (MetaScreenCastMonitorStream *monitor_stream,
+                MetaMonitor                 *new_monitor)
+{
+  MetaLogicalMonitor *new_logical_monitor;
+
+  new_logical_monitor = meta_monitor_get_logical_monitor (new_monitor);
+  if (!new_logical_monitor)
+    return FALSE;
+
+  if (!meta_rectangle_equal (&new_logical_monitor->rect,
+                             &monitor_stream->logical_monitor->rect))
+    return FALSE;
+
+  g_set_object (&monitor_stream->monitor, new_monitor);
+  g_set_object (&monitor_stream->logical_monitor, new_logical_monitor);
+
+  return TRUE;
+}
+
+static void
+on_monitors_changed (MetaMonitorManager          *monitor_manager,
+                     MetaScreenCastMonitorStream *monitor_stream)
+{
+  MetaMonitor *new_monitor = NULL;
+  GList *monitors;
+  GList *l;
+
+  monitors = meta_monitor_manager_get_monitors (monitor_manager);
+  for (l = monitors; l; l = l->next)
+    {
+      MetaMonitor *other_monitor = l->data;
+
+      if (meta_monitor_is_same_as (monitor_stream->monitor, other_monitor))
+        {
+          new_monitor = other_monitor;
+          break;
+        }
+    }
+
+  if (!new_monitor || !update_monitor (monitor_stream, new_monitor))
+    meta_screen_cast_stream_close (META_SCREEN_CAST_STREAM (monitor_stream));
+}
+
+ClutterStage *
+meta_screen_cast_monitor_stream_get_stage (MetaScreenCastMonitorStream *monitor_stream)
+{
+  return monitor_stream->stage;
+}
+
+MetaMonitor *
+meta_screen_cast_monitor_stream_get_monitor (MetaScreenCastMonitorStream *monitor_stream)
+{
+  return monitor_stream->monitor;
+}
+
+MetaScreenCastMonitorStream *
+meta_screen_cast_monitor_stream_new (GDBusConnection     *connection,
+                                     MetaMonitorManager  *monitor_manager,
+                                     MetaMonitor         *monitor,
+                                     ClutterStage        *stage,
+                                     GError             **error)
+{
+  MetaScreenCastMonitorStream *monitor_stream;
+
+  if (!meta_monitor_is_active (monitor))
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Monitor not active");
+      return NULL;
+    }
+
+  monitor_stream = g_initable_new (META_TYPE_SCREEN_CAST_MONITOR_STREAM,
+                                   NULL,
+                                   error,
+                                   "connection", connection,
+                                   "monitor", monitor,
+                                   NULL);
+  if (!monitor_stream)
+    return NULL;
+
+  monitor_stream->stage = stage;
+
+  g_signal_connect_object (monitor_manager, "monitors-changed-internal",
+                           G_CALLBACK (on_monitors_changed),
+                           monitor_stream, 0);
+
+  return monitor_stream;
+}
+
+static MetaScreenCastStreamSrc *
+meta_screen_cast_monitor_stream_create_src (MetaScreenCastStream  *stream,
+                                            GError               **error)
+{
+  MetaScreenCastMonitorStream *monitor_stream =
+    META_SCREEN_CAST_MONITOR_STREAM (stream);
+  MetaScreenCastMonitorStreamSrc *monitor_stream_src;
+
+  monitor_stream_src = meta_screen_cast_monitor_stream_src_new (monitor_stream,
+                                                                error);
+  if (!monitor_stream_src)
+    return NULL;
+
+  return META_SCREEN_CAST_STREAM_SRC (monitor_stream_src);
+}
+
+static void
+meta_screen_cast_monitor_stream_set_parameters (MetaScreenCastStream *stream,
+                                                GVariantBuilder      *parameters_builder)
+{
+  MetaScreenCastMonitorStream *monitor_stream =
+    META_SCREEN_CAST_MONITOR_STREAM (stream);
+  MetaRectangle logical_monitor_layout;
+
+  logical_monitor_layout =
+    meta_logical_monitor_get_layout (monitor_stream->logical_monitor);
+
+  g_variant_builder_add (parameters_builder, "{sv}",
+                         "position",
+                         g_variant_new ("(ii)",
+                                        logical_monitor_layout.x,
+                                        logical_monitor_layout.y));
+  g_variant_builder_add (parameters_builder, "{sv}",
+                         "size",
+                         g_variant_new ("(ii)",
+                                        logical_monitor_layout.width,
+                                        logical_monitor_layout.height));
+}
+
+static void
+meta_screen_cast_monitor_stream_set_property (GObject      *object,
+                                              guint         prop_id,
+                                              const GValue *value,
+                                              GParamSpec   *pspec)
+{
+  MetaScreenCastMonitorStream *monitor_stream =
+    META_SCREEN_CAST_MONITOR_STREAM (object);
+  MetaLogicalMonitor *logical_monitor;
+
+  switch (prop_id)
+    {
+    case PROP_MONITOR:
+      g_set_object (&monitor_stream->monitor, g_value_get_object (value));
+      logical_monitor = meta_monitor_get_logical_monitor (monitor_stream->monitor);
+      g_set_object (&monitor_stream->logical_monitor, logical_monitor);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_screen_cast_monitor_stream_get_property (GObject    *object,
+                                              guint       prop_id,
+                                              GValue     *value,
+                                              GParamSpec *pspec)
+{
+  MetaScreenCastMonitorStream *monitor_stream =
+    META_SCREEN_CAST_MONITOR_STREAM (object);
+
+  switch (prop_id)
+    {
+    case PROP_MONITOR:
+      g_value_set_object (value, monitor_stream->monitor);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_screen_cast_monitor_stream_finalize (GObject *object)
+{
+  MetaScreenCastMonitorStream *monitor_stream =
+    META_SCREEN_CAST_MONITOR_STREAM (object);
+
+  g_clear_object (&monitor_stream->monitor);
+  g_clear_object (&monitor_stream->logical_monitor);
+
+  G_OBJECT_CLASS (meta_screen_cast_monitor_stream_parent_class)->finalize (object);
+}
+
+static void
+meta_screen_cast_monitor_stream_init (MetaScreenCastMonitorStream *monitor_stream)
+{
+}
+
+static void
+meta_screen_cast_monitor_stream_class_init (MetaScreenCastMonitorStreamClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  MetaScreenCastStreamClass *stream_class =
+    META_SCREEN_CAST_STREAM_CLASS (klass);
+
+  object_class->set_property = meta_screen_cast_monitor_stream_set_property;
+  object_class->get_property = meta_screen_cast_monitor_stream_get_property;
+  object_class->finalize = meta_screen_cast_monitor_stream_finalize;
+
+  stream_class->create_src = meta_screen_cast_monitor_stream_create_src;
+  stream_class->set_parameters = meta_screen_cast_monitor_stream_set_parameters;
+
+  g_object_class_install_property (object_class,
+                                   PROP_MONITOR,
+                                   g_param_spec_object ("monitor",
+                                                        "monitor",
+                                                        "MetaMonitor",
+                                                        META_TYPE_MONITOR,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
+}

src/backends/meta-screen-cast-monitor-stream.h

@@ -0,0 +1,47 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 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_SCREEN_CAST_MONITOR_STREAM_H
+#define META_SCREEN_CAST_MONITOR_STREAM_H
+
+#include <glib-object.h>
+
+#include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-screen-cast-stream.h"
+
+#define META_TYPE_SCREEN_CAST_MONITOR_STREAM (meta_screen_cast_monitor_stream_get_type ())
+G_DECLARE_FINAL_TYPE (MetaScreenCastMonitorStream,
+                      meta_screen_cast_monitor_stream,
+                      META, SCREEN_CAST_MONITOR_STREAM,
+                      MetaScreenCastStream)
+
+MetaScreenCastMonitorStream * meta_screen_cast_monitor_stream_new (GDBusConnection    *connection,
+								   MetaMonitorManager *monitor_manager,
+                                                                   MetaMonitor        *monitor,
+                                                                   ClutterStage       *stage,
+                                                                   GError            **error);
+
+ClutterStage * meta_screen_cast_monitor_stream_get_stage (MetaScreenCastMonitorStream *monitor_stream);
+
+MetaMonitor * meta_screen_cast_monitor_stream_get_monitor (MetaScreenCastMonitorStream *monitor_stream);
+
+#endif /* META_SCREEN_CAST_MONITOR_STREAM_H */

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

@@ -0,0 +1,363 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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-screen-cast-session.h"
+
+#include "backends/meta-backend-private.h"
+#include "backends/meta-dbus-session-watcher.h"
+#include "backends/meta-screen-cast-monitor-stream.h"
+#include "backends/meta-screen-cast-stream.h"
+
+#define META_SCREEN_CAST_SESSION_DBUS_PATH "/org/gnome/Mutter/ScreenCast/Session"
+
+struct _MetaScreenCastSession
+{
+  MetaDBusScreenCastSessionSkeleton parent;
+
+  char *peer_name;
+
+  MetaScreenCastSessionType session_type;
+  char *object_path;
+
+  GList *streams;
+};
+
+static void
+meta_screen_cast_session_init_iface (MetaDBusScreenCastSessionIface *iface);
+
+static void
+meta_dbus_session_init_iface (MetaDbusSessionInterface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MetaScreenCastSession,
+                         meta_screen_cast_session,
+                         META_DBUS_TYPE_SCREEN_CAST_SESSION_SKELETON,
+                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_SCREEN_CAST_SESSION,
+                                                meta_screen_cast_session_init_iface)
+                         G_IMPLEMENT_INTERFACE (META_TYPE_DBUS_SESSION,
+                                                meta_dbus_session_init_iface))
+
+gboolean
+meta_screen_cast_session_start (MetaScreenCastSession  *session,
+                                GError                **error)
+{
+  GList *l;
+
+  for (l = session->streams; l; l = l->next)
+    {
+      MetaScreenCastStream *stream = l->data;
+
+      if (!meta_screen_cast_stream_start (stream, error))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+void
+meta_screen_cast_session_close (MetaScreenCastSession *session)
+{
+  MetaDBusScreenCastSession *skeleton = META_DBUS_SCREEN_CAST_SESSION (session);
+
+  g_list_free_full (session->streams, g_object_unref);
+
+  meta_dbus_session_notify_closed (META_DBUS_SESSION (session));
+
+  switch (session->session_type)
+    {
+    case META_SCREEN_CAST_SESSION_TYPE_NORMAL:
+      meta_dbus_screen_cast_session_emit_closed (skeleton);
+      break;
+    case META_SCREEN_CAST_SESSION_TYPE_REMOTE_DESKTOP:
+      break;
+    }
+
+  g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (session));
+
+  g_object_unref (session);
+}
+
+char *
+meta_screen_cast_session_get_object_path (MetaScreenCastSession *session)
+{
+  return session->object_path;
+}
+
+static gboolean
+check_permission (MetaScreenCastSession *session,
+                  GDBusMethodInvocation *invocation)
+{
+  return g_strcmp0 (session->peer_name,
+                    g_dbus_method_invocation_get_sender (invocation)) == 0;
+}
+
+static gboolean
+handle_start (MetaDBusScreenCastSession *skeleton,
+              GDBusMethodInvocation     *invocation)
+{
+  MetaScreenCastSession *session = META_SCREEN_CAST_SESSION (skeleton);
+  GError *error = NULL;
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  switch (session->session_type)
+    {
+    case META_SCREEN_CAST_SESSION_TYPE_NORMAL:
+      break;
+    case META_SCREEN_CAST_SESSION_TYPE_REMOTE_DESKTOP:
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Must be started from remote desktop session");
+      return TRUE;
+    }
+
+  if (!meta_screen_cast_session_start (session, &error))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Failed to start screen cast: %s",
+                                             error->message);
+      g_error_free (error);
+
+      return TRUE;
+    }
+
+  meta_dbus_screen_cast_session_complete_start (skeleton, invocation);
+
+  return TRUE;
+}
+
+static gboolean
+handle_stop (MetaDBusScreenCastSession *skeleton,
+             GDBusMethodInvocation     *invocation)
+{
+  MetaScreenCastSession *session = META_SCREEN_CAST_SESSION (skeleton);
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  switch (session->session_type)
+    {
+    case META_SCREEN_CAST_SESSION_TYPE_NORMAL:
+      break;
+    case META_SCREEN_CAST_SESSION_TYPE_REMOTE_DESKTOP:
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Must be stopped from remote desktop session");
+      return TRUE;
+    }
+
+  meta_screen_cast_session_close (session);
+
+  meta_dbus_screen_cast_session_complete_stop (skeleton, invocation);
+
+  return TRUE;
+}
+
+static void
+on_stream_closed (MetaScreenCastStream  *stream,
+                  MetaScreenCastSession *session)
+{
+  meta_screen_cast_session_close (session);
+}
+
+static gboolean
+handle_record_monitor (MetaDBusScreenCastSession *skeleton,
+                       GDBusMethodInvocation     *invocation,
+                       const char                *connector,
+                       GVariant                  *properties_variant)
+{
+  MetaScreenCastSession *session = META_SCREEN_CAST_SESSION (skeleton);
+  GDBusInterfaceSkeleton *interface_skeleton;
+  GDBusConnection *connection;
+  MetaBackend *backend = meta_get_backend ();
+  MetaMonitorManager *monitor_manager =
+    meta_backend_get_monitor_manager (backend);
+  MetaMonitor *monitor;
+  ClutterStage *stage;
+  GError *error = NULL;
+  MetaScreenCastMonitorStream *monitor_stream;
+  MetaScreenCastStream *stream;
+  char *stream_path;
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  interface_skeleton = G_DBUS_INTERFACE_SKELETON (skeleton);
+  connection = g_dbus_interface_skeleton_get_connection (interface_skeleton);
+
+  if (g_str_equal (connector, ""))
+    monitor = meta_monitor_manager_get_primary_monitor (monitor_manager);
+  else
+    monitor = meta_monitor_manager_get_monitor_from_connector (monitor_manager,
+                                                               connector);
+
+  if (!monitor)
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Unknown monitor");
+      return TRUE;
+    }
+
+  stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
+
+  monitor_stream = meta_screen_cast_monitor_stream_new (connection,
+                                                        monitor_manager,
+                                                        monitor,
+                                                        stage,
+                                                        &error);
+  if (!monitor_stream)
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Failed to record monitor: %s",
+                                             error->message);
+      g_error_free (error);
+      return TRUE;
+    }
+
+  stream = META_SCREEN_CAST_STREAM (monitor_stream);
+  stream_path = meta_screen_cast_stream_get_object_path (stream);
+
+  session->streams = g_list_append (session->streams, stream);
+
+  g_signal_connect (stream, "closed", G_CALLBACK (on_stream_closed), session);
+
+  meta_dbus_screen_cast_session_complete_record_monitor (skeleton,
+                                                         invocation,
+                                                         stream_path);
+
+  return TRUE;
+}
+
+static gboolean
+handle_record_window (MetaDBusScreenCastSession *skeleton,
+                      GDBusMethodInvocation     *invocation,
+                      GVariant                  *properties_variant)
+{
+  MetaScreenCastSession *session = META_SCREEN_CAST_SESSION (skeleton);
+
+  if (!check_permission (session, invocation))
+    {
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_ACCESS_DENIED,
+                                             "Permission denied");
+      return TRUE;
+    }
+
+  g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                         G_DBUS_ERROR_FAILED,
+                                         "Recording a window not yet supported");
+  return TRUE;
+}
+
+static void
+meta_screen_cast_session_init_iface (MetaDBusScreenCastSessionIface *iface)
+{
+  iface->handle_start = handle_start;
+  iface->handle_stop = handle_stop;
+  iface->handle_record_monitor = handle_record_monitor;
+  iface->handle_record_window = handle_record_window;
+}
+
+static void
+meta_screen_cast_session_client_vanished (MetaDbusSession *dbus_session)
+{
+  meta_screen_cast_session_close (META_SCREEN_CAST_SESSION (dbus_session));
+}
+
+static void
+meta_dbus_session_init_iface (MetaDbusSessionInterface *iface)
+{
+  iface->client_vanished = meta_screen_cast_session_client_vanished;
+}
+
+MetaScreenCastSession *
+meta_screen_cast_session_new (MetaScreenCast             *screen_cast,
+                              MetaScreenCastSessionType   session_type,
+                              const char                 *peer_name,
+                              GError                    **error)
+{
+  GDBusInterfaceSkeleton *interface_skeleton;
+  MetaScreenCastSession *session;
+  GDBusConnection *connection;
+  static unsigned int global_session_number = 0;
+
+  session = g_object_new (META_TYPE_SCREEN_CAST_SESSION, NULL);
+  session->session_type = session_type;
+  session->peer_name = g_strdup (peer_name);
+  session->object_path =
+    g_strdup_printf (META_SCREEN_CAST_SESSION_DBUS_PATH "/u%u",
+                     ++global_session_number);
+
+  interface_skeleton = G_DBUS_INTERFACE_SKELETON (session);
+  connection = meta_screen_cast_get_connection (screen_cast);
+  if (!g_dbus_interface_skeleton_export (interface_skeleton,
+                                         connection,
+                                         session->object_path,
+                                         error))
+    return NULL;
+
+  return session;
+}
+
+static void
+meta_screen_cast_session_finalize (GObject *object)
+{
+  MetaScreenCastSession *session = META_SCREEN_CAST_SESSION (object);
+
+  g_free (session->peer_name);
+  g_free (session->object_path);
+
+  G_OBJECT_CLASS (meta_screen_cast_session_parent_class)->finalize (object);
+}
+
+static void
+meta_screen_cast_session_init (MetaScreenCastSession *session)
+{
+}
+
+static void
+meta_screen_cast_session_class_init (MetaScreenCastSessionClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_screen_cast_session_finalize;
+}

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

@@ -0,0 +1,51 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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_SCREEN_CAST_SESSION_H
+#define META_SCREEN_CAST_SESSION_H
+
+#include "backends/meta-screen-cast.h"
+
+typedef enum _MetaScreenCastSessionType
+{
+  META_SCREEN_CAST_SESSION_TYPE_NORMAL,
+  META_SCREEN_CAST_SESSION_TYPE_REMOTE_DESKTOP,
+} MetaScreenCastSessionType;
+
+#define META_TYPE_SCREEN_CAST_SESSION (meta_screen_cast_session_get_type ())
+G_DECLARE_FINAL_TYPE (MetaScreenCastSession, meta_screen_cast_session,
+                      META, SCREEN_CAST_SESSION,
+                      MetaDBusScreenCastSessionSkeleton)
+
+char * meta_screen_cast_session_get_object_path (MetaScreenCastSession *session);
+
+MetaScreenCastSession * meta_screen_cast_session_new (MetaScreenCast             *screen_cast,
+                                                      MetaScreenCastSessionType   session_type,
+                                                      const char                 *peer_name,
+                                                      GError                    **error);
+
+gboolean meta_screen_cast_session_start (MetaScreenCastSession  *session,
+                                         GError                **error);
+
+void meta_screen_cast_session_close (MetaScreenCastSession *session);
+
+#endif /* META_SCREEN_CAST_SESSION_H */

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

@@ -0,0 +1,680 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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-screen-cast-stream-src.h"
+
+#include <errno.h>
+#include <pipewire/pipewire.h>
+#include <spa/format-builder.h>
+#include <spa/format-utils.h>
+#include <spa/props.h>
+#include <spa/type-map.h>
+#include <spa/video/format-utils.h>
+#include <stdint.h>
+#include <sys/mman.h>
+
+#include "backends/meta-screen-cast-stream.h"
+#include "clutter/clutter-mutter.h"
+#include "core/meta-fraction.h"
+#include "meta/boxes.h"
+
+#define PRIVATE_OWNER_FROM_FIELD(TypeName, field_ptr, field_name) \
+  (TypeName *)((guint8 *)(field_ptr) - G_PRIVATE_OFFSET (TypeName, field_name))
+
+enum
+{
+  PROP_0,
+
+  PROP_STREAM,
+};
+
+enum
+{
+  READY,
+  CLOSED,
+
+  N_SIGNALS
+};
+
+static guint signals[N_SIGNALS];
+
+typedef struct _MetaSpaType
+{
+  uint32_t format;
+  uint32_t props;
+  struct spa_type_meta meta;
+  struct spa_type_data data;
+  struct spa_type_media_type media_type;
+  struct spa_type_media_subtype media_subtype;
+  struct spa_type_format_video format_video;
+  struct spa_type_video_format video_format;
+} MetaSpaType;
+
+typedef struct _MetaPipeWireSource
+{
+  GSource base;
+
+  struct pw_loop *pipewire_loop;
+} MetaPipeWireSource;
+
+typedef struct _MetaScreenCastStreamSrcPrivate
+{
+  MetaScreenCastStream *stream;
+
+  struct pw_core *pipewire_core;
+  struct pw_remote *pipewire_remote;
+  struct pw_type *pipewire_type;
+  MetaPipeWireSource *pipewire_source;
+  struct spa_hook pipewire_remote_listener;
+
+  gboolean is_enabled;
+
+  struct pw_stream *pipewire_stream;
+  struct spa_hook pipewire_stream_listener;
+
+  MetaSpaType spa_type;
+  uint8_t params_buffer[1024];
+  struct spa_video_info_raw video_format;
+
+  uint64_t last_frame_timestamp_us;
+} MetaScreenCastStreamSrcPrivate;
+
+static void
+meta_screen_cast_stream_src_init_initable_iface (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MetaScreenCastStreamSrc,
+                         meta_screen_cast_stream_src,
+                         G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                meta_screen_cast_stream_src_init_initable_iface)
+                         G_ADD_PRIVATE (MetaScreenCastStreamSrc))
+
+#define PROP(f, key, type, ...)                                         \
+          SPA_POD_PROP (f, key, 0, type, 1, __VA_ARGS__)
+#define PROP_U_MM(f, key, type, ...)                                    \
+          SPA_POD_PROP (f, key, (SPA_POD_PROP_FLAG_UNSET |              \
+                                 SPA_POD_PROP_RANGE_MIN_MAX),           \
+                        type, 3, __VA_ARGS__)
+
+static void
+meta_screen_cast_stream_src_get_specs (MetaScreenCastStreamSrc *src,
+                                       int                     *width,
+                                       int                     *height,
+                                       float                   *frame_rate)
+{
+  MetaScreenCastStreamSrcClass *klass =
+    META_SCREEN_CAST_STREAM_SRC_GET_CLASS (src);
+
+  klass->get_specs (src, width, height, frame_rate);
+}
+
+static void
+meta_screen_cast_stream_src_record_frame (MetaScreenCastStreamSrc *src,
+                                          uint8_t                 *data)
+{
+  MetaScreenCastStreamSrcClass *klass =
+    META_SCREEN_CAST_STREAM_SRC_GET_CLASS (src);
+
+  klass->record_frame (src, data);
+}
+
+void
+meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src)
+{
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+  uint32_t buffer_id;
+  struct spa_buffer *buffer;
+  uint8_t *map = NULL;
+  uint8_t *data;
+  uint64_t now_us;
+
+  now_us = g_get_monotonic_time ();
+  if (priv->last_frame_timestamp_us != 0 &&
+      (now_us - priv->last_frame_timestamp_us <
+       ((1000000 * priv->video_format.max_framerate.denom) /
+        priv->video_format.max_framerate.num)))
+    return;
+
+  if (!priv->pipewire_stream)
+    return;
+
+  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->datas[0].type == priv->spa_type.data.MemFd)
+    {
+      map = mmap (NULL, buffer->datas[0].maxsize + buffer->datas[0].mapoffset,
+                  PROT_READ | PROT_WRITE, MAP_SHARED,
+                  buffer->datas[0].fd, 0);
+      if (map == MAP_FAILED)
+        {
+          g_warning ("Failed to mmap pipewire stream buffer: %s\n",
+                     strerror (errno));
+          return;
+        }
+
+      data = SPA_MEMBER (map, buffer->datas[0].mapoffset, uint8_t);
+    }
+  else if (buffer->datas[0].type == priv->spa_type.data.MemPtr)
+    {
+      data = buffer->datas[0].data;
+    }
+  else
+    {
+      return;
+    }
+
+  meta_screen_cast_stream_src_record_frame (src, data);
+  priv->last_frame_timestamp_us = now_us;
+
+  if (map)
+    munmap (map, buffer->datas[0].maxsize + buffer->datas[0].mapoffset);
+
+  pw_stream_send_buffer (priv->pipewire_stream, buffer_id);
+}
+
+static gboolean
+meta_screen_cast_stream_src_is_enabled (MetaScreenCastStreamSrc *src)
+{
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+
+  return priv->is_enabled;
+}
+
+static void
+meta_screen_cast_stream_src_enable (MetaScreenCastStreamSrc *src)
+{
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+
+  META_SCREEN_CAST_STREAM_SRC_GET_CLASS (src)->enable (src);
+
+  priv->is_enabled = TRUE;
+}
+
+static void
+meta_screen_cast_stream_src_disable (MetaScreenCastStreamSrc *src)
+{
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+
+  META_SCREEN_CAST_STREAM_SRC_GET_CLASS (src)->disable (src);
+
+  priv->is_enabled = FALSE;
+}
+
+static void
+meta_screen_cast_stream_src_notify_closed (MetaScreenCastStreamSrc *src)
+{
+  g_signal_emit (src, signals[CLOSED], 0);
+}
+
+static void
+on_stream_state_changed (void                 *data,
+                         enum pw_stream_state  old,
+                         enum pw_stream_state  state,
+                         const char           *error_message)
+{
+  MetaScreenCastStreamSrc *src = data;
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+  uint32_t node_id;
+
+  switch (state)
+    {
+    case PW_STREAM_STATE_ERROR:
+      g_warning ("pipewire stream error: %s", error_message);
+      meta_screen_cast_stream_src_notify_closed (src);
+      break;
+    case PW_STREAM_STATE_CONFIGURE:
+      node_id = pw_stream_get_node_id (priv->pipewire_stream);
+      g_signal_emit (src, signals[READY], 0, (unsigned int) node_id);
+      break;
+    case PW_STREAM_STATE_UNCONNECTED:
+    case PW_STREAM_STATE_CONNECTING:
+    case PW_STREAM_STATE_READY:
+    case PW_STREAM_STATE_PAUSED:
+      if (meta_screen_cast_stream_src_is_enabled (src))
+        meta_screen_cast_stream_src_disable (src);
+      break;
+    case PW_STREAM_STATE_STREAMING:
+      if (!meta_screen_cast_stream_src_is_enabled (src))
+        meta_screen_cast_stream_src_enable (src);
+      break;
+    }
+}
+
+static void
+on_stream_format_changed (void              *data,
+                          struct spa_format *format)
+{
+  MetaScreenCastStreamSrc *src = data;
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+  struct pw_type *pipewire_type = priv->pipewire_type;
+  struct spa_type_param_alloc_buffers *param_alloc_buffers;
+  struct spa_pod_builder pod_builder = { NULL };
+  struct spa_pod_frame object_frame;
+  struct spa_pod_frame prop_frame;
+  struct spa_param *params[1];
+  const int bpp = 4;
+
+  if (!format)
+    {
+      pw_stream_finish_format (priv->pipewire_stream, SPA_RESULT_OK, NULL, 0);
+      return;
+    }
+
+  spa_format_video_raw_parse (format,
+                              &priv->video_format,
+                              &priv->spa_type.format_video);
+
+  spa_pod_builder_init (&pod_builder,
+                        priv->params_buffer,
+                        sizeof (priv->params_buffer));
+
+  param_alloc_buffers = &pipewire_type->param_alloc_buffers;
+  spa_pod_builder_object (&pod_builder, &object_frame, 0,
+                          param_alloc_buffers->Buffers,
+                          PROP (&prop_frame, param_alloc_buffers->size,
+                                SPA_POD_TYPE_INT,
+                                (priv->video_format.size.width *
+                                 priv->video_format.size.height *
+                                 bpp)),
+                          PROP (&prop_frame, param_alloc_buffers->stride,
+                                SPA_POD_TYPE_INT,
+                                priv->video_format.size.width * bpp),
+                          PROP_U_MM (&prop_frame, param_alloc_buffers->buffers,
+                                     SPA_POD_TYPE_INT,
+                                     16, 2, 16),
+                          PROP (&prop_frame, param_alloc_buffers->align,
+                                SPA_POD_TYPE_INT,
+                                16));
+  params[0] = SPA_POD_BUILDER_DEREF (&pod_builder, object_frame.ref,
+                                     struct spa_param);
+
+  pw_stream_finish_format (priv->pipewire_stream, SPA_RESULT_OK,
+                           params, G_N_ELEMENTS (params));
+}
+
+static const struct pw_stream_events stream_events = {
+  PW_VERSION_STREAM_EVENTS,
+  .state_changed = on_stream_state_changed,
+  .format_changed = on_stream_format_changed,
+};
+
+static struct pw_stream *
+create_pipewire_stream (MetaScreenCastStreamSrc  *src,
+                        GError                  **error)
+{
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+  struct pw_stream *pipewire_stream;
+  const struct spa_format *format;
+  uint8_t buffer[1024];
+  struct spa_pod_builder pod_builder =
+    SPA_POD_BUILDER_INIT (buffer, sizeof (buffer));
+  struct spa_pod_frame format_frame;
+  struct spa_pod_frame prop_frame;
+  MetaSpaType *spa_type = &priv->spa_type;
+  int width, height;
+  float frame_rate;
+  MetaFraction frame_rate_fraction;
+
+  pipewire_stream = pw_stream_new (priv->pipewire_remote,
+                                   "meta-screen-cast-src",
+                                   NULL);
+
+  meta_screen_cast_stream_src_get_specs (src, &width, &height, &frame_rate);
+  frame_rate_fraction = meta_fraction_from_double (frame_rate);
+
+  spa_pod_builder_format (&pod_builder, &format_frame,
+                          spa_type->format,
+                          spa_type->media_type.video,
+                          spa_type->media_subtype.raw,
+                          PROP (&prop_frame,
+                                spa_type->format_video.format,
+                                SPA_POD_TYPE_ID, spa_type->video_format.BGRx),
+                          PROP (&prop_frame,
+                                spa_type->format_video.size,
+                                SPA_POD_TYPE_RECTANGLE,
+                                width, height),
+                          PROP (&prop_frame,
+                                spa_type->format_video.framerate,
+                                SPA_POD_TYPE_FRACTION,
+                                0, 1),
+                          PROP_U_MM (&prop_frame,
+                                     spa_type->format_video.max_framerate,
+                                     SPA_POD_TYPE_FRACTION,
+                                     frame_rate_fraction.num,
+                                     frame_rate_fraction.denom,
+                                     1, 1,
+                                     frame_rate_fraction.num,
+                                     frame_rate_fraction.denom));
+  format = SPA_POD_BUILDER_DEREF (&pod_builder, format_frame.ref, struct spa_format);
+
+  pw_stream_add_listener (pipewire_stream,
+                          &priv->pipewire_stream_listener,
+                          &stream_events,
+                          src);
+
+  if (!pw_stream_connect (pipewire_stream,
+                          PW_DIRECTION_OUTPUT,
+                          PW_STREAM_MODE_BUFFER,
+                          NULL,
+                          PW_STREAM_FLAG_NONE,
+                          1, &format))
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "Could not connect");
+      return NULL;
+    }
+
+  return pipewire_stream;
+}
+
+static void
+on_state_changed (void                 *data,
+                  enum pw_remote_state  old,
+                  enum pw_remote_state  state,
+                  const char           *error_message)
+{
+  MetaScreenCastStreamSrc *src = data;
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+  struct pw_stream *pipewire_stream;
+  GError *error = NULL;
+
+  switch (state)
+    {
+    case PW_REMOTE_STATE_ERROR:
+      g_warning ("pipewire remote error: %s\n", error_message);
+      meta_screen_cast_stream_src_notify_closed (src);
+      break;
+    case PW_REMOTE_STATE_CONNECTED:
+      pipewire_stream = create_pipewire_stream (src, &error);
+      if (!pipewire_stream)
+        {
+          g_warning ("Could not create pipewire stream: %s", error->message);
+          g_error_free (error);
+          meta_screen_cast_stream_src_notify_closed (src);
+        }
+      else
+        {
+          priv->pipewire_stream = pipewire_stream;
+        }
+      break;
+    case PW_REMOTE_STATE_UNCONNECTED:
+    case PW_REMOTE_STATE_CONNECTING:
+      break;
+    }
+}
+
+static gboolean
+pipewire_loop_source_prepare (GSource *base,
+                              int     *timeout)
+{
+  *timeout = -1;
+  return FALSE;
+}
+
+static gboolean
+pipewire_loop_source_dispatch (GSource     *source,
+                               GSourceFunc  callback,
+                               gpointer     user_data)
+{
+  MetaPipeWireSource *pipewire_source = (MetaPipeWireSource *) source;
+  int result;
+
+  result = pw_loop_iterate (pipewire_source->pipewire_loop, 0);
+  if (result == SPA_RESULT_ERRNO)
+    g_warning ("pipewire_loop_iterate failed: %s", strerror (errno));
+  else if (result != SPA_RESULT_OK)
+    g_warning ("pipewire_loop_iterate failed: %d", result);
+
+  return TRUE;
+}
+
+static void
+pipewire_loop_source_finalize (GSource *source)
+{
+  MetaPipeWireSource *pipewire_source = (MetaPipeWireSource *) source;
+
+  pw_loop_leave (pipewire_source->pipewire_loop);
+  pw_loop_destroy (pipewire_source->pipewire_loop);
+}
+
+static GSourceFuncs pipewire_source_funcs =
+{
+  pipewire_loop_source_prepare,
+  NULL,
+  pipewire_loop_source_dispatch,
+  pipewire_loop_source_finalize
+};
+
+static void
+init_spa_type (MetaSpaType         *type,
+               struct spa_type_map *map)
+{
+  type->format = spa_type_map_get_id (map, SPA_TYPE__Format);
+  type->props = spa_type_map_get_id (map, SPA_TYPE__Props);
+  spa_type_meta_map (map, &type->meta);
+  spa_type_data_map (map, &type->data);
+  spa_type_media_type_map (map, &type->media_type);
+  spa_type_media_subtype_map (map, &type->media_subtype);
+  spa_type_format_video_map (map, &type->format_video);
+  spa_type_video_format_map (map, &type->video_format);
+}
+
+static MetaPipeWireSource *
+create_pipewire_source (void)
+{
+  MetaPipeWireSource *pipewire_source;
+
+  pipewire_source =
+    (MetaPipeWireSource *) g_source_new (&pipewire_source_funcs,
+                                         sizeof (MetaPipeWireSource));
+  pipewire_source->pipewire_loop = pw_loop_new (NULL);
+  g_source_add_unix_fd (&pipewire_source->base,
+                        pw_loop_get_fd (pipewire_source->pipewire_loop),
+                        G_IO_IN | G_IO_ERR);
+
+  pw_loop_enter (pipewire_source->pipewire_loop);
+  g_source_attach (&pipewire_source->base, NULL);
+
+  return pipewire_source;
+}
+
+static const struct pw_remote_events remote_events = {
+  PW_VERSION_REMOTE_EVENTS,
+  .state_changed = on_state_changed,
+};
+
+static gboolean
+meta_screen_cast_stream_src_initable_init (GInitable     *initable,
+                                           GCancellable  *cancellable,
+                                           GError       **error)
+{
+  MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (initable);
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+
+  priv->pipewire_source = create_pipewire_source ();
+  priv->pipewire_core = pw_core_new (priv->pipewire_source->pipewire_loop,
+                                     NULL);
+  if (!priv->pipewire_core)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "Failed to create pipewire core");
+      return FALSE;
+    }
+
+#if PIPEWIRE_VERSION_MICRO  == 4
+  priv->pipewire_remote = pw_remote_new (priv->pipewire_core, NULL);
+#elif PIPEWIRE_VERSION_MICRO  >= 5
+  priv->pipewire_remote = pw_remote_new (priv->pipewire_core, NULL, 0);
+#else
+  priv->pipewire_remote = NULL;
+#endif
+  if (!priv->pipewire_remote)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "Couldn't creat pipewire remote");
+      return FALSE;
+    }
+
+  pw_remote_add_listener (priv->pipewire_remote,
+                          &priv->pipewire_remote_listener,
+                          &remote_events,
+                          src);
+
+  priv->pipewire_type = pw_core_get_type (priv->pipewire_core);
+  init_spa_type (&priv->spa_type, priv->pipewire_type->map);
+
+  if (pw_remote_connect (priv->pipewire_remote) != 0)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "Couldn't connect pipewire remote");
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+meta_screen_cast_stream_src_init_initable_iface (GInitableIface *iface)
+{
+  iface->init = meta_screen_cast_stream_src_initable_init;
+}
+
+MetaScreenCastStream *
+meta_screen_cast_stream_src_get_stream (MetaScreenCastStreamSrc *src)
+{
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+
+  return priv->stream;
+}
+
+static void
+meta_screen_cast_stream_src_finalize (GObject *object)
+{
+  MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (object);
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+
+  if (meta_screen_cast_stream_src_is_enabled (src))
+    meta_screen_cast_stream_src_disable (src);
+
+  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);
+}
+
+static void
+meta_screen_cast_stream_src_set_property (GObject      *object,
+                                          guint         prop_id,
+                                          const GValue *value,
+                                          GParamSpec   *pspec)
+{
+  MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (object);
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+
+  switch (prop_id)
+    {
+    case PROP_STREAM:
+      priv->stream = g_value_get_object (value);
+      break;;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_screen_cast_stream_src_get_property (GObject    *object,
+                                          guint       prop_id,
+                                          GValue     *value,
+                                          GParamSpec *pspec)
+{
+  MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (object);
+  MetaScreenCastStreamSrcPrivate *priv =
+    meta_screen_cast_stream_src_get_instance_private (src);
+
+  switch (prop_id)
+    {
+    case PROP_STREAM:
+      g_value_set_object (value, priv->stream);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_screen_cast_stream_src_init (MetaScreenCastStreamSrc *src)
+{
+}
+
+static void
+meta_screen_cast_stream_src_class_init (MetaScreenCastStreamSrcClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_screen_cast_stream_src_finalize;
+  object_class->set_property = meta_screen_cast_stream_src_set_property;
+  object_class->get_property = meta_screen_cast_stream_src_get_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_STREAM,
+                                   g_param_spec_object ("stream",
+                                                        "stream",
+                                                        "MetaScreenCastStream",
+                                                        META_TYPE_SCREEN_CAST_STREAM,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  signals[READY] = g_signal_new ("ready",
+                                 G_TYPE_FROM_CLASS (klass),
+                                 G_SIGNAL_RUN_LAST,
+                                 0,
+                                 NULL, NULL, NULL,
+                                 G_TYPE_NONE, 1,
+                                 G_TYPE_UINT);
+  signals[CLOSED] = g_signal_new ("closed",
+                                  G_TYPE_FROM_CLASS (klass),
+                                  G_SIGNAL_RUN_LAST,
+                                  0,
+                                  NULL, NULL, NULL,
+                                  G_TYPE_NONE, 0);
+}

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

@@ -0,0 +1,56 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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_SCREEN_CAST_STREAM_SRC_H
+#define META_SCREEN_CAST_STREAM_SRC_H
+
+#include <glib-object.h>
+
+#include "clutter/clutter.h"
+
+typedef struct _MetaScreenCastStream MetaScreenCastStream;
+
+#define META_TYPE_SCREEN_CAST_STREAM_SRC (meta_screen_cast_stream_src_get_type ())
+G_DECLARE_DERIVABLE_TYPE (MetaScreenCastStreamSrc,
+                          meta_screen_cast_stream_src,
+                          META, SCREEN_CAST_STREAM_SRC,
+                          GObject)
+
+struct _MetaScreenCastStreamSrcClass
+{
+  GObjectClass parent_class;
+
+  void (* get_specs) (MetaScreenCastStreamSrc *src,
+                      int                     *width,
+                      int                     *height,
+                      float                   *frame_rate);
+  void (* enable) (MetaScreenCastStreamSrc *src);
+  void (* disable) (MetaScreenCastStreamSrc *src);
+  void (* record_frame) (MetaScreenCastStreamSrc *src,
+                         uint8_t                 *data);
+};
+
+void meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src);
+
+MetaScreenCastStream * meta_screen_cast_stream_src_get_stream (MetaScreenCastStreamSrc *src);
+
+#endif /* META_SCREEN_CAST_STREAM_SRC_H */

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

@@ -0,0 +1,261 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 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-screen-cast-stream.h"
+
+#define META_SCREEN_CAST_STREAM_DBUS_PATH "/org/gnome/Mutter/ScreenCast/Stream"
+
+enum
+{
+  PROP_0,
+
+  PROP_CONNECTION,
+};
+
+enum
+{
+  CLOSED,
+
+  N_SIGNALS
+};
+
+static guint signals[N_SIGNALS];
+
+typedef struct _MetaScreenCastStreamPrivate
+{
+  GDBusConnection *connection;
+  char *object_path;
+
+  MetaScreenCastStreamSrc *src;
+} MetaScreenCastStreamPrivate;
+
+static void
+meta_screen_cast_stream_init_initable_iface (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MetaScreenCastStream,
+                         meta_screen_cast_stream,
+                         META_DBUS_TYPE_SCREEN_CAST_STREAM_SKELETON,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                meta_screen_cast_stream_init_initable_iface)
+                         G_ADD_PRIVATE (MetaScreenCastStream))
+
+static MetaScreenCastStreamSrc *
+meta_screen_cast_stream_create_src (MetaScreenCastStream  *stream,
+                                    GError               **error)
+{
+  return META_SCREEN_CAST_STREAM_GET_CLASS (stream)->create_src (stream,
+                                                                 error);
+}
+
+static void
+meta_screen_cast_stream_set_parameters (MetaScreenCastStream *stream,
+                                        GVariantBuilder      *parameters_builder)
+{
+  META_SCREEN_CAST_STREAM_GET_CLASS (stream)->set_parameters (stream,
+                                                              parameters_builder);
+}
+
+static void
+on_stream_src_closed (MetaScreenCastStreamSrc *src,
+                      MetaScreenCastStream    *stream)
+{
+  MetaScreenCastStreamPrivate *priv =
+    meta_screen_cast_stream_get_instance_private (stream);
+
+  if (priv->src)
+    meta_screen_cast_stream_close (stream);
+}
+
+static void
+on_stream_src_ready (MetaScreenCastStreamSrc *src,
+                     uint32_t                 node_id,
+                     MetaScreenCastStream    *stream)
+{
+  MetaDBusScreenCastStream *skeleton = META_DBUS_SCREEN_CAST_STREAM (stream);
+
+  meta_dbus_screen_cast_stream_emit_pipewire_stream_added (skeleton, node_id);
+}
+
+gboolean
+meta_screen_cast_stream_start (MetaScreenCastStream  *stream,
+                               GError               **error)
+{
+  MetaScreenCastStreamPrivate *priv =
+    meta_screen_cast_stream_get_instance_private (stream);
+  MetaScreenCastStreamSrc *src;
+
+  src = meta_screen_cast_stream_create_src (stream, error);
+  if (!src)
+    return FALSE;
+
+  priv->src = src;
+  g_signal_connect (src, "ready", G_CALLBACK (on_stream_src_ready), stream);
+  g_signal_connect (src, "closed", G_CALLBACK (on_stream_src_closed), stream);
+
+  return TRUE;
+}
+
+void
+meta_screen_cast_stream_close (MetaScreenCastStream *stream)
+{
+  MetaScreenCastStreamPrivate *priv =
+    meta_screen_cast_stream_get_instance_private (stream);
+
+  g_clear_object (&priv->src);
+
+  g_signal_emit (stream, signals[CLOSED], 0);
+}
+
+char *
+meta_screen_cast_stream_get_object_path (MetaScreenCastStream *stream)
+{
+  MetaScreenCastStreamPrivate *priv =
+    meta_screen_cast_stream_get_instance_private (stream);
+
+  return priv->object_path;
+}
+
+static void
+meta_screen_cast_stream_set_property (GObject      *object,
+                                      guint         prop_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  MetaScreenCastStream *stream = META_SCREEN_CAST_STREAM (object);
+  MetaScreenCastStreamPrivate *priv =
+    meta_screen_cast_stream_get_instance_private (stream);
+
+  switch (prop_id)
+    {
+    case PROP_CONNECTION:
+      priv->connection = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_screen_cast_stream_get_property (GObject    *object,
+                                      guint       prop_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  MetaScreenCastStream *stream = META_SCREEN_CAST_STREAM (object);
+  MetaScreenCastStreamPrivate *priv =
+    meta_screen_cast_stream_get_instance_private (stream);
+
+  switch (prop_id)
+    {
+    case PROP_CONNECTION:
+      g_value_set_object (value, priv->connection);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_screen_cast_stream_finalize (GObject *object)
+{
+  MetaScreenCastStream *stream = META_SCREEN_CAST_STREAM (object);
+  MetaScreenCastStreamPrivate *priv =
+    meta_screen_cast_stream_get_instance_private (stream);
+
+  if (priv->src)
+    meta_screen_cast_stream_close (stream);
+
+  g_clear_pointer (&priv->object_path, g_free);
+
+  G_OBJECT_CLASS (meta_screen_cast_stream_parent_class)->finalize (object);
+}
+
+static gboolean
+meta_screen_cast_stream_initable_init (GInitable     *initable,
+                                       GCancellable  *cancellable,
+                                       GError       **error)
+{
+  MetaScreenCastStream *stream = META_SCREEN_CAST_STREAM (initable);
+  MetaDBusScreenCastStream *skeleton = META_DBUS_SCREEN_CAST_STREAM (stream);
+  MetaScreenCastStreamPrivate *priv =
+    meta_screen_cast_stream_get_instance_private (stream);
+  GVariantBuilder parameters_builder;
+  GVariant *parameters_variant;
+  static unsigned int global_stream_number = 0;
+
+  g_variant_builder_init (&parameters_builder, G_VARIANT_TYPE_VARDICT);
+  meta_screen_cast_stream_set_parameters (stream, &parameters_builder);
+
+  parameters_variant = g_variant_builder_end (&parameters_builder);
+  meta_dbus_screen_cast_stream_set_parameters (skeleton, parameters_variant);
+
+  priv->object_path =
+    g_strdup_printf (META_SCREEN_CAST_STREAM_DBUS_PATH "/u%u",
+                     ++global_stream_number);
+  if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (stream),
+                                         priv->connection,
+                                         priv->object_path,
+                                         error))
+    return FALSE;
+
+  return TRUE;
+}
+
+static void
+meta_screen_cast_stream_init_initable_iface (GInitableIface *iface)
+{
+  iface->init = meta_screen_cast_stream_initable_init;
+}
+
+static void
+meta_screen_cast_stream_init (MetaScreenCastStream *stream)
+{
+}
+
+static void
+meta_screen_cast_stream_class_init (MetaScreenCastStreamClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_screen_cast_stream_finalize;
+  object_class->set_property = meta_screen_cast_stream_set_property;
+  object_class->get_property = meta_screen_cast_stream_get_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_CONNECTION,
+                                   g_param_spec_object ("connection",
+                                                        "connection",
+                                                        "GDBus connection",
+                                                        G_TYPE_DBUS_CONNECTION,
+                                                        G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  signals[CLOSED] = g_signal_new ("closed",
+                                  G_TYPE_FROM_CLASS (klass),
+                                  G_SIGNAL_RUN_LAST,
+                                  0,
+                                  NULL, NULL, NULL,
+                                  G_TYPE_NONE, 0);
+}

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

@@ -0,0 +1,53 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 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_SCREEN_CAST_STREAM_H
+#define META_SCREEN_CAST_STREAM_H
+
+#include <glib-object.h>
+
+#include "backends/meta-screen-cast-stream-src.h"
+#include "meta-dbus-screen-cast.h"
+
+#define META_TYPE_SCREEN_CAST_STREAM (meta_screen_cast_stream_get_type ())
+G_DECLARE_DERIVABLE_TYPE (MetaScreenCastStream, meta_screen_cast_stream,
+                          META, SCREEN_CAST_STREAM,
+                          MetaDBusScreenCastStreamSkeleton)
+
+struct _MetaScreenCastStreamClass
+{
+  MetaDBusScreenCastStreamSkeletonClass parent_class;
+
+  MetaScreenCastStreamSrc * (* create_src) (MetaScreenCastStream *stream,
+                                            GError              **error);
+  void (* set_parameters) (MetaScreenCastStream *stream,
+                           GVariantBuilder      *parameters_builder);
+};
+
+gboolean meta_screen_cast_stream_start (MetaScreenCastStream *stream,
+                                        GError              **error);
+
+void meta_screen_cast_stream_close (MetaScreenCastStream *stream);
+
+char * meta_screen_cast_stream_get_object_path (MetaScreenCastStream *stream);
+
+#endif /* META_SCREEN_CAST_STREAM_H */

src/backends/meta-screen-cast.c

@@ -0,0 +1,276 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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-screen-cast.h"
+
+#include <pipewire/pipewire.h>
+
+#include "backends/meta-backend-private.h"
+#include "backends/meta-screen-cast-session.h"
+#include "backends/meta-remote-desktop-session.h"
+
+#define META_SCREEN_CAST_DBUS_SERVICE "org.gnome.Mutter.ScreenCast"
+#define META_SCREEN_CAST_DBUS_PATH "/org/gnome/Mutter/ScreenCast"
+
+struct _MetaScreenCast
+{
+  MetaDBusScreenCastSkeleton parent;
+
+  int dbus_name_id;
+
+  GList *sessions;
+
+  MetaDbusSessionWatcher *session_watcher;
+};
+
+static void
+meta_screen_cast_init_iface (MetaDBusScreenCastIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MetaScreenCast, meta_screen_cast,
+                         META_DBUS_TYPE_SCREEN_CAST_SKELETON,
+                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_SCREEN_CAST,
+                                                meta_screen_cast_init_iface))
+
+GDBusConnection *
+meta_screen_cast_get_connection (MetaScreenCast *screen_cast)
+{
+  GDBusInterfaceSkeleton *interface_skeleton =
+    G_DBUS_INTERFACE_SKELETON (screen_cast);
+
+  return g_dbus_interface_skeleton_get_connection (interface_skeleton);
+}
+
+static gboolean
+register_remote_desktop_screen_cast_session (MetaScreenCastSession  *session,
+                                             const char             *remote_desktop_session_id,
+                                             GError                **error)
+{
+  MetaBackend *backend = meta_get_backend ();
+  MetaRemoteDesktop *remote_desktop = meta_backend_get_remote_desktop (backend);
+  MetaRemoteDesktopSession *remote_desktop_session;
+
+  remote_desktop_session =
+    meta_remote_desktop_get_session (remote_desktop, remote_desktop_session_id);
+  if (!remote_desktop_session)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "No remote desktop session found");
+      return FALSE;
+    }
+
+  if (!meta_remote_desktop_session_register_screen_cast (remote_desktop_session,
+                                                         session,
+                                                         error))
+    return FALSE;
+
+  return TRUE;
+}
+
+static void
+on_session_closed (MetaScreenCastSession *session,
+                   MetaScreenCast        *screen_cast)
+{
+  screen_cast->sessions = g_list_remove (screen_cast->sessions, session);
+}
+
+static gboolean
+handle_create_session (MetaDBusScreenCast    *skeleton,
+                       GDBusMethodInvocation *invocation,
+                       GVariant              *properties)
+{
+  MetaScreenCast *screen_cast = META_SCREEN_CAST (skeleton);
+  const char *peer_name;
+  MetaScreenCastSession *session;
+  GError *error = NULL;
+  const char *session_path;
+  const char *client_dbus_name;
+  char *remote_desktop_session_id = NULL;
+  MetaScreenCastSessionType session_type;
+
+  g_variant_lookup (properties, "remote-desktop-session-id", "s",
+                    &remote_desktop_session_id);
+
+  if (remote_desktop_session_id)
+    session_type = META_SCREEN_CAST_SESSION_TYPE_REMOTE_DESKTOP;
+  else
+    session_type = META_SCREEN_CAST_SESSION_TYPE_NORMAL;
+
+  peer_name = g_dbus_method_invocation_get_sender (invocation);
+  session = meta_screen_cast_session_new (screen_cast,
+                                          session_type,
+                                          peer_name,
+                                          &error);
+  if (!session)
+    {
+      g_warning ("Failed to create screen cast session: %s",
+                 error->message);
+
+      g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                             G_DBUS_ERROR_FAILED,
+                                             "Failed to create session: %s",
+                                             error->message);
+      g_error_free (error);
+
+      return TRUE;
+    }
+
+  if (remote_desktop_session_id)
+    {
+      if (!register_remote_desktop_screen_cast_session (session,
+                                                        remote_desktop_session_id,
+                                                        &error))
+        {
+          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
+                                                 G_DBUS_ERROR_FAILED,
+                                                 "%s", error->message);
+          g_error_free (error);
+          g_object_unref (session);
+          return TRUE;
+        }
+    }
+
+  client_dbus_name = g_dbus_method_invocation_get_sender (invocation);
+  meta_dbus_session_watcher_watch_session (screen_cast->session_watcher,
+                                           client_dbus_name,
+                                           META_DBUS_SESSION (session));
+
+  session_path = meta_screen_cast_session_get_object_path (session);
+  meta_dbus_screen_cast_complete_create_session (skeleton,
+                                                 invocation,
+                                                 session_path);
+
+  screen_cast->sessions = g_list_append (screen_cast->sessions, session);
+
+  g_signal_connect (session, "session-closed",
+                    G_CALLBACK (on_session_closed),
+                    screen_cast);
+
+  return TRUE;
+}
+
+static void
+meta_screen_cast_init_iface (MetaDBusScreenCastIface *iface)
+{
+  iface->handle_create_session = handle_create_session;
+}
+
+static void
+on_bus_acquired (GDBusConnection *connection,
+                 const char      *name,
+                 gpointer         user_data)
+{
+  MetaScreenCast *screen_cast = user_data;
+  GDBusInterfaceSkeleton *interface_skeleton =
+    G_DBUS_INTERFACE_SKELETON (screen_cast);
+  GError *error = NULL;
+
+  if (!g_dbus_interface_skeleton_export (interface_skeleton,
+                                         connection,
+                                         META_SCREEN_CAST_DBUS_PATH,
+                                         &error))
+    g_warning ("Failed to export remote desktop object: %s\n", error->message);
+}
+
+static void
+on_name_acquired (GDBusConnection *connection,
+                  const char      *name,
+                  gpointer         user_data)
+{
+  g_info ("Acquired name %s\n", name);
+}
+
+static void
+on_name_lost (GDBusConnection *connection,
+              const char      *name,
+              gpointer         user_data)
+{
+  g_warning ("Lost or failed to acquire name %s\n", name);
+}
+
+static void
+meta_screen_cast_constructed (GObject *object)
+{
+  MetaScreenCast *screen_cast = META_SCREEN_CAST (object);
+
+  screen_cast->dbus_name_id =
+    g_bus_own_name (G_BUS_TYPE_SESSION,
+                    META_SCREEN_CAST_DBUS_SERVICE,
+                    G_BUS_NAME_OWNER_FLAGS_NONE,
+                    on_bus_acquired,
+                    on_name_acquired,
+                    on_name_lost,
+                    screen_cast,
+                    NULL);
+}
+
+static void
+meta_screen_cast_finalize (GObject *object)
+{
+  MetaScreenCast *screen_cast = META_SCREEN_CAST (object);
+
+  if (screen_cast->dbus_name_id)
+    g_bus_unown_name (screen_cast->dbus_name_id);
+
+  while (screen_cast->sessions)
+    {
+      MetaScreenCastSession *session = screen_cast->sessions->data;
+
+      meta_screen_cast_session_close (session);
+    }
+
+  G_OBJECT_CLASS (meta_screen_cast_parent_class)->finalize (object);
+}
+
+MetaScreenCast *
+meta_screen_cast_new (MetaDbusSessionWatcher *session_watcher)
+{
+  MetaScreenCast *screen_cast;
+
+  screen_cast = g_object_new (META_TYPE_SCREEN_CAST, NULL);
+  screen_cast->session_watcher = session_watcher;
+
+  return screen_cast;
+}
+
+
+static void
+meta_screen_cast_init (MetaScreenCast *screen_cast)
+{
+  static gboolean is_pipewire_initialized = FALSE;
+
+  if (!is_pipewire_initialized)
+    {
+      pw_init (NULL, NULL);
+      is_pipewire_initialized = TRUE;
+    }
+}
+
+static void
+meta_screen_cast_class_init (MetaScreenCastClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructed = meta_screen_cast_constructed;
+  object_class->finalize = meta_screen_cast_finalize;
+}

src/backends/meta-screen-cast.h

@@ -0,0 +1,40 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 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_SCREEN_CAST_H
+#define META_SCREEN_CAST_H
+
+#include <glib-object.h>
+
+#include "backends/meta-dbus-session-watcher.h"
+#include "meta-dbus-screen-cast.h"
+
+#define META_TYPE_SCREEN_CAST (meta_screen_cast_get_type ())
+G_DECLARE_FINAL_TYPE (MetaScreenCast, meta_screen_cast,
+                      META, SCREEN_CAST,
+                      MetaDBusScreenCastSkeleton)
+
+GDBusConnection * meta_screen_cast_get_connection (MetaScreenCast *screen_cast);
+
+MetaScreenCast * meta_screen_cast_new (MetaDbusSessionWatcher *session_watcher);
+
+#endif /* META_SCREEN_CAST_H */

src/backends/meta-settings-private.h

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

src/backends/meta-settings.c

@@ -67,23 +67,14 @@ calculate_ui_scaling_factor (MetaSettings *settings)
 {
   MetaMonitorManager *monitor_manager =
     meta_backend_get_monitor_manager (settings->backend);
-  GList *logical_monitors;
-  GList *l;
-  float max_scale = 1.0;
+  MetaLogicalMonitor *primary_logical_monitor;
 
-  logical_monitors =
-    meta_monitor_manager_get_logical_monitors (monitor_manager);
-  for (l = logical_monitors; l; l = l->next)
-    {
-      MetaLogicalMonitor *logical_monitor = l->data;
+  primary_logical_monitor =
+    meta_monitor_manager_get_primary_logical_monitor (monitor_manager);
+  if (!primary_logical_monitor)
+    return 1;
 
-      max_scale = MAX (meta_logical_monitor_get_scale (logical_monitor),
-                       max_scale);
-    }
-
-  g_warn_if_fail (fmodf (max_scale, 1.0) == 0.0);
-
-  return (int) max_scale;
+  return (int) meta_logical_monitor_get_scale (primary_logical_monitor);
 }
 
 static gboolean
@@ -262,6 +253,10 @@ experimental_features_handler (GVariant *features_variant,
       /* 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
         g_info ("Unknown experimental feature '%s'\n", feature);
     }
@@ -348,11 +343,25 @@ meta_settings_init (MetaSettings *settings)
   update_experimental_features (settings);
 }
 
+static void
+on_monitors_changed (MetaMonitorManager *monitor_manager,
+                     MetaSettings       *settings)
+{
+  meta_settings_update_ui_scaling_factor (settings);
+}
+
 void
 meta_settings_post_init (MetaSettings *settings)
 {
+  MetaMonitorManager *monitor_manager =
+    meta_backend_get_monitor_manager (settings->backend);
+
   update_ui_scaling_factor (settings);
   update_font_dpi (settings);
+
+  g_signal_connect_object (monitor_manager, "monitors-changed-internal",
+                           G_CALLBACK (on_monitors_changed),
+                           settings, G_CONNECT_AFTER);
 }
 
 static void

src/backends/native/gen-default-modes.py

@@ -51,7 +51,7 @@ common_resolutions = [
 
 output_lines = [
     "/* Generated by gen-default-modes.py */\n",
-    "const drmModeModeInfo meta_default_drm_mode_infos[] = {",
+    "static const drmModeModeInfo meta_default_drm_mode_infos[] = {",
 ]
 
 def sync_flags(hsync, vsync):

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

@@ -67,7 +67,15 @@ struct _MetaBackendNativePrivate
 };
 typedef struct _MetaBackendNativePrivate MetaBackendNativePrivate;
 
-G_DEFINE_TYPE_WITH_PRIVATE (MetaBackendNative, meta_backend_native, META_TYPE_BACKEND);
+static GInitableIface *initable_parent_iface;
+
+static void
+initable_iface_init (GInitableIface *initable_iface);
+
+G_DEFINE_TYPE_WITH_CODE (MetaBackendNative, meta_backend_native, META_TYPE_BACKEND,
+                         G_ADD_PRIVATE (MetaBackendNative)
+                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+                                                initable_iface_init))
 
 static void
 meta_backend_native_finalize (GObject *object)
@@ -400,37 +408,33 @@ meta_backend_native_create_idle_monitor (MetaBackend *backend,
 }
 
 static MetaMonitorManager *
-meta_backend_native_create_monitor_manager (MetaBackend *backend)
+meta_backend_native_create_monitor_manager (MetaBackend *backend,
+                                            GError     **error)
 {
-  return g_object_new (META_TYPE_MONITOR_MANAGER_KMS, NULL);
+  return g_initable_new (META_TYPE_MONITOR_MANAGER_KMS, NULL, error,
+                         "backend", backend,
+                         NULL);
 }
 
 static MetaCursorRenderer *
 meta_backend_native_create_cursor_renderer (MetaBackend *backend)
 {
-  return g_object_new (META_TYPE_CURSOR_RENDERER_NATIVE, NULL);
+  return META_CURSOR_RENDERER (meta_cursor_renderer_native_new (backend));
 }
 
 static MetaRenderer *
-meta_backend_native_create_renderer (MetaBackend *backend)
+meta_backend_native_create_renderer (MetaBackend *backend,
+                                     GError     **error)
 {
-  MetaBackendNative *native = META_BACKEND_NATIVE (backend);
-  MetaBackendNativePrivate *priv =
-    meta_backend_native_get_instance_private (native);
-  int kms_fd;
-  const char *kms_file_path;
-  GError *error = NULL;
+  MetaMonitorManager *monitor_manager =
+    meta_backend_get_monitor_manager (backend);
+  MetaMonitorManagerKms *monitor_manager_kms =
+    META_MONITOR_MANAGER_KMS (monitor_manager);
   MetaRendererNative *renderer_native;
 
-  kms_fd = meta_launcher_get_kms_fd (priv->launcher);
-  kms_file_path = meta_launcher_get_kms_file_path (priv->launcher);
-  renderer_native = meta_renderer_native_new (kms_fd, kms_file_path, &error);
+  renderer_native = meta_renderer_native_new (monitor_manager_kms, error);
   if (!renderer_native)
-    {
-      meta_warning ("Failed to create renderer: %s\n", error->message);
-      g_error_free (error);
-      return NULL;
-    }
+    return NULL;
 
   return META_RENDERER (renderer_native);
 }
@@ -560,14 +564,34 @@ meta_backend_native_update_screen_size (MetaBackend *backend,
   ClutterActor *stage = meta_backend_get_stage (backend);
 
   stage_native = meta_clutter_backend_native_get_stage_native (clutter_backend);
-  if (meta_is_stage_views_enabled ())
-    meta_stage_native_rebuild_views (stage_native);
-  else
-    meta_stage_native_legacy_set_size (stage_native, width, height);
+  meta_stage_native_rebuild_views (stage_native);
 
   clutter_actor_set_size (stage, width, height);
 }
 
+static gboolean
+meta_backend_native_initable_init (GInitable     *initable,
+                                   GCancellable  *cancellable,
+                                   GError       **error)
+{
+  if (!meta_is_stage_views_enabled ())
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "The native backend requires stage views");
+      return FALSE;
+    }
+
+  return initable_parent_iface->init (initable, cancellable, error);
+}
+
+static void
+initable_iface_init (GInitableIface *initable_iface)
+{
+  initable_parent_iface = g_type_interface_peek_parent (initable_iface);
+
+  initable_iface->init = meta_backend_native_initable_init;
+}
+
 static void
 meta_backend_native_class_init (MetaBackendNativeClass *klass)
 {
@@ -625,14 +649,23 @@ meta_backend_native_init (MetaBackendNative *native)
              native);
 }
 
+MetaLauncher *
+meta_backend_native_get_launcher (MetaBackendNative *native)
+{
+  MetaBackendNativePrivate *priv =
+    meta_backend_native_get_instance_private (native);
+
+  return priv->launcher;
+}
+
 gboolean
 meta_activate_vt (int vt, GError **error)
 {
   MetaBackend *backend = meta_get_backend ();
   MetaBackendNative *native = META_BACKEND_NATIVE (backend);
-  MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
+  MetaLauncher *launcher = meta_backend_native_get_launcher (native);
 
-  return meta_launcher_activate_vt (priv->launcher, vt, error);
+  return meta_launcher_activate_vt (launcher, vt, error);
 }
 
 MetaBarrierManagerNative *
@@ -682,14 +715,11 @@ meta_backend_native_pause (MetaBackendNative *native)
     meta_backend_get_monitor_manager (backend);
   MetaMonitorManagerKms *monitor_manager_kms =
     META_MONITOR_MANAGER_KMS (monitor_manager);
-  MetaRendererNative *renderer_native =
-    META_RENDERER_NATIVE (meta_backend_get_renderer (backend));
 
   clutter_evdev_release_devices ();
   clutter_egl_freeze_master_clock ();
 
   meta_monitor_manager_kms_pause (monitor_manager_kms);
-  meta_renderer_native_pause (renderer_native);
 }
 
 void meta_backend_native_resume (MetaBackendNative *native)

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

@@ -27,6 +27,7 @@
 
 #include "backends/meta-backend-private.h"
 #include "backends/native/meta-clutter-backend-native.h"
+#include "backends/native/meta-launcher.h"
 
 #define META_TYPE_BACKEND_NATIVE (meta_backend_native_get_type ())
 G_DECLARE_FINAL_TYPE (MetaBackendNative, meta_backend_native,
@@ -38,4 +39,6 @@ void meta_backend_native_pause (MetaBackendNative *backend_native);
 
 void meta_backend_native_resume (MetaBackendNative *backend_native);
 
+MetaLauncher * meta_backend_native_get_launcher (MetaBackendNative *native);
+
 #endif /* META_BACKEND_NATIVE_H */

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

@@ -0,0 +1,363 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2013-2017 Red Hat
+ *
+ * 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/native/meta-crtc-kms.h"
+
+#include "backends/meta-backend-private.h"
+#include "backends/native/meta-gpu-kms.h"
+
+#define ALL_TRANSFORMS (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)
+#define ALL_TRANSFORMS_MASK ((1 << ALL_TRANSFORMS) - 1)
+
+typedef struct _MetaCrtcKms
+{
+  unsigned int index;
+  uint32_t underscan_prop_id;
+  uint32_t underscan_hborder_prop_id;
+  uint32_t underscan_vborder_prop_id;
+  uint32_t primary_plane_id;
+  uint32_t rotation_prop_id;
+  uint32_t rotation_map[ALL_TRANSFORMS];
+  uint32_t all_hw_transforms;
+} MetaCrtcKms;
+
+gboolean
+meta_crtc_kms_is_transform_handled (MetaCrtc             *crtc,
+                                    MetaMonitorTransform  transform)
+{
+  MetaCrtcKms *crtc_kms = crtc->driver_private;
+
+  if ((1 << transform) & crtc_kms->all_hw_transforms)
+    return TRUE;
+  else
+    return FALSE;
+}
+
+void
+meta_crtc_kms_apply_transform (MetaCrtc *crtc)
+{
+  MetaCrtcKms *crtc_kms = crtc->driver_private;
+  MetaGpu *gpu = meta_crtc_get_gpu (crtc);
+  MetaGpuKms *gpu_kms = META_GPU_KMS (gpu);
+  int kms_fd;
+  MetaMonitorTransform hw_transform;
+
+  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
+
+  if (crtc_kms->all_hw_transforms & (1 << crtc->transform))
+    hw_transform = crtc->transform;
+  else
+    hw_transform = META_MONITOR_TRANSFORM_NORMAL;
+
+  if (!meta_crtc_kms_is_transform_handled (crtc, META_MONITOR_TRANSFORM_NORMAL))
+    return;
+
+  if (drmModeObjectSetProperty (kms_fd,
+                                crtc_kms->primary_plane_id,
+                                DRM_MODE_OBJECT_PLANE,
+                                crtc_kms->rotation_prop_id,
+                                crtc_kms->rotation_map[hw_transform]) != 0)
+    {
+      g_warning ("Failed to apply DRM plane transform %d: %m", hw_transform);
+
+      /*
+       * Blacklist this HW transform, we want to fallback to our
+       * fallbacks in this case.
+       */
+      crtc_kms->all_hw_transforms &= ~(1 << hw_transform);
+    }
+}
+
+void
+meta_crtc_kms_set_underscan (MetaCrtc *crtc,
+                             gboolean  is_underscanning)
+{
+  MetaCrtcKms *crtc_kms = crtc->driver_private;
+  MetaGpu *gpu = meta_crtc_get_gpu (crtc);
+  MetaGpuKms *gpu_kms = META_GPU_KMS (gpu);
+  int kms_fd;
+
+  if (!crtc_kms->underscan_prop_id)
+    return;
+
+  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
+
+  if (is_underscanning)
+    {
+      drmModeObjectSetProperty (kms_fd, crtc->crtc_id,
+                                DRM_MODE_OBJECT_CRTC,
+                                crtc_kms->underscan_prop_id, (uint64_t) 1);
+
+      if (crtc_kms->underscan_hborder_prop_id)
+        {
+          uint64_t value;
+
+          value = crtc->current_mode->width * 0.05;
+          drmModeObjectSetProperty (kms_fd, crtc->crtc_id,
+                                    DRM_MODE_OBJECT_CRTC,
+                                    crtc_kms->underscan_hborder_prop_id, value);
+        }
+      if (crtc_kms->underscan_vborder_prop_id)
+        {
+          uint64_t value;
+
+          value = crtc->current_mode->height * 0.05;
+          drmModeObjectSetProperty (kms_fd, crtc->crtc_id,
+                                    DRM_MODE_OBJECT_CRTC,
+                                    crtc_kms->underscan_vborder_prop_id, value);
+        }
+
+    }
+  else
+    {
+      drmModeObjectSetProperty (kms_fd, crtc->crtc_id,
+                                DRM_MODE_OBJECT_CRTC,
+                                crtc_kms->underscan_prop_id, (uint64_t) 0);
+    }
+}
+
+static int
+find_property_index (MetaGpu                    *gpu,
+                     drmModeObjectPropertiesPtr  props,
+                     const char                 *prop_name,
+                     drmModePropertyPtr         *out_prop)
+{
+  MetaGpuKms *gpu_kms = META_GPU_KMS (gpu);
+  int kms_fd;
+  unsigned int i;
+
+  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
+
+  for (i = 0; i < props->count_props; i++)
+    {
+      drmModePropertyPtr prop;
+
+      prop = drmModeGetProperty (kms_fd, props->props[i]);
+      if (!prop)
+        continue;
+
+      if (strcmp (prop->name, prop_name) == 0)
+        {
+          *out_prop = prop;
+          return i;
+        }
+
+      drmModeFreeProperty (prop);
+    }
+
+  return -1;
+}
+
+static void
+parse_transforms (MetaCrtc          *crtc,
+                  drmModePropertyPtr prop)
+{
+  MetaCrtcKms *crtc_kms = crtc->driver_private;
+  int i;
+
+  for (i = 0; i < prop->count_enums; i++)
+    {
+      int transform = -1;
+
+      if (strcmp (prop->enums[i].name, "rotate-0") == 0)
+        transform = META_MONITOR_TRANSFORM_NORMAL;
+      else if (strcmp (prop->enums[i].name, "rotate-90") == 0)
+        transform = META_MONITOR_TRANSFORM_90;
+      else if (strcmp (prop->enums[i].name, "rotate-180") == 0)
+        transform = META_MONITOR_TRANSFORM_180;
+      else if (strcmp (prop->enums[i].name, "rotate-270") == 0)
+        transform = META_MONITOR_TRANSFORM_270;
+
+      if (transform != -1)
+        {
+          crtc_kms->all_hw_transforms |= 1 << transform;
+          crtc_kms->rotation_map[transform] = 1 << prop->enums[i].value;
+        }
+    }
+}
+
+static gboolean
+is_primary_plane (MetaGpu                   *gpu,
+                  drmModeObjectPropertiesPtr props)
+{
+  drmModePropertyPtr prop;
+  int idx;
+
+  idx = find_property_index (gpu, props, "type", &prop);
+  if (idx < 0)
+    return FALSE;
+
+  drmModeFreeProperty (prop);
+  return props->prop_values[idx] == DRM_PLANE_TYPE_PRIMARY;
+}
+
+static void
+init_crtc_rotations (MetaCrtc *crtc,
+                     MetaGpu  *gpu)
+{
+  MetaCrtcKms *crtc_kms = crtc->driver_private;
+  MetaGpuKms *gpu_kms = META_GPU_KMS (gpu);
+  int kms_fd;
+  drmModeObjectPropertiesPtr props;
+  drmModePlaneRes *planes;
+  drmModePlane *drm_plane;
+  unsigned int i;
+
+  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
+
+  planes = drmModeGetPlaneResources (kms_fd);
+  if (planes == NULL)
+    return;
+
+  for (i = 0; i < planes->count_planes; i++)
+    {
+      drmModePropertyPtr prop;
+
+      drm_plane = drmModeGetPlane (kms_fd, planes->planes[i]);
+
+      if (!drm_plane)
+        continue;
+
+      if ((drm_plane->possible_crtcs & (1 << crtc_kms->index)))
+        {
+          props = drmModeObjectGetProperties (kms_fd,
+                                              drm_plane->plane_id,
+                                              DRM_MODE_OBJECT_PLANE);
+
+          if (props && is_primary_plane (gpu, props))
+            {
+              int rotation_idx;
+
+              crtc_kms->primary_plane_id = drm_plane->plane_id;
+              rotation_idx = find_property_index (gpu, props,
+                                                  "rotation", &prop);
+              if (rotation_idx >= 0)
+                {
+                  crtc_kms->rotation_prop_id = props->props[rotation_idx];
+                  parse_transforms (crtc, prop);
+                  drmModeFreeProperty (prop);
+                }
+            }
+
+          if (props)
+            drmModeFreeObjectProperties (props);
+        }
+
+      drmModeFreePlane (drm_plane);
+    }
+
+  crtc->all_transforms |= crtc_kms->all_hw_transforms;
+
+  drmModeFreePlaneResources (planes);
+}
+
+static void
+find_crtc_properties (MetaCrtc   *crtc,
+                      MetaGpuKms *gpu_kms)
+{
+  MetaCrtcKms *crtc_kms = crtc->driver_private;
+  int kms_fd;
+  drmModeObjectPropertiesPtr props;
+  unsigned int i;
+
+  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
+  props = drmModeObjectGetProperties (kms_fd, crtc->crtc_id,
+                                      DRM_MODE_OBJECT_CRTC);
+  if (!props)
+    return;
+
+  for (i = 0; i < props->count_props; i++)
+    {
+      drmModePropertyPtr prop = drmModeGetProperty (kms_fd, props->props[i]);
+      if (!prop)
+        continue;
+
+      if ((prop->flags & DRM_MODE_PROP_ENUM) &&
+          strcmp (prop->name, "underscan") == 0)
+        crtc_kms->underscan_prop_id = prop->prop_id;
+      else if ((prop->flags & DRM_MODE_PROP_RANGE) &&
+               strcmp (prop->name, "underscan hborder") == 0)
+        crtc_kms->underscan_hborder_prop_id = prop->prop_id;
+      else if ((prop->flags & DRM_MODE_PROP_RANGE) &&
+               strcmp (prop->name, "underscan vborder") == 0)
+        crtc_kms->underscan_vborder_prop_id = prop->prop_id;
+
+      drmModeFreeProperty (prop);
+    }
+}
+
+static void
+meta_crtc_destroy_notify (MetaCrtc *crtc)
+{
+  g_free (crtc->driver_private);
+}
+
+MetaCrtc *
+meta_create_kms_crtc (MetaGpuKms   *gpu_kms,
+                      drmModeCrtc  *drm_crtc,
+                      unsigned int  crtc_index)
+{
+  MetaGpu *gpu = META_GPU (gpu_kms);
+  MetaCrtc *crtc;
+  MetaCrtcKms *crtc_kms;
+
+  crtc = g_object_new (META_TYPE_CRTC, NULL);
+
+  crtc->gpu = gpu;
+  crtc->crtc_id = drm_crtc->crtc_id;
+  crtc->rect.x = drm_crtc->x;
+  crtc->rect.y = drm_crtc->y;
+  crtc->rect.width = drm_crtc->width;
+  crtc->rect.height = drm_crtc->height;
+  crtc->is_dirty = FALSE;
+  crtc->transform = META_MONITOR_TRANSFORM_NORMAL;
+  crtc->all_transforms = meta_is_stage_views_enabled () ?
+    ALL_TRANSFORMS_MASK : META_MONITOR_TRANSFORM_NORMAL;
+
+  if (drm_crtc->mode_valid)
+    {
+      GList *l;
+
+      for (l = meta_gpu_get_modes (gpu); l; l = l->next)
+        {
+          MetaCrtcMode *mode = l->data;
+
+          if (meta_drm_mode_equal (&drm_crtc->mode, mode->driver_private))
+            {
+              crtc->current_mode = mode;
+              break;
+            }
+        }
+    }
+
+  crtc_kms = g_new0 (MetaCrtcKms, 1);
+  crtc_kms->index = crtc_index;
+
+  crtc->driver_private = crtc_kms;
+  crtc->driver_notify = (GDestroyNotify) meta_crtc_destroy_notify;
+
+  find_crtc_properties (crtc, gpu_kms);
+  init_crtc_rotations (crtc, gpu);
+
+  return crtc;
+}

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

@@ -0,0 +1,44 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 Red Hat
+ *
+ * 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_CRTC_KMS_H
+#define META_CRTC_KMS_H
+
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+
+#include "backends/meta-crtc.h"
+#include "backends/meta-gpu.h"
+#include "backends/native/meta-gpu-kms.h"
+
+gboolean meta_crtc_kms_is_transform_handled (MetaCrtc             *crtc,
+                                             MetaMonitorTransform  transform);
+
+void meta_crtc_kms_apply_transform (MetaCrtc *crtc);
+
+void meta_crtc_kms_set_underscan (MetaCrtc *crtc,
+                                  gboolean  is_underscanning);
+
+MetaCrtc * meta_create_kms_crtc (MetaGpuKms   *gpu_kms,
+                                 drmModeCrtc  *drm_crtc,
+                                 unsigned int  crtc_index);
+
+#endif /* META_CRTC_KMS_H */

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

@@ -38,6 +38,7 @@
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor.h"
 #include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-output.h"
 #include "backends/native/meta-renderer-native.h"
 #include "core/boxes-private.h"
 #include "meta/boxes.h"
@@ -64,22 +65,30 @@
 
 static GQuark quark_cursor_sprite = 0;
 
+struct _MetaCursorRendererNative
+{
+  MetaCursorRenderer parent;
+};
+
 struct _MetaCursorRendererNativePrivate
 {
+  MetaMonitorManager *monitor_manager;
+
   gboolean hw_state_invalidated;
   gboolean has_hw_cursor;
-  gboolean hw_cursor_broken;
 
   MetaCursorSprite *last_cursor;
   guint animation_timeout_id;
+};
+typedef struct _MetaCursorRendererNativePrivate MetaCursorRendererNativePrivate;
 
-  int drm_fd;
-  struct gbm_device *gbm;
+typedef struct _MetaCursorRendererNativeGpuData
+{
+  gboolean hw_cursor_broken;
 
   uint64_t cursor_width;
   uint64_t cursor_height;
-};
-typedef struct _MetaCursorRendererNativePrivate MetaCursorRendererNativePrivate;
+} MetaCursorRendererNativeGpuData;
 
 typedef enum _MetaCursorGbmBoState
 {
@@ -88,18 +97,57 @@ typedef enum _MetaCursorGbmBoState
   META_CURSOR_GBM_BO_STATE_INVALIDATED,
 } MetaCursorGbmBoState;
 
-typedef struct _MetaCursorNativePrivate
+typedef struct _MetaCursorNativeGpuState
 {
   guint active_bo;
   MetaCursorGbmBoState pending_bo_state;
   struct gbm_bo *bos[HW_CURSOR_BUFFER_COUNT];
+} MetaCursorNativeGpuState;
+
+typedef struct _MetaCursorNativePrivate
+{
+  GHashTable *gpu_states;
 } MetaCursorNativePrivate;
 
+static GQuark quark_cursor_renderer_native_gpu_data = 0;
+
 G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRendererNative, meta_cursor_renderer_native, META_TYPE_CURSOR_RENDERER);
 
+static MetaCursorNativeGpuState *
+get_cursor_gpu_state (MetaCursorNativePrivate *cursor_priv,
+                      MetaGpuKms              *gpu_kms);
+
+static MetaCursorNativeGpuState *
+ensure_cursor_gpu_state (MetaCursorNativePrivate *cursor_priv,
+                         MetaGpuKms              *gpu_kms);
+
 static MetaCursorNativePrivate *
 ensure_cursor_priv (MetaCursorSprite *cursor_sprite);
 
+static MetaCursorNativePrivate *
+get_cursor_priv (MetaCursorSprite *cursor_sprite);
+
+static MetaCursorRendererNativeGpuData *
+meta_cursor_renderer_native_gpu_data_from_gpu (MetaGpuKms *gpu_kms)
+{
+  return g_object_get_qdata (G_OBJECT (gpu_kms),
+                             quark_cursor_renderer_native_gpu_data);
+}
+
+static MetaCursorRendererNativeGpuData *
+meta_create_cursor_renderer_native_gpu_data (MetaGpuKms *gpu_kms)
+{
+  MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
+
+  cursor_renderer_gpu_data = g_new0 (MetaCursorRendererNativeGpuData, 1);
+  g_object_set_qdata_full (G_OBJECT (gpu_kms),
+                           quark_cursor_renderer_native_gpu_data,
+                           cursor_renderer_gpu_data,
+                           g_free);
+
+  return cursor_renderer_gpu_data;
+}
+
 static void
 meta_cursor_renderer_native_finalize (GObject *object)
 {
@@ -113,52 +161,41 @@ meta_cursor_renderer_native_finalize (GObject *object)
 }
 
 static guint
-get_pending_cursor_sprite_gbm_bo_index (MetaCursorSprite *cursor_sprite)
+get_pending_cursor_sprite_gbm_bo_index (MetaCursorNativeGpuState *cursor_gpu_state)
 {
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
-
-  return (cursor_priv->active_bo + 1) % HW_CURSOR_BUFFER_COUNT;
+  return (cursor_gpu_state->active_bo + 1) % HW_CURSOR_BUFFER_COUNT;
 }
 
 static struct gbm_bo *
-get_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
+get_pending_cursor_sprite_gbm_bo (MetaCursorNativeGpuState *cursor_gpu_state)
 {
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
   guint pending_bo;
 
-  if (!cursor_priv)
-    return NULL;
-
-  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_sprite);
-  return cursor_priv->bos[pending_bo];
+  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_gpu_state);
+  return cursor_gpu_state->bos[pending_bo];
 }
 
 static struct gbm_bo *
-get_active_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
+get_active_cursor_sprite_gbm_bo (MetaCursorNativeGpuState *cursor_gpu_state)
 {
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
-
-  if (!cursor_priv)
-    return NULL;
-
-  return cursor_priv->bos[cursor_priv->active_bo];
+  return cursor_gpu_state->bos[cursor_gpu_state->active_bo];
 }
 
 static void
 set_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite,
+                                  MetaGpuKms       *gpu_kms,
                                   struct gbm_bo    *bo)
 {
   MetaCursorNativePrivate *cursor_priv;
+  MetaCursorNativeGpuState *cursor_gpu_state;
   guint pending_bo;
 
   cursor_priv = ensure_cursor_priv (cursor_sprite);
+  cursor_gpu_state = ensure_cursor_gpu_state (cursor_priv, gpu_kms);
 
-  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_sprite);
-  cursor_priv->bos[pending_bo] = bo;
-  cursor_priv->pending_bo_state = META_CURSOR_GBM_BO_STATE_SET;
+  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_gpu_state);
+  cursor_gpu_state->bos[pending_bo] = bo;
+  cursor_gpu_state->pending_bo_state = META_CURSOR_GBM_BO_STATE_SET;
 }
 
 static void
@@ -167,19 +204,30 @@ set_crtc_cursor (MetaCursorRendererNative *native,
                  MetaCursorSprite         *cursor_sprite)
 {
   MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+  MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
+  MetaGpuKms *gpu_kms;
+  int kms_fd;
+
+  gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc));
+  cursor_renderer_gpu_data =
+    meta_cursor_renderer_native_gpu_data_from_gpu (gpu_kms);
+  kms_fd = meta_gpu_kms_get_fd (gpu_kms);
 
   if (cursor_sprite)
     {
-      MetaCursorNativePrivate *cursor_priv =
-        g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
+      MetaCursorNativePrivate *cursor_priv;
+      MetaCursorNativeGpuState *cursor_gpu_state;
       struct gbm_bo *bo;
       union gbm_bo_handle handle;
       int hot_x, hot_y;
 
-      if (cursor_priv->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET)
-        bo = get_pending_cursor_sprite_gbm_bo (cursor_sprite);
+      cursor_priv = get_cursor_priv (cursor_sprite);
+      cursor_gpu_state = get_cursor_gpu_state (cursor_priv, gpu_kms);
+
+      if (cursor_gpu_state->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET)
+        bo = get_pending_cursor_sprite_gbm_bo (cursor_gpu_state);
       else
-        bo = get_active_cursor_sprite_gbm_bo (cursor_sprite);
+        bo = get_active_cursor_sprite_gbm_bo (cursor_gpu_state);
 
       if (!priv->hw_state_invalidated && bo == crtc->cursor_renderer_private)
         return;
@@ -189,29 +237,33 @@ set_crtc_cursor (MetaCursorRendererNative *native,
       handle = gbm_bo_get_handle (bo);
       meta_cursor_sprite_get_hotspot (cursor_sprite, &hot_x, &hot_y);
 
-      if (drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, handle.u32,
-                             priv->cursor_width, priv->cursor_height,
+      if (drmModeSetCursor2 (kms_fd, crtc->crtc_id, handle.u32,
+                             cursor_renderer_gpu_data->cursor_width,
+                             cursor_renderer_gpu_data->cursor_height,
                              hot_x, hot_y) < 0)
         {
-          g_warning ("drmModeSetCursor2 failed with (%s), "
-                     "drawing cursor with OpenGL from now on",
-                     strerror (errno));
-          priv->has_hw_cursor = FALSE;
-          priv->hw_cursor_broken = TRUE;
+          if (errno != EACCES)
+            {
+              g_warning ("drmModeSetCursor2 failed with (%s), "
+                         "drawing cursor with OpenGL from now on",
+                         strerror (errno));
+              priv->has_hw_cursor = FALSE;
+              cursor_renderer_gpu_data->hw_cursor_broken = TRUE;
+            }
         }
 
-      if (cursor_priv->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET)
+      if (cursor_gpu_state->pending_bo_state == META_CURSOR_GBM_BO_STATE_SET)
         {
-          cursor_priv->active_bo =
-            (cursor_priv->active_bo + 1) % HW_CURSOR_BUFFER_COUNT;
-          cursor_priv->pending_bo_state = META_CURSOR_GBM_BO_STATE_NONE;
+          cursor_gpu_state->active_bo =
+            (cursor_gpu_state->active_bo + 1) % HW_CURSOR_BUFFER_COUNT;
+          cursor_gpu_state->pending_bo_state = META_CURSOR_GBM_BO_STATE_NONE;
         }
     }
   else
     {
       if (priv->hw_state_invalidated || crtc->cursor_renderer_private != NULL)
         {
-          drmModeSetCursor2 (priv->drm_fd, crtc->crtc_id, 0, 0, 0, 0, 0);
+          drmModeSetCursor2 (kms_fd, crtc->crtc_id, 0, 0, 0, 0, 0);
           crtc->cursor_renderer_private = NULL;
         }
     }
@@ -269,17 +321,21 @@ update_monitor_crtc_cursor (MetaMonitor         *monitor,
                                  &data->in_local_cursor_rect,
                                  NULL))
     {
+      MetaGpuKms *gpu_kms;
+      int kms_fd;
       float crtc_cursor_x, crtc_cursor_y;
 
       set_crtc_cursor (data->in_cursor_renderer_native,
                        monitor_crtc_mode->output->crtc,
                        data->in_cursor_sprite);
 
+      gpu_kms = META_GPU_KMS (meta_monitor_get_gpu (monitor));
+      kms_fd = meta_gpu_kms_get_fd (gpu_kms);
       crtc_cursor_x = (data->in_local_cursor_rect.origin.x -
                        scaled_crtc_rect.origin.x) * scale;
       crtc_cursor_y = (data->in_local_cursor_rect.origin.y -
                        scaled_crtc_rect.origin.y) * scale;
-      drmModeMoveCursor (priv->drm_fd,
+      drmModeMoveCursor (kms_fd,
                          monitor_crtc_mode->output->crtc->crtc_id,
                          roundf (crtc_cursor_x),
                          roundf (crtc_cursor_y));
@@ -301,9 +357,7 @@ update_hw_cursor (MetaCursorRendererNative *native,
 {
   MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
   MetaCursorRenderer *renderer = META_CURSOR_RENDERER (native);
-  MetaBackend *backend = meta_get_backend ();
-  MetaMonitorManager *monitor_manager =
-    meta_backend_get_monitor_manager (backend);
+  MetaMonitorManager *monitor_manager = priv->monitor_manager;
   GList *logical_monitors;
   GList *l;
   ClutterRect rect;
@@ -359,18 +413,24 @@ update_hw_cursor (MetaCursorRendererNative *native,
 }
 
 static gboolean
-has_valid_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
+has_valid_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite,
+                                MetaGpuKms       *gpu_kms)
 {
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
+  MetaCursorNativePrivate *cursor_priv;
+  MetaCursorNativeGpuState *cursor_gpu_state;
 
+  cursor_priv = get_cursor_priv (cursor_sprite);
   if (!cursor_priv)
     return FALSE;
 
-  switch (cursor_priv->pending_bo_state)
+  cursor_gpu_state = get_cursor_gpu_state (cursor_priv, gpu_kms);
+  if (!cursor_gpu_state)
+    return FALSE;
+
+  switch (cursor_gpu_state->pending_bo_state)
     {
     case META_CURSOR_GBM_BO_STATE_NONE:
-      return get_active_cursor_sprite_gbm_bo (cursor_sprite) != NULL;
+      return get_active_cursor_sprite_gbm_bo (cursor_gpu_state) != NULL;
     case META_CURSOR_GBM_BO_STATE_SET:
       return TRUE;
     case META_CURSOR_GBM_BO_STATE_INVALIDATED:
@@ -386,14 +446,17 @@ static gboolean
 cursor_over_transformed_logical_monitor (MetaCursorRenderer *renderer,
                                          MetaCursorSprite   *cursor_sprite)
 {
-  MetaBackend *backend = meta_get_backend ();
-  MetaMonitorManager *monitor_manager =
-    meta_backend_get_monitor_manager (backend);
+  MetaCursorRendererNative *cursor_renderer_native =
+    META_CURSOR_RENDERER_NATIVE (renderer);
+  MetaCursorRendererNativePrivate *priv =
+    meta_cursor_renderer_native_get_instance_private (cursor_renderer_native);
+  MetaMonitorManager *monitor_manager = priv->monitor_manager;
   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)
@@ -432,8 +495,11 @@ static gboolean
 can_draw_cursor_unscaled (MetaCursorRenderer *renderer,
                           MetaCursorSprite   *cursor_sprite)
 {
-  MetaBackend *backend;
-  MetaMonitorManager *monitor_manager;
+  MetaCursorRendererNative *cursor_renderer_native =
+    META_CURSOR_RENDERER_NATIVE (renderer);
+  MetaCursorRendererNativePrivate *priv =
+    meta_cursor_renderer_native_get_instance_private (cursor_renderer_native);
+  MetaMonitorManager *monitor_manager = priv->monitor_manager;
   ClutterRect cursor_rect;
   GList *logical_monitors;
   GList *l;
@@ -442,8 +508,6 @@ can_draw_cursor_unscaled (MetaCursorRenderer *renderer,
   if (!meta_is_stage_views_scaled ())
    return meta_cursor_sprite_get_texture_scale (cursor_sprite) == 1.0;
 
-  backend = meta_get_backend ();
-  monitor_manager = meta_backend_get_monitor_manager (backend);
   logical_monitors =
     meta_monitor_manager_get_logical_monitors (monitor_manager);
 
@@ -479,14 +543,31 @@ should_have_hw_cursor (MetaCursorRenderer *renderer,
 {
   MetaCursorRendererNative *native = META_CURSOR_RENDERER_NATIVE (renderer);
   MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+  GList *gpus;
+  GList *l;
   CoglTexture *texture;
 
-  if (priv->hw_cursor_broken)
-    return FALSE;
-
   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;
+      MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
+
+      cursor_renderer_gpu_data =
+        meta_cursor_renderer_native_gpu_data_from_gpu (gpu_kms);
+      if (!cursor_renderer_gpu_data)
+        return FALSE;
+
+      if (cursor_renderer_gpu_data->hw_cursor_broken)
+        return FALSE;
+
+      if (!has_valid_cursor_sprite_gbm_bo (cursor_sprite, gpu_kms))
+        return FALSE;
+    }
+
   if (cursor_over_transformed_logical_monitor (renderer, cursor_sprite))
     return FALSE;
 
@@ -497,9 +578,6 @@ should_have_hw_cursor (MetaCursorRenderer *renderer,
   if (!can_draw_cursor_unscaled (renderer, cursor_sprite))
     return FALSE;
 
-  if (!has_valid_cursor_sprite_gbm_bo (cursor_sprite))
-    return FALSE;
-
   return TRUE;
 }
 
@@ -571,62 +649,94 @@ meta_cursor_renderer_native_update_cursor (MetaCursorRenderer *renderer,
 }
 
 static void
-get_hardware_cursor_size (MetaCursorRendererNative *native,
-                          uint64_t *width, uint64_t *height)
+cursor_gpu_state_free (MetaCursorNativeGpuState *cursor_gpu_state)
 {
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
+  int i;
 
-  *width = priv->cursor_width;
-  *height = priv->cursor_height;
+  for (i = 0; i < HW_CURSOR_BUFFER_COUNT; i++)
+    g_clear_pointer (&cursor_gpu_state->bos[i], (GDestroyNotify) gbm_bo_destroy);
+  g_free (cursor_gpu_state);
+}
+
+static MetaCursorNativeGpuState *
+get_cursor_gpu_state (MetaCursorNativePrivate *cursor_priv,
+                      MetaGpuKms              *gpu_kms)
+{
+  return g_hash_table_lookup (cursor_priv->gpu_states, gpu_kms);
+}
+
+static MetaCursorNativeGpuState *
+ensure_cursor_gpu_state (MetaCursorNativePrivate *cursor_priv,
+                         MetaGpuKms              *gpu_kms)
+{
+  MetaCursorNativeGpuState *cursor_gpu_state;
+
+  cursor_gpu_state = get_cursor_gpu_state (cursor_priv, gpu_kms);
+  if (cursor_gpu_state)
+    return cursor_gpu_state;
+
+  cursor_gpu_state = g_new0 (MetaCursorNativeGpuState, 1);
+  g_hash_table_insert (cursor_priv->gpu_states, gpu_kms, cursor_gpu_state);
+
+  return cursor_gpu_state;
 }
 
 static void
-cursor_priv_free (gpointer data)
+cursor_priv_free (MetaCursorNativePrivate *cursor_priv)
 {
-  MetaCursorNativePrivate *cursor_priv = data;
-  guint i;
+  g_hash_table_destroy (cursor_priv->gpu_states);
+}
 
-  if (!data)
-    return;
-
-  for (i = 0; i < HW_CURSOR_BUFFER_COUNT; i++)
-    g_clear_pointer (&cursor_priv->bos[0], (GDestroyNotify) gbm_bo_destroy);
-  g_slice_free (MetaCursorNativePrivate, cursor_priv);
+static MetaCursorNativePrivate *
+get_cursor_priv (MetaCursorSprite *cursor_sprite)
+{
+  return g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
 }
 
 static MetaCursorNativePrivate *
 ensure_cursor_priv (MetaCursorSprite *cursor_sprite)
 {
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
+  MetaCursorNativePrivate *cursor_priv;
 
-  if (!cursor_priv)
-    {
-      cursor_priv = g_slice_new0 (MetaCursorNativePrivate);
-      g_object_set_qdata_full (G_OBJECT (cursor_sprite),
-                               quark_cursor_sprite,
-                               cursor_priv,
-                               cursor_priv_free);
-    }
+  cursor_priv = get_cursor_priv (cursor_sprite);
+  if (cursor_priv)
+    return cursor_priv;
+
+  cursor_priv = g_new0 (MetaCursorNativePrivate, 1);
+  cursor_priv->gpu_states =
+    g_hash_table_new_full (g_direct_hash,
+                           g_direct_equal,
+                           NULL,
+                           (GDestroyNotify) cursor_gpu_state_free);
+  g_object_set_qdata_full (G_OBJECT (cursor_sprite),
+                           quark_cursor_sprite,
+                           cursor_priv,
+                           (GDestroyNotify) cursor_priv_free);
 
   return cursor_priv;
 }
 
 static void
-load_cursor_sprite_gbm_buffer (MetaCursorRendererNative *native,
-                               MetaCursorSprite         *cursor_sprite,
-                               uint8_t                  *pixels,
-                               uint                      width,
-                               uint                      height,
-                               int                       rowstride,
-                               uint32_t                  gbm_format)
+load_cursor_sprite_gbm_buffer_for_gpu (MetaCursorRendererNative *native,
+                                       MetaGpuKms               *gpu_kms,
+                                       MetaCursorSprite         *cursor_sprite,
+                                       uint8_t                  *pixels,
+                                       uint                      width,
+                                       uint                      height,
+                                       int                       rowstride,
+                                       uint32_t                  gbm_format)
 {
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
   uint64_t cursor_width, cursor_height;
+  MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
+  struct gbm_device *gbm_device;
 
-  get_hardware_cursor_size (native, &cursor_width, &cursor_height);
+  cursor_renderer_gpu_data =
+    meta_cursor_renderer_native_gpu_data_from_gpu (gpu_kms);
+  if (!cursor_renderer_gpu_data)
+    return;
+
+  cursor_width = (uint64_t) cursor_renderer_gpu_data->cursor_width;
+  cursor_height = (uint64_t) cursor_renderer_gpu_data->cursor_height;
 
   if (width > cursor_width || height > cursor_height)
     {
@@ -635,14 +745,15 @@ load_cursor_sprite_gbm_buffer (MetaCursorRendererNative *native,
       return;
     }
 
-  if (gbm_device_is_format_supported (priv->gbm, gbm_format,
+  gbm_device = meta_gbm_device_from_gpu (gpu_kms);
+  if (gbm_device_is_format_supported (gbm_device, gbm_format,
                                       GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE))
     {
       struct gbm_bo *bo;
       uint8_t buf[4 * cursor_width * cursor_height];
       uint i;
 
-      bo = gbm_bo_create (priv->gbm, cursor_width, cursor_height,
+      bo = gbm_bo_create (gbm_device, cursor_width, cursor_height,
                           gbm_format, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE);
       if (!bo)
         {
@@ -661,7 +772,7 @@ load_cursor_sprite_gbm_buffer (MetaCursorRendererNative *native,
           return;
         }
 
-      set_pending_cursor_sprite_gbm_bo (cursor_sprite, bo);
+      set_pending_cursor_sprite_gbm_bo (cursor_sprite, gpu_kms, bo);
     }
   else
     {
@@ -670,42 +781,50 @@ load_cursor_sprite_gbm_buffer (MetaCursorRendererNative *native,
 }
 
 static void
-invalidate_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite)
+invalidate_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite,
+                                         MetaGpuKms       *gpu_kms)
 {
-  MetaCursorNativePrivate *cursor_priv =
-    g_object_get_qdata (G_OBJECT (cursor_sprite), quark_cursor_sprite);
+  MetaCursorNativePrivate *cursor_priv;
+  MetaCursorNativeGpuState *cursor_gpu_state;
   guint pending_bo;
 
+  cursor_priv = get_cursor_priv (cursor_sprite);
   if (!cursor_priv)
     return;
 
-  pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_sprite);
-  g_clear_pointer (&cursor_priv->bos[pending_bo],
+  cursor_gpu_state = get_cursor_gpu_state (cursor_priv, gpu_kms);
+  if (!cursor_gpu_state)
+    return;
+
+  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_priv->pending_bo_state = META_CURSOR_GBM_BO_STATE_INVALIDATED;
+  cursor_gpu_state->pending_bo_state = META_CURSOR_GBM_BO_STATE_INVALIDATED;
 }
 
 #ifdef HAVE_WAYLAND
 static void
-meta_cursor_renderer_native_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,
-                                                           MetaCursorSprite *cursor_sprite,
-                                                           struct wl_resource *buffer)
+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);
-  MetaCursorRendererNativePrivate *priv =
-    meta_cursor_renderer_native_get_instance_private (native);
+  MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
   uint32_t gbm_format;
   uint64_t cursor_width, cursor_height;
   CoglTexture *texture;
   uint width, height;
 
-  if (!priv->gbm || priv->hw_cursor_broken)
+  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;
 
   /* 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);
+  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);
@@ -742,16 +861,18 @@ meta_cursor_renderer_native_realize_cursor_from_wl_buffer (MetaCursorRenderer *r
         }
 
       buffer_data = wl_shm_buffer_get_data (shm_buffer);
-      load_cursor_sprite_gbm_buffer (native,
-                                     cursor_sprite,
-                                     buffer_data,
-                                     width, height, rowstride,
-                                     gbm_format);
+      load_cursor_sprite_gbm_buffer_for_gpu (native,
+                                             gpu_kms,
+                                             cursor_sprite,
+                                             buffer_data,
+                                             width, height, rowstride,
+                                             gbm_format);
 
       wl_shm_buffer_end_access (shm_buffer);
     }
   else
     {
+      struct gbm_device *gbm_device;
       struct gbm_bo *bo;
 
       /* HW cursors have a predefined size (at least 64x64), which usually is
@@ -760,7 +881,8 @@ meta_cursor_renderer_native_realize_cursor_from_wl_buffer (MetaCursorRenderer *r
        * access to the data, but it's not possible if the buffer is in GPU
        * memory (and possibly tiled too), so if we don't get the right size, we
        * fallback to GL. */
-      get_hardware_cursor_size (native, &cursor_width, &cursor_height);
+      cursor_width = (uint64_t) cursor_renderer_gpu_data->cursor_width;
+      cursor_height = (uint64_t) cursor_renderer_gpu_data->cursor_height;
 
       if (width != cursor_width || height != cursor_height)
         {
@@ -768,7 +890,8 @@ meta_cursor_renderer_native_realize_cursor_from_wl_buffer (MetaCursorRenderer *r
           return;
         }
 
-      bo = gbm_bo_import (priv->gbm,
+      gbm_device = meta_gbm_device_from_gpu (gpu_kms);
+      bo = gbm_bo_import (gbm_device,
                           GBM_BO_IMPORT_WL_BUFFER,
                           buffer,
                           GBM_BO_USE_CURSOR);
@@ -778,32 +901,83 @@ meta_cursor_renderer_native_realize_cursor_from_wl_buffer (MetaCursorRenderer *r
           return;
         }
 
-      set_pending_cursor_sprite_gbm_bo (cursor_sprite, bo);
+      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
+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;
+
+  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;
+
+  invalidate_pending_cursor_sprite_gbm_bo (cursor_sprite, gpu_kms);
+
+  load_cursor_sprite_gbm_buffer_for_gpu (native,
+                                         gpu_kms,
+                                         cursor_sprite,
+                                         (uint8_t *) xc_image->pixels,
+                                         xc_image->width,
+                                         xc_image->height,
+                                         xc_image->width * 4,
+                                         GBM_FORMAT_ARGB8888);
+}
+
 static void
 meta_cursor_renderer_native_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,
-                                                         MetaCursorSprite *cursor_sprite,
-                                                         XcursorImage *xc_image)
+                                                         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;
 
-  if (!priv->gbm || priv->hw_cursor_broken)
-    return;
+  gpus = meta_monitor_manager_get_gpus (priv->monitor_manager);
+  for (l = gpus; l; l = l->next)
+    {
+      MetaGpuKms *gpu_kms = l->data;
 
-  invalidate_pending_cursor_sprite_gbm_bo (cursor_sprite);
-
-  load_cursor_sprite_gbm_buffer (native,
-                                 cursor_sprite,
-                                 (uint8_t *) xc_image->pixels,
-                                 xc_image->width,
-                                 xc_image->height,
-                                 xc_image->width * 4,
-                                 GBM_FORMAT_ARGB8888);
+      meta_cursor_renderer_native_realize_cursor_from_xcursor_for_gpu (
+        renderer,
+        gpu_kms,
+        cursor_sprite,
+        xc_image);
+    }
 }
 
 static void
@@ -822,6 +996,8 @@ meta_cursor_renderer_native_class_init (MetaCursorRendererNativeClass *klass)
     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 =
+    g_quark_from_static_string ("-meta-cursor-renderer-native-gpu-data");
 }
 
 static void
@@ -844,49 +1020,72 @@ on_monitors_changed (MetaMonitorManager       *monitors,
 }
 
 static void
-meta_cursor_renderer_native_init (MetaCursorRendererNative *native)
+init_hw_cursor_support (MetaCursorRendererNative *cursor_renderer_native)
 {
-  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
-  MetaMonitorManager *monitors;
+  MetaCursorRendererNativePrivate *priv =
+    meta_cursor_renderer_native_get_instance_private (cursor_renderer_native);
+  GList *gpus;
+  GList *l;
 
-  monitors = meta_monitor_manager_get ();
-  g_signal_connect_object (monitors, "monitors-changed",
-                           G_CALLBACK (on_monitors_changed), native, 0);
-
-  priv->hw_state_invalidated = TRUE;
-
-#if defined(CLUTTER_WINDOWING_EGL)
-  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
+  gpus = meta_monitor_manager_get_gpus (priv->monitor_manager);
+  for (l = gpus; l; l = l->next)
     {
-      MetaBackend *backend = meta_get_backend ();
-      MetaRenderer *renderer = meta_backend_get_renderer (backend);
-      MetaRendererNative *renderer_native = META_RENDERER_NATIVE (renderer);
-
-      priv->drm_fd = meta_renderer_native_get_kms_fd (renderer_native);
-      priv->gbm = meta_renderer_native_get_gbm (renderer_native);
-
+      MetaGpuKms *gpu_kms = l->data;
+      MetaCursorRendererNativeGpuData *cursor_renderer_gpu_data;
+      int kms_fd;
+      struct gbm_device *gbm_device;
       uint64_t width, height;
-      if (drmGetCap (priv->drm_fd, DRM_CAP_CURSOR_WIDTH, &width) == 0 &&
-          drmGetCap (priv->drm_fd, DRM_CAP_CURSOR_HEIGHT, &height) == 0)
+
+      gbm_device = meta_gbm_device_from_gpu (gpu_kms);
+      if (!gbm_device)
+        continue;
+
+      cursor_renderer_gpu_data =
+        meta_create_cursor_renderer_native_gpu_data (gpu_kms);
+
+      kms_fd = meta_gpu_kms_get_fd (gpu_kms);
+      if (drmGetCap (kms_fd, DRM_CAP_CURSOR_WIDTH, &width) == 0 &&
+          drmGetCap (kms_fd, DRM_CAP_CURSOR_HEIGHT, &height) == 0)
         {
-          priv->cursor_width = width;
-          priv->cursor_height = height;
+          cursor_renderer_gpu_data->cursor_width = width;
+          cursor_renderer_gpu_data->cursor_height = height;
         }
       else
         {
-          priv->cursor_width = 64;
-          priv->cursor_height = 64;
+          cursor_renderer_gpu_data->cursor_width = 64;
+          cursor_renderer_gpu_data->cursor_height = 64;
         }
     }
-#endif
 }
 
-struct gbm_device *
-meta_cursor_renderer_native_get_gbm_device (MetaCursorRendererNative *native)
+MetaCursorRendererNative *
+meta_cursor_renderer_native_new (MetaBackend *backend)
 {
-  MetaCursorRendererNativePrivate *priv = meta_cursor_renderer_native_get_instance_private (native);
+  MetaMonitorManager *monitor_manager =
+    meta_backend_get_monitor_manager (backend);
+  MetaCursorRendererNative *cursor_renderer_native;
+  MetaCursorRendererNativePrivate *priv;
 
-  return priv->gbm;
+  cursor_renderer_native =
+    g_object_new (META_TYPE_CURSOR_RENDERER_NATIVE, NULL);
+  priv =
+    meta_cursor_renderer_native_get_instance_private (cursor_renderer_native);
+
+  g_signal_connect_object (monitor_manager, "monitors-changed-internal",
+                           G_CALLBACK (on_monitors_changed),
+                           cursor_renderer_native, 0);
+
+  priv->monitor_manager = monitor_manager;
+  priv->hw_state_invalidated = TRUE;
+
+  init_hw_cursor_support (cursor_renderer_native);
+
+  return cursor_renderer_native;
+}
+
+static void
+meta_cursor_renderer_native_init (MetaCursorRendererNative *native)
+{
 }
 
 void

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

@@ -27,30 +27,13 @@
 
 #include "meta-cursor-renderer.h"
 
-#define META_TYPE_CURSOR_RENDERER_NATIVE             (meta_cursor_renderer_native_get_type ())
-#define META_CURSOR_RENDERER_NATIVE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER_NATIVE, MetaCursorRendererNative))
-#define META_CURSOR_RENDERER_NATIVE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_CURSOR_RENDERER_NATIVE, MetaCursorRendererNativeClass))
-#define META_IS_CURSOR_RENDERER_NATIVE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_CURSOR_RENDERER_NATIVE))
-#define META_IS_CURSOR_RENDERER_NATIVE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_CURSOR_RENDERER_NATIVE))
-#define META_CURSOR_RENDERER_NATIVE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_CURSOR_RENDERER_NATIVE, MetaCursorRendererNativeClass))
+#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)
 
-typedef struct _MetaCursorRendererNative        MetaCursorRendererNative;
-typedef struct _MetaCursorRendererNativeClass   MetaCursorRendererNativeClass;
-
-struct _MetaCursorRendererNative
-{
-  MetaCursorRenderer parent;
-};
-
-struct _MetaCursorRendererNativeClass
-{
-  MetaCursorRendererClass parent_class;
-};
-
-GType meta_cursor_renderer_native_get_type (void) G_GNUC_CONST;
-
-struct gbm_device * meta_cursor_renderer_native_get_gbm_device (MetaCursorRendererNative *renderer);
-void meta_cursor_renderer_native_get_cursor_size (MetaCursorRendererNative *native, uint64_t *width, uint64_t *height);
 void meta_cursor_renderer_native_force_update (MetaCursorRendererNative *renderer);
 
+MetaCursorRendererNative * meta_cursor_renderer_native_new (MetaBackend *backend);
+
 #endif /* META_CURSOR_RENDERER_NATIVE_H */