shell: Adapt to ClutterEffect vfunc changes

Add the new ClutterPaintNode argument to the vfuncs. No other
change is needed.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1350

.gitlab-ci.yml

@@ -9,6 +9,7 @@ stages:
 variables:
     BUNDLE: "extensions-git.flatpak"
     JS_LOG: "js-report.txt"
+    POT_LOG: "pot-update.txt"
 
 .only_default: &only_default
     only:
@@ -66,7 +67,6 @@ no_template_check:
 build:
     image: registry.gitlab.gnome.org/gnome/mutter/master:v4
     stage: build
-    needs: []
     before_script:
         - .gitlab-ci/checkout-mutter.sh
         - meson mutter mutter/build --prefix=/usr -Dtests=false
@@ -85,7 +85,6 @@ build:
 test:
     image: registry.gitlab.gnome.org/gnome/mutter/master:v4
     stage: test
-    needs: ["build"]
     variables:
         XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
         NO_AT_BRIDGE: "1"
@@ -100,9 +99,24 @@ test:
             - build/meson-logs/testlog.txt
         when: on_failure
 
+test-pot:
+    image: registry.gitlab.gnome.org/gnome/mutter/master:v4
+    stage: test
+    before_script:
+        - ninja -C mutter/build install
+    script:
+        # Check that pot files are generated correctly:
+        # https://savannah.gnu.org/bugs/?50920#comment5
+        - ninja -C build gnome-shell-pot 2>&1 | awk '
+            BEGIN { start=0; }
+            start==1 { print $0; }
+            /gnome-shell-pot/ { start=1; }
+          ' | tee $POT_LOG
+        - (! grep -q . $POT_LOG)
+    <<: *only_default
+
 flatpak:
     stage: build
-    needs: []
     variables:
         SUBPROJECT: "subprojects/extensions-app"
         # Your manifest path

NEWS

@@ -1,70 +1,3 @@
-3.37.90
-=======
-* Fix extension updates when many extensions are installed [Jeremias; !1363]
-* Fix missing icons in on-screen keyboard [Emre; #2631, #3007]
-* Fix delay when showing calendar events [Sebastian; #2992]
-* Allow rearranging items in app picker [Georges; !1284]
-* Fix top bar navigation when NumLock is active [Olivier; #550]
-* Delay login animation until wallpaper has loaded [Michael; #734996]
-* Reset auth prompt on login screen on VT switch before fade in [Ray; #2997]
-* Move screencasting into a separate service [Jonas Å.; !1372]
-* Replace loaded terms with more descriptive one [Olivier; !1393]
-* Add "Boot Options" support to restart dialog [Hans; !199]
-* Move "Restart" into a separate menu item/dialog [Florian; #2202]
-* Default to not installing updates on low battery [Michael; #2717]
-* Misc. bug fixes and cleanups [Florian, Daniel V., Georges, Jonas Å.,
-  Daniel G., Carlos, Benjamin, Piotr, Andre, Jonas D., Andy; !1357, !1356,
-  #2969, #2969, !1358, !1371, #3005, !1380, #3022, !1381, !895, !1387, !1386,
-  !1385, #3037, !1389, !1390, !1391, !1383, !1399, #2983, !1403]
-
-Contributors:
-  Jonas Ådahl, Benjamin Berg, Michael Catanzaro, Piotr Drąg, Jonas Dreßler,
-  Olivier Fourdan, Carlos Garnacho, Hans de Goede, Andy Holmes,
-  Sebastian Keller, Andre Moreira Magalhaes, Daniel García Moreno,
-  Florian Müllner, Georges Basile Stavracas Neto, Jeremias Ortega, Ray Strode,
-  Emre Uyguroglu, Daniel van Vugt
-
-Translators:
-  Tim Sabsch [de], Boyuan Yang [zh_CN], Fabio Tomat [fur],
-  Efstathios Iosifidis [el], Rafael Fontenelle [pt_BR], Yuri Chornoivan [uk],
-  Daniel Șerbănescu [ro], Jordi Mas [ca], Daniel Mustieles [es],
-  Emin Tufan Çetin [tr], Asier Sarasua Garmendia [eu]
-
-3.37.3
-======
-* Refactor and clean up window picker
-  [Jonas D., Florian; !1297, !1298, !1305, !1345, !1353]
-* Move calendar events out of notifications list [Florian; !1282]
-* Refine app folder dialogs [Georges; !1301]
-* Hide switch-user button on lock screen if unsupported [Chingkai; #2687]
-* Refactor and clean up app picker pagination [Georges; !1271]
-* Add API to retrieve specified mimetypes from clipboards [Carlos; !1321]
-* Support prepending workspace with horizontal layouts [Florian; #2916]
-* Update microphone icon on input volume changes [fludixx; #2902]
-* Cache labels on GPU [Daniel; !1329]
-* Fix regressions in redesigned modal dialogs [Florian, Jonas D.; #2491, !1336]
-* Use GIcon for all application icons [Florian; !1342]
-* Support pre-authenticated logins in vmware environments [yun341; #1983]
-* Better support sandboxed apps with multiple .desktop files [Florian; #219]
-* Fix on-screen keyboard size in portrait orientation [Florian; #2349]
-* Plugged leaks [Sebastian, Daniel, Florian; !1306, !1319, !1341]
-* Misc. bug fixes and cleanups [Jonas D., Georges, Marco, Florian, Sebastian,
-  MOZGIII, Daniel, Mariana, Jonas Å.; !1296, !1295, #2643, !1300, !1309,
-  !1119, #2901, !1313, !1251, !1285, !1307, !1318, !1310, !1320, !1327, !1315,
-  !1289, !1331, !1332, !1333, !1334, !1340, !1287, !1308, !1346, !1299, !1343,
-  !1351, !1352, !1322]
-
-Contributors:
-  Marco Trevisan (Treviño), Chingkai, Jonas Dreßler, Carlos Garnacho,
-  Sebastian Keller, MOZGIII, Florian Müllner, Georges Basile Stavracas Neto,
-  Mariana Picolo, Daniel van Vugt, fludixx, yun341, Jonas Ådahl
-
-Translators:
-  Daniel Mustieles [es], Boyuan Yang [zh_CN], Yuri Chornoivan [uk],
-  Jordi Mas [ca], sicklylife [ja], Emin Tufan Çetin [tr],
-  Baurzhan Muftakhidinov [kk], Florentina Mușat [ro], Aurimas Černius [lt],
-  Rūdolfs Mazurs [lv]
-
 3.37.2
 ======
 * Add support for "PrefersNonDefaultGPU" desktop key [Bastien; !1226]

data/dbus-interfaces/org.freedesktop.login1.Manager.xml

@@ -20,12 +20,6 @@
     <method name="ListSessions">
       <arg name="sessions" type="a(susso)" direction="out"/>
     </method>
-    <method name="CanRebootToBootLoaderMenu">
-      <arg type="s" direction="out"/>
-    </method>
-    <method name="SetRebootToBootLoaderMenu">
-      <arg type="t" direction="in"/>
-    </method>
     <signal name="PrepareForSleep">
       <arg type="b" direction="out"/>
     </signal>

data/dbus-interfaces/org.gnome.Mutter.ScreenCast.xml

@@ -1,191 +0,0 @@
-<!DOCTYPE node PUBLIC
-'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
-'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
-<node>
-
-  <!--
-      org.gnome.Mutter.ScreenCast:
-      @short_description: Screen cast interface
-
-      This API is private and not intended to be used outside of the integrated
-      system that uses libmutter. No compatibility between versions are
-      promised.
-  -->
-  <interface name="org.gnome.Mutter.ScreenCast">
-
-    <!--
-	CreateSession:
-	@properties: Properties
-	@session_path: Path to the new session object
-
-	* "remote-desktop-session-id" (s): The ID of a remote desktop session.
-					   Remote desktop driven screen casts
-					   are started and stopped by the remote
-					   desktop session.
-	* "disable-animations" (b): Set to "true" if the screen cast application
-				    would prefer animations to be globally
-				    disabled, while the session is running. Default
-				    is "false". Available since version 3.
-    -->
-    <method name="CreateSession">
-      <arg name="properties" type="a{sv}" direction="in" />
-      <arg name="session_path" type="o" direction="out" />
-    </method>
-
-    <!--
-        Version:
-        @short_description: API version
-    -->
-    <property name="Version" type="i" access="read" />
-
-  </interface>
-
-  <!--
-       org.gnome.Mutter.ScreenCast.Session:
-       @short_description: Screen cast session
-  -->
-  <interface name="org.gnome.Mutter.ScreenCast.Session">
-
-    <!--
-	Start:
-
-	Start the screen cast session
-    -->
-    <method name="Start" />
-
-    <!--
-	Stop:
-
-	Stop the screen cast session
-    -->
-    <method name="Stop" />
-
-    <!--
-	Closed:
-
-	The session has closed.
-    -->
-    <signal name="Closed" />
-
-    <!--
-	RecordMonitor:
-	@connector: Connector of the monitor to record
-	@properties: Properties
-	@stream_path: Path to the new stream object
-
-	Record a single monitor.
-
-	Available @properties include:
-
-	* "cursor-mode" (u): Cursor mode. Default: 'hidden' (see below)
-	                     Available since API version 2.
-	* "is-recording" (b): Whether this is a screen recording. May be
-			      be used for choosing panel icon.
-			      Default: false. Available since API version 4.
-
-	Available cursor mode values:
-
-	0: hidden - cursor is not included in the stream
-	1: embedded - cursor is included in the framebuffer
-	2: metadata - cursor is included as metadata in the PipeWire stream
-    -->
-    <method name="RecordMonitor">
-      <arg name="connector" type="s" direction="in" />
-      <arg name="properties" type="a{sv}" direction="in" />
-      <arg name="stream_path" type="o" direction="out" />
-    </method>
-
-    <!--
-	RecordWindow:
-	@properties: Properties used determining what window to select
-	@stream_path: Path to the new stream object
-
-	Supported since API version 2.
-
-	Record a single window. The cursor will not be included.
-
-	Available @properties include:
-
-	* "window-id" (t): Id of the window to record.
-	* "cursor-mode" (u): Cursor mode. Default: 'hidden' (see RecordMonitor).
-	* "is-recording" (b): Whether this is a screen recording. May be
-			      be used for choosing panel icon.
-			      Default: false. Available since API version 4.
-
-    -->
-    <method name="RecordWindow">
-      <arg name="properties" type="a{sv}" direction="in" />
-      <arg name="stream_path" type="o" direction="out" />
-    </method>
-
-    <!--
-	RecordArea:
-	@x: X position of the recorded area
-	@y: Y position of the recorded area
-	@width: width of the recorded area
-	@height: height of the recorded area
-	@properties: Properties
-	@stream_path: Path to the new stream object
-
-	Record an area of the stage. The coordinates are in stage coordinates.
-	The size of the stream does not necessarily match the size of the
-	recorded area, and will depend on DPI scale of the affected monitors.
-
-	Available @properties include:
-
-	* "cursor-mode" (u): Cursor mode. Default: 'hidden' (see below)
-	                     Available since API version 2.
-	* "is-recording" (b): Whether this is a screen recording. May be
-			      be used for choosing panel icon.
-			      Default: false. Available since API version 4.
-
-	Available cursor mode values:
-
-	0: hidden - cursor is not included in the stream
-	1: embedded - cursor is included in the framebuffer
-	2: metadata - cursor is included as metadata in the PipeWire stream
-    -->
-    <method name="RecordArea">
-      <arg name="x" type="i" direction="in" />
-      <arg name="y" type="i" direction="in" />
-      <arg name="width" type="i" direction="in" />
-      <arg name="height" type="i" direction="in" />
-      <arg name="properties" type="a{sv}" direction="in" />
-      <arg name="stream_path" type="o" direction="out" />
-    </method>
-  </interface>
-
-  <!--
-       org.gnome.Mutter.ScreenCast.Stream:
-       @short_description: Screen cast stream
-  -->
-  <interface name="org.gnome.Mutter.ScreenCast.Stream">
-
-    <!--
-	PipeWireStreamAdded:
-	@short_description: Pipewire stream added
-
-	A signal emitted when PipeWire stream for the screen cast stream has
-	been created. The @node_id corresponds to the PipeWire stream node.
-    -->
-    <signal name="PipeWireStreamAdded">
-      <annotation name="org.gtk.GDBus.C.Name" value="pipewire-stream-added"/>
-      <arg name="node_id" type="u" direction="out" />
-    </signal>
-
-    <!--
-	Parameters:
-	@short_description: Optional stream parameters
-
-	Available parameters include:
-
-	* "position" (ii): Position of the source of the stream in the
-	                   compositor coordinate space.
-	* "size" (ii): Size of the source of the stream in the compositor
-		       coordinate space.
-    -->
-    <property name="Parameters" type="a{sv}" access="read" />
-
-  </interface>
-
-</node>

data/dbus-interfaces/org.gnome.Shell.Introspect.xml

@@ -70,14 +70,6 @@
     -->
     <property name="AnimationsEnabled" type="b" access="read"/>
 
-    <!--
-       ScreenSize:
-       @short_description: The size of the screen
-
-       Since: 3
-    -->
-    <property name="ScreenSize" type="(ii)" access="read"/>
-
     <property name="version" type="u" access="read"/>
   </interface>
 </node>

data/gnome-shell-dbus-interfaces.gresource.xml

@@ -28,7 +28,6 @@
     <file preprocess="xml-stripblanks">org.freedesktop.UPower.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Magnifier.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.Magnifier.ZoomRegion.xml</file>
-    <file preprocess="xml-stripblanks">org.gnome.Mutter.ScreenCast.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.ScreenSaver.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.SessionManager.EndSessionDialog.xml</file>
     <file preprocess="xml-stripblanks">org.gnome.SessionManager.Inhibitor.xml</file>

data/gnome-shell-theme.gresource.xml

@@ -6,25 +6,25 @@
     <file>checkbox-off-focused.svg</file>
     <file>checkbox-off.svg</file>
     <file>checkbox.svg</file>
-    <file alias="icons/scalable/actions/color-pick.svg">color-pick.svg</file>
+    <file alias="icons/color-pick.svg">color-pick.svg</file>
     <file>dash-placeholder.svg</file>
     <file>gnome-shell.css</file>
     <file>gnome-shell-high-contrast.css</file>
-    <file alias="icons/scalable/status/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
+    <file alias="icons/message-indicator-symbolic.svg">message-indicator-symbolic.svg</file>
     <file>no-events.svg</file>
     <file>no-notifications.svg</file>
     <file>pad-osd.css</file>
-    <file alias="icons/scalable/status/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
+    <file alias="icons/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
-    <file alias="icons/scalable/status/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
+    <file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
-    <file alias="icons/scalable/actions/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
+    <file alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
-    <file alias="icons/scalable/actions/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
+    <file alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
-    <file alias="icons/scalable/actions/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
+    <file alias="icons/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
-    <file alias="icons/scalable/actions/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
+    <file alias="icons/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
+    <file alias="icons/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
+    <file alias="icons/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
+    <file alias="icons/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-layout-filled-symbolic.svg">keyboard-layout-filled-symbolic.svg</file>
+    <file alias="icons/keyboard-layout-filled-symbolic.svg">keyboard-layout-filled-symbolic.svg</file>
-    <file alias="icons/scalable/status/keyboard-shift-filled-symbolic.svg">keyboard-shift-filled-symbolic.svg</file>
+    <file alias="icons/keyboard-shift-filled-symbolic.svg">keyboard-shift-filled-symbolic.svg</file>
     <file>process-working.svg</file>
     <file>toggle-off.svg</file>
     <file>toggle-off-dark.svg</file>

data/gnome-shell-wayland.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=GNOME Shell on Wayland
 # On wayland, force a session shutdown
-OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-shutdown.target
+OnFailure=gnome-shell-disable-extensions.service gnome-session-shutdown.target
 OnFailureJobMode=replace-irreversibly
 CollectMode=inactive-or-failed
 RefuseManualStart=on
@@ -13,21 +13,18 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
+# The units already conflict because they use the same BusName
+#Conflicts=gnome-shell-x11.service
+
 [Service]
-Slice=session.slice
 Type=notify
-# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
-#       with systemd >= 245. Also, the current solution is kind of painful
-#       as systemd had a bug where it retries the condition.
-# Only start if the template instance matches the session type.
-ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
 ExecStart=@bindir@/gnome-shell
-# Exit code 1 means we are probably *not* dealing with an extension failure
-SuccessExitStatus=1
 
 # unset some environment variables that were set by the shell and won't work now that the shell is gone
 ExecStopPost=-systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY
 
+# Exit code 1 means we are probably *not* dealing with an extension failure
+SuccessExitStatus=1
 # On wayland we cannot restart
 Restart=no
 # Kill any stubborn child processes after this long

data/gnome-shell-wayland.target

@@ -6,5 +6,5 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
-Wants=org.gnome.Shell@wayland.service
+Requires=gnome-shell-wayland.service
-Wants=org.gnome.Shell@x11.service
+After=gnome-shell-wayland.service

data/gnome-shell-x11.service.in

@@ -1,7 +1,7 @@
 [Unit]
 Description=GNOME Shell on X11
 # On X11, try to show the GNOME Session Failed screen
-OnFailure=org.gnome.Shell-disable-extensions.service gnome-session-failed.target
+OnFailure=gnome-shell-disable-extensions.service gnome-session-failed.target
 OnFailureJobMode=replace
 CollectMode=inactive-or-failed
 RefuseManualStart=on
@@ -13,24 +13,18 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
+# The units already conflict because they use the same BusName
+#Conflicts=gnome-shell-wayland.service
+
 # Limit startup frequency more than the default
 StartLimitIntervalSec=15s
 StartLimitBurst=3
 
 [Service]
-Slice=session.slice
 Type=notify
-# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
-#       with systemd >= 245. Also, the current solution is kind of painful
-#       as systemd had a bug where it retries the condition.
-# Only start if the template instance matches the session type.
-ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
 ExecStart=@bindir@/gnome-shell
 # Exit code 1 means we are probably *not* dealing with an extension failure
 SuccessExitStatus=1
-
-# On X11 we do not need to unset any variables
-
 # On X11 we want to restart on-success (Alt+F2 + r) and on-failure.
 Restart=always
 # Do not wait before restarting the shell

data/gnome-shell-x11.target

@@ -0,0 +1,10 @@
+[Unit]
+Description=GNOME Shell on X11
+DefaultDependencies=no
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+Requires=gnome-shell-x11.service
+After=gnome-shell-x11.service

data/meson.build

@@ -101,21 +101,22 @@ if have_systemd
   unitconf.set('bindir', bindir)
 
   configure_file(
-    input: 'org.gnome.Shell@x11.service.in',
+    input: 'gnome-shell-x11.service.in',
-    output: 'org.gnome.Shell@x11.service',
+    output: 'gnome-shell-x11.service',
     configuration: unitconf,
     install_dir: systemduserunitdir
   )
 
   configure_file(
-    input: 'org.gnome.Shell@wayland.service.in',
+    input: 'gnome-shell-wayland.service.in',
-    output: 'org.gnome.Shell@wayland.service',
+    output: 'gnome-shell-wayland.service',
     configuration: unitconf,
     install_dir: systemduserunitdir
   )
 
-  units = files('org.gnome.Shell.target',
+  units = files('gnome-shell-x11.target',
-                'org.gnome.Shell-disable-extensions.service')
+                'gnome-shell-wayland.target',
+                'gnome-shell-disable-extensions.service')
 
   install_data(units, install_dir: systemduserunitdir)
 endif

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

@@ -109,17 +109,6 @@
         the shell.
       </description>
     </key>
-    <key name="app-picker-layout" type="aa{sv}">
-      <default>[]</default>
-      <summary>Layout of the app picker</summary>
-      <description>
-        Layout of the app picker. Each entry in the array is a page. Pages are
-        stored in the order they appear in GNOME Shell. Each page contains an
-        “application id” → 'data' pair. Currently, the following values are
-        stored as 'data':
-          • “position”: the position of the application icon in the page
-      </description>
-    </key>
     <child name="keybindings" schema="org.gnome.shell.keybindings"/>
   </schema>
 

data/theme/gnome-shell-sass/widgets/_calendar.scss

@@ -232,9 +232,7 @@
     color: $fg_color;
     font-feature-settings: "tnum";
     @include fontsize($base_font_size);
-
+    text-align: right;
-    &:ltr { text-align: right; }
-    &:rtl { text-align: left; }
   }
 
   // timezone offset label

data/theme/gnome-shell-sass/widgets/_login-dialog.scss

@@ -138,10 +138,11 @@
 .user-widget.horizontal .user-widget-label {
   @include fontsize($base_font_size + 2);
   font-weight: bold;
+  text-align: left;
   padding-left: 15px;
 
-  &:ltr { padding-left: 14px; text-align: left; }
+  &:ltr { padding-left: 14px; }
-  &:rtl { padding-right: 14px; text-align: right; }
+  &:rtl { padding-right: 14px; }
 }
 
 .user-widget.vertical .user-widget-label {

data/theme/gnome-shell-sass/widgets/_message-list.scss

@@ -71,11 +71,9 @@
     > .event-time {
       color: transparentize($fg_color, 0.5);
       @include fontsize($base_font_size - 2);
+      text-align: right;
       /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
       padding-bottom: 0.13em;
-
-      &:ltr { text-align: right };
-      &:rtl { text-align: left };
     }
   }
 

data/theme/gnome-shell-sass/widgets/_popovers.scss

@@ -76,10 +76,8 @@ $popover_arrow_height: 12px;
 
 // container for radio and check boxes
 .popup-menu-ornament {
+  text-align: right;
   width: 1.2em;
-
-  &:ltr { text-align: right };
-  &:rtl { text-align: left };
 }
 
 // separator

data/theme/gnome-shell-sass/widgets/_window-picker.scss

@@ -1,7 +1,7 @@
 /* Window Picker */
 
-$window_picker_spacing: $base_spacing; // 6px
+$window_picker_spacing: $base_spacing * 2; // 16px
-$window_picker_padding: $base_padding * 2; // 12px
+$window_picker_padding: $base_padding * 2; // 16px
 
 $window_thumbnail_border_color:transparentize($selected_fg_color, 0.65);
 
@@ -13,8 +13,8 @@ $window_clone_border_size: 6px;
 // Window picker
 .window-picker {
   // Space between window thumbnails
-  spacing: $window_picker_spacing;
+  -horizontal-spacing: $window_picker_spacing;
-
+  -vertical-spacing: $window_picker_spacing;
   // Padding for container around window thumbnails
   padding: $window_picker_padding;
 

docs/reference/shell/meson.build

@@ -3,8 +3,13 @@ private_headers = [
   'gactionobservable.h',
   'gactionobserver.h',
   'shell-network-agent.h',
+  'shell-recorder-src.h'
 ]
 
+if not enable_recorder
+  private_headers += 'shell-recorder.h'
+endif
+
 exclude_directories = [
   'calendar-server',
   'hotplug-sniffer',

js/dbusServices/dbusService.js

@@ -25,8 +25,6 @@ var ServiceImplementation = class {
 
         // subclasses may override this to disable automatic shutdown
         this._autoShutdown = true;
-
-        this._queueShutdownCheck();
     }
 
     // subclasses may override this to own additional names

js/dbusServices/meson.build

@@ -8,12 +8,6 @@ dbus_services = {
   'org.gnome.Shell.Notifications': 'notifications',
 }
 
-if enable_recorder
-  dbus_services += {
-    'org.gnome.Shell.Screencast': 'screencast',
-  }
-endif
-
 config_dir = '@0@/..'.format(meson.current_build_dir())
 
 foreach service, dir : dbus_services

js/dbusServices/org.gnome.Shell.Screencast.src.gresource.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/Shell/Screencast/js">
-    <file>main.js</file>
-    <file>screencastService.js</file>
-    <file>dbusService.js</file>
-
-    <file>misc/config.js</file>
-    <file>misc/fileUtils.js</file>
-  </gresource>
-</gresources>

js/dbusServices/screencast/main.js

@@ -1,11 +0,0 @@
-/* exported main */
-
-const { DBusService } = imports.dbusService;
-const { ScreencastService } = imports.screencastService;
-
-function main() {
-    const service = new DBusService(
-        'org.gnome.Shell.Screencast',
-        new ScreencastService());
-    service.run();
-}

js/dbusServices/screencast/screencastService.js

@@ -1,458 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported ScreencastService */
-
-const { Gio, GLib, Gst } = imports.gi;
-
-const { loadInterfaceXML, loadSubInterfaceXML } = imports.misc.fileUtils;
-const { ServiceImplementation } = imports.dbusService;
-
-const ScreencastIface = loadInterfaceXML('org.gnome.Shell.Screencast');
-
-const IntrospectIface = loadInterfaceXML('org.gnome.Shell.Introspect');
-const IntrospectProxy = Gio.DBusProxy.makeProxyWrapper(IntrospectIface);
-
-const ScreenCastIface = loadSubInterfaceXML(
-    'org.gnome.Mutter.ScreenCast', 'org.gnome.Mutter.ScreenCast');
-const ScreenCastSessionIface = loadSubInterfaceXML(
-    'org.gnome.Mutter.ScreenCast.Session', 'org.gnome.Mutter.ScreenCast');
-const ScreenCastStreamIface = loadSubInterfaceXML(
-    'org.gnome.Mutter.ScreenCast.Stream', 'org.gnome.Mutter.ScreenCast');
-const ScreenCastProxy = Gio.DBusProxy.makeProxyWrapper(ScreenCastIface);
-const ScreenCastSessionProxy = Gio.DBusProxy.makeProxyWrapper(ScreenCastSessionIface);
-const ScreenCastStreamProxy = Gio.DBusProxy.makeProxyWrapper(ScreenCastStreamIface);
-
-const DEFAULT_PIPELINE = 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux';
-const DEFAULT_FRAMERATE = 30;
-const DEFAULT_DRAW_CURSOR = true;
-
-const PipelineState = {
-    INIT: 0,
-    PLAYING: 1,
-    FLUSHING: 2,
-    STOPPED: 3,
-};
-
-const SessionState = {
-    INIT: 0,
-    ACTIVE: 1,
-    STOPPED: 2,
-};
-
-var Recorder = class {
-    constructor(sessionPath, x, y, width, height, filePath, options,
-        invocation,
-        onErrorCallback) {
-        this._startInvocation = invocation;
-        this._dbusConnection = invocation.get_connection();
-        this._onErrorCallback = onErrorCallback;
-        this._stopInvocation = null;
-
-        this._pipelineIsPlaying = false;
-        this._sessionIsActive = false;
-
-        this._x = x;
-        this._y = y;
-        this._width = width;
-        this._height = height;
-        this._filePath = filePath;
-
-        this._pipelineString = DEFAULT_PIPELINE;
-        this._framerate = DEFAULT_FRAMERATE;
-        this._drawCursor = DEFAULT_DRAW_CURSOR;
-
-        this._applyOptions(options);
-        this._watchSender(invocation.get_sender());
-
-        this._initSession(sessionPath);
-    }
-
-    _applyOptions(options) {
-        for (const option in options)
-            options[option] = options[option].deep_unpack();
-
-        if (options['pipeline'] !== undefined)
-            this._pipelineString = options['pipeline'];
-        if (options['framerate'] !== undefined)
-            this._framerate = options['framerate'];
-        if ('draw-cursor' in options)
-            this._drawCursor = options['draw-cursor'];
-    }
-
-    _watchSender(sender) {
-        this._nameWatchId = this._dbusConnection.watch_name(
-            sender,
-            Gio.BusNameWatcherFlags.NONE,
-            null,
-            this._senderVanished.bind(this));
-    }
-
-    _unwatchSender() {
-        if (this._nameWatchId !== 0) {
-            this._dbusConnection.unwatch_name(this._nameWatchId);
-            this._nameWatchId = 0;
-        }
-    }
-
-    _senderVanished() {
-        this._unwatchSender();
-
-        this.stopRecording(null);
-    }
-
-    _notifyStopped() {
-        this._unwatchSender();
-        if (this._onStartedCallback)
-            this._onStartedCallback(this, false);
-        else if (this._onStoppedCallback)
-            this._onStoppedCallback(this);
-        else
-            this._onErrorCallback(this);
-    }
-
-    _onSessionClosed() {
-        switch (this._pipelineState) {
-        case PipelineState.STOPPED:
-            break;
-        default:
-            this._pipeline.set_state(Gst.State.NULL);
-            log(`Unexpected pipeline state: ${this._pipelineState}`);
-            break;
-        }
-        this._notifyStopped();
-    }
-
-    _initSession(sessionPath) {
-        this._sessionProxy = new ScreenCastSessionProxy(Gio.DBus.session,
-            'org.gnome.Mutter.ScreenCast',
-            sessionPath);
-        this._sessionProxy.connectSignal('Closed', this._onSessionClosed.bind(this));
-    }
-
-    _startPipeline(nodeId) {
-        this._ensurePipeline(nodeId);
-
-        const bus = this._pipeline.get_bus();
-        bus.add_watch(bus, this._onBusMessage.bind(this));
-
-        this._pipeline.set_state(Gst.State.PLAYING);
-        this._pipelineState = PipelineState.PLAYING;
-
-        this._onStartedCallback(this, true);
-        this._onStartedCallback = null;
-    }
-
-    startRecording(onStartedCallback) {
-        this._onStartedCallback = onStartedCallback;
-
-        const [streamPath] = this._sessionProxy.RecordAreaSync(
-            this._x, this._y,
-            this._width, this._height,
-            {
-                'is-recording': GLib.Variant.new('b', true),
-                'cursor-mode': GLib.Variant.new('u', this._drawCursor ? 1 : 0),
-            });
-
-        this._streamProxy = new ScreenCastStreamProxy(Gio.DBus.session,
-            'org.gnome.ScreenCast.Stream',
-            streamPath);
-
-        this._streamProxy.connectSignal('PipeWireStreamAdded',
-            (proxy, sender, params) => {
-                const [nodeId] = params;
-                this._startPipeline(nodeId);
-            });
-        this._sessionProxy.StartSync();
-        this._sessionState = SessionState.ACTIVE;
-    }
-
-    stopRecording(onStoppedCallback) {
-        this._pipelineState = PipelineState.FLUSHING;
-        this._onStoppedCallback = onStoppedCallback;
-        this._pipeline.send_event(Gst.Event.new_eos());
-    }
-
-    _stopSession() {
-        this._sessionProxy.StopSync();
-        this._sessionState = SessionState.STOPPED;
-    }
-
-    _onBusMessage(bus, message, _) {
-        switch (message.type) {
-        case Gst.MessageType.EOS:
-            this._pipeline.set_state(Gst.State.NULL);
-
-            switch (this._pipelineState) {
-            case PipelineState.FLUSHING:
-                this._pipelineState = PipelineState.STOPPED;
-                break;
-            default:
-                break;
-            }
-
-            switch (this._sessionState) {
-            case SessionState.ACTIVE:
-                this._stopSession();
-                break;
-            case SessionState.STOPPED:
-                this._notifyStopped();
-                break;
-            default:
-                break;
-            }
-
-            break;
-        default:
-            break;
-        }
-        return true;
-    }
-
-    _substituteThreadCount(pipelineDescr) {
-        const numProcessors = GLib.get_num_processors();
-        const numThreads = Math.min(Math.max(1, numProcessors), 64);
-        return pipelineDescr.replace(/%T/, numThreads);
-    }
-
-    _ensurePipeline(nodeId) {
-        const framerate = this._framerate;
-
-        let fullPipeline = `
-            pipewiresrc path=${nodeId}
-                        do-timestamp=true
-                        keepalive-time=1000
-                        resend-last=true !
-            video/x-raw,max-framerate=${framerate}/1 !
-            videoconvert !
-            ${this._pipelineString} !
-            filesink location="${this._filePath}"`;
-        fullPipeline = this._substituteThreadCount(fullPipeline);
-
-        this._pipeline = Gst.parse_launch_full(fullPipeline,
-            null,
-            Gst.ParseFlags.FATAL_ERRORS);
-    }
-};
-
-var ScreencastService = class extends ServiceImplementation {
-    constructor() {
-        super(ScreencastIface, '/org/gnome/Shell/Screencast');
-
-        Gst.init(null);
-
-        this._recorders = new Map();
-        this._senders = new Map();
-
-        this._lockdownSettings = new Gio.Settings({
-            schema_id: 'org.gnome.desktop.lockdown',
-        });
-
-        this._proxy = new ScreenCastProxy(Gio.DBus.session,
-            'org.gnome.Mutter.ScreenCast',
-            '/org/gnome/Mutter/ScreenCast');
-
-        this._introspectProxy = new IntrospectProxy(Gio.DBus.session,
-            'org.gnome.Shell.Introspect',
-            '/org/gnome/Shell/Introspect');
-    }
-
-    _removeRecorder(sender) {
-        this._recorders.delete(sender);
-        if (this._recorders.size === 0)
-            this.release();
-    }
-
-    _addRecorder(sender, recorder) {
-        this._recorders.set(sender, recorder);
-        if (this._recorders.size === 1)
-            this.hold();
-    }
-
-    _getAbsolutePath(filename) {
-        if (GLib.path_is_absolute(filename))
-            return filename;
-
-        let videoDir = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_VIDEOS);
-        if (!GLib.file_test(videoDir, GLib.FileTest.EXISTS))
-            videoDir = GLib.get_home_dir();
-
-        return GLib.build_filenamev([videoDir, filename]);
-    }
-
-    _generateFilePath(template) {
-        let filename = '';
-        let escape = false;
-
-        [...template].forEach(c => {
-            if (escape) {
-                switch (c) {
-                case '%':
-                    filename += '%';
-                    break;
-                case 'd': {
-                    const datetime = GLib.DateTime.new_now_local();
-                    const datestr = datetime.format('%0x');
-                    const datestrEscaped = datestr.replace(/\//g, '-');
-
-                    filename += datestrEscaped;
-                    break;
-                }
-
-                case 't': {
-                    const datetime = GLib.DateTime.new_now_local();
-                    const datestr = datetime.format('%0X');
-                    const datestrEscaped = datestr.replace(/\//g, ':');
-
-                    filename += datestrEscaped;
-                    break;
-                }
-
-                default:
-                    log(`Warning: Unknown escape ${c}`);
-                }
-
-                escape = false;
-            } else if (c === '%') {
-                escape = true;
-            } else {
-                filename += c;
-            }
-        });
-
-        if (escape)
-            filename += '%';
-
-        return this._getAbsolutePath(filename);
-    }
-
-    ScreencastAsync(params, invocation) {
-        let returnValue = [false, ''];
-
-        if (this._lockdownSettings.get_boolean('disable-save-to-disk')) {
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }
-
-        const sender = invocation.get_sender();
-
-        if (this._recorders.get(sender)) {
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }
-
-        const [sessionPath] = this._proxy.CreateSessionSync({});
-
-        const [fileTemplate, options] = params;
-        const [screenWidth, screenHeight] = this._introspectProxy.ScreenSize;
-        const filePath = this._generateFilePath(fileTemplate);
-
-        let recorder;
-
-        try {
-            recorder = new Recorder(
-                sessionPath,
-                0, 0,
-                screenWidth, screenHeight,
-                fileTemplate,
-                options,
-                invocation,
-                _recorder => this._removeRecorder(sender));
-        } catch (error) {
-            log(`Failed to create recorder: ${error.message}`);
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }
-
-        this._addRecorder(sender, recorder);
-
-        try {
-            recorder.startRecording(
-                (_, result) => {
-                    if (result) {
-                        returnValue = [true, filePath];
-                        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-                    } else {
-                        this._removeRecorder(sender);
-                        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-                    }
-
-                });
-        } catch (error) {
-            log(`Failed to start recorder: ${error.message}`);
-            this._removeRecorder(sender);
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-        }
-    }
-
-    ScreencastAreaAsync(params, invocation) {
-        let returnValue = [false, ''];
-
-        if (this._lockdownSettings.get_boolean('disable-save-to-disk')) {
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }
-
-        const sender = invocation.get_sender();
-
-        if (this._recorders.get(sender)) {
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }
-
-        const [sessionPath] = this._proxy.CreateSessionSync({});
-
-        const [x, y, width, height, fileTemplate, options] = params;
-        const filePath = this._generateFilePath(fileTemplate);
-
-        let recorder;
-
-        try {
-            recorder = new Recorder(
-                sessionPath,
-                x, y,
-                width, height,
-                filePath,
-                options,
-                invocation,
-                _recorder => this._removeRecorder(sender));
-        } catch (error) {
-            log(`Failed to create recorder: ${error.message}`);
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-            return;
-        }
-
-        this._addRecorder(sender, recorder);
-
-        try {
-            recorder.startRecording(
-                (_, result) => {
-                    if (result) {
-                        returnValue = [true, filePath];
-                        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-                    } else {
-                        this._removeRecorder(sender);
-                        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-                    }
-
-                });
-        } catch (error) {
-            log(`Failed to start recorder: ${error.message}`);
-            this._removeRecorder(sender);
-            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
-        }
-    }
-
-    StopScreencastAsync(params, invocation) {
-        const sender = invocation.get_sender();
-
-        const recorder = this._recorders.get(sender);
-        if (!recorder) {
-            invocation.return_value(GLib.Variant.new('(b)', [false]));
-            return;
-        }
-
-        recorder.stopRecording(() => {
-            this._removeRecorder(sender);
-            invocation.return_value(GLib.Variant.new('(b)', [true]));
-        });
-    }
-};

js/gdm/authPrompt.js

@@ -71,7 +71,7 @@ var AuthPrompt = GObject.registerClass({
         this._userVerifier.connect('verification-complete', this._onVerificationComplete.bind(this));
         this._userVerifier.connect('reset', this._onReset.bind(this));
         this._userVerifier.connect('smartcard-status-changed', this._onSmartcardStatusChanged.bind(this));
-        this._userVerifier.connect('credential-manager-authenticated', this._onCredentialManagerAuthenticated.bind(this));
+        this._userVerifier.connect('ovirt-user-authenticated', this._onOVirtUserAuthenticated.bind(this));
         this.smartcardDetected = this._userVerifier.smartcardDetected;
 
         this.connect('destroy', this._onDestroy.bind(this));
@@ -242,7 +242,7 @@ var AuthPrompt = GObject.registerClass({
         this.emit('prompted');
     }
 
-    _onCredentialManagerAuthenticated() {
+    _onOVirtUserAuthenticated() {
         if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
             this.reset();
     }

js/gdm/credentialManager.js

@@ -1,24 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported CredentialManager */
-
-class CredentialManager {
-    constructor(service) {
-        this._token = null;
-        this._service = service;
-        this._authenticatedSignalId = null;
-    }
-
-    get token() {
-        return this._token;
-    }
-
-    set token(t) {
-        this._token = t;
-        if (this._token)
-            this.emit('user-authenticated', this._token);
-    }
-
-    get service() {
-        return this._service;
-    }
-}

js/gdm/loginDialog.js

@@ -953,15 +953,16 @@ var LoginDialog = GObject.registerClass({
         if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
             return;
 
-        if (this._authPrompt.verificationStatus !== AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
-            this._authPrompt.reset();
-
         this._bindOpacity();
         this.ease({
             opacity: 255,
             duration: _FADE_ANIMATION_TIME,
             mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            onComplete: () => this._unbindOpacity(),
+            onComplete: () => {
+                if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING)
+                    this._authPrompt.reset();
+                this._unbindOpacity();
+            },
         });
     }
 

js/gdm/oVirt.js

@@ -3,9 +3,6 @@
 
 const Gio = imports.gi.Gio;
 const Signals = imports.signals;
-const Credential = imports.gdm.credentialManager;
-
-var SERVICE_NAME = 'gdm-ovirtcred';
 
 const OVirtCredentialsIface = `
 <node>
@@ -31,14 +28,30 @@ function OVirtCredentials() {
     return self;
 }
 
-var OVirtCredentialsManager = class OVirtCredentialsManager extends Credential.CredentialManager {
+var OVirtCredentialsManager = class {
     constructor() {
-        super(SERVICE_NAME);
+        this._token = null;
+
         this._credentials = new OVirtCredentials();
         this._credentials.connectSignal('UserAuthenticated',
-            (proxy, sender, [token]) => {
+                                        this._onUserAuthenticated.bind(this));
-                this.token = token;
+    }
-            });
+
+    _onUserAuthenticated(proxy, sender, [token]) {
+        this._token = token;
+        this.emit('user-authenticated', token);
+    }
+
+    hasToken() {
+        return this._token != null;
+    }
+
+    getToken() {
+        return this._token;
+    }
+
+    resetToken() {
+        this._token = null;
     }
 };
 Signals.addSignalMethods(OVirtCredentialsManager.prototype);

js/gdm/util.js

@@ -8,7 +8,6 @@ const Signals = imports.signals;
 const Batch = imports.gdm.batch;
 const Fprint = imports.gdm.fingerprint;
 const OVirt = imports.gdm.oVirt;
-const Vmware = imports.gdm.vmware;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const SmartcardManager = imports.misc.smartcardManager;
@@ -25,6 +24,7 @@ Gio._promisify(Gdm.UserVerifierProxy.prototype,
 var PASSWORD_SERVICE_NAME = 'gdm-password';
 var FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
 var SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
+var OVIRT_SERVICE_NAME = 'gdm-ovirtcred';
 var FADE_ANIMATION_TIME = 160;
 var CLONE_FADE_ANIMATION_TIME = 250;
 
@@ -160,20 +160,13 @@ var ShellUserVerifier = class {
 
         this._failCounter = 0;
 
-        this._credentialManagers = {};
+        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
-        this._credentialManagers[OVirt.SERVICE_NAME] = OVirt.getOVirtCredentialsManager();
-        this._credentialManagers[Vmware.SERVICE_NAME] = Vmware.getVmwareCredentialsManager();
 
-        for (let service in this._credentialManagers) {
+        if (this._oVirtCredentialsManager.hasToken())
-            if (this._credentialManagers[service].token) {
+            this._oVirtUserAuthenticated(this._oVirtCredentialsManager.getToken());
-                this._onCredentialManagerAuthenticated(this._credentialManagers[service],
-                    this._credentialManagers[service].token);
-            }
 
-            this._credentialManagers[service]._authenticatedSignalId =
+        this._oVirtUserAuthenticatedId = this._oVirtCredentialsManager.connect('user-authenticated',
-                this._credentialManagers[service].connect('user-authenticated',
+                                                                               this._oVirtUserAuthenticated.bind(this));
-                                                          this._onCredentialManagerAuthenticated.bind(this));
-        }
     }
 
     begin(userName, hold) {
@@ -229,11 +222,8 @@ var ShellUserVerifier = class {
         this._smartcardManager.disconnect(this._smartcardRemovedId);
         this._smartcardManager = null;
 
-        for (let service in this._credentialManagers) {
+        this._oVirtCredentialsManager.disconnect(this._oVirtUserAuthenticatedId);
-            let credentialManager = this._credentialManagers[service];
+        this._oVirtCredentialsManager = null;
-            credentialManager.disconnect(credentialManager._authenticatedSignalId);
-            credentialManager = null;
-        }
     }
 
     answerQuery(serviceName, answer) {
@@ -321,9 +311,9 @@ var ShellUserVerifier = class {
             });
     }
 
-    _onCredentialManagerAuthenticated(credentialManager, _token) {
+    _oVirtUserAuthenticated(_token) {
-        this._preemptingService = credentialManager.service;
+        this._preemptingService = OVIRT_SERVICE_NAME;
-        this.emit('credential-manager-authenticated');
+        this.emit('ovirt-user-authenticated');
     }
 
     _checkForSmartcard() {
@@ -500,12 +490,9 @@ var ShellUserVerifier = class {
         if (!this.serviceIsForeground(serviceName))
             return;
 
-        let token = null;
+        if (serviceName == OVIRT_SERVICE_NAME) {
-        if (this._credentialManagers[serviceName])
+            // The only question asked by this service is "Token?"
-            token = this._credentialManagers[serviceName].token;
+            this.answerQuery(serviceName, this._oVirtCredentialsManager.getToken());
-
-        if (token) {
-            this.answerQuery(serviceName, token);
             return;
         }
 
@@ -573,10 +560,8 @@ var ShellUserVerifier = class {
         // If the login failed with the preauthenticated oVirt credentials
         // then discard the credentials and revert to default authentication
         // mechanism.
-        let foregroundService = Object.keys(this._credentialManagers).find(service =>
+        if (this.serviceIsForeground(OVIRT_SERVICE_NAME)) {
-            this.serviceIsForeground(service));
+            this._oVirtCredentialsManager.resetToken();
-        if (foregroundService) {
-            this._credentialManagers[foregroundService].token = null;
             this._preemptingService = null;
             this._verificationFailed(false);
             return;

js/gdm/vmware.js

@@ -1,54 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported getVmwareCredentialsManager */
-
-const Gio = imports.gi.Gio;
-const Signals = imports.signals;
-const Credential = imports.gdm.credentialManager;
-
-const dbusPath = '/org/vmware/viewagent/Credentials';
-const dbusInterface = 'org.vmware.viewagent.Credentials';
-
-var SERVICE_NAME = 'gdm-vmwcred';
-
-const VmwareCredentialsIface = '<node> \
-<interface name="' + dbusInterface + '"> \
-<signal name="UserAuthenticated"> \
-    <arg type="s" name="token"/> \
-</signal> \
-</interface> \
-</node>';
-
-
-const VmwareCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(VmwareCredentialsIface);
-
-let _vmwareCredentialsManager = null;
-
-function VmwareCredentials() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-                                   g_interface_name: VmwareCredentialsInfo.name,
-                                   g_interface_info: VmwareCredentialsInfo,
-                                   g_name: dbusInterface,
-                                   g_object_path: dbusPath,
-                                   g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
-    self.init(null);
-    return self;
-}
-
-var VmwareCredentialsManager = class VmwareCredentialsManager extends Credential.CredentialManager {
-    constructor() {
-        super(SERVICE_NAME);
-        this._credentials = new VmwareCredentials();
-        this._credentials.connectSignal('UserAuthenticated',
-            (proxy, sender, [token]) => {
-                this.token = token;
-            });
-    }
-};
-Signals.addSignalMethods(VmwareCredentialsManager.prototype);
-
-function getVmwareCredentialsManager() {
-    if (!_vmwareCredentialsManager)
-        _vmwareCredentialsManager = new VmwareCredentialsManager();
-
-    return _vmwareCredentialsManager;
-}

js/js-resources.gresource.xml

@@ -6,8 +6,6 @@
     <file>gdm/fingerprint.js</file>
     <file>gdm/loginDialog.js</file>
     <file>gdm/oVirt.js</file>
-    <file>gdm/credentialManager.js</file>
-    <file>gdm/vmware.js</file>
     <file>gdm/realmd.js</file>
     <file>gdm/util.js</file>
 
@@ -32,7 +30,6 @@
     <file>misc/util.js</file>
     <file>misc/weather.js</file>
 
-    <file>perf/basic.js</file>
     <file>perf/core.js</file>
     <file>perf/hwtest.js</file>
 
@@ -93,6 +90,7 @@
     <file>ui/ripples.js</file>
     <file>ui/runDialog.js</file>
     <file>ui/screenShield.js</file>
+    <file>ui/screencast.js</file>
     <file>ui/screenshot.js</file>
     <file>ui/scripting.js</file>
     <file>ui/search.js</file>
@@ -137,6 +135,7 @@
     <file>ui/status/volume.js</file>
     <file>ui/status/bluetooth.js</file>
     <file>ui/status/remoteAccess.js</file>
+    <file>ui/status/screencast.js</file>
     <file>ui/status/system.js</file>
     <file>ui/status/thunderbolt.js</file>
   </gresource>

js/misc/fileUtils.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported collectFromDatadirs, recursivelyDeleteDir,
-            recursivelyMoveDir, loadInterfaceXML, loadSubInterfaceXML */
+            recursivelyMoveDir, loadInterfaceXML */
 
 const { Gio, GLib } = imports.gi;
 const Config = imports.misc.config;
@@ -67,19 +67,14 @@ function recursivelyMoveDir(srcDir, destDir) {
 }
 
 let _ifaceResource = null;
-function ensureIfaceResource() {
-    if (_ifaceResource)
-        return;
-
-    // don't use global.datadir so the method is usable from tests/tools
-    let dir = GLib.getenv('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
-    let path = `${dir}/gnome-shell-dbus-interfaces.gresource`;
-    _ifaceResource = Gio.Resource.load(path);
-    _ifaceResource._register();
-}
-
 function loadInterfaceXML(iface) {
-    ensureIfaceResource();
+    if (!_ifaceResource) {
+        // don't use global.datadir so the method is usable from tests/tools
+        let dir = GLib.getenv('GNOME_SHELL_DATADIR') || Config.PKGDATADIR;
+        let path = `${dir}/gnome-shell-dbus-interfaces.gresource`;
+        _ifaceResource = Gio.Resource.load(path);
+        _ifaceResource._register();
+    }
 
     let uri = `resource:///org/gnome/shell/dbus-interfaces/${iface}.xml`;
     let f = Gio.File.new_for_uri(uri);
@@ -93,25 +88,3 @@ function loadInterfaceXML(iface) {
 
     return null;
 }
-
-function loadSubInterfaceXML(iface, ifaceFile) {
-    let xml = loadInterfaceXML(ifaceFile);
-    if (!xml)
-        return null;
-
-    let ifaceStartTag = `<interface name="${iface}">`;
-    let ifaceStopTag = '</interface>';
-    let ifaceStartIndex = xml.indexOf(ifaceStartTag);
-    let ifaceEndIndex = xml.indexOf(ifaceStopTag, ifaceStartIndex + 1) + ifaceStopTag.length;
-
-    let xmlHeader = '<!DOCTYPE node PUBLIC\n' +
-        '\'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\'\n' +
-        '\'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\'>\n' +
-        '<node>\n';
-    let xmlFooter = '</node>';
-
-    return (
-        xmlHeader +
-        xml.substr(ifaceStartIndex, ifaceEndIndex - ifaceStartIndex) +
-        xmlFooter);
-}

js/misc/introspect.js

@@ -3,9 +3,9 @@ const { Gio, GLib, Meta, Shell, St } = imports.gi;
 
 const INTROSPECT_SCHEMA = 'org.gnome.shell';
 const INTROSPECT_KEY = 'introspect';
-const APP_ALLOWLIST = ['org.freedesktop.impl.portal.desktop.gtk'];
+const APP_WHITELIST = ['org.freedesktop.impl.portal.desktop.gtk'];
 
-const INTROSPECT_DBUS_API_VERSION = 3;
+const INTROSPECT_DBUS_API_VERSION = 2;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
@@ -46,24 +46,19 @@ var IntrospectService = class {
 
         this._syncRunningApplications();
 
-        this._allowlistMap = new Map();
+        this._whitelistMap = new Map();
-        APP_ALLOWLIST.forEach(appName => {
+        APP_WHITELIST.forEach(appName => {
             Gio.DBus.watch_name(Gio.BusType.SESSION,
                 appName,
                 Gio.BusNameWatcherFlags.NONE,
-                (conn, name, owner) => this._allowlistMap.set(name, owner),
+                (conn, name, owner) => this._whitelistMap.set(name, owner),
-                (conn, name) => this._allowlistMap.delete(name));
+                (conn, name) => this._whitelistMap.delete(name));
         });
 
         this._settings = St.Settings.get();
         this._settings.connect('notify::enable-animations',
             this._syncAnimationsEnabled.bind(this));
         this._syncAnimationsEnabled();
-
-        const monitorManager = Meta.MonitorManager.get();
-        monitorManager.connect('monitors-changed',
-            this._syncScreenSize.bind(this));
-        this._syncScreenSize();
     }
 
     _isStandaloneApp(app) {
@@ -74,8 +69,8 @@ var IntrospectService = class {
         return this._introspectSettings.get_boolean(INTROSPECT_KEY);
     }
 
-    _isSenderAllowed(sender) {
+    _isSenderWhitelisted(sender) {
-        return [...this._allowlistMap.values()].includes(sender);
+        return [...this._whitelistMap.values()].includes(sender);
     }
 
     _getSandboxedAppId(app) {
@@ -138,7 +133,7 @@ var IntrospectService = class {
         if (this._isIntrospectEnabled())
             return true;
 
-        if (this._isSenderAllowed(invocation.get_sender()))
+        if (this._isSenderWhitelisted(invocation.get_sender()))
             return true;
 
         return false;
@@ -214,28 +209,10 @@ var IntrospectService = class {
         }
     }
 
-    _syncScreenSize() {
-        const oldScreenWidth = this._screenWidth;
-        const oldScreenHeight = this._screenHeight;
-        this._screenWidth = global.screen_width;
-        this._screenHeight = global.screen_height;
-
-        if (oldScreenWidth !== this._screenWidth ||
-            oldScreenHeight !== this._screenHeight) {
-            const variant = new GLib.Variant('(ii)',
-                [this._screenWidth, this._screenHeight]);
-            this._dbusImpl.emit_property_changed('ScreenSize', variant);
-        }
-    }
-
     get AnimationsEnabled() {
         return this._animationsEnabled;
     }
 
-    get ScreenSize() {
-        return [this._screenWidth, this._screenHeight];
-    }
-
     get version() {
         return INTROSPECT_DBUS_API_VERSION;
     }

js/misc/loginManager.js

@@ -158,23 +158,6 @@ var LoginManagerSystemd = class {
         });
     }
 
-    canRebootToBootLoaderMenu(asyncCallback) {
-        this._proxy.CanRebootToBootLoaderMenuRemote((result, error) => {
-            if (error) {
-                asyncCallback(false, false);
-            } else {
-                const needsAuth = result[0] === 'challenge';
-                const canRebootToBootLoaderMenu = needsAuth || result[0] === 'yes';
-                asyncCallback(canRebootToBootLoaderMenu, needsAuth);
-            }
-        });
-    }
-
-    setRebootToBootLoaderMenu() {
-        /* Parameter is timeout in usec, show to menu for 60 seconds */
-        this._proxy.SetRebootToBootLoaderMenuRemote(60000000);
-    }
-
     listSessions(asyncCallback) {
         this._proxy.ListSessionsRemote((result, error) => {
             if (error)
@@ -220,13 +203,6 @@ var LoginManagerDummy = class {
         asyncCallback(false, false);
     }
 
-    canRebootToBootLoaderMenu(asyncCallback) {
-        asyncCallback(false, false);
-    }
-
-    setRebootToBootLoaderMenu() {
-    }
-
     listSessions(asyncCallback) {
         asyncCallback([]);
     }

js/misc/parentalControlsManager.js

@@ -121,10 +121,10 @@ var ParentalControlsManager = GObject.registerClass({
     // Calculate whether the given app (a Gio.DesktopAppInfo) should be shown
     // on the desktop, in search results, etc. The app should be shown if:
     //  - The .desktop file doesn’t say it should be hidden.
-    //  - The executable from the .desktop file’s Exec line isn’t denied in
+    //  - The executable from the .desktop file’s Exec line isn’t blacklisted in
     //    the user’s parental controls.
     //  - None of the flatpak app IDs from the X-Flatpak and the
-    //    X-Flatpak-RenamedFrom lines are denied in the user’s parental
+    //    X-Flatpak-RenamedFrom lines are blacklisted in the user’s parental
     //    controls.
     shouldShowApp(appInfo) {
         // Quick decision?

js/misc/systemActions.js

@@ -21,7 +21,6 @@ const SENSOR_OBJECT_PATH = '/net/hadess/SensorProxy';
 const SensorProxyInterface = loadInterfaceXML('net.hadess.SensorProxy');
 
 const POWER_OFF_ACTION_ID        = 'power-off';
-const RESTART_ACTION_ID          = 'restart';
 const LOCK_SCREEN_ACTION_ID      = 'lock-screen';
 const LOGOUT_ACTION_ID           = 'logout';
 const SUSPEND_ACTION_ID          = 'suspend';
@@ -41,38 +40,41 @@ function getDefault() {
 
 const SystemActions = GObject.registerClass({
     Properties: {
-        'can-power-off': GObject.ParamSpec.boolean(
+        'can-power-off': GObject.ParamSpec.boolean('can-power-off',
-            'can-power-off', 'can-power-off', 'can-power-off',
+                                                   'can-power-off',
-            GObject.ParamFlags.READABLE,
+                                                   'can-power-off',
-            false),
+                                                   GObject.ParamFlags.READABLE,
-        'can-restart': GObject.ParamSpec.boolean(
+                                                   false),
-            'can-restart', 'can-restart', 'can-restart',
+        'can-suspend': GObject.ParamSpec.boolean('can-suspend',
-            GObject.ParamFlags.READABLE,
+                                                 'can-suspend',
-            false),
+                                                 'can-suspend',
-        'can-suspend': GObject.ParamSpec.boolean(
+                                                 GObject.ParamFlags.READABLE,
-            'can-suspend', 'can-suspend', 'can-suspend',
+                                                 false),
-            GObject.ParamFlags.READABLE,
+        'can-lock-screen': GObject.ParamSpec.boolean('can-lock-screen',
-            false),
+                                                     'can-lock-screen',
-        'can-lock-screen': GObject.ParamSpec.boolean(
+                                                     'can-lock-screen',
-            'can-lock-screen', 'can-lock-screen', 'can-lock-screen',
+                                                     GObject.ParamFlags.READABLE,
-            GObject.ParamFlags.READABLE,
+                                                     false),
-            false),
+        'can-switch-user': GObject.ParamSpec.boolean('can-switch-user',
-        'can-switch-user': GObject.ParamSpec.boolean(
+                                                     'can-switch-user',
-            'can-switch-user', 'can-switch-user', 'can-switch-user',
+                                                     'can-switch-user',
-            GObject.ParamFlags.READABLE,
+                                                     GObject.ParamFlags.READABLE,
-            false),
+                                                     false),
-        'can-logout': GObject.ParamSpec.boolean(
+        'can-logout': GObject.ParamSpec.boolean('can-logout',
-            'can-logout', 'can-logout', 'can-logout',
+                                                'can-logout',
-            GObject.ParamFlags.READABLE,
+                                                'can-logout',
-            false),
+                                                GObject.ParamFlags.READABLE,
-        'can-lock-orientation': GObject.ParamSpec.boolean(
+                                                false),
-            'can-lock-orientation', 'can-lock-orientation', 'can-lock-orientation',
+        'can-lock-orientation': GObject.ParamSpec.boolean('can-lock-orientation',
-            GObject.ParamFlags.READABLE,
+                                                          'can-lock-orientation',
-            false),
+                                                          'can-lock-orientation',
-        'orientation-lock-icon': GObject.ParamSpec.string(
+                                                          GObject.ParamFlags.READABLE,
-            'orientation-lock-icon', 'orientation-lock-icon', 'orientation-lock-icon',
+                                                          false),
-            GObject.ParamFlags.READWRITE,
+        'orientation-lock-icon': GObject.ParamSpec.string('orientation-lock-icon',
-            null),
+                                                          'orientation-lock-icon',
+                                                          'orientation-lock-icon',
+                                                          GObject.ParamFlags.READWRITE,
+                                                          null),
     },
 }, class SystemActions extends GObject.Object {
     _init() {
@@ -91,15 +93,7 @@ const SystemActions = GObject.registerClass({
             name: C_("search-result", "Power Off"),
             iconName: 'system-shutdown-symbolic',
             // Translators: A list of keywords that match the power-off action, separated by semicolons
-            keywords: tokenizeKeywords(_('power off;shutdown;halt;stop')),
+            keywords: tokenizeKeywords(_('power off;shutdown;reboot;restart;halt;stop')),
-            available: false,
-        });
-        this._actions.set(RESTART_ACTION_ID, {
-            // Translators: The name of the restart action in search
-            name: C_('search-result', 'Restart'),
-            iconName: 'system-reboot-symbolic',
-            // Translators: A list of keywords that match the restart action, separated by semicolons
-            keywords: tokenizeKeywords(_('reboot;restart;')),
             available: false,
         });
         this._actions.set(LOCK_SCREEN_ACTION_ID, {
@@ -209,11 +203,6 @@ const SystemActions = GObject.registerClass({
         return this._actions.get(POWER_OFF_ACTION_ID).available;
     }
 
-    // eslint-disable-next-line camelcase
-    get can_restart() {
-        return this._actions.get(RESTART_ACTION_ID).available;
-    }
-
     // eslint-disable-next-line camelcase
     get can_suspend() {
         return this._actions.get(SUSPEND_ACTION_ID).available;
@@ -317,9 +306,6 @@ const SystemActions = GObject.registerClass({
         case POWER_OFF_ACTION_ID:
             this.activatePowerOff();
             break;
-        case RESTART_ACTION_ID:
-            this.activateRestart();
-            break;
         case LOCK_SCREEN_ACTION_ID:
             this.activateLockScreen();
             break;
@@ -361,9 +347,6 @@ const SystemActions = GObject.registerClass({
                         this._loginScreenSettings.get_boolean(DISABLE_RESTART_KEY));
         this._actions.get(POWER_OFF_ACTION_ID).available = this._canHavePowerOff && !disabled;
         this.notify('can-power-off');
-
-        this._actions.get(RESTART_ACTION_ID).available = this._canHavePowerOff && !disabled;
-        this.notify('can-restart');
     }
 
     _updateHaveSuspend() {
@@ -462,13 +445,6 @@ const SystemActions = GObject.registerClass({
         this._session.ShutdownRemote(0);
     }
 
-    activateRestart() {
-        if (!this._actions.get(RESTART_ACTION_ID).available)
-            throw new Error('The restart action is not available!');
-
-        this._session.RebootRemote();
-    }
-
     activateSuspend() {
         if (!this._actions.get(SUSPEND_ACTION_ID).available)
             throw new Error('The suspend action is not available!');

js/perf/basic.js

@@ -1,146 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-/* exported run, finish, script_topBarNavDone, script_notificationShowDone,
-   script_notificationCloseDone, script_overviewShowDone,
-   script_applicationsShowStart, script_applicationsShowDone, METRICS,
-*/
-/* eslint camelcase: ["error", { properties: "never", allow: ["^script_"] }] */
-
-const { St } = imports.gi;
-
-const Main = imports.ui.main;
-const MessageTray = imports.ui.messageTray;
-const Scripting = imports.ui.scripting;
-
-// This script tests the most important (basic) functionality of the shell.
-
-var METRICS = {};
-
-async function run() {
-    /* eslint-disable no-await-in-loop */
-    Scripting.defineScriptEvent('topBarNavStart', 'Starting to navigate the top bar');
-    Scripting.defineScriptEvent('topBarNavDone', 'Done navigating the top bar');
-    Scripting.defineScriptEvent('notificationShowStart', 'Showing a notification');
-    Scripting.defineScriptEvent('notificationShowDone', 'Done showing a notification');
-    Scripting.defineScriptEvent('notificationCloseStart', 'Closing a notification');
-    Scripting.defineScriptEvent('notificationCloseDone', 'Done closing a notification');
-    Scripting.defineScriptEvent('overviewShowStart', 'Starting to show the overview');
-    Scripting.defineScriptEvent('overviewShowDone', 'Overview finished showing');
-    Scripting.defineScriptEvent('applicationsShowStart', 'Starting to switch to applications view');
-    Scripting.defineScriptEvent('applicationsShowDone', 'Done switching to applications view');
-
-    Main.overview.connect('shown',
-        () => Scripting.scriptEvent('overviewShowDone'));
-
-    await Scripting.sleep(1000);
-
-    // navigate through top bar
-    Scripting.scriptEvent('topBarNavStart');
-    Main.panel.statusArea.aggregateMenu.menu.open();
-    await Scripting.sleep(400);
-
-    const { menuManager } = Main.panel;
-    while (menuManager.activeMenu &&
-        Main.panel.navigate_focus(menuManager.activeMenu.sourceActor,
-            St.DirectionType.TAB_BACKWARD, false))
-        await Scripting.sleep(400);
-    Scripting.scriptEvent('topBarNavDone');
-
-    await Scripting.sleep(1000);
-
-    // notification
-    const source = new MessageTray.SystemNotificationSource();
-    Main.messageTray.add(source);
-
-    Scripting.scriptEvent('notificationShowStart');
-    source.connect('notification-show',
-        () => Scripting.scriptEvent('notificationShowDone'));
-
-    const notification = new MessageTray.Notification(source,
-        'A test notification');
-    source.showNotification(notification);
-    await Scripting.sleep(400);
-
-    Main.panel.statusArea.dateMenu.menu.open();
-    await Scripting.sleep(400);
-
-    Scripting.scriptEvent('notificationCloseStart');
-    notification.connect('destroy',
-        () => Scripting.scriptEvent('notificationCloseDone'));
-
-    notification.destroy();
-    await Scripting.sleep(400);
-
-    Main.panel.statusArea.dateMenu.menu.close();
-    await Scripting.waitLeisure();
-
-    await Scripting.sleep(1000);
-
-    // overview (window picker)
-    Scripting.scriptEvent('overviewShowStart');
-    Main.overview.show();
-    await Scripting.waitLeisure();
-    Main.overview.hide();
-    await Scripting.waitLeisure();
-
-    await Scripting.sleep(1000);
-
-    // overview (app picker)
-    Main.overview.show();
-    await Scripting.waitLeisure();
-
-    Scripting.scriptEvent('applicationsShowStart');
-    // eslint-disable-next-line require-atomic-updates
-    Main.overview.dash.showAppsButton.checked = true;
-    await Scripting.waitLeisure();
-    Scripting.scriptEvent('applicationsShowDone');
-    // eslint-disable-next-line require-atomic-updates
-    Main.overview.dash.showAppsButton.checked = false;
-    await Scripting.waitLeisure();
-
-    Main.overview.hide();
-    await Scripting.waitLeisure();
-    /* eslint-enable no-await-in-loop */
-}
-
-let topBarNav = false;
-let notificationShown = false;
-let notificationClosed = false;
-let windowPickerShown = false;
-let appPickerShown = false;
-
-function script_topBarNavDone() {
-    topBarNav = true;
-}
-
-function script_notificationShowDone() {
-    notificationShown = true;
-}
-
-function script_notificationCloseDone() {
-    notificationClosed = true;
-}
-
-function script_overviewShowDone() {
-    windowPickerShown = true;
-}
-
-function script_applicationsShowDone() {
-    appPickerShown = true;
-}
-
-function finish() {
-    if (!topBarNav)
-        throw new Error('Failed to navigate top bar');
-
-    if (!notificationShown)
-        throw new Error('Failed to show notification');
-
-    if (!notificationClosed)
-        throw new Error('Failed to close notification');
-
-    if (!windowPickerShown)
-        throw new Error('Failed to show window picker');
-
-    if (!appPickerShown)
-        throw new Error('Failed to show app picker');
-}

js/perf/core.js

@@ -70,8 +70,7 @@ let WINDOW_CONFIGS = [
     { width: 640, height: 480, alpha: true,  maximized: false, count: 10, metric: 'overviewFps10Alpha' },
 ];
 
-async function run() {
+function *run() {
-    /* eslint-disable no-await-in-loop */
     Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
     Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
     Scripting.defineScriptEvent("afterShowHide", "After a show/hide cycle for the overview");
@@ -85,7 +84,7 @@ async function run() {
         Scripting.scriptEvent('overviewShowDone');
     });
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     for (let i = 0; i < 2 * WINDOW_CONFIGS.length; i++) {
         // We go to the overview twice for each configuration; the first time
@@ -93,50 +92,49 @@ async function run() {
         // a clean set of numbers.
         if ((i % 2) == 0) {
             let config = WINDOW_CONFIGS[i / 2];
-            await Scripting.destroyTestWindows();
+            yield Scripting.destroyTestWindows();
 
             for (let k = 0; k < config.count; k++) {
-                await Scripting.createTestWindow({ width: config.width,
+                yield Scripting.createTestWindow({ width: config.width,
                                                    height: config.height,
                                                    alpha: config.alpha,
                                                    maximized: config.maximized });
             }
 
-            await Scripting.waitTestWindows();
+            yield Scripting.waitTestWindows();
-            await Scripting.sleep(1000);
+            yield Scripting.sleep(1000);
-            await Scripting.waitLeisure();
+            yield Scripting.waitLeisure();
         }
 
         Scripting.scriptEvent('overviewShowStart');
         Main.overview.show();
 
-        await Scripting.waitLeisure();
+        yield Scripting.waitLeisure();
         Main.overview.hide();
-        await Scripting.waitLeisure();
+        yield Scripting.waitLeisure();
 
         System.gc();
-        await Scripting.sleep(1000);
+        yield Scripting.sleep(1000);
         Scripting.collectStatistics();
         Scripting.scriptEvent('afterShowHide');
     }
 
-    await Scripting.destroyTestWindows();
+    yield Scripting.destroyTestWindows();
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     Main.overview.show();
-    await Scripting.waitLeisure();
+    yield Scripting.waitLeisure();
 
     for (let i = 0; i < 2; i++) {
         Scripting.scriptEvent('applicationsShowStart');
         // eslint-disable-next-line require-atomic-updates
         Main.overview.dash.showAppsButton.checked = true;
-        await Scripting.waitLeisure();
+        yield Scripting.waitLeisure();
         Scripting.scriptEvent('applicationsShowDone');
         // eslint-disable-next-line require-atomic-updates
         Main.overview.dash.showAppsButton.checked = false;
-        await Scripting.waitLeisure();
+        yield Scripting.waitLeisure();
     }
-    /* eslint-enable no-await-in-loop */
 }
 
 let showingOverview = false;

js/perf/hwtest.js

@@ -94,8 +94,7 @@ function extractBootTimestamp() {
     return result;
 }
 
-async function run() {
+function *run() {
-    /* eslint-disable no-await-in-loop */
     Scripting.defineScriptEvent("desktopShown", "Finished initial animation");
     Scripting.defineScriptEvent("overviewShowStart", "Starting to show the overview");
     Scripting.defineScriptEvent("overviewShowDone", "Overview finished showing");
@@ -111,7 +110,7 @@ async function run() {
     Scripting.defineScriptEvent("geditLaunch", "gedit application launch");
     Scripting.defineScriptEvent("geditFirstFrame", "first frame of gedit window drawn");
 
-    await Scripting.waitLeisure();
+    yield Scripting.waitLeisure();
     Scripting.scriptEvent('desktopShown');
 
     let interfaceSettings = new Gio.Settings({
@@ -121,22 +120,22 @@ async function run() {
 
     Scripting.scriptEvent('overviewShowStart');
     Main.overview.show();
-    await Scripting.waitLeisure();
+    yield Scripting.waitLeisure();
     Scripting.scriptEvent('overviewShowDone');
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     Scripting.scriptEvent('applicationsShowStart');
     // eslint-disable-next-line require-atomic-updates
     Main.overview.dash.showAppsButton.checked = true;
 
-    await Scripting.waitLeisure();
+    yield Scripting.waitLeisure();
     Scripting.scriptEvent('applicationsShowDone');
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     Main.overview.hide();
-    await Scripting.waitLeisure();
+    yield Scripting.waitLeisure();
 
     // --------------------- //
     // Tests of redraw speed //
@@ -146,46 +145,46 @@ async function run() {
     global.frame_finish_timestamp = true;
 
     for (let k = 0; k < 5; k++)
-        await Scripting.createTestWindow({ maximized: true });
+        yield Scripting.createTestWindow({ maximized: true });
-    await Scripting.waitTestWindows();
+    yield Scripting.waitTestWindows();
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     Scripting.scriptEvent('mainViewDrawStart');
-    await waitAndDraw(1000);
+    yield waitAndDraw(1000);
     Scripting.scriptEvent('mainViewDrawDone');
 
     Main.overview.show();
     Scripting.waitLeisure();
 
-    await Scripting.sleep(1500);
+    yield Scripting.sleep(1500);
 
     Scripting.scriptEvent('overviewDrawStart');
-    await waitAndDraw(1000);
+    yield waitAndDraw(1000);
     Scripting.scriptEvent('overviewDrawDone');
 
-    await Scripting.destroyTestWindows();
+    yield Scripting.destroyTestWindows();
     Main.overview.hide();
 
-    await Scripting.createTestWindow({ maximized: true,
+    yield Scripting.createTestWindow({ maximized: true,
                                        redraws: true });
-    await Scripting.waitTestWindows();
+    yield Scripting.waitTestWindows();
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     Scripting.scriptEvent('redrawTestStart');
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
     Scripting.scriptEvent('redrawTestDone');
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
     Scripting.scriptEvent('collectTimings');
 
-    await Scripting.destroyTestWindows();
+    yield Scripting.destroyTestWindows();
 
     global.frame_timestamps = false;
     global.frame_finish_timestamp = false;
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     let appSys = Shell.AppSystem.get_default();
     let app = appSys.lookup_app('org.gnome.gedit.desktop');
@@ -198,22 +197,21 @@ async function run() {
         throw new Error('gedit was already running');
 
     while (windows.length == 0) {
-        await waitSignal(global.display, 'window-created');
+        yield waitSignal(global.display, 'window-created');
         windows = app.get_windows();
     }
 
     let actor = windows[0].get_compositor_private();
-    await waitSignal(actor, 'first-frame');
+    yield waitSignal(actor, 'first-frame');
     Scripting.scriptEvent('geditFirstFrame');
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     windows[0].delete(global.get_current_time());
 
-    await Scripting.sleep(1000);
+    yield Scripting.sleep(1000);
 
     interfaceSettings.set_boolean('enable-animations', true);
-    /* eslint-enable no-await-in-loop */
 }
 
 let overviewShowStart;

js/ui/background.js

@@ -347,8 +347,6 @@ var Background = GObject.registerClass({
             this.set_color(color);
         else
             this.set_gradient(shadingType, color, secondColor);
-
-        this._setLoaded();
     }
 
     _watchFile(file) {
@@ -767,27 +765,10 @@ var BackgroundManager = class BackgroundManager {
             this._updateBackgroundActor();
         });
 
-        let loadedSignalId;
-        if (background.isLoaded) {
-            GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
-                this.emit('loaded');
-                return GLib.SOURCE_REMOVE;
-            });
-        } else {
-            loadedSignalId = background.connect('loaded', () => {
-                background.disconnect(loadedSignalId);
-                loadedSignalId = null;
-                this.emit('loaded');
-            });
-        }
-
         backgroundActor.connect('destroy', () => {
             if (changeSignalId)
                 background.disconnect(changeSignalId);
 
-            if (loadedSignalId)
-                background.disconnect(loadedSignalId);
-
             if (backgroundActor.loadedSignalId)
                 background.disconnect(backgroundActor.loadedSignalId);
         });

js/ui/boxpointer.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported BoxPointer */
 
-const { Clutter, GObject, St } = imports.gi;
+const { Clutter, GObject, Shell, St } = imports.gi;
 
 const Main = imports.ui.main;
 
@@ -453,16 +453,15 @@ var BoxPointer = GObject.registerClass({
         let alignment = this._arrowAlignment;
         let monitorIndex = Main.layoutManager.findIndexForActor(sourceActor);
 
-        this._sourceExtents = sourceActor.get_transformed_extents();
+        this._sourceAllocation = Shell.util_get_transformed_allocation(sourceActor);
         this._workArea = Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
 
         // Position correctly relative to the sourceActor
         let sourceNode = sourceActor.get_theme_node();
         let sourceContentBox = sourceNode.get_content_box(sourceActor.get_allocation_box());
-        let sourceTopLeft = this._sourceExtents.get_top_left();
+        let sourceAllocation = this._sourceAllocation;
-        let sourceBottomRight = this._sourceExtents.get_bottom_right();
+        let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
-        let sourceCenterX = sourceTopLeft.x + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
+        let sourceCenterY = sourceAllocation.y1 + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
-        let sourceCenterY = sourceTopLeft.y + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
         let [, , natWidth, natHeight] = this.get_preferred_size();
 
         // We also want to keep it onscreen, and separated from the
@@ -482,16 +481,16 @@ var BoxPointer = GObject.registerClass({
 
         switch (this._arrowSide) {
         case St.Side.TOP:
-            resY = sourceBottomRight.y + gap;
+            resY = sourceAllocation.y2 + gap;
             break;
         case St.Side.BOTTOM:
-            resY = sourceTopLeft.y - natHeight - gap;
+            resY = sourceAllocation.y1 - natHeight - gap;
             break;
         case St.Side.LEFT:
-            resX = sourceBottomRight.x + gap;
+            resX = sourceAllocation.x2 + gap;
             break;
         case St.Side.RIGHT:
-            resX = sourceTopLeft.x - natWidth - gap;
+            resX = sourceAllocation.x1 - natWidth - gap;
             break;
         }
 
@@ -587,30 +586,29 @@ var BoxPointer = GObject.registerClass({
     }
 
     _calculateArrowSide(arrowSide) {
-        let sourceTopLeft = this._sourceExtents.get_top_left();
+        let sourceAllocation = this._sourceAllocation;
-        let sourceBottomRight = this._sourceExtents.get_bottom_right();
         let [, , boxWidth, boxHeight] = this.get_preferred_size();
         let workarea = this._workArea;
 
         switch (arrowSide) {
         case St.Side.TOP:
-            if (sourceBottomRight.y + boxHeight > workarea.y + workarea.height &&
+            if (sourceAllocation.y2 + boxHeight > workarea.y + workarea.height &&
-                boxHeight < sourceTopLeft.y - workarea.y)
+                boxHeight < sourceAllocation.y1 - workarea.y)
                 return St.Side.BOTTOM;
             break;
         case St.Side.BOTTOM:
-            if (sourceTopLeft.y - boxHeight < workarea.y &&
+            if (sourceAllocation.y1 - boxHeight < workarea.y &&
-                boxHeight < workarea.y + workarea.height - sourceBottomRight.y)
+                boxHeight < workarea.y + workarea.height - sourceAllocation.y2)
                 return St.Side.TOP;
             break;
         case St.Side.LEFT:
-            if (sourceBottomRight.x + boxWidth > workarea.x + workarea.width &&
+            if (sourceAllocation.x2 + boxWidth > workarea.x + workarea.width &&
-                boxWidth < sourceTopLeft.x - workarea.x)
+                boxWidth < sourceAllocation.x1 - workarea.x)
                 return St.Side.RIGHT;
             break;
         case St.Side.RIGHT:
-            if (sourceTopLeft.x - boxWidth < workarea.x &&
+            if (sourceAllocation.x1 - boxWidth < workarea.x &&
-                boxWidth < workarea.x + workarea.width - sourceBottomRight.x)
+                boxWidth < workarea.x + workarea.width - sourceAllocation.x2)
                 return St.Side.LEFT;
             break;
         }

js/ui/dnd.js

@@ -388,16 +388,17 @@ var _Draggable = class _Draggable {
             const [, newAllocatedWidth] = this._dragActor.get_preferred_width(-1);
             const [, newAllocatedHeight] = this._dragActor.get_preferred_height(-1);
 
-            const transformedExtents = this._dragActor.get_transformed_extents();
+            const transformedAllocation =
+                Shell.util_get_transformed_allocation(this._dragActor);
 
             // Set the actor's scale such that it will keep the same
             // transformed size when it's reparented to the uiGroup
             this._dragActor.set_scale(
-                transformedExtents.get_width() / newAllocatedWidth,
+                transformedAllocation.get_width() / newAllocatedWidth,
-                transformedExtents.get_height() / newAllocatedHeight);
+                transformedAllocation.get_height() / newAllocatedHeight);
 
-            this._dragOffsetX = transformedExtents.origin.x - this._dragStartX;
+            this._dragOffsetX = transformedAllocation.x1 - this._dragStartX;
-            this._dragOffsetY = transformedExtents.origin.y - this._dragStartY;
+            this._dragOffsetY = transformedAllocation.y1 - this._dragStartY;
 
             this._dragOrigParent.remove_actor(this._dragActor);
             Main.uiGroup.add_child(this._dragActor);

js/ui/endSessionDialog.js

@@ -18,7 +18,7 @@
  */
 
 const { AccountsService, Clutter, Gio,
-        GLib, GObject, Pango, Polkit, Shell, St, UPowerGlib: UPower }  = imports.gi;
+        GLib, GObject, Pango, Polkit, Shell, St }  = imports.gi;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
@@ -31,30 +31,24 @@ const { loadInterfaceXML } = imports.misc.fileUtils;
 
 const _ITEM_ICON_SIZE = 64;
 
-const LOW_BATTERY_THRESHOLD = 30;
-
 const EndSessionDialogIface = loadInterfaceXML('org.gnome.SessionManager.EndSessionDialog');
 
 const logoutDialogContent = {
     subjectWithUser: C_("title", "Log Out %s"),
     subject: C_("title", "Log Out"),
     descriptionWithUser(user, seconds) {
-        return ngettext(
+        return ngettext("%s will be logged out automatically in %d second.",
-            '%s will be logged out automatically in %d second.',
+                        "%s will be logged out automatically in %d seconds.",
-            '%s will be logged out automatically in %d seconds.',
+                        seconds).format(user, seconds);
-            seconds).format(user, seconds);
     },
     description(seconds) {
-        return ngettext(
+        return ngettext("You will be logged out automatically in %d second.",
-            'You will be logged out automatically in %d second.',
+                        "You will be logged out automatically in %d seconds.",
-            'You will be logged out automatically in %d seconds.',
+                        seconds).format(seconds);
-            seconds).format(seconds);
     },
     showBatteryWarning: false,
-    confirmButtons: [{
+    confirmButtons: [{ signal: 'ConfirmedLogout',
-        signal: 'ConfirmedLogout',
+                       label: C_("button", "Log Out") }],
-        label: C_('button', 'Log Out'),
-    }],
     showOtherSessions: false,
 };
 
@@ -62,36 +56,30 @@ const shutdownDialogContent = {
     subject: C_("title", "Power Off"),
     subjectWithUpdates: C_("title", "Install Updates & Power Off"),
     description(seconds) {
-        return ngettext(
+        return ngettext("The system will power off automatically in %d second.",
-            'The system will power off automatically in %d second.',
+                        "The system will power off automatically in %d seconds.",
-            'The system will power off automatically in %d seconds.',
+                        seconds).format(seconds);
-            seconds).format(seconds);
     },
     checkBoxText: C_("checkbox", "Install pending software updates"),
     showBatteryWarning: true,
-    confirmButtons: [{
+    confirmButtons: [{ signal: 'ConfirmedReboot',
-        signal: 'ConfirmedShutdown',
+                       label: C_("button", "Restart") },
-        label: C_('button', 'Power Off'),
+                     { signal: 'ConfirmedShutdown',
-    }],
+                       label: C_("button", "Power Off") }],
     iconName: 'system-shutdown-symbolic',
     showOtherSessions: true,
 };
 
 const restartDialogContent = {
     subject: C_("title", "Restart"),
-    subjectWithUpdates: C_('title', 'Install Updates & Restart'),
     description(seconds) {
-        return ngettext(
+        return ngettext("The system will restart automatically in %d second.",
-            'The system will restart automatically in %d second.',
+                        "The system will restart automatically in %d seconds.",
-            'The system will restart automatically in %d seconds.',
+                        seconds).format(seconds);
-            seconds).format(seconds);
     },
-    checkBoxText: C_('checkbox', 'Install pending software updates'),
+    showBatteryWarning: false,
-    showBatteryWarning: true,
+    confirmButtons: [{ signal: 'ConfirmedReboot',
-    confirmButtons: [{
+                       label: C_("button", "Restart") }],
-        signal: 'ConfirmedReboot',
-        label: C_('button', 'Restart'),
-    }],
     iconName: 'view-refresh-symbolic',
     showOtherSessions: true,
 };
@@ -100,16 +88,13 @@ const restartUpdateDialogContent = {
 
     subject: C_("title", "Restart & Install Updates"),
     description(seconds) {
-        return ngettext(
+        return ngettext("The system will automatically restart and install updates in %d second.",
-            'The system will automatically restart and install updates in %d second.',
+                        "The system will automatically restart and install updates in %d seconds.",
-            'The system will automatically restart and install updates in %d seconds.',
+                        seconds).format(seconds);
-            seconds).format(seconds);
     },
     showBatteryWarning: true,
-    confirmButtons: [{
+    confirmButtons: [{ signal: 'ConfirmedReboot',
-        signal: 'ConfirmedReboot',
+                       label: C_("button", "Restart & Install") }],
-        label: C_('button', 'Restart & Install'),
-    }],
     unusedFutureButtonForTranslation: C_("button", "Install & Power Off"),
     unusedFutureCheckBoxForTranslation: C_("checkbox", "Power off after updates are installed"),
     iconName: 'view-refresh-symbolic',
@@ -127,10 +112,8 @@ const restartUpgradeDialogContent = {
     },
     disableTimer: true,
     showBatteryWarning: false,
-    confirmButtons: [{
+    confirmButtons: [{ signal: 'ConfirmedReboot',
-        signal: 'ConfirmedReboot',
+                       label: C_("button", "Restart & Install") }],
-        label: C_('button', 'Restart & Install'),
-    }],
     iconName: 'view-refresh-symbolic',
     showOtherSessions: true,
 };
@@ -159,7 +142,7 @@ const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface);
 const PkOfflineIface = loadInterfaceXML('org.freedesktop.PackageKit.Offline');
 const PkOfflineProxy = Gio.DBusProxy.makeProxyWrapper(PkOfflineIface);
 
-const UPowerIface = loadInterfaceXML('org.freedesktop.UPower.Device');
+const UPowerIface = loadInterfaceXML('org.freedesktop.UPower');
 const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerIface);
 
 function findAppFromInhibitor(inhibitor) {
@@ -230,11 +213,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
                       destroyOnClose: false });
 
         this._loginManager = LoginManager.getLoginManager();
-        this._loginManager.canRebootToBootLoaderMenu(
-            (canRebootToBootLoaderMenu, unusedNeedsAuth) => {
-                this._canRebootToBootLoaderMenu = canRebootToBootLoaderMenu;
-            });
-
         this._userManager = AccountsService.UserManager.get_default();
         this._user = this._userManager.get_user(GLib.get_user_name());
         this._updatesPermission = null;
@@ -246,7 +224,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
 
         this._powerProxy = new UPowerProxy(Gio.DBus.system,
                                            'org.freedesktop.UPower',
-                                           '/org/freedesktop/UPower/devices/DisplayDevice',
+                                           '/org/freedesktop/UPower',
                                            (proxy, error) => {
                                                if (error) {
                                                    log(error.message);
@@ -261,9 +239,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         this._totalSecondsToStayOpen = 0;
         this._applications = [];
         this._sessions = [];
-        this._capturedEventId = 0;
-        this._rebootButton = null;
-        this._rebootButtonAlt = null;
 
         this.connect('destroy',
                      this._onDestroy.bind(this));
@@ -281,7 +256,7 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
 
         this._batteryWarning = new St.Label({
             style_class: 'end-session-dialog-battery-warning',
-            text: _('Low battery power: please plug in before installing updates.'),
+            text: _('Running on battery power: Please plug in before installing updates.'),
         });
         this._batteryWarning.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
         this._batteryWarning.clutter_text.line_wrap = true;
@@ -331,32 +306,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         this._user.disconnect(this._userChangedId);
     }
 
-    _isDischargingBattery() {
-        return this._powerProxy.IsPresent &&
-            this._powerProxy.State !== UPower.DeviceState.CHARGING &&
-            this._powerProxy.State !== UPower.DeviceState.FULLY_CHARGED;
-    }
-
-    _isBatteryLow() {
-        return this._isDischargingBattery() && this._powerProxy.Percentage < LOW_BATTERY_THRESHOLD;
-    }
-
-    _shouldShowLowBatteryWarning(dialogContent) {
-        if (!dialogContent.showBatteryWarning)
-            return false;
-
-        if (!this._isBatteryLow())
-            return false;
-
-        if (this._checkBox.checked)
-            return true;
-
-        // Show the warning if updates have already been triggered, but
-        // the user doesn't have enough permissions to cancel them.
-        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
-        return this._updateInfo.UpdatePrepared && this._updateInfo.UpdateTriggered && !updatesAllowed;
-    }
-
     _sync() {
         let open = this.state == ModalDialog.State.OPENING || this.state == ModalDialog.State.OPENED;
         if (!open)
@@ -370,7 +319,10 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         if (dialogContent.subjectWithUpdates && this._checkBox.checked)
             subject = dialogContent.subjectWithUpdates;
 
-        this._batteryWarning.visible = this._shouldShowLowBatteryWarning(dialogContent);
+        if (dialogContent.showBatteryWarning) {
+            this._batteryWarning.visible =
+                this._powerProxy.OnBattery && this._checkBox.checked;
+        }
 
         let description;
         let displayTime = _roundSecondsToInterval(this._totalSecondsToStayOpen,
@@ -411,38 +363,16 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         this._sessionSection.visible = hasSessions;
     }
 
-    _onCapturedEvent(actor, event) {
-        let altEnabled = false;
-
-        let type = event.type();
-        if (type !== Clutter.EventType.KEY_PRESS && type !== Clutter.EventType.KEY_RELEASE)
-            return Clutter.EVENT_PROPAGATE;
-
-        let key = event.get_key_symbol();
-        if (key !== Clutter.KEY_Alt_L && key !== Clutter.KEY_Alt_R)
-            return Clutter.EVENT_PROPAGATE;
-
-        if (type === Clutter.EventType.KEY_PRESS)
-            altEnabled = true;
-
-        this._rebootButton.visible = !altEnabled;
-        this._rebootButtonAlt.visible = altEnabled;
-
-        return Clutter.EVENT_PROPAGATE;
-    }
-
     _updateButtons() {
-        this.clearButtons();
-
-        this.addButton({ action: this.cancel.bind(this),
-                         label: _("Cancel"),
-                         key: Clutter.KEY_Escape });
-
         let dialogContent = DialogContent[this._type];
+        let buttons = [{ action: this.cancel.bind(this),
+                         label: _("Cancel"),
+                         key: Clutter.KEY_Escape }];
+
         for (let i = 0; i < dialogContent.confirmButtons.length; i++) {
             let signal = dialogContent.confirmButtons[i].signal;
             let label = dialogContent.confirmButtons[i].label;
-            let button = this.addButton({
+            buttons.push({
                 action: () => {
                     this.close(true);
                     let signalId = this.connect('closed', () => {
@@ -452,34 +382,9 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
                 },
                 label,
             });
-
-            // Add Alt "Boot Options" option to the Reboot button
-            if (this._canRebootToBootLoaderMenu && signal === 'ConfirmedReboot') {
-                this._rebootButton = button;
-                this._rebootButtonAlt = this.addButton({
-                    action: () => {
-                        this.close(true);
-                        let signalId = this.connect('closed', () => {
-                            this.disconnect(signalId);
-                            this._confirmRebootToBootLoaderMenu();
-                        });
-                    },
-                    label: C_('button', 'Boot Options'),
-                });
-                this._rebootButtonAlt.visible = false;
-                this._capturedEventId = global.stage.connect('captured-event',
-                    this._onCapturedEvent.bind(this));
-            }
         }
-    }
 
-    _stopAltCapture() {
+        this.setButtons(buttons);
-        if (this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-        this._rebootButton = null;
-        this._rebootButtonAlt = null;
     }
 
     close(skipSignal) {
@@ -491,21 +396,14 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
 
     cancel() {
         this._stopTimer();
-        this._stopAltCapture();
         this._dbusImpl.emit_signal('Canceled', null);
         this.close();
     }
 
-    _confirmRebootToBootLoaderMenu() {
-        this._loginManager.setRebootToBootLoaderMenu();
-        this._confirm('ConfirmedReboot');
-    }
-
     _confirm(signal) {
         let callback = () => {
             this._fadeOutDialog();
             this._stopTimer();
-            this._stopAltCapture();
             this._dbusImpl.emit_signal(signal, null);
         };
 
@@ -773,17 +671,19 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
         if (dialogContent.showOtherSessions)
             this._loadSessions();
 
+        let updateTriggered = this._updateInfo.UpdateTriggered;
+        let updatePrepared = this._updateInfo.UpdatePrepared;
         let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;
 
         _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
-        this._checkBox.visible = dialogContent.checkBoxText && this._updateInfo.UpdatePrepared && updatesAllowed;
+        this._checkBox.visible = dialogContent.checkBoxText && updatePrepared && updatesAllowed;
+        this._checkBox.checked = this._checkBox.visible;
 
-        if (this._type === DialogType.UPGRADE_RESTART)
+        // We show the warning either together with the checkbox, or when
-            this._checkBox.checked = this._checkBox.visible && this._updateInfo.UpdateTriggered && !this._isDischargingBattery();
+        // updates have already been triggered, but the user doesn't have
-        else
+        // enough permissions to cancel them.
-            this._checkBox.checked = this._checkBox.visible && !this._isBatteryLow();
+        this._batteryWarning.visible = dialogContent.showBatteryWarning &&
-
+                                        (this._checkBox.visible || updatePrepared && updateTriggered && !updatesAllowed);
-        this._batteryWarning.visible = this._shouldShowLowBatteryWarning(dialogContent);
 
         this._updateButtons();
 

js/ui/environment.js

@@ -134,14 +134,7 @@ function _easeActor(actor, params) {
         actor.set_easing_mode(params.mode);
     delete params.mode;
 
-    const prepare = () => {
+    let cleanup = () => Meta.enable_unredirect_for_display(global.display);
-        Meta.disable_unredirect_for_display(global.display);
-        global.begin_work();
-    };
-    const cleanup = () => {
-        Meta.enable_unredirect_for_display(global.display);
-        global.end_work();
-    };
     let callback = _makeEaseCallback(params, cleanup);
 
     // cancel overwritten transitions
@@ -156,9 +149,9 @@ function _easeActor(actor, params) {
         .find(t => t !== null);
 
     if (transition && transition.delay)
-        transition.connect('started', () => prepare());
+        transition.connect('started', () => Meta.disable_unredirect_for_display(global.display));
     else
-        prepare();
+        Meta.disable_unredirect_for_display(global.display);
 
     if (transition) {
         transition.set({ repeatCount, autoReverse });
@@ -198,14 +191,7 @@ function _easeActorProperty(actor, propName, target, params) {
     if (actor instanceof Clutter.Actor && !actor.mapped)
         duration = 0;
 
-    const prepare = () => {
+    let cleanup = () => Meta.enable_unredirect_for_display(global.display);
-        Meta.disable_unredirect_for_display(global.display);
-        global.begin_work();
-    };
-    const cleanup = () => {
-        Meta.enable_unredirect_for_display(global.display);
-        global.end_work();
-    };
     let callback = _makeEaseCallback(params, cleanup);
 
     // cancel overwritten transition
@@ -217,7 +203,7 @@ function _easeActorProperty(actor, propName, target, params) {
         if (!isReversed)
             obj[prop] = target;
 
-        prepare();
+        Meta.disable_unredirect_for_display(global.display);
         callback(true);
 
         return;
@@ -236,9 +222,9 @@ function _easeActorProperty(actor, propName, target, params) {
     transition.set_to(target);
 
     if (transition.delay)
-        transition.connect('started', () => prepare());
+        transition.connect('started', () => Meta.disable_unredirect_for_display(global.display));
     else
-        prepare();
+        Meta.disable_unredirect_for_display(global.display);
 
     transition.connect('stopped', (t, finished) => callback(finished));
 }

js/ui/extensionDownloader.js

@@ -139,9 +139,7 @@ function checkForUpdates() {
             return;
         if (extension.hasUpdate)
             return;
-        metadatas[uuid] = {
+        metadatas[uuid] = extension.metadata;
-            version: extension.metadata.version,
-        };
     });
 
     if (Object.keys(metadatas).length === 0)

js/ui/iconGrid.js

@@ -52,17 +52,6 @@ const defaultGridModes = [
     },
 ];
 
-var LEFT_DIVIDER_LEEWAY = 20;
-var RIGHT_DIVIDER_LEEWAY = 20;
-
-var DragLocation = {
-    INVALID: 0,
-    START_EDGE: 1,
-    ON_ICON: 2,
-    END_EDGE: 3,
-    EMPTY_SPACE: 4,
-};
-
 var BaseIcon = GObject.registerClass(
 class BaseIcon extends St.Bin {
     _init(label, params) {
@@ -957,99 +946,6 @@ var IconGridLayout = GObject.registerClass({
         }
     }
 
-    /**
-     * getDropTarget:
-     * @param {int} x: position of the horizontal axis
-     * @param {int} y: position of the vertical axis
-     *
-     * Retrieves the item located at (@x, @y), as well as the drag location.
-     * Both @x and @y are relative to the grid.
-     *
-     * @returns {[Clutter.Actor, DragLocation]} the item and drag location
-     * under (@x, @y)
-     */
-    getDropTarget(x, y) {
-        const childSize = this._getChildrenMaxSize();
-        const [leftEmptySpace, topEmptySpace, hSpacing, vSpacing] =
-            this._calculateSpacing(childSize);
-
-        const isRtl =
-            Clutter.get_default_text_direction() === Clutter.TextDirection.RTL;
-
-        let page = this._orientation === Clutter.Orientation.VERTICAL
-            ? Math.floor(y / this._pageHeight)
-            : Math.floor(x / this._pageWidth);
-
-        // Out of bounds
-        if (page >= this._pages.length)
-            return [null, DragLocation.INVALID];
-
-        if (isRtl && this._orientation === Clutter.Orientation.HORIZONTAL)
-            page = swap(page, this._pages.length);
-
-        // Page-relative coordinates from now on
-        x %= this._pageWidth;
-        y %= this._pageHeight;
-
-        if (x < leftEmptySpace || y < topEmptySpace)
-            return [null, DragLocation.INVALID];
-
-        const gridWidth =
-            childSize * this._columnsPerPage +
-            hSpacing * (this._columnsPerPage - 1);
-        const gridHeight =
-            childSize * this._rowsPerPage +
-            vSpacing * (this._rowsPerPage - 1);
-
-        if (x > leftEmptySpace + gridWidth || y > topEmptySpace + gridHeight)
-            return [null, DragLocation.INVALID];
-
-        const halfHSpacing = hSpacing / 2;
-        const halfVSpacing = vSpacing / 2;
-        const visibleItems = this._getVisibleChildrenForPage(page);
-
-        for (const item of visibleItems) {
-            const childBox = item.allocation.copy();
-
-            // Page offset
-            switch (this._orientation) {
-            case Clutter.Orientation.HORIZONTAL:
-                childBox.set_origin(childBox.x1 % this._pageWidth, childBox.y1);
-                break;
-            case Clutter.Orientation.VERTICAL:
-                childBox.set_origin(childBox.x1, childBox.y1 % this._pageHeight);
-                break;
-            }
-
-            // Outside the icon boundaries
-            if (x < childBox.x1 - halfHSpacing ||
-                x > childBox.x2 + halfHSpacing ||
-                y < childBox.y1 - halfVSpacing ||
-                y > childBox.y2 + halfVSpacing)
-                continue;
-
-            let dragLocation;
-
-            if (x < childBox.x1 + LEFT_DIVIDER_LEEWAY)
-                dragLocation = DragLocation.START_EDGE;
-            else if (x > childBox.x2 - RIGHT_DIVIDER_LEEWAY)
-                dragLocation = DragLocation.END_EDGE;
-            else
-                dragLocation = DragLocation.ON_ICON;
-
-            if (isRtl) {
-                if (dragLocation === DragLocation.START_EDGE)
-                    dragLocation = DragLocation.END_EDGE;
-                else if (dragLocation === DragLocation.END_EDGE)
-                    dragLocation = DragLocation.START_EDGE;
-            }
-
-            return [item, dragLocation];
-        }
-
-        return [null, DragLocation.EMPTY_SPACE];
-    }
-
     // eslint-disable-next-line camelcase
     get allow_incomplete_pages() {
         return this._allowIncompletePages;
@@ -1663,11 +1559,6 @@ var IconGrid = GObject.registerClass({
         this.queue_relayout();
     }
 
-    getDropTarget(x, y) {
-        const layoutManager = this.layout_manager;
-        return layoutManager.getDropTarget(x, y, this._currentPage);
-    }
-
     get itemsPerPage() {
         const layoutManager = this.layout_manager;
         return layoutManager.rows_per_page * layoutManager.columns_per_page;

js/ui/inhibitShortcutsDialog.js

@@ -7,7 +7,7 @@ const PermissionStore = imports.misc.permissionStore;
 
 const WAYLAND_KEYBINDINGS_SCHEMA = 'org.gnome.mutter.wayland.keybindings';
 
-const APP_ALLOWLIST = ['gnome-control-center.desktop'];
+const APP_WHITELIST = ['gnome-control-center.desktop'];
 const APP_PERMISSIONS_TABLE = 'gnome';
 const APP_PERMISSIONS_ID = 'shortcuts-inhibitor';
 const GRANTED = 'GRANTED';
@@ -118,7 +118,7 @@ var InhibitShortcutsDialog = GObject.registerClass({
     }
 
     vfunc_show() {
-        if (this._app && APP_ALLOWLIST.includes(this._app.get_id())) {
+        if (this._app && APP_WHITELIST.includes(this._app.get_id())) {
             this._emitResponse(DialogResponse.ALLOW);
             return;
         }

js/ui/keyboard.js

@@ -42,7 +42,7 @@ const defaultKeysPost = [
     [[{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }],
      [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }],
      [{ label: '=/<', width: 3, level: 3, right: true }],
-     [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-filled-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }]],
+     [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key' }, { action: 'hide', extraClassName: 'hide-key' }]],
     [[{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }],
      [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }],
      [{ label: '?123', width: 3, level: 2, right: true }],
@@ -61,24 +61,6 @@ class AspectContainer extends St.Widget {
         this.queue_relayout();
     }
 
-    vfunc_get_preferred_width(forHeight) {
-        let [min, nat] = super.vfunc_get_preferred_width(forHeight);
-
-        if (forHeight > 0)
-            nat = forHeight * this._ratio;
-
-        return [min, nat];
-    }
-
-    vfunc_get_preferred_height(forWidth) {
-        let [min, nat] = super.vfunc_get_preferred_height(forWidth);
-
-        if (forWidth > 0)
-            nat = forWidth / this._ratio;
-
-        return [min, nat];
-    }
-
     vfunc_allocate(box) {
         if (box.get_width() > 0 && box.get_height() > 0) {
             let sizeRatio = box.get_width() / box.get_height();
@@ -1091,8 +1073,8 @@ var Keypad = GObject.registerClass({
             { label: '8', keyval: Clutter.KEY_8, left: 1, top: 2 },
             { label: '9', keyval: Clutter.KEY_9, left: 2, top: 2 },
             { label: '0', keyval: Clutter.KEY_0, left: 1, top: 3 },
-            { keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic', left: 3, top: 0 },
+            { label: '⌫', keyval: Clutter.KEY_BackSpace, left: 3, top: 0 },
-            { keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic', left: 3, top: 1, height: 2 },
+            { keyval: Clutter.KEY_Return, extraClassName: 'enter-key', left: 3, top: 1, height: 2 },
         ];
 
         super._init({
@@ -1109,7 +1091,7 @@ var Keypad = GObject.registerClass({
 
         for (let i = 0; i < keys.length; i++) {
             let cur = keys[i];
-            let key = new Key(cur.label || "", [], cur.icon);
+            let key = new Key(cur.label || "", []);
 
             if (keys[i].extraClassName)
                 key.keyButton.add_style_class_name(cur.extraClassName);
@@ -1626,9 +1608,7 @@ class Keyboard extends St.BoxLayout {
              * we allow the OSK being smaller than 1/3rd of the monitor height
              * there.
              */
-            const forWidth = this.get_theme_node().adjust_for_width(monitor.width);
+            this.height = Math.min(maxHeight, this.get_preferred_height(monitor.width));
-            const [, natHeight] = this.get_preferred_height(forWidth);
-            this.height = Math.min(maxHeight, natHeight);
         }
     }
 

js/ui/layout.js

@@ -6,6 +6,7 @@ const Signals = imports.signals;
 
 const Background = imports.ui.background;
 const BackgroundMenu = imports.ui.backgroundMenu;
+const LoginManager = imports.misc.loginManager;
 
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
@@ -294,6 +295,18 @@ var LayoutManager = GObject.registerClass({
         monitorManager.connect('monitors-changed',
                                this._monitorsChanged.bind(this));
         this._monitorsChanged();
+
+        // NVIDIA drivers don't preserve FBO contents across
+        // suspend/resume, see
+        // https://bugzilla.gnome.org/show_bug.cgi?id=739178
+        if (Shell.util_need_background_refresh()) {
+            LoginManager.getLoginManager().connect('prepare-for-sleep',
+                (lm, suspending) => {
+                    if (suspending)
+                        return;
+                    Meta.Background.refresh_all();
+                });
+        }
     }
 
     // This is called by Main after everything else is constructed
@@ -457,15 +470,6 @@ var LayoutManager = GObject.registerClass({
         }
     }
 
-    _waitLoaded(bgManager) {
-        return new Promise(resolve => {
-            const id = bgManager.connect('loaded', () => {
-                bgManager.disconnect(id);
-                resolve();
-            });
-        });
-    }
-
     _updateBackgrounds() {
         for (let i = 0; i < this._bgManagers.length; i++)
             this._bgManagers[i].destroy();
@@ -473,7 +477,7 @@ var LayoutManager = GObject.registerClass({
         this._bgManagers = [];
 
         if (Main.sessionMode.isGreeter)
-            return Promise.resolve();
+            return;
 
         for (let i = 0; i < this.monitors.length; i++) {
             let bgManager = this._createBackgroundManager(i);
@@ -482,8 +486,6 @@ var LayoutManager = GObject.registerClass({
             if (i != this.primaryIndex && this._startingUp)
                 bgManager.backgroundActor.hide();
         }
-
-        return Promise.all(this._bgManagers.map(this._waitLoaded));
     }
 
     _updateKeyboardBox() {
@@ -642,7 +644,7 @@ var LayoutManager = GObject.registerClass({
     // When starting a normal user session, we want to grow it out of the middle
     // of the screen.
 
-    async _prepareStartupAnimation() {
+    _prepareStartupAnimation() {
         // During the initial transition, add a simple actor to block all events,
         // so they don't get delivered to X11 windows that have been transformed.
         this._coverPane = new Clutter.Actor({ opacity: 0,
@@ -659,6 +661,8 @@ var LayoutManager = GObject.registerClass({
         } else if (Main.sessionMode.isGreeter) {
             this.panelBox.translation_y = -this.panelBox.height;
         } else {
+            this._updateBackgrounds();
+
             // We need to force an update of the regions now before we scale
             // the UI group to get the correct allocation for the struts.
             this._updateRegions();
@@ -674,8 +678,6 @@ var LayoutManager = GObject.registerClass({
             this.uiGroup.scale_x = this.uiGroup.scale_y = 0.75;
             this.uiGroup.opacity = 0;
             global.window_group.set_clip(monitor.x, monitor.y, monitor.width, monitor.height);
-
-            await this._updateBackgrounds();
         }
 
         this.emit('startup-prepared');
@@ -1228,9 +1230,8 @@ class HotCorner extends Clutter.Actor {
             return;
 
         if (Main.overview.shouldToggleByCornerOrButton()) {
+            this._ripples.playAnimation(this._x, this._y);
             Main.overview.toggle();
-            if (Main.overview.animationInProgress)
-                this._ripples.playAnimation(this._x, this._y);
         }
     }
 

js/ui/lookingGlass.js

@@ -482,13 +482,16 @@ class RedBorderEffect extends Clutter.Effect {
         this._pipeline = null;
     }
 
-    vfunc_paint(paintContext) {
+    vfunc_paint_node(node, paintContext) {
-        let framebuffer = paintContext.get_framebuffer();
-        let coglContext = framebuffer.get_context();
         let actor = this.get_actor();
-        actor.continue_paint(paintContext);
+
+        const actorNode = new Clutter.ActorNode(actor);
+        node.add_child(actorNode);
 
         if (!this._pipeline) {
+            const framebuffer = paintContext.get_framebuffer();
+            const coglContext = framebuffer.get_context();
+
             let color = new Cogl.Color();
             color.init_from_4ub(0xff, 0, 0, 0xc4);
 
@@ -499,18 +502,28 @@ class RedBorderEffect extends Clutter.Effect {
         let alloc = actor.get_allocation_box();
         let width = 2;
 
+        const pipelineNode = new Clutter.PipelineNode(this._pipeline);
+        pipelineNode.set_name('Red Border');
+        actorNode.add_child(pipelineNode);
+
+        const box = new Clutter.ActorBox();
+
         // clockwise order
-        framebuffer.draw_rectangle(this._pipeline,
+        box.set_origin(0, 0);
-            0, 0, alloc.get_width(), width);
+        box.set_size(alloc.get_width(), width);
-        framebuffer.draw_rectangle(this._pipeline,
+        pipelineNode.add_rectangle(box);
-            alloc.get_width() - width, width,
+
-            alloc.get_width(), alloc.get_height());
+        box.set_origin(alloc.get_width() - width, width);
-        framebuffer.draw_rectangle(this._pipeline,
+        box.set_size(width, alloc.get_height());
-            0, alloc.get_height(),
+        pipelineNode.add_rectangle(box);
-            alloc.get_width() - width, alloc.get_height() - width);
+
-        framebuffer.draw_rectangle(this._pipeline,
+        box.set_origin(0, alloc.get_height() - width);
-            0, alloc.get_height() - width,
+        box.set_size(alloc.get_width() - width, width);
-            width, width);
+        pipelineNode.add_rectangle(box);
+
+        box.set_origin(0, width);
+        box.set_size(width, alloc.get_height() - width);
+        pipelineNode.add_rectangle(box);
     }
 });
 

js/ui/main.js

@@ -3,10 +3,10 @@
             ctrlAltTabManager, padOsdService, osdWindowManager,
             osdMonitorLabeler, shellMountOpDBusService, shellDBusService,
             shellAccessDialogDBusService, shellAudioSelectionDBusService,
-            screenSaverDBus, uiGroup, magnifier, xdndHandler, keyboard,
+            screenSaverDBus, screencastService, uiGroup, magnifier,
-            kbdA11yDialog, introspectService, start, pushModal, popModal,
+            xdndHandler, keyboard, kbdA11yDialog, introspectService,
-            activateWindow, createLookingGlass, initializeDeferredWork,
+            start, pushModal, popModal, activateWindow, createLookingGlass,
-            getThemeStylesheet, setThemeStylesheet */
+            initializeDeferredWork, getThemeStylesheet, setThemeStylesheet */
 
 const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 
@@ -34,6 +34,7 @@ const LoginManager = imports.misc.loginManager;
 const LookingGlass = imports.ui.lookingGlass;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
+const Screencast = imports.ui.screencast;
 const ScreenShield = imports.ui.screenShield;
 const Scripting = imports.ui.scripting;
 const SessionMode = imports.ui.sessionMode;
@@ -73,6 +74,7 @@ var shellAudioSelectionDBusService = null;
 var shellDBusService = null;
 var shellMountOpDBusService = null;
 var screenSaverDBus = null;
+var screencastService = null;
 var modalCount = 0;
 var actionMode = Shell.ActionMode.NONE;
 var modalActorFocusStack = [];
@@ -198,6 +200,7 @@ function _initializeUI() {
     uiGroup = layoutManager.uiGroup;
 
     padOsdService = new PadOsd.PadOsdService();
+    screencastService = new Screencast.ScreencastService();
     xdndHandler = new XdndHandler.XdndHandler();
     ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
     osdWindowManager = new OsdWindow.OsdWindowManager();

js/ui/overviewControls.js

@@ -455,6 +455,8 @@ class ControlsManager extends St.Widget {
         this._group.add_child(this.viewSelector);
         this._group.add_actor(this._thumbnailsSlider);
 
+        layout.connect('allocation-changed', this._updateWorkspacesGeometry.bind(this));
+
         Main.overview.connect('showing', this._updateSpacerVisibility.bind(this));
 
         this.connect('destroy', this._onDestroy.bind(this));
@@ -477,6 +479,26 @@ class ControlsManager extends St.Widget {
         this._workspaceAdjustment.value = activeIndex;
     }
 
+    _updateWorkspacesGeometry() {
+        let [x, y] = this.get_transformed_position();
+        let [width, height] = this.get_transformed_size();
+        let geometry = { x, y, width, height };
+
+        let spacing = this.get_theme_node().get_length('spacing');
+        let dashWidth = this._dashSlider.getVisibleWidth() + spacing;
+        let thumbnailsWidth = this._thumbnailsSlider.getNonExpandedWidth() + spacing;
+
+        geometry.width -= dashWidth;
+        geometry.width -= thumbnailsWidth;
+
+        if (this.get_text_direction() == Clutter.TextDirection.LTR)
+            geometry.x += dashWidth;
+        else
+            geometry.x += thumbnailsWidth;
+
+        this.viewSelector.setWorkspacesFullGeometry(geometry);
+    }
+
     _setVisibility() {
         // Ignore the case when we're leaving the overview, since
         // actors will be made visible again when entering the overview

js/ui/panel.js

@@ -736,11 +736,13 @@ class AggregateMenu extends PanelMenu.Button {
         this._volume = new imports.ui.status.volume.Indicator();
         this._brightness = new imports.ui.status.brightness.Indicator();
         this._system = new imports.ui.status.system.Indicator();
+        this._screencast = new imports.ui.status.screencast.Indicator();
         this._location = new imports.ui.status.location.Indicator();
         this._nightLight = new imports.ui.status.nightLight.Indicator();
         this._thunderbolt = new imports.ui.status.thunderbolt.Indicator();
 
         this._indicators.add_child(this._thunderbolt);
+        this._indicators.add_child(this._screencast);
         this._indicators.add_child(this._location);
         this._indicators.add_child(this._nightLight);
         if (this._network)

js/ui/panelMenu.js

@@ -183,9 +183,10 @@ var Button = GObject.registerClass({
     }
 
     _onDestroy() {
+        super._onDestroy();
+
         if (this.menu)
             this.menu.destroy();
-        super._onDestroy();
     }
 });
 

js/ui/popupMenu.js

@@ -881,10 +881,9 @@ var PopupMenu = class extends PopupMenuBase {
 
         let state = event.get_state();
 
-        // if user has a modifier down (except capslock and numlock)
+        // if user has a modifier down (except capslock)
         // then don't handle the key press here
         state &= ~Clutter.ModifierType.LOCK_MASK;
-        state &= ~Clutter.ModifierType.MOD2_MASK;
         state &= Clutter.ModifierType.MODIFIER_MASK;
 
         if (state)
@@ -1325,7 +1324,7 @@ var PopupMenuManager = class {
 
     removeMenu(menu) {
         if (menu == this.activeMenu)
-            this._grabHelper.ungrab({ actor: menu.actor });
+            this._closeMenu(false, menu);
 
         let position = this._findMenu(menu);
         if (position == -1) // not a menu we manage

js/ui/screencast.js

@@ -0,0 +1,146 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const { Gio, GLib, Shell } = imports.gi;
+const Signals = imports.signals;
+
+const Main = imports.ui.main;
+
+const { loadInterfaceXML } = imports.misc.fileUtils;
+
+const ScreencastIface = loadInterfaceXML('org.gnome.Shell.Screencast');
+
+var ScreencastService = class {
+    constructor() {
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreencastIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/Screencast');
+
+        Gio.DBus.session.own_name('org.gnome.Shell.Screencast', Gio.BusNameOwnerFlags.REPLACE, null, null);
+
+        this._recorders = new Map();
+
+        this._lockdownSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.lockdown' });
+
+        Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
+    }
+
+    get isRecording() {
+        return this._recorders.size > 0;
+    }
+
+    _ensureRecorderForSender(sender) {
+        let recorder = this._recorders.get(sender);
+        if (!recorder) {
+            recorder = new Shell.Recorder({ stage: global.stage,
+                                            display: global.display });
+            recorder._watchNameId =
+                Gio.bus_watch_name(Gio.BusType.SESSION, sender, 0, null,
+                                   this._onNameVanished.bind(this));
+            this._recorders.set(sender, recorder);
+            this.emit('updated');
+        }
+        return recorder;
+    }
+
+    _sessionUpdated() {
+        if (Main.sessionMode.allowScreencast)
+            return;
+
+        for (let sender of this._recorders.keys())
+            this._stopRecordingForSender(sender);
+    }
+
+    _onNameVanished(connection, name) {
+        this._stopRecordingForSender(name);
+    }
+
+    _stopRecordingForSender(sender) {
+        let recorder = this._recorders.get(sender);
+        if (!recorder)
+            return false;
+
+        Gio.bus_unwatch_name(recorder._watchNameId);
+        recorder.close();
+        this._recorders.delete(sender);
+        this.emit('updated');
+
+        return true;
+    }
+
+    _applyOptionalParameters(recorder, options) {
+        for (let option in options)
+            options[option] = options[option].deep_unpack();
+
+        if (options['pipeline'])
+            recorder.set_pipeline(options['pipeline']);
+        if (options['framerate'])
+            recorder.set_framerate(options['framerate']);
+        if ('draw-cursor' in options)
+            recorder.set_draw_cursor(options['draw-cursor']);
+    }
+
+    ScreencastAsync(params, invocation) {
+        let returnValue = [false, ''];
+        if (!Main.sessionMode.allowScreencast ||
+            this._lockdownSettings.get_boolean('disable-save-to-disk')) {
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
+
+        let sender = invocation.get_sender();
+        let recorder = this._ensureRecorderForSender(sender);
+        if (!recorder.is_recording()) {
+            let [fileTemplate, options] = params;
+
+            recorder.set_file_template(fileTemplate);
+            this._applyOptionalParameters(recorder, options);
+            let [success, fileName] = recorder.record();
+            returnValue = [success, fileName ? fileName : ''];
+            if (!success)
+                this._stopRecordingForSender(sender);
+        }
+
+        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+    }
+
+    ScreencastAreaAsync(params, invocation) {
+        let returnValue = [false, ''];
+        if (!Main.sessionMode.allowScreencast ||
+            this._lockdownSettings.get_boolean('disable-save-to-disk')) {
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+            return;
+        }
+
+        let sender = invocation.get_sender();
+        let recorder = this._ensureRecorderForSender(sender);
+
+        if (!recorder.is_recording()) {
+            let [x, y, width, height, fileTemplate, options] = params;
+
+            if (x < 0 || y < 0 ||
+                width <= 0 || height <= 0 ||
+                x + width > global.screen_width ||
+                y + height > global.screen_height) {
+                invocation.return_error_literal(Gio.IOErrorEnum,
+                                                Gio.IOErrorEnum.CANCELLED,
+                                                "Invalid params");
+                return;
+            }
+
+            recorder.set_file_template(fileTemplate);
+            recorder.set_area(x, y, width, height);
+            this._applyOptionalParameters(recorder, options);
+            let [success, fileName] = recorder.record();
+            returnValue = [success, fileName ? fileName : ''];
+            if (!success)
+                this._stopRecordingForSender(sender);
+        }
+
+        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+    }
+
+    StopScreencastAsync(params, invocation) {
+        let success = this._stopRecordingForSender(invocation.get_sender());
+        invocation.return_value(GLib.Variant.new('(b)', [success]));
+    }
+};
+Signals.addSignalMethods(ScreencastService.prototype);

js/ui/scripting.js

@@ -21,13 +21,16 @@ const { loadInterfaceXML } = imports.misc.fileUtils;
 // When scripting an automated test we want to make a series of calls
 // in a linear fashion, but we also want to be able to let the main
 // loop run so actions can finish. For this reason we write the script
-// as an async function that uses await when it wants to let the main
+// as a generator function that yields when it want to let the main
 // loop run.
 //
-//    await Scripting.sleep(1000);
+//    yield Scripting.sleep(1000);
 //    main.overview.show();
-//    await Scripting.waitLeisure();
+//    yield Scripting.waitLeisure();
 //
+// While it isn't important to the person writing the script, the actual
+// yielded result is a function that the caller uses to provide the
+// callback for resuming the script.
 
 /**
  * sleep:
@@ -282,11 +285,13 @@ function _collect(scriptModule, outputFile) {
 }
 
 async function _runPerfScript(scriptModule, outputFile) {
-    try {
+    for (let step of scriptModule.run()) {
-        await scriptModule.run();
+        try {
-    } catch (err) {
+            await step; // eslint-disable-line no-await-in-loop
-        log(`Script failed: ${err}\n${err.stack}`);
+        } catch (err) {
-        Meta.exit(Meta.ExitCode.ERROR);
+            log(`Script failed: ${err}\n${err.stack}`);
+            Meta.exit(Meta.ExitCode.ERROR);
+        }
     }
 
     try {

js/ui/sessionMode.js

@@ -113,10 +113,10 @@ function _loadMode(file, info) {
     }
 
     _modes[modeName] = {};
-    const  excludedProps = ['unlockDialog'];
+    let propBlacklist = ['unlockDialog'];
     for (let prop in _modes[DEFAULT_MODE]) {
         if (newMode[prop] !== undefined &&
-            !excludedProps.includes(prop))
+            !propBlacklist.includes(prop))
             _modes[modeName][prop] = newMode[prop];
     }
     _modes[modeName]['isPrimary'] = true;

js/ui/status/network.js

@@ -15,7 +15,6 @@ const Util = imports.misc.util;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
-Gio._promisify(Gio.DBusConnection.prototype, 'call', 'call_finish');
 Gio._promisify(NM.Client, 'new_async', 'new_finish');
 Gio._promisify(NM.Client.prototype,
     'check_connectivity_async', 'check_connectivity_finish');
@@ -83,30 +82,6 @@ function ensureActiveConnectionProps(active) {
     }
 }
 
-function launchSettingsPanel(panel, ...args) {
-    const param = new GLib.Variant('(sav)',
-        [panel, args.map(s => new GLib.Variant('s', s))]);
-    const platformData = {
-        'desktop-startup-id': new GLib.Variant('s',
-            '_TIME%s'.format(global.get_current_time())),
-    };
-    try {
-        Gio.DBus.session.call(
-            'org.gnome.ControlCenter',
-            '/org/gnome/ControlCenter',
-            'org.freedesktop.Application',
-            'ActivateAction',
-            new GLib.Variant('(sava{sv})',
-                ['launch-panel', [param], platformData]),
-            null,
-            Gio.DBusCallFlags.NONE,
-            -1,
-            null);
-    } catch (e) {
-        log('Failed to launch Settings panel: %s'.format(e.message));
-    }
-}
-
 var NMConnectionItem = class {
     constructor(section, connection) {
         this._section = section;
@@ -564,7 +539,8 @@ var NMDeviceModem = class extends NMConnectionDevice {
     }
 
     _autoConnect() {
-        launchSettingsPanel('network', 'connect-3g', this._device.get_path());
+        Util.spawn(['gnome-control-center', 'network',
+                    'connect-3g', this._device.get_path()]);
     }
 
     destroy() {
@@ -955,8 +931,8 @@ class NMWirelessDialog extends ModalDialog.ModalDialog {
                 (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
                 // 802.1x-enabled APs require further configuration, so they're
                 // handled in gnome-control-center
-                launchSettingsPanel('wifi', 'connect-8021x-wifi',
+                Util.spawn(['gnome-control-center', 'wifi', 'connect-8021x-wifi',
-                    this._device.get_path(), accessPoints[0].get_path());
+                            this._device.get_path(), accessPoints[0].get_path()]);
             } else {
                 let connection = new NM.SimpleConnection();
                 this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null);

js/ui/status/remoteAccess.js

@@ -24,8 +24,7 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
             return;
 
         this._handles = new Set();
-        this._sharedIndicator = null;
+        this._indicator = null;
-        this._recordingIndicator = null;
         this._menuSection = null;
 
         controller.connect('new-handle', (o, handle) => {
@@ -34,49 +33,32 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
     }
 
     _ensureControls() {
-        if (this._sharedIndicator && this._recordingIndicator)
+        if (this._indicator)
             return;
 
-        this._sharedIndicator = this._addIndicator();
+        this._indicator = this._addIndicator();
-        this._sharedIndicator.icon_name = 'screen-shared-symbolic';
+        this._indicator.icon_name = 'screen-shared-symbolic';
-        this._sharedIndicator.add_style_class_name('remote-access-indicator');
+        this._indicator.add_style_class_name('remote-access-indicator');
-
+        this._item =
-        this._sharedItem =
             new PopupMenu.PopupSubMenuMenuItem(_("Screen is Being Shared"),
                                                true);
-        this._sharedItem.menu.addAction(_("Turn off"),
+        this._item.menu.addAction(_("Turn off"),
-            () => {
+                                  () => {
-                for (let handle of this._handles) {
+                                      for (let handle of this._handles)
-                    if (!handle.is_recording)
+                                          handle.stop();
-                        handle.stop();
+                                  });
-                }
+        this._item.icon.icon_name = 'screen-shared-symbolic';
-            });
+        this.menu.addMenuItem(this._item);
-        this._sharedItem.icon.icon_name = 'screen-shared-symbolic';
-        this.menu.addMenuItem(this._sharedItem);
-
-        this._recordingIndicator = this._addIndicator();
-        this._recordingIndicator.icon_name = 'media-record-symbolic';
-        this._recordingIndicator.add_style_class_name('screencast-indicator');
-    }
-
-    _isScreenShared() {
-        return [...this._handles].some(handle => !handle.is_recording);
-    }
-
-    _isRecording() {
-        return [...this._handles].some(handle => handle.is_recording);
     }
 
     _sync() {
-        if (this._isScreenShared()) {
+        if (this._handles.size == 0) {
-            this._sharedIndicator.visible = true;
+            this._indicator.visible = false;
-            this._sharedItem.visible = true;
+            this._item.visible = false;
         } else {
-            this._sharedIndicator.visible = false;
+            this._indicator.visible = true;
-            this._sharedItem.visible = false;
+            this._item.visible = true;
         }
-
-        this._recordingIndicator.visible = this._isRecording();
     }
 
     _onStopped(handle) {
@@ -88,7 +70,9 @@ class RemoteAccessApplet extends PanelMenu.SystemIndicator {
         this._handles.add(handle);
         handle.connect('stopped', this._onStopped.bind(this));
 
-        this._ensureControls();
+        if (this._handles.size == 1) {
-        this._sync();
+            this._ensureControls();
+            this._sync();
+        }
     }
 });

js/ui/status/rfkill.js

@@ -86,8 +86,6 @@ class Indicator extends PanelMenu.SystemIndicator {
 
         Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
         this._sessionUpdated();
-
-        this._sync();
     }
 
     _sessionUpdated() {

js/ui/status/screencast.js

@@ -0,0 +1,25 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* exported Indicator */
+
+const GObject = imports.gi.GObject;
+
+const Main = imports.ui.main;
+const PanelMenu = imports.ui.panelMenu;
+
+var Indicator = GObject.registerClass(
+class Indicator extends PanelMenu.SystemIndicator {
+    _init() {
+        super._init();
+
+        this._indicator = this._addIndicator();
+        this._indicator.icon_name = 'media-record-symbolic';
+        this._indicator.add_style_class_name('screencast-indicator');
+        this._sync();
+
+        Main.screencastService.connect('updated', this._sync.bind(this));
+    }
+
+    _sync() {
+        this._indicator.visible = Main.screencastService.isRecording;
+    }
+});

js/ui/status/system.js

@@ -27,8 +27,6 @@ class Indicator extends PanelMenu.SystemIndicator {
             () => this._updateSessionSubMenu());
         this._powerOffItem.connect('notify::visible',
             () => this._updateSessionSubMenu());
-        this._restartItem.connect('notify::visible',
-            () => this._updateSessionSubMenu());
         // Whether shutdown is available or not depends on both lockdown
         // settings (disable-log-out) and Polkit policy - the latter doesn't
         // notify, so we update the menu item each time the menu opens or
@@ -54,7 +52,6 @@ class Indicator extends PanelMenu.SystemIndicator {
             this._loginScreenItem.visible ||
             this._logoutItem.visible ||
             this._suspendItem.visible ||
-            this._restartItem.visible ||
             this._powerOffItem.visible;
     }
 
@@ -73,8 +70,9 @@ class Indicator extends PanelMenu.SystemIndicator {
         this.menu.addMenuItem(item);
         this._orientationLockItem = item;
         this._systemActions.bind_property('can-lock-orientation',
-            this._orientationLockItem, 'visible',
+                                          this._orientationLockItem,
-            bindFlags);
+                                          'visible',
+                                          bindFlags);
         this._systemActions.connect('notify::orientation-lock-icon', () => {
             let iconName = this._systemActions.orientation_lock_icon;
             let labelText = this._systemActions.getName("lock-orientation");
@@ -86,8 +84,8 @@ class Indicator extends PanelMenu.SystemIndicator {
         let app = this._settingsApp = Shell.AppSystem.get_default().lookup_app(
             'gnome-control-center.desktop');
         if (app) {
-            const [icon] = app.app_info.get_icon().names;
+            let [icon, name] = [app.app_info.get_icon().names[0],
-            const name = app.app_info.get_name();
+                                app.get_name()];
             item = new PopupMenu.PopupImageMenuItem(name, icon);
             item.connect('activate', () => {
                 this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
@@ -109,49 +107,15 @@ class Indicator extends PanelMenu.SystemIndicator {
         this.menu.addMenuItem(item);
         this._lockScreenItem = item;
         this._systemActions.bind_property('can-lock-screen',
-            this._lockScreenItem, 'visible',
+                                          this._lockScreenItem,
-            bindFlags);
+                                          'visible',
+                                          bindFlags);
 
         this._sessionSubMenu = new PopupMenu.PopupSubMenuMenuItem(
             _('Power Off / Log Out'), true);
         this._sessionSubMenu.icon.icon_name = 'system-shutdown-symbolic';
 
-        item = new PopupMenu.PopupMenuItem(_('Suspend'));
+        item = new PopupMenu.PopupMenuItem(_("Log Out"));
-        item.connect('activate', () => {
-            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activateSuspend();
-        });
-        this._sessionSubMenu.menu.addMenuItem(item);
-        this._suspendItem = item;
-        this._systemActions.bind_property('can-suspend',
-            this._suspendItem, 'visible',
-            bindFlags);
-
-        item = new PopupMenu.PopupMenuItem(_('Restart…'));
-        item.connect('activate', () => {
-            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activateRestart();
-        });
-        this._sessionSubMenu.menu.addMenuItem(item);
-        this._restartItem = item;
-        this._systemActions.bind_property('can-restart',
-            this._restartItem, 'visible',
-            bindFlags);
-
-        item = new PopupMenu.PopupMenuItem(_('Power Off…'));
-        item.connect('activate', () => {
-            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activatePowerOff();
-        });
-        this._sessionSubMenu.menu.addMenuItem(item);
-        this._powerOffItem = item;
-        this._systemActions.bind_property('can-power-off',
-            this._powerOffItem, 'visible',
-            bindFlags);
-
-        this._sessionSubMenu.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        item = new PopupMenu.PopupMenuItem(_('Log Out'));
         item.connect('activate', () => {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
             this._systemActions.activateLogout();
@@ -159,10 +123,11 @@ class Indicator extends PanelMenu.SystemIndicator {
         this._sessionSubMenu.menu.addMenuItem(item);
         this._logoutItem = item;
         this._systemActions.bind_property('can-logout',
-            this._logoutItem, 'visible',
+                                          this._logoutItem,
-            bindFlags);
+                                          'visible',
+                                          bindFlags);
 
-        item = new PopupMenu.PopupMenuItem(_('Switch User…'));
+        item = new PopupMenu.PopupMenuItem(_("Switch User…"));
         item.connect('activate', () => {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
             this._systemActions.activateSwitchUser();
@@ -170,8 +135,35 @@ class Indicator extends PanelMenu.SystemIndicator {
         this._sessionSubMenu.menu.addMenuItem(item);
         this._loginScreenItem = item;
         this._systemActions.bind_property('can-switch-user',
-            this._loginScreenItem, 'visible',
+                                          this._loginScreenItem,
-            bindFlags);
+                                          'visible',
+                                          bindFlags);
+
+        this._sessionSubMenu.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        item = new PopupMenu.PopupMenuItem(_("Suspend"));
+        item.connect('activate', () => {
+            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
+            this._systemActions.activateSuspend();
+        });
+        this._sessionSubMenu.menu.addMenuItem(item);
+        this._suspendItem = item;
+        this._systemActions.bind_property('can-suspend',
+                                          this._suspendItem,
+                                          'visible',
+                                          bindFlags);
+
+        item = new PopupMenu.PopupMenuItem(_("Power Off…"));
+        item.connect('activate', () => {
+            this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
+            this._systemActions.activatePowerOff();
+        });
+        this._sessionSubMenu.menu.addMenuItem(item);
+        this._powerOffItem = item;
+        this._systemActions.bind_property('can-power-off',
+                                          this._powerOffItem,
+                                          'visible',
+                                          bindFlags);
 
         this.menu.addMenuItem(this._sessionSubMenu);
     }

js/ui/unlockDialog.js

@@ -573,9 +573,11 @@ var UnlockDialog = GObject.registerClass({
 
         this._screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
 
+        this._userSwitchEnabledId = 0;
         this._userSwitchEnabledId = this._screenSaverSettings.connect('changed::user-switch-enabled',
             this._updateUserSwitchVisibility.bind(this));
 
+        this._userLoadedId = 0;
         this._userLoadedId = this._user.connect('notify::is-loaded',
             this._updateUserSwitchVisibility.bind(this));
 

js/ui/viewSelector.js

@@ -299,6 +299,10 @@ var ViewSelector = GObject.registerClass({
             Main.overview.fadeInDesktop();
     }
 
+    setWorkspacesFullGeometry(geom) {
+        this._workspacesDisplay.setWorkspacesFullGeometry(geom);
+    }
+
     vfunc_hide() {
         this.reset();
         this._workspacesDisplay.hide();

js/ui/windowManager.js

@@ -42,11 +42,6 @@ const GsdWacomProxy = Gio.DBusProxy.makeProxyWrapper(GsdWacomIface);
 
 const WINDOW_DIMMER_EFFECT_NAME = "gnome-shell-window-dimmer";
 
-Gio._promisify(Shell,
-    'util_start_systemd_unit', 'util_start_systemd_unit_finish');
-Gio._promisify(Shell,
-    'util_stop_systemd_unit', 'util_stop_systemd_unit_finish');
-
 var DisplayChangeDialog = GObject.registerClass(
 class DisplayChangeDialog extends ModalDialog.ModalDialog {
     _init(wm) {
@@ -906,23 +901,46 @@ var WindowManager = class {
         global.display.connect('init-xserver', (display, task) => {
             IBusManager.getIBusManager().restartDaemon(['--xim']);
 
-            /* Timeout waiting for start job completion after 5 seconds */
+            try {
-            let cancellable = new Gio.Cancellable();
+                if (!Shell.util_start_systemd_unit('gsd-xsettings.target', 'fail'))
-            GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
+                    log('Not starting gsd-xsettings; waiting for gnome-session to do so');
-                cancellable.cancel();
-                return GLib.SOURCE_REMOVE;
-            });
 
-            this._startX11Services(task, cancellable);
+                /* Leave this watchdog timeout so don't block indefinitely here */
+                let timeoutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
+                    Gio.DBus.session.unwatch_name(watchId);
+                    log('Warning: Failed to start gsd-xsettings');
+                    task.return_boolean(true);
+                    timeoutId = 0;
+                    return GLib.SOURCE_REMOVE;
+                });
+
+                /* When gsd-xsettings daemon is started, we are good to resume */
+                let watchId = Gio.DBus.session.watch_name(
+                    'org.gnome.SettingsDaemon.XSettings',
+                    Gio.BusNameWatcherFlags.NONE,
+                    () => {
+                        Gio.DBus.session.unwatch_name(watchId);
+                        if (timeoutId > 0) {
+                            task.return_boolean(true);
+                            GLib.source_remove(timeoutId);
+                        }
+                    },
+                    null);
+            } catch (e) {
+                log('Error starting gsd-xsettings: %s'.format(e.message));
+                task.return_boolean(true);
+            }
 
             return true;
         });
         global.display.connect('x11-display-closing', () => {
             if (!Meta.is_wayland_compositor())
                 return;
-
+            try {
-            this._stopX11Services(null);
+                Shell.util_stop_systemd_unit('gsd-xsettings.target', 'fail');
-
+            } catch (e) {
+                log('Error stopping gsd-xsettings: %s'.format(e.message));
+            }
             IBusManager.getIBusManager().restartDaemon();
         });
 
@@ -990,36 +1008,6 @@ var WindowManager = class {
         global.stage.add_action(topDragAction);
     }
 
-    async _startX11Services(task, cancellable) {
-        try {
-            await Shell.util_start_systemd_unit(
-                'gnome-session-x11-services-ready.target', 'fail', cancellable);
-        } catch (e) {
-            // Ignore NOT_SUPPORTED error, which indicates we are not systemd
-            // managed and gnome-session will have taken care of everything
-            // already.
-            // Note that we do log cancellation from here.
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED))
-                log('Error starting X11 services: %s'.format(e.message));
-        } finally {
-            task.return_boolean(true);
-        }
-    }
-
-    async _stopX11Services(cancellable) {
-        try {
-            await Shell.util_stop_systemd_unit(
-                'gnome-session-x11-services.target', 'fail', cancellable);
-        } catch (e) {
-            // Ignore NOT_SUPPORTED error, which indicates we are not systemd
-            // managed and gnome-session will have taken care of everything
-            // already.
-            // Note that we do log cancellation from here.
-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_SUPPORTED))
-                log('Error stopping X11 services: %s'.format(e.message));
-        }
-    }
-
     _showPadOsd(display, device, settings, imagePath, editionMode, monitorIndex) {
         this._currentPadOsd = new PadOsd.PadOsd(device, settings, imagePath, editionMode, monitorIndex);
         this._currentPadOsd.connect('closed', () => (this._currentPadOsd = null));

js/ui/windowPreview.js

@@ -97,7 +97,7 @@ var WindowPreviewLayout = GObject.registerClass({
 
                 child.allocate(childBox);
             } else {
-                child.allocate_preferred_size(0, 0);
+                child.allocate_preferred_size();
             }
         }
     }
@@ -189,12 +189,6 @@ var WindowPreviewLayout = GObject.registerClass({
 });
 
 var WindowPreview = GObject.registerClass({
-    Properties: {
-        'overlay-enabled': GObject.ParamSpec.boolean(
-            'overlay-enabled', 'overlay-enabled', 'overlay-enabled',
-            GObject.ParamFlags.READWRITE,
-            true),
-    },
     Signals: {
         'drag-begin': {},
         'drag-cancelled': {},
@@ -229,6 +223,7 @@ var WindowPreview = GObject.registerClass({
 
         this._delegate = this;
 
+        this.slotId = 0;
         this._stackAbove = null;
 
         this._windowContainer.layout_manager.connect(
@@ -242,6 +237,8 @@ var WindowPreview = GObject.registerClass({
             this._windowActor.connect('destroy', () => this.destroy());
 
         this._updateAttachedDialogs();
+        this.x = this.boundingBox.x;
+        this.y = this.boundingBox.y;
 
         let clickAction = new Clutter.ClickAction();
         clickAction.connect('clicked', () => this._activate());
@@ -260,7 +257,6 @@ var WindowPreview = GObject.registerClass({
         this.inDrag = false;
 
         this._selected = false;
-        this._overlayEnabled = true;
         this._closeRequested = false;
         this._idleHideOverlayId = 0;
 
@@ -353,14 +349,6 @@ var WindowPreview = GObject.registerClass({
         this.add_child(this._border);
         this.add_child(this._title);
         this.add_child(this._closeButton);
-
-        this.connect('notify::realized', () => {
-            if (!this.realized)
-                return;
-
-            this._border.ensure_style();
-            this._title.ensure_style();
-        });
     }
 
     vfunc_get_preferred_width(forHeight) {
@@ -415,6 +403,8 @@ var WindowPreview = GObject.registerClass({
     }
 
     chromeHeights() {
+        this._border.ensure_style();
+        this._title.ensure_style();
         const [, closeButtonHeight] = this._closeButton.get_preferred_height(-1);
         const [, titleHeight] = this._title.get_preferred_height(-1);
 
@@ -427,6 +417,7 @@ var WindowPreview = GObject.registerClass({
     }
 
     chromeWidths() {
+        this._border.ensure_style();
         const [, closeButtonWidth] = this._closeButton.get_preferred_width(-1);
 
         const leftOversize = this._closeButtonSide === St.Side.LEFT
@@ -440,9 +431,6 @@ var WindowPreview = GObject.registerClass({
     }
 
     showOverlay(animate) {
-        if (!this._overlayEnabled)
-            return;
-
         const ongoingTransition = this._border.get_transition('opacity');
 
         // Don't do anything if we're fully visible already
@@ -578,25 +566,6 @@ var WindowPreview = GObject.registerClass({
         });
     }
 
-    // eslint-disable-next-line camelcase
-    get overlay_enabled() {
-        return this._overlayEnabled;
-    }
-
-    // eslint-disable-next-line camelcase
-    set overlay_enabled(enabled) {
-        if (this._overlayEnabled === enabled)
-            return;
-
-        this._overlayEnabled = enabled;
-        this.notify('overlay-enabled');
-
-        if (!enabled)
-            this.hideOverlay(false);
-        else if (this['has-pointer'] || global.stage.key_focus === this)
-            this.showOverlay(true);
-    }
-
     // Find the actor just below us, respecting reparenting done by DND code
     _getActualStackAbove() {
         if (this._stackAbove == null)

js/ui/workspaceSwitcherPopup.js

@@ -11,10 +11,7 @@ var DISPLAY_TIMEOUT = 600;
 var WorkspaceSwitcherPopupList = GObject.registerClass(
 class WorkspaceSwitcherPopupList extends St.Widget {
     _init() {
-        super._init({
+        super._init({ style_class: 'workspace-switcher' });
-            style_class: 'workspace-switcher',
-            offscreen_redirect: Clutter.OffscreenRedirect.ALWAYS,
-        });
 
         this._itemSpacing = 0;
         this._childHeight = 0;

js/ui/workspacesView.js

@@ -7,7 +7,6 @@ const Main = imports.ui.main;
 const SwipeTracker = imports.ui.swipeTracker;
 const Workspace = imports.ui.workspace;
 
-var { ANIMATION_TIME } = imports.ui.overview;
 var WORKSPACE_SWITCH_TIME = 250;
 var SCROLL_TIMEOUT_TIME = 150;
 
@@ -22,18 +21,18 @@ var WorkspacesViewBase = GObject.registerClass({
     GTypeFlags: GObject.TypeFlags.ABSTRACT,
 }, class WorkspacesViewBase extends St.Widget {
     _init(monitorIndex) {
-        const { x, y, width, height } =
+        super._init({ style_class: 'workspaces-view' });
-            Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
-
-        super._init({
-            style_class: 'workspaces-view',
-            x, y, width, height,
-        });
         this.connect('destroy', this._onDestroy.bind(this));
         global.focus_manager.add_group(this);
 
+        // The actor itself isn't a drop target, so we don't want to pick on its area
+        this.set_size(0, 0);
+
         this._monitorIndex = monitorIndex;
 
+        this._fullGeometry = null;
+        this._actualGeometry = null;
+
         this._inDrag = false;
         this._windowDragBeginId = Main.overview.connect('window-drag-begin', this._dragBegin.bind(this));
         this._windowDragEndId = Main.overview.connect('window-drag-end', this._dragEnd.bind(this));
@@ -52,19 +51,24 @@ var WorkspacesViewBase = GObject.registerClass({
         }
     }
 
-    _dragBegin() {
+    _dragBegin(overview, window) {
         this._inDrag = true;
+        this._setReservedSlot(window);
     }
 
     _dragEnd() {
         this._inDrag = false;
+        this._setReservedSlot(null);
     }
 
-    vfunc_allocate(box) {
+    setFullGeometry(geom) {
-        this.set_allocation(box);
+        this._fullGeometry = geom;
+        this._syncFullGeometry();
+    }
 
-        for (const child of this)
+    setActualGeometry(geom) {
-            child.allocate_available_size(0, 0, box.get_width(), box.get_height());
+        this._actualGeometry = geom;
+        this._syncActualGeometry();
     }
 });
 
@@ -79,8 +83,9 @@ class WorkspacesView extends WorkspacesViewBase {
         this._gestureActive = false; // touch(pad) gestures
 
         this._scrollAdjustment = scrollAdjustment;
-        this._onScrollId = this._scrollAdjustment.connect('notify::value',
+        this._onScrollId =
-            this._updateScrollPosition.bind(this));
+            this._scrollAdjustment.connect('notify::value',
+                this._onScroll.bind(this));
 
         this._workspaces = [];
         this._updateWorkspaces();
@@ -92,42 +97,34 @@ class WorkspacesView extends WorkspacesViewBase {
                 this._workspaces.sort((a, b) => {
                     return a.metaWorkspace.index() - b.metaWorkspace.index();
                 });
-                this._workspaces.forEach(
+                this._updateWorkspaceActors(false);
-                    (ws, i) => this.set_child_at_index(ws, i));
             });
 
-        this._overviewShownId = Main.overview.connect('shown', () => {
+
-            this.clip_to_allocation = true;
+        this._overviewShownId =
-        });
+            Main.overview.connect('shown', () => {
+                this.set_clip(this._fullGeometry.x, this._fullGeometry.y,
+                              this._fullGeometry.width, this._fullGeometry.height);
+            });
 
         this._switchWorkspaceNotifyId =
             global.window_manager.connect('switch-workspace',
                                           this._activeWorkspaceChanged.bind(this));
     }
 
-    vfunc_allocate(box) {
+    _setReservedSlot(window) {
-        this.set_allocation(box);
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].setReservedSlot(window);
+    }
 
-        if (this.get_n_children() === 0)
+    _syncFullGeometry() {
-            return;
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].setFullGeometry(this._fullGeometry);
+    }
 
-        const { workspaceManager } = global;
+    _syncActualGeometry() {
-        const { nWorkspaces } = workspaceManager;
+        for (let i = 0; i < this._workspaces.length; i++)
-
+            this._workspaces[i].setActualGeometry(this._actualGeometry);
-        const vertical = workspaceManager.layout_rows === -1;
-        const rtl = this.text_direction === Clutter.TextDirection.RTL;
-
-        this._workspaces.forEach((child, index) => {
-            if (rtl && !vertical)
-                index = nWorkspaces - index - 1;
-
-            const x = vertical ? 0 : index * this.width;
-            const y = vertical ? index * this.height : 0;
-
-            child.allocate_available_size(x, y, box.get_width(), box.get_height());
-        });
-
-        this._updateScrollPosition();
     }
 
     getActiveWorkspace() {
@@ -143,11 +140,11 @@ class WorkspacesView extends WorkspacesViewBase {
             else
                 this._workspaces[w].fadeToOverview();
         }
-        this._updateScrollPosition();
+        this._updateWorkspaceActors(false);
     }
 
     animateFromOverview(animationType) {
-        this.clip_to_allocation = false;
+        this.remove_clip();
 
         for (let w = 0; w < this._workspaces.length; w++) {
             if (animationType == AnimationType.ZOOM)
@@ -162,22 +159,49 @@ class WorkspacesView extends WorkspacesViewBase {
             this._workspaces[i].syncStacking(stackIndices);
     }
 
-    _scrollToActive() {
+    // Update workspace actors parameters
-        const { workspaceManager } = global;
+    // @showAnimation: iff %true, transition between states
-        const active = workspaceManager.get_active_workspace_index();
+    _updateWorkspaceActors(showAnimation) {
+        let workspaceManager = global.workspace_manager;
+        let active = workspaceManager.get_active_workspace_index();
 
-        this._animating = true;
+        this._animating = showAnimation;
-        this._updateVisibility();
 
-        this._scrollAdjustment.remove_transition('value');
+        for (let w = 0; w < this._workspaces.length; w++) {
-        this._scrollAdjustment.ease(active, {
+            let workspace = this._workspaces[w];
-            duration: WORKSPACE_SWITCH_TIME,
+
-            mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
+            workspace.remove_all_transitions();
-            onComplete: () => {
+
-                this._animating = false;
+            let params = {};
-                this._updateVisibility();
+            if (workspaceManager.layout_rows == -1)
-            },
+                params.y = (w - active) * this._fullGeometry.height;
-        });
+            else if (this.text_direction == Clutter.TextDirection.RTL)
+                params.x = (active - w) * this._fullGeometry.width;
+            else
+                params.x = (w - active) * this._fullGeometry.width;
+
+            if (showAnimation) {
+                let easeParams = Object.assign(params, {
+                    duration: WORKSPACE_SWITCH_TIME,
+                    mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
+                });
+                // we have to call _updateVisibility() once before the
+                // animation and once afterwards - it does not really
+                // matter which tween we use, so we pick the first one ...
+                if (w == 0) {
+                    this._updateVisibility();
+                    easeParams.onComplete = () => {
+                        this._animating = false;
+                        this._updateVisibility();
+                    };
+                }
+                workspace.ease(easeParams);
+            } else {
+                workspace.set(params);
+                if (w == 0)
+                    this._updateVisibility();
+            }
+        }
     }
 
     _updateVisibility() {
@@ -218,14 +242,19 @@ class WorkspacesView extends WorkspacesViewBase {
             }
         }
 
-        this._updateScrollPosition();
+        if (this._fullGeometry) {
+            this._updateWorkspaceActors(false);
+            this._syncFullGeometry();
+        }
+        if (this._actualGeometry)
+            this._syncActualGeometry();
     }
 
     _activeWorkspaceChanged(_wm, _from, _to, _direction) {
         if (this._scrolling)
             return;
 
-        this._scrollToActive();
+        this._updateWorkspaceActors(true);
     }
 
     _onDestroy() {
@@ -241,33 +270,27 @@ class WorkspacesView extends WorkspacesViewBase {
 
     startTouchGesture() {
         this._gestureActive = true;
-
-        this._updateVisibility();
     }
 
     endTouchGesture() {
         this._gestureActive = false;
 
         // Make sure title captions etc are shown as necessary
-        this._scrollToActive();
+        this._updateWorkspaceActors(true);
         this._updateVisibility();
     }
 
     // sync the workspaces' positions to the value of the scroll adjustment
     // and change the active workspace if appropriate
-    _updateScrollPosition() {
+    _onScroll(adj) {
-        if (!this.has_allocation())
+        if (adj.get_transition('value') !== null && !this._gestureActive)
             return;
 
-        const adj = this._scrollAdjustment;
-        const allowSwitch =
-            adj.get_transition('value') === null && !this._gestureActive;
-
         let workspaceManager = global.workspace_manager;
         let active = workspaceManager.get_active_workspace_index();
         let current = Math.round(adj.value);
 
-        if (allowSwitch && active !== current) {
+        if (active != current && !this._gestureActive) {
             if (!this._workspaces[current]) {
                 // The current workspace was destroyed. This could happen
                 // when you are on the last empty workspace, and consolidate
@@ -284,16 +307,36 @@ class WorkspacesView extends WorkspacesViewBase {
         if (adj.upper == 1)
             return;
 
-        const vertical = workspaceManager.layout_rows === -1;
+        let last = this._workspaces.length - 1;
-        const rtl = this.text_direction === Clutter.TextDirection.RTL;
-        const progress = vertical || !rtl
-            ? adj.value : adj.upper - adj.value;
 
-        for (const ws of this._workspaces) {
+        if (workspaceManager.layout_rows == -1) {
-            if (vertical)
+            let firstWorkspaceY = this._workspaces[0].y;
-                ws.translation_y = -progress * this.height;
+            let lastWorkspaceY = this._workspaces[last].y;
-            else
+            let workspacesHeight = lastWorkspaceY - firstWorkspaceY;
-                ws.translation_x = -progress * this.width;
+
+            let currentY = firstWorkspaceY;
+            let newY = -Math.round(adj.value / (adj.upper - 1) * workspacesHeight);
+
+            let dy = newY - currentY;
+
+            for (let i = 0; i < this._workspaces.length; i++) {
+                this._workspaces[i].visible = Math.abs(i - adj.value) <= 1;
+                this._workspaces[i].y += dy;
+            }
+        } else {
+            let firstWorkspaceX = this._workspaces[0].x;
+            let lastWorkspaceX = this._workspaces[last].x;
+            let workspacesWidth = lastWorkspaceX - firstWorkspaceX;
+
+            let currentX = firstWorkspaceX;
+            let newX = -Math.round(adj.value / (adj.upper - 1) * workspacesWidth);
+
+            let dx = newX - currentX;
+
+            for (let i = 0; i < this._workspaces.length; i++) {
+                this._workspaces[i].visible = Math.abs(i - adj.value) <= 1;
+                this._workspaces[i].x += dx;
+            }
         }
     }
 });
@@ -306,6 +349,18 @@ class ExtraWorkspaceView extends WorkspacesViewBase {
         this.add_actor(this._workspace);
     }
 
+    _setReservedSlot(window) {
+        this._workspace.setReservedSlot(window);
+    }
+
+    _syncFullGeometry() {
+        this._workspace.setFullGeometry(this._fullGeometry);
+    }
+
+    _syncActualGeometry() {
+        this._workspace.setActualGeometry(this._actualGeometry);
+    }
+
     getActiveWorkspace() {
         return this._workspace;
     }
@@ -383,10 +438,6 @@ class WorkspacesDisplay extends St.Widget {
         this._windowDragEndId =
             Main.overview.connect('window-drag-begin',
                 this._windowDragEnd.bind(this));
-        this._overviewShownId = Main.overview.connect('shown', () => {
-            this._inWindowFade = false;
-            this._syncWorkspacesActualGeometry();
-        });
 
         this._primaryIndex = Main.layoutManager.primaryIndex;
         this._workspacesViews = [];
@@ -401,11 +452,10 @@ class WorkspacesDisplay extends St.Widget {
         this._scrollEventId = 0;
         this._keyPressEventId = 0;
         this._scrollTimeoutId = 0;
-        this._syncActualGeometryLater = 0;
 
         this._actualGeometry = null;
+        this._fullGeometry = null;
         this._inWindowDrag = false;
-        this._inWindowFade = false;
 
         this._gestureActive = false; // touch(pad) gestures
         this._canScroll = true; // limiting scrolling speed
@@ -426,11 +476,6 @@ class WorkspacesDisplay extends St.Widget {
             this._parentSetLater = 0;
         }
 
-        if (this._syncActualGeometryLater) {
-            Meta.later_remove(this._syncActualGeometryLater);
-            this._syncActualGeometryLater = 0;
-        }
-
         if (this._scrollTimeoutId !== 0) {
             GLib.source_remove(this._scrollTimeoutId);
             this._scrollTimeoutId = 0;
@@ -440,7 +485,6 @@ class WorkspacesDisplay extends St.Widget {
         global.workspace_manager.disconnect(this._reorderWorkspacesdId);
         Main.overview.disconnect(this._windowDragBeginId);
         Main.overview.disconnect(this._windowDragEndId);
-        Main.overview.disconnect(this._overviewShownId);
     }
 
     _windowDragBegin() {
@@ -506,8 +550,11 @@ class WorkspacesDisplay extends St.Widget {
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].startTouchGesture();
 
+        let monitors = Main.layoutManager.monitors;
+        let geometry = monitor === this._primaryIndex
+            ? this._fullGeometry : monitors[monitor];
         let distance = global.workspace_manager.layout_rows === -1
-            ? this.height : this.width;
+            ? geometry.height : geometry.width;
 
         let progress = adjustment.value / adjustment.page_size;
         let points = Array.from(
@@ -554,20 +601,17 @@ class WorkspacesDisplay extends St.Widget {
         this.show();
         this._updateWorkspacesViews();
 
-        for (let i = 0; i < this._workspacesViews.length; i++) {
+        if (this._actualGeometry && this._fullGeometry) {
-            let animationType;
+            for (let i = 0; i < this._workspacesViews.length; i++) {
-            if (fadeOnPrimary && i == this._primaryIndex)
+                let animationType;
-                animationType = AnimationType.FADE;
+                if (fadeOnPrimary && i == this._primaryIndex)
-            else
+                    animationType = AnimationType.FADE;
-                animationType = AnimationType.ZOOM;
+                else
-            this._workspacesViews[i].animateToOverview(animationType);
+                    animationType = AnimationType.ZOOM;
+                this._workspacesViews[i].animateToOverview(animationType);
+            }
         }
 
-        this._inWindowFade = fadeOnPrimary;
-
-        if (this._actualGeometry && !fadeOnPrimary)
-            this._syncWorkspacesActualGeometry();
-
         this._restackedNotifyId =
             Main.overview.connect('windows-restacked',
                                   this._onRestacked.bind(this));
@@ -587,17 +631,6 @@ class WorkspacesDisplay extends St.Widget {
                 animationType = AnimationType.ZOOM;
             this._workspacesViews[i].animateFromOverview(animationType);
         }
-
-        this._inWindowFade = fadeOnPrimary;
-
-        const { primaryIndex } = Main.layoutManager;
-        const { x, y, width, height } =
-            Main.layoutManager.getWorkAreaForMonitor(primaryIndex);
-        this._getPrimaryView().ease({
-            x, y, width, height,
-            duration: fadeOnPrimary ? 0 : ANIMATION_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-        });
     }
 
     vfunc_hide() {
@@ -627,7 +660,6 @@ class WorkspacesDisplay extends St.Widget {
             return;
 
         this._updateWorkspacesViews();
-        this._syncWorkspacesActualGeometry();
     }
 
     _updateWorkspacesViews() {
@@ -647,6 +679,11 @@ class WorkspacesDisplay extends St.Widget {
             this._workspacesViews.push(view);
             Main.layoutManager.overviewGroup.add_actor(view);
         }
+
+        if (this._fullGeometry)
+            this._syncWorkspacesFullGeometry();
+        if (this._actualGeometry)
+            this._syncWorkspacesActualGeometry();
     }
 
     _getMonitorIndexForEvent(event) {
@@ -693,35 +730,43 @@ class WorkspacesDisplay extends St.Widget {
         });
     }
 
+    // This geometry should always be the fullest geometry
+    // the workspaces switcher can ever be allocated, as if
+    // the sliding controls were never slid in at all.
+    setWorkspacesFullGeometry(geom) {
+        this._fullGeometry = geom;
+        this._syncWorkspacesFullGeometry();
+    }
+
+    _syncWorkspacesFullGeometry() {
+        if (!this._workspacesViews.length)
+            return;
+
+        let monitors = Main.layoutManager.monitors;
+        for (let i = 0; i < monitors.length; i++) {
+            let geometry = i == this._primaryIndex ? this._fullGeometry : monitors[i];
+            this._workspacesViews[i].setFullGeometry(geometry);
+        }
+    }
+
     _updateWorkspacesActualGeometry() {
         const [x, y] = this.get_transformed_position();
         const width = this.allocation.get_width();
         const height = this.allocation.get_height();
 
         this._actualGeometry = { x, y, width, height };
-
+        this._syncWorkspacesActualGeometry();
-        if (this._syncActualGeometryLater > 0)
-            return;
-
-        this._syncActualGeometryLater =
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
-                this._syncWorkspacesActualGeometry();
-
-                this._syncActualGeometryLater = 0;
-                return GLib.SOURCE_REMOVE;
-            });
     }
 
     _syncWorkspacesActualGeometry() {
-        const primaryView = this._getPrimaryView();
+        if (!this._workspacesViews.length)
-        if (!primaryView || this._inWindowFade)
             return;
 
-        primaryView.ease({
+        let monitors = Main.layoutManager.monitors;
-            ...this._actualGeometry,
+        for (let i = 0; i < monitors.length; i++) {
-            duration: Main.overview.animationInProgress ? ANIMATION_TIME : 0,
+            let geometry = i === this._primaryIndex ? this._actualGeometry : monitors[i];
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
+            this._workspacesViews[i].setActualGeometry(geometry);
-        });
+        }
     }
 
     _onRestacked(overview, stackIndices) {

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.37.90',
+  version: '3.37.2',
   meson_version: '>= 0.53.0',
   license: 'GPLv2+'
 )
@@ -25,7 +25,7 @@ gio_req = '>= 2.56.0'
 gi_req = '>= 1.49.1'
 gjs_req = '>= 1.65.1'
 gtk_req = '>= 3.15.0'
-mutter_req = '>= 3.37.90'
+mutter_req = '>= 3.37.2'
 polkit_req = '>= 0.100'
 schemas_req = '>= 3.33.1'
 startup_req = '>= 0.11'
@@ -96,10 +96,9 @@ gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
 bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
 gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
 gst_base_dep = dependency('gstreamer-base-1.0', required: false)
-pipewire_dep = dependency('libpipewire-0.3', required: false)
 
 recorder_deps = []
-enable_recorder = gst_dep.found() and gst_base_dep.found() and pipewire_dep.found()
+enable_recorder = gst_dep.found() and gst_base_dep.found()
 if enable_recorder
   recorder_deps += [gst_dep, gst_base_dep, gtk_dep, x11_dep]
 endif

po/POTFILES.skip

@@ -1,3 +1 @@
-data/org.gnome.Shell@wayland.service.in
-data/org.gnome.Shell@x11.service.in
 subprojects/extensions-tool/src/templates/indicator/extension.js

po/ro.po

@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-07-21 05:44+0000\n"
+"POT-Creation-Date: 2020-06-09 19:41+0000\n"
-"PO-Revision-Date: 2020-07-21 09:07+0200\n"
+"PO-Revision-Date: 2020-06-17 18:47+0300\n"
 "Last-Translator: Florentina Mușat <florentina [dot] musat [dot] 28 [at] "
 "gmail [dot] com>\n"
 "Language-Team: Gnome Romanian Translation Team <gnomero-list@lists."
@@ -224,112 +224,95 @@ msgid ""
 msgstr ""
 "Activează un API D-Bus care permite introspecția stării aplicației shell."
 
-#: data/org.gnome.shell.gschema.xml.in:114
+#: data/org.gnome.shell.gschema.xml.in:119
-msgid "Layout of the app picker"
-msgstr "Aspectul selectorului de aplicații"
-
-#: data/org.gnome.shell.gschema.xml.in:115
-msgid ""
-"Layout of the app picker. Each entry in the array is a page. Pages are "
-"stored in the order they appear in GNOME Shell. Each page contains an "
-"“application id” → 'data' pair. Currently, the following values are stored "
-"as 'data': • “position”: the position of the application icon in the page"
-msgstr ""
-"Aspectul selectorului de aplicații. Fiecare intrare din matrice este o "
-"pagină. Paginile sunt stocate în ordinea în care apar în GNOME Shell. "
-"Fiecare pagină conține o pereche de „id aplicație” → „date”. Momentan, "
-"următoarele valori sunt stocate ca „data”: • „poziție”: poziția iconiței "
-"aplicației în pagină."
-
-#: data/org.gnome.shell.gschema.xml.in:130
 msgid "Keybinding to open the application menu"
 msgstr "Combinație de taste pentru deschiderea meniului aplicației"
 
-#: data/org.gnome.shell.gschema.xml.in:131
+#: data/org.gnome.shell.gschema.xml.in:120
 msgid "Keybinding to open the application menu."
 msgstr "Combinație de taste pentru deschiderea meniului aplicației."
 
-#: data/org.gnome.shell.gschema.xml.in:137
+#: data/org.gnome.shell.gschema.xml.in:126
 msgid "Keybinding to open the “Show Applications” view"
 msgstr ""
 "Combinație de taste pentru deschiderea modului de afișare „Arată aplicațiile”"
 
-#: data/org.gnome.shell.gschema.xml.in:138
+#: data/org.gnome.shell.gschema.xml.in:127
 msgid ""
 "Keybinding to open the “Show Applications” view of the Activities Overview."
 msgstr ""
 "Combinație de taste pentru deschiderea modului de afișare „Arată "
 "aplicațiile” a prezentării generale a activităților."
 
-#: data/org.gnome.shell.gschema.xml.in:145
+#: data/org.gnome.shell.gschema.xml.in:134
 msgid "Keybinding to open the overview"
 msgstr "Combinație de taste pentru deschiderea prezentării generale"
 
-#: data/org.gnome.shell.gschema.xml.in:146
+#: data/org.gnome.shell.gschema.xml.in:135
 msgid "Keybinding to open the Activities Overview."
 msgstr ""
 "Combinație de taste pentru deschiderea prezentării generale a activităților."
 
-#: data/org.gnome.shell.gschema.xml.in:152
+#: data/org.gnome.shell.gschema.xml.in:141
 msgid "Keybinding to toggle the visibility of the notification list"
 msgstr ""
 "Combinație de taste pentru comutarea vizibilității listei de notificare"
 
-#: data/org.gnome.shell.gschema.xml.in:153
+#: data/org.gnome.shell.gschema.xml.in:142
 msgid "Keybinding to toggle the visibility of the notification list."
 msgstr ""
 "Combinație de taste pentru comutarea vizibilității listei de notificare."
 
-#: data/org.gnome.shell.gschema.xml.in:159
+#: data/org.gnome.shell.gschema.xml.in:148
 msgid "Keybinding to focus the active notification"
 msgstr "Combinație de taste pentru focalizarea notificării active"
 
-#: data/org.gnome.shell.gschema.xml.in:160
+#: data/org.gnome.shell.gschema.xml.in:149
 msgid "Keybinding to focus the active notification."
 msgstr "Combinație de taste pentru focalizarea notificării active."
 
-#: data/org.gnome.shell.gschema.xml.in:166
+#: data/org.gnome.shell.gschema.xml.in:155
 msgid "Switch to application 1"
 msgstr "Comută la aplicația 1"
 
-#: data/org.gnome.shell.gschema.xml.in:170
+#: data/org.gnome.shell.gschema.xml.in:159
 msgid "Switch to application 2"
 msgstr "Comută la aplicația 2"
 
-#: data/org.gnome.shell.gschema.xml.in:174
+#: data/org.gnome.shell.gschema.xml.in:163
 msgid "Switch to application 3"
 msgstr "Comută la aplicația 3"
 
-#: data/org.gnome.shell.gschema.xml.in:178
+#: data/org.gnome.shell.gschema.xml.in:167
 msgid "Switch to application 4"
 msgstr "Comută la aplicația 4"
 
-#: data/org.gnome.shell.gschema.xml.in:182
+#: data/org.gnome.shell.gschema.xml.in:171
 msgid "Switch to application 5"
 msgstr "Comută la aplicația 5"
 
-#: data/org.gnome.shell.gschema.xml.in:186
+#: data/org.gnome.shell.gschema.xml.in:175
 msgid "Switch to application 6"
 msgstr "Comută la aplicația 6"
 
-#: data/org.gnome.shell.gschema.xml.in:190
+#: data/org.gnome.shell.gschema.xml.in:179
 msgid "Switch to application 7"
 msgstr "Comută la aplicația 7"
 
-#: data/org.gnome.shell.gschema.xml.in:194
+#: data/org.gnome.shell.gschema.xml.in:183
 msgid "Switch to application 8"
 msgstr "Comută la aplicația 8"
 
-#: data/org.gnome.shell.gschema.xml.in:198
+#: data/org.gnome.shell.gschema.xml.in:187
 msgid "Switch to application 9"
 msgstr "Comută la aplicația 9"
 
-#: data/org.gnome.shell.gschema.xml.in:207
+#: data/org.gnome.shell.gschema.xml.in:196
-#: data/org.gnome.shell.gschema.xml.in:234
+#: data/org.gnome.shell.gschema.xml.in:223
 msgid "Limit switcher to current workspace."
 msgstr "Limitează comutatorul la spațiul de lucru curent."
 
-#: data/org.gnome.shell.gschema.xml.in:208
+#: data/org.gnome.shell.gschema.xml.in:197
 msgid ""
 "If true, only applications that have windows on the current workspace are "
 "shown in the switcher. Otherwise, all applications are included."
@@ -337,11 +320,11 @@ msgstr ""
 "Dacă este activat, doar aplicațiile care au ferestre în spațiul de lucru "
 "curent sunt arătate în comutator. Altfel, toate aplicațiile sunt incluse."
 
-#: data/org.gnome.shell.gschema.xml.in:225
+#: data/org.gnome.shell.gschema.xml.in:214
 msgid "The application icon mode."
 msgstr "Miniatură și pictograma aplicației."
 
-#: data/org.gnome.shell.gschema.xml.in:226
+#: data/org.gnome.shell.gschema.xml.in:215
 msgid ""
 "Configures how the windows are shown in the switcher. Valid possibilities "
 "are “thumbnail-only” (shows a thumbnail of the window), “app-icon-"
@@ -351,7 +334,7 @@ msgstr ""
 "Posibilități valide sunt „mod miniatură” (arată o miniatură a ferestrei) "
 "„mod iconiță” (arată doar iconița aplicației) sau „ambele”."
 
-#: data/org.gnome.shell.gschema.xml.in:235
+#: data/org.gnome.shell.gschema.xml.in:224
 msgid ""
 "If true, only windows from the current workspace are shown in the switcher. "
 "Otherwise, all windows are included."
@@ -359,59 +342,59 @@ msgstr ""
 "Dacă este activat, doar ferestrele din spațiul de lucru curent sunt arătate "
 "în comutator. Altfel, toate ferestrele sunt incluse."
 
-#: data/org.gnome.shell.gschema.xml.in:245
+#: data/org.gnome.shell.gschema.xml.in:234
 msgid "Locations"
 msgstr "Locații"
 
-#: data/org.gnome.shell.gschema.xml.in:246
+#: data/org.gnome.shell.gschema.xml.in:235
 msgid "The locations to show in world clocks"
 msgstr "Locațiile de arătat în ceasuri globale"
 
-#: data/org.gnome.shell.gschema.xml.in:256
+#: data/org.gnome.shell.gschema.xml.in:245
 msgid "Automatic location"
 msgstr "Locație automată"
 
-#: data/org.gnome.shell.gschema.xml.in:257
+#: data/org.gnome.shell.gschema.xml.in:246
 msgid "Whether to fetch the current location or not"
 msgstr "Dacă să se obțină locația curentă"
 
-#: data/org.gnome.shell.gschema.xml.in:264
+#: data/org.gnome.shell.gschema.xml.in:253
 msgid "Location"
 msgstr "Locație"
 
-#: data/org.gnome.shell.gschema.xml.in:265
+#: data/org.gnome.shell.gschema.xml.in:254
 msgid "The location for which to show a forecast"
 msgstr "Locația pentru care să se arate o prognoză"
 
-#: data/org.gnome.shell.gschema.xml.in:277
+#: data/org.gnome.shell.gschema.xml.in:266
 msgid "Attach modal dialog to the parent window"
 msgstr "Atașează dialogul modal la fereastra părinte"
 
-#: data/org.gnome.shell.gschema.xml.in:278
+#: data/org.gnome.shell.gschema.xml.in:267
-#: data/org.gnome.shell.gschema.xml.in:287
+#: data/org.gnome.shell.gschema.xml.in:276
-#: data/org.gnome.shell.gschema.xml.in:295
+#: data/org.gnome.shell.gschema.xml.in:284
-#: data/org.gnome.shell.gschema.xml.in:303
+#: data/org.gnome.shell.gschema.xml.in:292
-#: data/org.gnome.shell.gschema.xml.in:311
+#: data/org.gnome.shell.gschema.xml.in:300
 msgid ""
 "This key overrides the key in org.gnome.mutter when running GNOME Shell."
 msgstr ""
 "Această cheie suprascrie cheia corespondentă din org.gnome.mutter când "
 "Vizualizatorul activităților GNOME rulează."
 
-#: data/org.gnome.shell.gschema.xml.in:286
+#: data/org.gnome.shell.gschema.xml.in:275
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 "Activează mozaic lateral la plasarea ferestrelor pe marginile ecranului"
 
-#: data/org.gnome.shell.gschema.xml.in:294
+#: data/org.gnome.shell.gschema.xml.in:283
 msgid "Workspaces are managed dynamically"
 msgstr "Spațiile de lucru sunt gestionate în mod dinamic"
 
-#: data/org.gnome.shell.gschema.xml.in:302
+#: data/org.gnome.shell.gschema.xml.in:291
 msgid "Workspaces only on primary monitor"
 msgstr "Spații de lucru doar pe monitorul principal"
 
-#: data/org.gnome.shell.gschema.xml.in:310
+#: data/org.gnome.shell.gschema.xml.in:299
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr ""
 "Întârzie schimbările de focalizare în maus până când cursorul încetează să "
@@ -450,7 +433,7 @@ msgstr "Vizitează pagina principală a extensiei"
 
 #: js/gdm/authPrompt.js:135 js/ui/audioDeviceSelection.js:57
 #: js/ui/components/networkAgent.js:110 js/ui/components/polkitAgent.js:139
-#: js/ui/endSessionDialog.js:369 js/ui/extensionDownloader.js:183
+#: js/ui/endSessionDialog.js:369 js/ui/extensionDownloader.js:181
 #: js/ui/shellMountOperation.js:376 js/ui/shellMountOperation.js:386
 #: js/ui/status/network.js:916 subprojects/extensions-app/js/main.js:149
 msgid "Cancel"
@@ -492,7 +475,7 @@ msgstr "Nume de utilizator"
 msgid "Login Window"
 msgstr "Fereastră de autentificare"
 
-#: js/gdm/util.js:355
+#: js/gdm/util.js:345
 msgid "Authentication error"
 msgstr "Eroare de autentificare"
 
@@ -501,7 +484,7 @@ msgstr "Eroare de autentificare"
 #. as a cue to display our own message.
 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: js/gdm/util.js:481
+#: js/gdm/util.js:471
 msgid "(or swipe finger)"
 msgstr "(sau treceți degetul peste)"
 
@@ -744,36 +727,36 @@ msgstr "Refuză accesul"
 msgid "Grant Access"
 msgstr "Permite accesul"
 
-#: js/ui/appDisplay.js:1297
+#: js/ui/appDisplay.js:902
 msgid "Unnamed Folder"
 msgstr "Dosar nedenumit"
 
 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2767 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2241 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "Ferestre deschise"
 
-#: js/ui/appDisplay.js:2786 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2260 js/ui/panel.js:82
 msgid "New Window"
 msgstr "Fereastră nouă"
 
-#: js/ui/appDisplay.js:2802
+#: js/ui/appDisplay.js:2276
 msgid "Launch using Integrated Graphics Card"
 msgstr "Lansează folosind placa grafică integrată"
 
-#: js/ui/appDisplay.js:2803
+#: js/ui/appDisplay.js:2277
 msgid "Launch using Discrete Graphics Card"
 msgstr "Lansează folosind placa grafică discretă"
 
-#: js/ui/appDisplay.js:2831 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2305 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "Elimină din favorite"
 
-#: js/ui/appDisplay.js:2837
+#: js/ui/appDisplay.js:2311
 msgid "Add to Favorites"
 msgstr "Adaugă la Favorite"
 
-#: js/ui/appDisplay.js:2847 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2321 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "Arată detaliile"
 
@@ -803,7 +786,7 @@ msgstr "Căști auriculare"
 msgid "Headset"
 msgstr "Căști cu microfon"
 
-#: js/ui/audioDeviceSelection.js:68 js/ui/status/volume.js:272
+#: js/ui/audioDeviceSelection.js:68 js/ui/status/volume.js:273
 msgid "Microphone"
 msgstr "Microfon"
 
@@ -1317,15 +1300,15 @@ msgstr "%s (la distanță)"
 msgid "%s (console)"
 msgstr "%s (consolă)"
 
-#: js/ui/extensionDownloader.js:187
+#: js/ui/extensionDownloader.js:185
 msgid "Install"
 msgstr "Instalează"
 
-#: js/ui/extensionDownloader.js:193
+#: js/ui/extensionDownloader.js:191
 msgid "Install Extension"
 msgstr "Instalează extensia"
 
-#: js/ui/extensionDownloader.js:194
+#: js/ui/extensionDownloader.js:192
 #, javascript-format
 msgid "Download and install “%s” from extensions.gnome.org?"
 msgstr "Descărcați și instalați „%s” de la extensions.gnome.org?"
@@ -1358,11 +1341,11 @@ msgstr "O aplicație vrea să inhibe scurtăturile"
 msgid "You can restore shortcuts by pressing %s."
 msgstr "Puteți restaura scurtăturile apăsând %s."
 
-#: js/ui/inhibitShortcutsDialog.js:100
+#: js/ui/inhibitShortcutsDialog.js:98
 msgid "Deny"
 msgstr "Refuză"
 
-#: js/ui/inhibitShortcutsDialog.js:107
+#: js/ui/inhibitShortcutsDialog.js:105
 msgid "Allow"
 msgstr "Permite"
 
@@ -1431,7 +1414,7 @@ msgstr "Oprește"
 msgid "Leave Off"
 msgstr "Lasă oprit"
 
-#: js/ui/keyboard.js:225
+#: js/ui/keyboard.js:207
 msgid "Region & Language Settings"
 msgstr "Configurări de regiune și limbă"
 
@@ -1505,7 +1488,7 @@ msgstr "Blocarea ecranului este dezactivată"
 msgid "Screen Locking requires the GNOME display manager."
 msgstr "Blocarea ecranului necesită administratorul de afișaj GNOME."
 
-#: js/ui/messageTray.js:1476
+#: js/ui/messageTray.js:1547
 msgid "System Information"
 msgstr "Informații despre sistem"
 
@@ -1517,13 +1500,13 @@ msgstr "Artist necunoscut"
 msgid "Unknown title"
 msgstr "Titlu necunoscut"
 
-#: js/ui/overview.js:74
+#: js/ui/overview.js:73
 msgid "Undo"
 msgstr "Anulează"
 
 #. Translators: This is the main view to select
 #. activities. See also note for "Activities" string.
-#: js/ui/overview.js:87
+#: js/ui/overview.js:86
 msgid "Overview"
 msgstr "Prezentare generală"
 
@@ -1531,7 +1514,7 @@ msgstr "Prezentare generală"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: js/ui/overview.js:108
+#: js/ui/overview.js:107
 msgid "Type to search"
 msgstr "Tastați pentru a căuta"
 
@@ -2189,11 +2172,11 @@ msgstr "Eroare de autorizare Thunderbolt"
 msgid "Could not authorize the Thunderbolt device: %s"
 msgstr "Nu s-a putut autoriza dispozitivul Thunderbolt: %s"
 
-#: js/ui/status/volume.js:155
+#: js/ui/status/volume.js:154
 msgid "Volume changed"
 msgstr "Volumul a fost schimbat"
 
-#: js/ui/status/volume.js:217
+#: js/ui/status/volume.js:225
 msgid "Volume"
 msgstr "Volum"
 
@@ -2239,11 +2222,11 @@ msgstr "Glisați în sus pentru a debloca"
 msgid "Click or press a key to unlock"
 msgstr "Apăsați clic sau o tastă pentru a debloca"
 
-#: js/ui/unlockDialog.js:555
+#: js/ui/unlockDialog.js:550
 msgid "Unlock Window"
 msgstr "Deblochează fereastră"
 
-#: js/ui/unlockDialog.js:564
+#: js/ui/unlockDialog.js:559
 msgid "Log in as another user"
 msgstr "Intră în sesiune ca utilizator diferit"
 
@@ -2379,12 +2362,12 @@ msgstr "Utilizează un mod specific, de exemplu „gdm” pentru ecranul de loga
 msgid "List possible modes"
 msgstr "Enumeră câmpurile care pot fi afișate"
 
-#: src/shell-app.c:268
+#: src/shell-app.c:286
 msgctxt "program"
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: src/shell-app.c:519
+#: src/shell-app.c:537
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "Nu s-a putut lansa „%s”"

po/zh_CN.po

@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2020-07-12 02:14+0000\n"
+"POT-Creation-Date: 2020-05-28 11:29+0000\n"
-"PO-Revision-Date: 2020-07-11 22:32-0400\n"
+"PO-Revision-Date: 2020-05-29 09:03-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -444,7 +444,7 @@ msgstr "用户名"
 msgid "Login Window"
 msgstr "登录窗口"
 
-#: js/gdm/util.js:355
+#: js/gdm/util.js:345
 msgid "Authentication error"
 msgstr "认证出错"
 
@@ -453,7 +453,7 @@ msgstr "认证出错"
 #. as a cue to display our own message.
 #. Translators: this message is shown below the password entry field
 #. to indicate the user can swipe their finger instead
-#: js/gdm/util.js:481
+#: js/gdm/util.js:471
 msgid "(or swipe finger)"
 msgstr "（或滑动手指）"
 
@@ -559,7 +559,7 @@ msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: js/misc/util.js:191 js/ui/dateMenu.js:162
+#: js/misc/util.js:191
 msgid "Yesterday"
 msgstr "昨天"
 
@@ -672,44 +672,44 @@ msgstr "您到热点登录的连接不安全。您在此页面输入的密码或
 
 #. No support for non-modal system dialogs, so ignore the option
 #. let modal = options['modal'] || true;
-#: js/ui/accessDialog.js:39 js/ui/status/location.js:369
+#: js/ui/accessDialog.js:39 js/ui/status/location.js:374
 msgid "Deny Access"
 msgstr "拒绝访问"
 
-#: js/ui/accessDialog.js:40 js/ui/status/location.js:372
+#: js/ui/accessDialog.js:40 js/ui/status/location.js:377
 msgid "Grant Access"
 msgstr "允许访问"
 
-#: js/ui/appDisplay.js:903
+#: js/ui/appDisplay.js:960
 msgid "Unnamed Folder"
 msgstr "未命名文件夹"
 
 #. Translators: This is the heading of a list of open windows
-#: js/ui/appDisplay.js:2225 js/ui/panel.js:75
+#: js/ui/appDisplay.js:2219 js/ui/panel.js:75
 msgid "Open Windows"
 msgstr "打开窗口"
 
-#: js/ui/appDisplay.js:2244 js/ui/panel.js:82
+#: js/ui/appDisplay.js:2238 js/ui/panel.js:82
 msgid "New Window"
 msgstr "新窗口"
 
-#: js/ui/appDisplay.js:2260
+#: js/ui/appDisplay.js:2254
 msgid "Launch using Integrated Graphics Card"
 msgstr "使用集成显卡启动"
 
-#: js/ui/appDisplay.js:2261
+#: js/ui/appDisplay.js:2255
 msgid "Launch using Discrete Graphics Card"
 msgstr "使用独立显卡启动"
 
-#: js/ui/appDisplay.js:2289 js/ui/dash.js:239
+#: js/ui/appDisplay.js:2283 js/ui/dash.js:239
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
-#: js/ui/appDisplay.js:2295
+#: js/ui/appDisplay.js:2289
 msgid "Add to Favorites"
 msgstr "添加到收藏夹"
 
-#: js/ui/appDisplay.js:2305 js/ui/panel.js:93
+#: js/ui/appDisplay.js:2299 js/ui/panel.js:93
 msgid "Show Details"
 msgstr "显示细节"
 
@@ -739,7 +739,7 @@ msgstr "耳机"
 msgid "Headset"
 msgstr "耳麦"
 
-#: js/ui/audioDeviceSelection.js:68 js/ui/status/volume.js:272
+#: js/ui/audioDeviceSelection.js:68 js/ui/status/volume.js:273
 msgid "Microphone"
 msgstr "麦克风"
 
@@ -756,7 +756,7 @@ msgid "Settings"
 msgstr "设置"
 
 #. Translators: Enter 0-6 (Sunday-Saturday) for non-work days. Examples: "0" (Sunday) "6" (Saturday) "06" (Sunday and Saturday).
-#: js/ui/calendar.js:36
+#: js/ui/calendar.js:41
 msgctxt "calendar-no-work"
 msgid "06"
 msgstr "06"
@@ -766,43 +766,43 @@ msgstr "06"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: js/ui/calendar.js:65
+#: js/ui/calendar.js:70
 msgctxt "grid sunday"
 msgid "S"
 msgstr "日"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: js/ui/calendar.js:67
+#: js/ui/calendar.js:72
 msgctxt "grid monday"
 msgid "M"
 msgstr "一"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: js/ui/calendar.js:69
+#: js/ui/calendar.js:74
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "二"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: js/ui/calendar.js:71
+#: js/ui/calendar.js:76
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "三"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: js/ui/calendar.js:73
+#: js/ui/calendar.js:78
 msgctxt "grid thursday"
 msgid "T"
 msgstr "四"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: js/ui/calendar.js:75
+#: js/ui/calendar.js:80
 msgctxt "grid friday"
 msgid "F"
 msgstr "五"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: js/ui/calendar.js:77
+#: js/ui/calendar.js:82
 msgctxt "grid saturday"
 msgid "S"
 msgstr "六"
@@ -813,7 +813,7 @@ msgstr "六"
 #. * "%OB" is the new format specifier introduced in glibc 2.27,
 #. * in most cases you should not change it.
 #.
-#: js/ui/calendar.js:392
+#: js/ui/calendar.js:397
 msgid "%OB"
 msgstr "%OB"
 
@@ -826,37 +826,61 @@ msgstr "%OB"
 #. * in most cases you should not use the old "%B" here unless you
 #. * absolutely know what you are doing.
 #.
-#: js/ui/calendar.js:402
+#: js/ui/calendar.js:407
 msgid "%OB %Y"
 msgstr "%Y %OB"
 
-#: js/ui/calendar.js:461
+#: js/ui/calendar.js:466
 msgid "Previous month"
 msgstr "上个月"
 
-#: js/ui/calendar.js:476
+#: js/ui/calendar.js:481
 msgid "Next month"
 msgstr "下个月"
 
-#: js/ui/calendar.js:626
+#: js/ui/calendar.js:631
 #, no-javascript-format
 msgctxt "date day number format"
 msgid "%d"
 msgstr "%d"
 
-#: js/ui/calendar.js:682
+#: js/ui/calendar.js:687
 msgid "Week %V"
 msgstr "第 %V 个星期"
 
-#: js/ui/calendar.js:895
+#. Translators: Shown in calendar event list for all day events
+#. * Keep it short, best if you can use less then 10 characters
+#.
+#: js/ui/calendar.js:762
+msgctxt "event list time"
+msgid "All Day"
+msgstr "全天"
+
+#. Translators: Shown on calendar heading when selected day occurs on current year
+#: js/ui/calendar.js:900
+msgctxt "calendar heading"
+msgid "%A, %B %-d"
+msgstr "%-m月%-d日 %A"
+
+#. Translators: Shown on calendar heading when selected day occurs on different year
+#: js/ui/calendar.js:903
+msgctxt "calendar heading"
+msgid "%A, %B %-d, %Y"
+msgstr "%Y年%-m月%-d日 %A"
+
+#: js/ui/calendar.js:1133
 msgid "No Notifications"
 msgstr "无通知"
 
-#: js/ui/calendar.js:949
+#: js/ui/calendar.js:1136
+msgid "No Events"
+msgstr "无事件"
+
+#: js/ui/calendar.js:1190
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: js/ui/calendar.js:968
+#: js/ui/calendar.js:1209
 msgid "Clear"
 msgstr "清除"
 
@@ -1006,7 +1030,7 @@ msgstr "抱歉，认证失败。请重试。"
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s"
 
-#: js/ui/ctrlAltTab.js:21 js/ui/viewSelector.js:178
+#: js/ui/ctrlAltTab.js:21 js/ui/viewSelector.js:177
 msgid "Windows"
 msgstr "窗口"
 
@@ -1025,7 +1049,7 @@ msgstr "Dash"
 #. * "Tue 9:29 AM").  The string itself should become a full date, e.g.,
 #. * "February 17 2015".
 #.
-#: js/ui/dateMenu.js:79
+#: js/ui/dateMenu.js:75
 msgid "%B %-d %Y"
 msgstr "%Y年%-m月%-d日"
 
@@ -1033,67 +1057,35 @@ msgstr "%Y年%-m月%-d日"
 #. * below the time in the shell; it should combine the weekday and the
 #. * date, e.g. "Tuesday February 17 2015".
 #.
-#: js/ui/dateMenu.js:86
+#: js/ui/dateMenu.js:82
 msgid "%A %B %e %Y"
 msgstr "%Y年%-m月%-d日 %A"
 
-#. Translators: Shown on calendar heading when selected day occurs on current year
+#: js/ui/dateMenu.js:162
-#: js/ui/dateMenu.js:151
-msgctxt "calendar heading"
-msgid "%B %-d"
-msgstr "%-m月%-d日"
-
-#. Translators: Shown on calendar heading when selected day occurs on different year
-#: js/ui/dateMenu.js:154
-msgctxt "calendar heading"
-msgid "%B %-d %Y"
-msgstr "%Y年%-m月%-d日"
-
-#: js/ui/dateMenu.js:160
-msgid "Today"
-msgstr "今天"
-
-#: js/ui/dateMenu.js:164
-msgid "Tomorrow"
-msgstr "明天"
-
-#. Translators: Shown in calendar event list for all day events
-#. * Keep it short, best if you can use less then 10 characters
-#.
-#: js/ui/dateMenu.js:180
-msgctxt "event list time"
-msgid "All Day"
-msgstr "全天"
-
-#: js/ui/dateMenu.js:231
-msgid "No Events"
-msgstr "无事件"
-
-#: js/ui/dateMenu.js:348
 msgid "Add world clocks…"
 msgstr "添加世界时钟…"
 
-#: js/ui/dateMenu.js:349
+#: js/ui/dateMenu.js:163
 msgid "World Clocks"
 msgstr "世界时钟"
 
-#: js/ui/dateMenu.js:629
+#: js/ui/dateMenu.js:443
 msgid "Loading…"
 msgstr "正在载入……"
 
-#: js/ui/dateMenu.js:639
+#: js/ui/dateMenu.js:453
 msgid "Go online for weather information"
 msgstr "通过互联网查看天气信息"
 
-#: js/ui/dateMenu.js:641
+#: js/ui/dateMenu.js:455
 msgid "Weather information is currently unavailable"
 msgstr "天气信息目前不可用"
 
-#: js/ui/dateMenu.js:651
+#: js/ui/dateMenu.js:465
 msgid "Weather"
 msgstr "天气"
 
-#: js/ui/dateMenu.js:653
+#: js/ui/dateMenu.js:467
 msgid "Select weather location…"
 msgstr "选择天气地点…"
 
@@ -1276,11 +1268,11 @@ msgstr "某应用程序希望禁用快捷键"
 msgid "You can restore shortcuts by pressing %s."
 msgstr "按 %s 以恢复快捷键。"
 
-#: js/ui/inhibitShortcutsDialog.js:100
+#: js/ui/inhibitShortcutsDialog.js:98
 msgid "Deny"
 msgstr "拒绝"
 
-#: js/ui/inhibitShortcutsDialog.js:107
+#: js/ui/inhibitShortcutsDialog.js:105
 msgid "Allow"
 msgstr "允许"
 
@@ -1345,7 +1337,7 @@ msgstr "关闭"
 msgid "Leave Off"
 msgstr "保持关闭"
 
-#: js/ui/keyboard.js:225
+#: js/ui/keyboard.js:207
 msgid "Region & Language Settings"
 msgstr "区域与语言设置"
 
@@ -1418,25 +1410,25 @@ msgstr "屏幕锁定已禁用"
 msgid "Screen Locking requires the GNOME display manager."
 msgstr "屏幕锁定需要 GNOME 显示管理器。"
 
-#: js/ui/messageTray.js:1476
+#: js/ui/messageTray.js:1547
 msgid "System Information"
 msgstr "系统信息"
 
-#: js/ui/mpris.js:203
+#: js/ui/mpris.js:204
 msgid "Unknown artist"
 msgstr "未知艺人"
 
-#: js/ui/mpris.js:213
+#: js/ui/mpris.js:214
 msgid "Unknown title"
 msgstr "未知标题"
 
-#: js/ui/overview.js:74
+#: js/ui/overview.js:73
 msgid "Undo"
 msgstr "撤消"
 
 #. Translators: This is the main view to select
 #. activities. See also note for "Activities" string.
-#: js/ui/overview.js:87
+#: js/ui/overview.js:86
 msgid "Overview"
 msgstr "概览"
 
@@ -1444,7 +1436,7 @@ msgstr "概览"
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: js/ui/overview.js:108
+#: js/ui/overview.js:107
 msgid "Type to search"
 msgstr "输入以搜索"
 
@@ -1472,23 +1464,23 @@ msgstr "分配按键"
 msgid "Done"
 msgstr "完成"
 
-#: js/ui/padOsd.js:732
+#: js/ui/padOsd.js:745
 msgid "Edit…"
 msgstr "编辑…"
 
-#: js/ui/padOsd.js:774 js/ui/padOsd.js:891
+#: js/ui/padOsd.js:787 js/ui/padOsd.js:910
 msgid "None"
 msgstr "无"
 
-#: js/ui/padOsd.js:845
+#: js/ui/padOsd.js:863
 msgid "Press a button to configure"
 msgstr "按下按键以配置"
 
-#: js/ui/padOsd.js:846
+#: js/ui/padOsd.js:864
 msgid "Press Esc to exit"
 msgstr "按 Esc 以退出"
 
-#: js/ui/padOsd.js:849
+#: js/ui/padOsd.js:867
 msgid "Press any key to exit"
 msgstr "按任意键退出"
 
@@ -1578,7 +1570,7 @@ msgstr "隐藏文本"
 
 #: js/ui/shellEntry.js:162
 msgid "Caps lock is on."
-msgstr "大写锁定已开启。"
+msgstr "大写锁定键已开启。"
 
 #: js/ui/shellMountOperation.js:285
 msgid "Hidden Volume"
@@ -1750,17 +1742,17 @@ msgstr "定位服务已禁用"
 msgid "Enable"
 msgstr "启用"
 
-#: js/ui/status/location.js:350
+#: js/ui/status/location.js:355
 msgid "Allow location access"
 msgstr "允许获取位置信息"
 
 #. Translators: %s is an application name
-#: js/ui/status/location.js:352
+#: js/ui/status/location.js:357
 #, javascript-format
 msgid "The app %s wants to access your location"
 msgstr "应用 %s 想要获取您的位置信息"
 
-#: js/ui/status/location.js:362
+#: js/ui/status/location.js:367
 msgid "Location access can be changed at any time from the privacy settings."
 msgstr "位置访问权限可以随时在隐私设置里更改。"
 
@@ -2089,11 +2081,11 @@ msgstr "Thunderbolt 授权错误"
 msgid "Could not authorize the Thunderbolt device: %s"
 msgstr "无法授权 Thunderbolt 设备：%s"
 
-#: js/ui/status/volume.js:155
+#: js/ui/status/volume.js:154
 msgid "Volume changed"
 msgstr "音量已变更"
 
-#: js/ui/status/volume.js:217
+#: js/ui/status/volume.js:225
 msgid "Volume"
 msgstr "音量"
 
@@ -2139,19 +2131,19 @@ msgstr "向上滑动解锁"
 msgid "Click or press a key to unlock"
 msgstr "单击或按键解锁"
 
-#: js/ui/unlockDialog.js:555
+#: js/ui/unlockDialog.js:550
 msgid "Unlock Window"
 msgstr "解锁窗口"
 
-#: js/ui/unlockDialog.js:564
+#: js/ui/unlockDialog.js:559
 msgid "Log in as another user"
 msgstr "以另一个用户身份登录"
 
-#: js/ui/viewSelector.js:182
+#: js/ui/viewSelector.js:181
 msgid "Applications"
 msgstr "应用程序"
 
-#: js/ui/viewSelector.js:186
+#: js/ui/viewSelector.js:185
 msgid "Search"
 msgstr "搜索"
 
@@ -2277,12 +2269,12 @@ msgstr "使用指定模式，如“gdm”用于登录屏幕"
 msgid "List possible modes"
 msgstr "列出可用的模式"
 
-#: src/shell-app.c:268
+#: src/shell-app.c:286
 msgctxt "program"
 msgid "Unknown"
 msgstr "未知"
 
-#: src/shell-app.c:519
+#: src/shell-app.c:537
 #, c-format
 msgid "Failed to launch “%s”"
 msgstr "启动“%s”失败"
@@ -2512,7 +2504,7 @@ msgstr "描述"
 
 #: subprojects/extensions-tool/src/command-create.c:443
 msgid "A short description of what the extension does"
-msgstr "扩展功能的简短描述"
+msgstr "简短描述下扩展所做的事情"
 
 #: subprojects/extensions-tool/src/command-create.c:446
 msgid "TEMPLATE"
@@ -2855,14 +2847,6 @@ msgstr[0] "%u 个输入"
 msgid "System Sounds"
 msgstr "系统声音"
 
-#~ msgctxt "calendar heading"
-#~ msgid "%A, %B %-d"
-#~ msgstr "%-m月%-d日 %A"
-
-#~ msgctxt "calendar heading"
-#~ msgid "%A, %B %-d, %Y"
-#~ msgstr "%Y年%-m月%-d日 %A"
-
 #~ msgid "Frequently used applications will appear here"
 #~ msgstr "常用的应用程序会出现在这里"
 

src/calendar-server/gnome-shell-calendar-server.c

@@ -346,6 +346,8 @@ struct _App
 
   GSList *notify_appointments; /* CalendarAppointment *, for EventsAdded */
   GSList *notify_ids; /* gchar *, for EventsRemoved */
+  guint events_added_timeout_id;
+  guint events_removed_timeout_id;
 
   GSList *live_views;
 };
@@ -368,19 +370,24 @@ app_update_timezone (App *app)
     }
 }
 
-static void
+static gboolean
-app_notify_events_added (App *app)
+on_app_schedule_events_added_cb (gpointer user_data)
 {
+  App *app = user_data;
   GVariantBuilder builder, extras_builder;
   GSList *events, *link;
 
+  if (g_source_is_destroyed (g_main_current_source ()))
+    return FALSE;
+
   events = g_slist_reverse (app->notify_appointments);
   app->notify_appointments = NULL;
+  app->events_added_timeout_id = 0;
 
   print_debug ("Emitting EventsAddedOrUpdated with %d events", g_slist_length (events));
 
   if (!events)
-    return;
+    return FALSE;
 
   /* The a{sv} is used as an escape hatch in case we want to provide more
    * information in the future without breaking ABI
@@ -421,21 +428,41 @@ app_notify_events_added (App *app)
   g_variant_builder_clear (&builder);
 
   g_slist_free_full (events, calendar_appointment_free);
+
+  return FALSE;
 }
 
 static void
-app_notify_events_removed (App *app)
+app_schedule_events_added (App *app)
 {
+  print_debug ("Scheduling EventsAddedOrUpdated");
+  if (app->events_added_timeout_id == 0)
+    {
+      app->events_added_timeout_id = g_timeout_add_seconds (2,
+                                                            on_app_schedule_events_added_cb,
+                                                            app);
+      g_source_set_name_by_id (app->events_added_timeout_id, "[gnome-shell] on_app_schedule_events_added_cb");
+    }
+}
+
+static gboolean
+on_app_schedule_events_removed_cb (gpointer user_data)
+{
+  App *app = user_data;
   GVariantBuilder builder;
   GSList *ids, *link;
 
+  if (g_source_is_destroyed (g_main_current_source ()))
+    return FALSE;
+
   ids = app->notify_ids;
   app->notify_ids = NULL;
+  app->events_removed_timeout_id = 0;
 
   print_debug ("Emitting EventsRemoved with %d ids", g_slist_length (ids));
 
   if (!ids)
-    return;
+    return FALSE;
 
   g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
   for (link = ids; link; link = g_slist_next (link))
@@ -456,7 +483,20 @@ app_notify_events_removed (App *app)
 
   g_slist_free_full (ids, g_free);
 
-  return;
+  return FALSE;
+}
+
+static void
+app_schedule_events_removed (App *app)
+{
+  print_debug ("Scheduling EventsRemoved");
+  if (app->events_removed_timeout_id == 0)
+    {
+      app->events_removed_timeout_id = g_timeout_add_seconds (2,
+                                                              on_app_schedule_events_removed_cb,
+                                                              app);
+      g_source_set_name_by_id (app->events_removed_timeout_id, "[gnome-shell] on_app_schedule_events_removed_cb");
+    }
 }
 
 static void
@@ -506,7 +546,7 @@ app_process_added_modified_objects (App *app,
   g_clear_object (&cal_client);
 
   if (app->notify_appointments)
-    app_notify_events_added (app);
+    app_schedule_events_added (app);
 }
 
 static void
@@ -570,7 +610,7 @@ on_objects_removed (ECalClientView *view,
   g_clear_object (&client);
 
   if (app->notify_ids)
-    app_notify_events_removed (app);
+    app_schedule_events_removed (app);
 }
 
 static gboolean
@@ -834,6 +874,9 @@ app_free (App *app)
 {
   GSList *ll;
 
+  g_clear_handle_id (&app->events_added_timeout_id, g_source_remove);
+  g_clear_handle_id (&app->events_removed_timeout_id, g_source_remove);
+
   for (ll = app->live_views; ll != NULL; ll = g_slist_next (ll))
     {
       ECalClientView *view = E_CAL_CLIENT_VIEW (ll->data);

src/gnome-shell-perf-tool.in

@@ -51,8 +51,6 @@ def start_shell(perf_output=None):
             args.append('--nested')
         else:
             args.append('--display-server')
-    elif options.x11:
-        args.append('--x11')
 
     return subprocess.Popen(args, env=env)
 
@@ -297,8 +295,6 @@ parser.add_option("-w", "--wayland", action="store_true",
                   help="Run as a Wayland compositor")
 parser.add_option("-n", "--nested", action="store_true",
                   help="Run as a Wayland nested compositor")
-parser.add_option("-x", "--x11", action="store_true",
-                  help="Run as an X11 compositor")
 
 options, args = parser.parse_args()
 

src/meson.build

@@ -163,6 +163,15 @@ libshell_private_sources = [
   'shell-app-cache.c',
 ]
 
+if enable_recorder
+    libshell_sources += ['shell-recorder.c']
+    libshell_public_headers += ['shell-recorder.h']
+
+    libshell_private_sources += ['shell-recorder-src.c']
+    libshell_private_headers += ['shell-recorder-src.h']
+endif
+
+
 libshell_enums = gnome.mkenums_simple('shell-enum-types',
   sources: libshell_public_headers
 )

src/shell-blur-effect.c

@@ -163,7 +163,6 @@ struct _ShellBlurEffect
   ClutterEffect parent_instance;
 
   ClutterActor *actor;
-  int old_opacity_override;
 
   BlurData blur[2];
 
@@ -486,21 +485,6 @@ calculate_downscale_factor (float width,
   return downscale_factor;
 }
 
-static void
-clear_framebuffer (CoglFramebuffer *framebuffer)
-{
-  static CoglColor transparent;
-  static gboolean initialized = FALSE;
-
-  if (!initialized)
-    {
-      cogl_color_init_from_4ub (&transparent, 0, 0, 0, 0);
-      initialized = TRUE;
-    }
-
-  cogl_framebuffer_clear (framebuffer, COGL_BUFFER_BIT_COLOR, &transparent);
-}
-
 static void
 shell_blur_effect_set_actor (ClutterActorMeta *meta,
                              ClutterActor     *actor)
@@ -561,47 +545,45 @@ update_actor_box (ShellBlurEffect     *self,
 }
 
 static void
-paint_texture (ShellBlurEffect     *self,
+add_blurred_pipeline (ShellBlurEffect  *self,
-               ClutterPaintContext *paint_context)
+                      ClutterPaintNode *node)
 {
-  CoglFramebuffer *framebuffer;
+  g_autoptr (ClutterPaintNode) pipeline_node = NULL;
   float width, height;
 
-  framebuffer = clutter_paint_context_get_framebuffer (paint_context);
-
   /* Use the untransformed actor size here, since the framebuffer itself already
    * has the actor transform matrix applied.
    */
   clutter_actor_get_size (self->actor, &width, &height);
 
   update_brightness_uniform (self);
-  cogl_framebuffer_draw_rectangle (framebuffer,
+
-                                   self->brightness_fb.pipeline,
+  pipeline_node = clutter_pipeline_node_new (self->brightness_fb.pipeline);
-                                   0, 0,
+  clutter_paint_node_set_static_name (pipeline_node, "ShellBlurEffect (final)");
-                                   width,
+  clutter_paint_node_add_child (node, pipeline_node);
-                                   height);
+
+  clutter_paint_node_add_rectangle (pipeline_node,
+                                    &(ClutterActorBox) {
+                                      0.f, 0.f,
+                                      width,
+                                      height,
+                                    });
 }
 
-static void
+static ClutterPaintNode *
-apply_blur (ShellBlurEffect     *self,
+create_blur_nodes (ShellBlurEffect  *self,
-            ClutterPaintContext *paint_context,
+                   ClutterPaintNode *node,
-            FramebufferData     *from,
+                   uint8_t           paint_opacity)
-            uint8_t              paint_opacity)
 {
+  g_autoptr (ClutterPaintNode) brightness_node = NULL;
+  g_autoptr (ClutterPaintNode) hblur_node = NULL;
+  g_autoptr (ClutterPaintNode) vblur_node = NULL;
   BlurData *vblur;
   BlurData *hblur;
 
   vblur = &self->blur[VERTICAL];
   hblur = &self->blur[HORIZONTAL];
 
-  /* Copy the actor contents into the vblur framebuffer */
-  clear_framebuffer (vblur->data.framebuffer);
-  cogl_framebuffer_draw_rectangle (vblur->data.framebuffer,
-                                   from->pipeline,
-                                   0, 0,
-                                   cogl_texture_get_width (vblur->data.texture),
-                                   cogl_texture_get_height (vblur->data.texture));
-
   /* Pass 1:
    *
    * Draw the actor contents (which is in the vblur framebuffer
@@ -611,12 +593,16 @@ apply_blur (ShellBlurEffect     *self,
    */
   update_blur_uniforms (self, vblur);
 
-  clear_framebuffer (hblur->data.framebuffer);
+  vblur_node = clutter_layer_node_new_with_framebuffer (vblur->data.framebuffer,
-  cogl_framebuffer_draw_rectangle (hblur->data.framebuffer,
+                                                        vblur->data.pipeline,
-                                   vblur->data.pipeline,
+                                                        paint_opacity);
-                                   0, 0,
+  clutter_paint_node_set_static_name (vblur_node, "ShellBlurEffect (vertical pass)");
-                                   cogl_texture_get_width (hblur->data.texture),
+  clutter_paint_node_add_rectangle (vblur_node,
-                                   cogl_texture_get_height (hblur->data.texture));
+                                    &(ClutterActorBox) {
+                                      0.f, 0.f,
+                                      cogl_texture_get_width (hblur->data.texture),
+                                      cogl_texture_get_height (hblur->data.texture)
+                                    });
 
   /* Pass 2:
    *
@@ -624,30 +610,44 @@ apply_blur (ShellBlurEffect     *self,
    * horizontal blur pipeline into the brightness framebuffer.
    */
   update_blur_uniforms (self, hblur);
-  cogl_pipeline_set_color4ub (hblur->data.pipeline,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity);
 
-  clear_framebuffer (self->brightness_fb.framebuffer);
+  hblur_node = clutter_layer_node_new_with_framebuffer (hblur->data.framebuffer,
-  cogl_framebuffer_draw_rectangle (self->brightness_fb.framebuffer,
+                                                        hblur->data.pipeline,
-                                   hblur->data.pipeline,
+                                                        255);
-                                   0, 0,
+  clutter_paint_node_set_static_name (hblur_node, "ShellBlurEffect (horizontal pass)");
-                                   cogl_texture_get_width (self->brightness_fb.texture),
+  clutter_paint_node_add_rectangle (hblur_node,
-                                   cogl_texture_get_height (self->brightness_fb.texture));
+                                    &(ClutterActorBox) {
+                                      0.f, 0.f,
+                                      cogl_texture_get_width (self->brightness_fb.texture),
+                                      cogl_texture_get_height (self->brightness_fb.texture),
+                                    });
 
+  update_brightness_uniform (self);
+
+  brightness_node = clutter_layer_node_new_with_framebuffer (self->brightness_fb.framebuffer,
+                                                             self->brightness_fb.pipeline,
+                                                             255);
+  clutter_paint_node_set_static_name (brightness_node, "ShellBlurEffect (brightness)");
+
+  clutter_paint_node_add_child (hblur_node, vblur_node);
+  clutter_paint_node_add_child (brightness_node, hblur_node);
+  clutter_paint_node_add_child (node, brightness_node);
 
   self->cache_flags |= BLUR_APPLIED;
+
+  return g_steal_pointer (&vblur_node);
 }
 
-static gboolean
+static void
 paint_background (ShellBlurEffect     *self,
+                  ClutterPaintNode    *node,
                   ClutterPaintContext *paint_context,
                   ClutterActorBox     *source_actor_box)
 {
-  g_autoptr (GError) error = NULL;
+  g_autoptr (ClutterPaintNode) background_node = NULL;
+  g_autoptr (ClutterPaintNode) blit_node = NULL;
   CoglFramebuffer *framebuffer;
+  BlurData *vblur = &self->blur[VERTICAL];
   float transformed_x;
   float transformed_y;
   float transformed_width;
@@ -662,23 +662,31 @@ paint_background (ShellBlurEffect     *self,
                               &transformed_width,
                               &transformed_height);
 
-  clear_framebuffer (self->background_fb.framebuffer);
+  /* Background layer node */
-  cogl_blit_framebuffer (framebuffer,
+  background_node =
-                         self->background_fb.framebuffer,
+    clutter_layer_node_new_with_framebuffer (self->background_fb.framebuffer,
-                         transformed_x,
+                                             self->background_fb.pipeline,
-                         transformed_y,
+                                             255);
-                         0, 0,
+  clutter_paint_node_set_static_name (background_node, "ShellBlurEffect (background)");
-                         transformed_width,
+  clutter_paint_node_add_child (node, background_node);
-                         transformed_height,
+  clutter_paint_node_add_rectangle (background_node,
-                         &error);
+                                    &(ClutterActorBox) {
+                                      0.f, 0.f,
+                                      cogl_texture_get_width (vblur->data.texture),
+                                      cogl_texture_get_height (vblur->data.texture),
+                                    });
 
-  if (error)
+  /* Blit node */
-    {
+  blit_node = clutter_blit_node_new (framebuffer,
-      g_warning ("Error blitting overlay framebuffer: %s", error->message);
+                                     self->background_fb.framebuffer);
-      return FALSE;
+  clutter_paint_node_set_static_name (blit_node, "ShellBlurEffect (blit)");
-    }
+  clutter_paint_node_add_child (background_node, blit_node);
-
+  clutter_blit_node_add_blit_rectangle (CLUTTER_BLIT_NODE (blit_node),
-  return TRUE;
+                                        transformed_x,
+                                        transformed_y,
+                                        0, 0,
+                                        transformed_width,
+                                        transformed_height);
 }
 
 static gboolean
@@ -711,11 +719,25 @@ update_framebuffers (ShellBlurEffect     *self,
   return updated;
 }
 
+static void
+add_actor_node (ShellBlurEffect  *self,
+                ClutterPaintNode *node,
+                int               opacity)
+{
+  g_autoptr (ClutterPaintNode) actor_node = NULL;
+
+  actor_node = clutter_actor_node_new (self->actor, opacity);
+  clutter_paint_node_add_child (node, actor_node);
+}
+
 static void
 paint_actor_offscreen (ShellBlurEffect         *self,
-                       ClutterPaintContext     *paint_context,
+                       ClutterPaintNode        *node,
                        ClutterEffectPaintFlags  flags)
 {
+  g_autoptr (ClutterPaintNode) transform_node = NULL;
+  g_autoptr (ClutterPaintNode) layer_node = NULL;
+  CoglMatrix transform;
   gboolean actor_dirty;
 
   actor_dirty = (flags & CLUTTER_EFFECT_PAINT_ACTOR_DIRTY) != 0;
@@ -724,27 +746,30 @@ paint_actor_offscreen (ShellBlurEffect         *self,
   if (!actor_dirty && (self->cache_flags & ACTOR_PAINTED))
     return;
 
-  self->old_opacity_override = clutter_actor_get_opacity_override (self->actor);
+  // Layer node
-  clutter_actor_set_opacity_override (self->actor, 0xff);
+  layer_node = clutter_layer_node_new_with_framebuffer (self->actor_fb.framebuffer,
+                                                        self->actor_fb.pipeline,
+                                                        0xff);
+  clutter_paint_node_set_static_name (layer_node, "ShellBlurEffect (actor offscreen)");
+  clutter_paint_node_add_child (node, layer_node);
+  clutter_paint_node_add_rectangle (layer_node,
+                                    &(ClutterActorBox) {
+                                      0.f, 0.f,
+                                      cogl_texture_get_width (self->blur[VERTICAL].data.texture),
+                                      cogl_texture_get_height (self->blur[VERTICAL].data.texture),
+                                    });
 
-  /* Draw the actor contents into the actor offscreen framebuffer */
+  // Transform node
-  clear_framebuffer (self->actor_fb.framebuffer);
+  cogl_matrix_init_identity (&transform);
+  cogl_matrix_scale (&transform,
+                     1.f / self->downscale_factor,
+                     1.f / self->downscale_factor,
+                     1.f);
+  transform_node = clutter_transform_node_new (&transform);
+  clutter_paint_node_set_static_name (transform_node, "ShellBlurEffect (downscale)");
+  clutter_paint_node_add_child (layer_node, transform_node);
 
-  cogl_framebuffer_push_matrix (self->actor_fb.framebuffer);
+  add_actor_node (self, transform_node, 255);
-  cogl_framebuffer_scale (self->actor_fb.framebuffer,
-                          1.f / self->downscale_factor,
-                          1.f / self->downscale_factor,
-                          1.f);
-
-  clutter_paint_context_push_framebuffer (paint_context,
-                                          self->actor_fb.framebuffer);
-
-  clutter_actor_continue_paint (self->actor, paint_context);
-
-  cogl_framebuffer_pop_matrix (self->actor_fb.framebuffer);
-  clutter_paint_context_pop_framebuffer (paint_context);
-
-  clutter_actor_set_opacity_override (self->actor, self->old_opacity_override);
 
   self->cache_flags |= ACTOR_PAINTED;
 }
@@ -775,6 +800,7 @@ needs_repaint (ShellBlurEffect         *self,
 
 static void
 shell_blur_effect_paint (ClutterEffect           *effect,
+                         ClutterPaintNode        *node,
                          ClutterPaintContext     *paint_context,
                          ClutterEffectPaintFlags  flags)
 {
@@ -785,6 +811,8 @@ shell_blur_effect_paint (ClutterEffect           *effect,
 
   if (self->sigma > 0)
     {
+      g_autoptr (ClutterPaintNode) blur_node = NULL;
+
       if (needs_repaint (self, flags))
         {
           ClutterActorBox source_actor_box;
@@ -802,20 +830,18 @@ shell_blur_effect_paint (ClutterEffect           *effect,
             case SHELL_BLUR_MODE_ACTOR:
               paint_opacity = clutter_actor_get_paint_opacity (self->actor);
 
-              paint_actor_offscreen (self, paint_context, flags);
+              blur_node = create_blur_nodes (self, node, paint_opacity);
-              apply_blur (self, paint_context, &self->actor_fb, paint_opacity);
+              paint_actor_offscreen (self, blur_node, flags);
               break;
 
             case SHELL_BLUR_MODE_BACKGROUND:
-              if (!paint_background (self, paint_context, &source_actor_box))
+              blur_node = create_blur_nodes (self, node, 255);
-                goto fail;
+              paint_background (self, blur_node, paint_context, &source_actor_box);
-
-              apply_blur (self, paint_context, &self->background_fb, 255);
               break;
             }
         }
 
-      paint_texture (self, paint_context);
+      add_blurred_pipeline (self, node);
 
       /* Background blur needs to paint the actor after painting the blurred
        * background.
@@ -826,7 +852,7 @@ shell_blur_effect_paint (ClutterEffect           *effect,
           break;
 
         case SHELL_BLUR_MODE_BACKGROUND:
-          clutter_actor_continue_paint (self->actor, paint_context);
+          add_actor_node (self, node, -1);
           break;
         }
 
@@ -837,7 +863,7 @@ fail:
   /* When no blur is applied, or the offscreen framebuffers
    * couldn't be created, fallback to simply painting the actor.
    */
-  clutter_actor_continue_paint (self->actor, paint_context);
+  add_actor_node (self, node, -1);
 }
 
 static void
@@ -927,7 +953,7 @@ shell_blur_effect_class_init (ShellBlurEffectClass *klass)
 
   meta_class->set_actor = shell_blur_effect_set_actor;
 
-  effect_class->paint = shell_blur_effect_paint;
+  effect_class->paint_node = shell_blur_effect_paint;
 
   properties[PROP_SIGMA] =
     g_param_spec_int ("sigma",

src/shell-global.c

@@ -1361,15 +1361,9 @@ shell_global_get_pointer (ShellGlobal         *global,
 {
   ClutterModifierType raw_mods;
   MetaCursorTracker *tracker;
-  graphene_point_t point;
 
   tracker = meta_cursor_tracker_get_for_display (global->meta_display);
-  meta_cursor_tracker_get_pointer (tracker, &point, &raw_mods);
+  meta_cursor_tracker_get_pointer (tracker, x, y, &raw_mods);
-
-  if (x)
-    *x = point.x;
-  if (y)
-    *y = point.y;
 
   *mods = raw_mods & CLUTTER_MODIFIER_MASK;
 }

src/shell-glsl-effect.c

@@ -18,26 +18,16 @@ typedef struct _ShellGLSLEffectPrivate ShellGLSLEffectPrivate;
 struct _ShellGLSLEffectPrivate
 {
   CoglPipeline  *pipeline;
-
-  gint tex_width;
-  gint tex_height;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (ShellGLSLEffect, shell_glsl_effect, CLUTTER_TYPE_OFFSCREEN_EFFECT);
 
 static gboolean
 shell_glsl_effect_pre_paint (ClutterEffect       *effect,
+                             ClutterPaintNode    *node,
                              ClutterPaintContext *paint_context)
 {
-  ShellGLSLEffect *self = SHELL_GLSL_EFFECT (effect);
-  ClutterOffscreenEffect *offscreen_effect = CLUTTER_OFFSCREEN_EFFECT (effect);
-  ShellGLSLEffectPrivate *priv = shell_glsl_effect_get_instance_private (self);
   ClutterEffectClass *parent_class;
-  CoglHandle texture;
-  gboolean success;
-
-  if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
-    return FALSE;
 
   if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
     {
@@ -52,49 +42,21 @@ shell_glsl_effect_pre_paint (ClutterEffect       *effect,
     }
 
   parent_class = CLUTTER_EFFECT_CLASS (shell_glsl_effect_parent_class);
-  success = parent_class->pre_paint (effect, paint_context);
+  return parent_class->pre_paint (effect, node, paint_context);
+}
 
-  if (!success)
+static CoglPipeline *
-    return FALSE;
+shell_glsl_effect_create_pipeline (ClutterOffscreenEffect *effect,
-
+                                   CoglTexture            *texture)
-  texture = clutter_offscreen_effect_get_texture (offscreen_effect);
+{
-  priv->tex_width = cogl_texture_get_width (texture);
+  ShellGLSLEffect *self = SHELL_GLSL_EFFECT (effect);
-  priv->tex_height = cogl_texture_get_height (texture);
+  ShellGLSLEffectPrivate *priv = shell_glsl_effect_get_instance_private (self);
 
   cogl_pipeline_set_layer_texture (priv->pipeline, 0, texture);
 
-  return TRUE;
+  return cogl_object_ref (priv->pipeline);
 }
 
-static void
-shell_glsl_effect_paint_target (ClutterOffscreenEffect *effect,
-                                ClutterPaintContext    *paint_context)
-{
-  ShellGLSLEffect *self = SHELL_GLSL_EFFECT (effect);
-  ShellGLSLEffectPrivate *priv;
-  ClutterActor *actor;
-  guint8 paint_opacity;
-  CoglFramebuffer *framebuffer;
-
-  priv = shell_glsl_effect_get_instance_private (self);
-
-  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
-  paint_opacity = clutter_actor_get_paint_opacity (actor);
-
-  cogl_pipeline_set_color4ub (priv->pipeline,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity);
-
-  framebuffer = clutter_paint_context_get_framebuffer (paint_context);
-  cogl_framebuffer_draw_rectangle (framebuffer,
-                                   priv->pipeline,
-                                   0, 0,
-                                   priv->tex_width, priv->tex_height);
-}
-
-
 /**
  * shell_glsl_effect_add_glsl_snippet:
  * @effect: a #ShellGLSLEffect
@@ -199,7 +161,7 @@ shell_glsl_effect_class_init (ShellGLSLEffectClass *klass)
   ClutterOffscreenEffectClass *offscreen_class;
 
   offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
-  offscreen_class->paint_target = shell_glsl_effect_paint_target;
+  offscreen_class->create_pipeline = shell_glsl_effect_create_pipeline;
 
   effect_class->pre_paint = shell_glsl_effect_pre_paint;
 

src/shell-invert-lightness-effect.c

@@ -43,9 +43,6 @@ struct _ShellInvertLightnessEffect
 {
   ClutterOffscreenEffect parent_instance;
 
-  gint tex_width;
-  gint tex_height;
-
   CoglPipeline *pipeline;
 };
 
@@ -77,14 +74,12 @@ G_DEFINE_TYPE (ShellInvertLightnessEffect,
 
 static gboolean
 shell_invert_lightness_effect_pre_paint (ClutterEffect       *effect,
+                                         ClutterPaintNode    *node,
                                          ClutterPaintContext *paint_context)
 {
   ShellInvertLightnessEffect *self = SHELL_INVERT_LIGHTNESS_EFFECT (effect);
   ClutterEffectClass *parent_class;
 
-  if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (effect)))
-    return FALSE;
-
   if (!clutter_feature_available (CLUTTER_FEATURE_SHADERS_GLSL))
     {
       /* if we don't have support for GLSL shaders then we
@@ -99,43 +94,19 @@ shell_invert_lightness_effect_pre_paint (ClutterEffect       *effect,
 
   parent_class =
     CLUTTER_EFFECT_CLASS (shell_invert_lightness_effect_parent_class);
-  if (parent_class->pre_paint (effect, paint_context))
-    {
-      ClutterOffscreenEffect *offscreen_effect =
-        CLUTTER_OFFSCREEN_EFFECT (effect);
-      CoglTexture *texture;
 
-      texture = clutter_offscreen_effect_get_texture (offscreen_effect);
+  return parent_class->pre_paint (effect, node, paint_context);
-      self->tex_width = cogl_texture_get_width (texture);
-      self->tex_height = cogl_texture_get_height (texture);
-
-      cogl_pipeline_set_layer_texture (self->pipeline, 0, texture);
-
-      return TRUE;
-    }
-  else
-    return FALSE;
 }
 
-static void
+static CoglPipeline *
-shell_invert_lightness_effect_paint_target (ClutterOffscreenEffect *effect,
+shell_glsl_effect_create_pipeline (ClutterOffscreenEffect *effect,
-                                            ClutterPaintContext    *paint_context)
+                                   CoglTexture            *texture)
 {
   ShellInvertLightnessEffect *self = SHELL_INVERT_LIGHTNESS_EFFECT (effect);
-  ClutterActor *actor;
-  guint8 paint_opacity;
-  CoglFramebuffer *fb = clutter_paint_context_get_framebuffer (paint_context);
 
-  actor = clutter_actor_meta_get_actor (CLUTTER_ACTOR_META (effect));
+  cogl_pipeline_set_layer_texture (self->pipeline, 0, texture);
-  paint_opacity = clutter_actor_get_paint_opacity (actor);
 
-  cogl_pipeline_set_color4ub (self->pipeline,
+  return cogl_object_ref (self->pipeline);
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity,
-                              paint_opacity);
-  cogl_framebuffer_draw_rectangle (fb, self->pipeline,
-                                   0, 0, self->tex_width, self->tex_height);
 }
 
 static void
@@ -160,7 +131,7 @@ shell_invert_lightness_effect_class_init (ShellInvertLightnessEffectClass *klass
   ClutterOffscreenEffectClass *offscreen_class;
 
   offscreen_class = CLUTTER_OFFSCREEN_EFFECT_CLASS (klass);
-  offscreen_class->paint_target = shell_invert_lightness_effect_paint_target;
+  offscreen_class->create_pipeline = shell_glsl_effect_create_pipeline;
 
   effect_class->pre_paint = shell_invert_lightness_effect_pre_paint;
 

src/shell-recorder-src.c

@@ -0,0 +1,425 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include "config.h"
+
+#define GST_USE_UNSTABLE_API
+#include <gst/base/gstpushsrc.h>
+
+#include "shell-recorder-src.h"
+
+struct _ShellRecorderSrc
+{
+  GstPushSrc parent;
+
+  GMutex mutex;
+
+  GstCaps *caps;
+  GMutex queue_lock;
+  GCond queue_cond;
+  GQueue *queue;
+
+  gboolean eos;
+  gboolean flushing;
+  guint memory_used;
+  guint memory_used_update_idle;
+};
+
+struct _ShellRecorderSrcClass
+{
+  GstPushSrcClass parent_class;
+};
+
+enum {
+  PROP_0,
+  PROP_CAPS,
+  PROP_MEMORY_USED
+};
+
+#define shell_recorder_src_parent_class parent_class
+G_DEFINE_TYPE(ShellRecorderSrc, shell_recorder_src, GST_TYPE_PUSH_SRC);
+
+static void
+shell_recorder_src_init (ShellRecorderSrc      *src)
+{
+  gst_base_src_set_format (GST_BASE_SRC (src), GST_FORMAT_TIME);
+  gst_base_src_set_live (GST_BASE_SRC (src), TRUE);
+
+  src->queue = g_queue_new ();
+  g_mutex_init (&src->mutex);
+  g_mutex_init (&src->queue_lock);
+  g_cond_init (&src->queue_cond);
+}
+
+static gboolean
+shell_recorder_src_memory_used_update_idle (gpointer data)
+{
+  ShellRecorderSrc *src = data;
+
+  g_mutex_lock (&src->mutex);
+  src->memory_used_update_idle = 0;
+  g_mutex_unlock (&src->mutex);
+
+  g_object_notify (G_OBJECT (src), "memory-used");
+
+  return FALSE;
+}
+
+/* The memory_used property is used to monitor buffer usage,
+ * so we marshal notification back to the main loop thread.
+ */
+static void
+shell_recorder_src_update_memory_used (ShellRecorderSrc *src,
+				       int               delta)
+{
+  g_mutex_lock (&src->mutex);
+  src->memory_used += delta;
+  if (src->memory_used_update_idle == 0)
+    {
+      src->memory_used_update_idle = g_idle_add (shell_recorder_src_memory_used_update_idle, src);
+      g_source_set_name_by_id (src->memory_used_update_idle, "[gnome-shell] shell_recorder_src_memory_used_update_idle");
+    }
+  g_mutex_unlock (&src->mutex);
+}
+
+/* _negotiate() is called when we have to decide on a format. We
+ * use the configured format */
+static gboolean
+shell_recorder_src_negotiate (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+  gboolean result;
+
+  result = gst_base_src_set_caps (base_src, src->caps);
+
+  return result;
+}
+
+static gboolean
+shell_recorder_src_unlock (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+
+  g_mutex_lock (&src->queue_lock);
+  src->flushing = TRUE;
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean
+shell_recorder_src_unlock_stop (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+
+  g_mutex_lock (&src->queue_lock);
+  src->flushing = FALSE;
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean
+shell_recorder_src_start (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+
+  g_mutex_lock (&src->queue_lock);
+  src->flushing = FALSE;
+  src->eos = FALSE;
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean
+shell_recorder_src_stop (GstBaseSrc * base_src)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (base_src);
+
+  g_mutex_lock (&src->queue_lock);
+  src->flushing = TRUE;
+  src->eos = FALSE;
+  g_queue_foreach (src->queue, (GFunc) gst_buffer_unref, NULL);
+  g_queue_clear (src->queue);
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+
+  return TRUE;
+}
+
+static gboolean
+shell_recorder_src_send_event (GstElement * element, GstEvent * event)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (element);
+  gboolean res;
+
+  if (GST_EVENT_TYPE (event) == GST_EVENT_EOS)
+    {
+      shell_recorder_src_close (src);
+      gst_event_unref (event);
+      res = TRUE;
+    }
+  else
+    {
+      res = GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, send_event, (element,
+              event), FALSE);
+    }
+  return res;
+}
+
+/* The create() virtual function is responsible for returning the next buffer.
+ * We just pop buffers off of the queue and block if necessary.
+ */
+static GstFlowReturn
+shell_recorder_src_create (GstPushSrc  *push_src,
+			   GstBuffer  **buffer_out)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (push_src);
+  GstBuffer *buffer;
+
+  g_mutex_lock (&src->queue_lock);
+  while (TRUE) {
+    /* int the flushing state we just return FLUSHING */
+    if (src->flushing) {
+      g_mutex_unlock (&src->queue_lock);
+      return GST_FLOW_FLUSHING;
+    }
+
+    buffer = g_queue_pop_head (src->queue);
+
+    /* we have a buffer, exit the loop to handle it */
+    if (buffer != NULL)
+      break;
+
+    /* no buffer, check EOS */
+    if (src->eos) {
+      g_mutex_unlock (&src->queue_lock);
+      return GST_FLOW_EOS;
+    }
+    /* wait for something to happen and try again */
+    g_cond_wait (&src->queue_cond, &src->queue_lock);
+  }
+  g_mutex_unlock (&src->queue_lock);
+
+  shell_recorder_src_update_memory_used (src,
+					 - (int)(gst_buffer_get_size(buffer) / 1024));
+
+  *buffer_out = buffer;
+
+  return GST_FLOW_OK;
+}
+
+static void
+shell_recorder_src_set_caps (ShellRecorderSrc *src,
+			     const GstCaps    *caps)
+{
+  if (caps == src->caps)
+    return;
+
+  if (src->caps != NULL)
+    {
+      gst_caps_unref (src->caps);
+      src->caps = NULL;
+    }
+
+  if (caps)
+    {
+      /* The capabilities will be negotated with the downstream element
+       * and set on the pad when the first buffer is pushed.
+       */
+      src->caps = gst_caps_copy (caps);
+    }
+  else
+    src->caps = NULL;
+}
+
+static void
+shell_recorder_src_finalize (GObject *object)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (object);
+
+  g_clear_handle_id (&src->memory_used_update_idle, g_source_remove);
+
+  shell_recorder_src_set_caps (src, NULL);
+  g_queue_free_full (src->queue, (GDestroyNotify) gst_buffer_unref);
+
+  g_mutex_clear (&src->mutex);
+  g_mutex_clear (&src->queue_lock);
+  g_cond_clear (&src->queue_cond);
+
+  G_OBJECT_CLASS (shell_recorder_src_parent_class)->finalize (object);
+}
+
+static void
+shell_recorder_src_set_property (GObject      *object,
+				 guint         prop_id,
+				 const GValue *value,
+				 GParamSpec   *pspec)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (object);
+
+  switch (prop_id)
+    {
+    case PROP_CAPS:
+      shell_recorder_src_set_caps (src, gst_value_get_caps (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+shell_recorder_src_get_property (GObject         *object,
+				 guint            prop_id,
+				 GValue          *value,
+				 GParamSpec      *pspec)
+{
+  ShellRecorderSrc *src = SHELL_RECORDER_SRC (object);
+
+  switch (prop_id)
+    {
+    case PROP_CAPS:
+      gst_value_set_caps (value, src->caps);
+      break;
+    case PROP_MEMORY_USED:
+      g_mutex_lock (&src->mutex);
+      g_value_set_uint (value, src->memory_used);
+      g_mutex_unlock (&src->mutex);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+shell_recorder_src_class_init (ShellRecorderSrcClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+  GstBaseSrcClass *base_src_class = GST_BASE_SRC_CLASS (klass);
+  GstPushSrcClass *push_src_class = GST_PUSH_SRC_CLASS (klass);
+
+  static GstStaticPadTemplate src_template =
+    GST_STATIC_PAD_TEMPLATE ("src",
+			     GST_PAD_SRC,
+			     GST_PAD_ALWAYS,
+			     GST_STATIC_CAPS_ANY);
+
+  object_class->finalize = shell_recorder_src_finalize;
+  object_class->set_property = shell_recorder_src_set_property;
+  object_class->get_property = shell_recorder_src_get_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_CAPS,
+                                   g_param_spec_boxed ("caps",
+						       "Caps",
+						       "Fixed GstCaps for the source",
+						       GST_TYPE_CAPS,
+						       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (object_class,
+                                   PROP_MEMORY_USED,
+                                   g_param_spec_uint ("memory-used",
+						     "Memory Used",
+						     "Memory currently used by the queue (in kB)",
+						      0, G_MAXUINT, 0,
+						      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+  gst_element_class_add_pad_template (element_class,
+				      gst_static_pad_template_get (&src_template));
+
+  gst_element_class_set_details_simple (element_class,
+					"ShellRecorderSrc",
+					"Generic/Src",
+					"Feed screen capture data to a pipeline",
+					"Owen Taylor <otaylor@redhat.com>");
+
+  element_class->send_event = shell_recorder_src_send_event;
+
+  base_src_class->negotiate = shell_recorder_src_negotiate;
+  base_src_class->unlock = shell_recorder_src_unlock;
+  base_src_class->unlock_stop = shell_recorder_src_unlock_stop;
+  base_src_class->start = shell_recorder_src_start;
+  base_src_class->stop = shell_recorder_src_stop;
+
+  push_src_class->create = shell_recorder_src_create;
+}
+
+/**
+ * shell_recorder_src_add_buffer:
+ *
+ * Adds a buffer to the internal queue to be pushed out at the next opportunity.
+ * There is no flow control, so arbitrary amounts of memory may be used by
+ * the buffers on the queue. The buffer contents must match the #GstCaps
+ * set in the :caps property.
+ */
+void
+shell_recorder_src_add_buffer (ShellRecorderSrc *src,
+			       GstBuffer        *buffer)
+{
+  g_return_if_fail (SHELL_IS_RECORDER_SRC (src));
+  g_return_if_fail (src->caps != NULL);
+
+  shell_recorder_src_update_memory_used (src,
+					 (int)(gst_buffer_get_size(buffer) / 1024));
+
+  g_mutex_lock (&src->queue_lock);
+  g_queue_push_tail (src->queue, gst_buffer_ref (buffer));
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+}
+
+/**
+ * shell_recorder_src_close:
+ *
+ * Indicates the end of the input stream. Once all previously added buffers have
+ * been pushed out an end-of-stream message will be sent.
+ */
+void
+shell_recorder_src_close (ShellRecorderSrc *src)
+{
+  /* We can't send a message to the source immediately or buffers that haven't
+   * been pushed yet will be discarded. Instead mark ourselves EOS, which will
+   * make us send an event once everything has been pushed.
+   */
+  g_mutex_lock (&src->queue_lock);
+  src->eos = TRUE;
+  g_cond_signal (&src->queue_cond);
+  g_mutex_unlock (&src->queue_lock);
+}
+
+static gboolean
+plugin_init (GstPlugin *plugin)
+{
+  gst_element_register(plugin, "shellrecordersrc", GST_RANK_NONE,
+		       SHELL_TYPE_RECORDER_SRC);
+
+  return TRUE;
+}
+
+/**
+ * shell_recorder_src_register:
+ *
+ * Registers a plugin holding our single element to use privately in
+ * this application. Can safely be called multiple times.
+ */
+void
+shell_recorder_src_register (void)
+{
+  static gboolean registered = FALSE;
+  if (registered)
+    return;
+
+  gst_plugin_register_static (GST_VERSION_MAJOR, GST_VERSION_MINOR,
+			      "shellrecorder",
+			      "Plugin for ShellRecorder",
+			      plugin_init,
+			      "0.1",
+			      "LGPL",
+			      "gnome-shell", "gnome-shell", "http://live.gnome.org/GnomeShell");
+
+  registered = TRUE;
+}

src/shell-recorder-src.h

@@ -0,0 +1,40 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+#ifndef __SHELL_RECORDER_SRC_H__
+#define __SHELL_RECORDER_SRC_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+/**
+ * ShellRecorderSrc:
+ *
+ * shellrecordersrc a custom source element is pretty much like a very
+ * simple version of the stander GStreamer 'appsrc' element, without
+ * any of the provisions for seeking, generating data on demand,
+ * etc. In both cases, the application supplies the buffers and the
+ * element pushes them into the pipeline. The main reason for not using
+ * appsrc is that it wasn't a supported element until gstreamer 0.10.22,
+ * and as of 2009-03, many systems still have 0.10.21.
+ */
+typedef struct _ShellRecorderSrc      ShellRecorderSrc;
+typedef struct _ShellRecorderSrcClass ShellRecorderSrcClass;
+
+#define SHELL_TYPE_RECORDER_SRC              (shell_recorder_src_get_type ())
+#define SHELL_RECORDER_SRC(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), SHELL_TYPE_RECORDER_SRC, ShellRecorderSrc))
+#define SHELL_RECORDER_SRC_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), SHELL_TYPE_RECORDER_SRC, ShellRecorderSrcClass))
+#define SHELL_IS_RECORDER_SRC(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), SHELL_TYPE_RECORDER_SRC))
+#define SHELL_IS_RECORDER_SRC_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), SHELL_TYPE_RECORDER_SRC))
+#define SHELL_RECORDER_SRC_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), SHELL_TYPE_RECORDER_SRC, ShellRecorderSrcClass))
+
+GType              shell_recorder_src_get_type     (void) G_GNUC_CONST;
+
+void shell_recorder_src_register (void);
+
+void shell_recorder_src_add_buffer (ShellRecorderSrc *src,
+				    GstBuffer        *buffer);
+void shell_recorder_src_close      (ShellRecorderSrc *src);
+
+G_END_DECLS
+
+#endif /* __SHELL_RECORDER_SRC_H__ */

src/shell-recorder.h

@@ -0,0 +1,45 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+#ifndef __SHELL_RECORDER_H__
+#define __SHELL_RECORDER_H__
+
+#include <clutter/clutter.h>
+
+G_BEGIN_DECLS
+
+/**
+ * SECTION:shell-recorder
+ * @short_description: Record from a #ClutterStage
+ *
+ * The #ShellRecorder object is used to make recordings ("screencasts")
+ * of a #ClutterStage. Recording is done via #GStreamer. The default is
+ * to encode as a Theora movie and write it to a file in the current
+ * directory named after the date, but the encoding and output can
+ * be configured.
+ */
+#define SHELL_TYPE_RECORDER (shell_recorder_get_type ())
+G_DECLARE_FINAL_TYPE (ShellRecorder, shell_recorder, SHELL, RECORDER, GObject)
+
+ShellRecorder     *shell_recorder_new (ClutterStage  *stage);
+
+void               shell_recorder_set_framerate (ShellRecorder *recorder,
+                                                 int framerate);
+void               shell_recorder_set_file_template (ShellRecorder *recorder,
+                                                     const char    *file_template);
+void               shell_recorder_set_pipeline (ShellRecorder *recorder,
+						const char    *pipeline);
+void               shell_recorder_set_draw_cursor (ShellRecorder *recorder,
+                                                   gboolean       draw_cursor);
+void               shell_recorder_set_area     (ShellRecorder *recorder,
+                                                int            x,
+                                                int            y,
+                                                int            width,
+                                                int            height);
+gboolean           shell_recorder_record       (ShellRecorder  *recorder,
+                                                char          **filename_used);
+void               shell_recorder_close        (ShellRecorder *recorder);
+void               shell_recorder_pause        (ShellRecorder *recorder);
+gboolean           shell_recorder_is_recording (ShellRecorder *recorder);
+
+G_END_DECLS
+
+#endif /* __SHELL_RECORDER_H__ */

src/shell-screenshot.c

@@ -12,12 +12,6 @@
 #include "shell-screenshot.h"
 #include "shell-util.h"
 
-typedef enum _ShellScreenshotFlag
-{
-  SHELL_SCREENSHOT_FLAG_NONE,
-  SHELL_SCREENSHOT_FLAG_INCLUDE_CURSOR,
-} ShellScreenshotFlag;
-
 typedef struct _ShellScreenshotPrivate  ShellScreenshotPrivate;
 
 struct _ShellScreenshot
@@ -38,6 +32,7 @@ struct _ShellScreenshotPrivate
   cairo_surface_t *image;
   cairo_rectangle_int_t screenshot_area;
 
+  gboolean include_cursor;
   gboolean include_frame;
 };
 
@@ -50,6 +45,10 @@ typedef enum
 
 G_DEFINE_TYPE_WITH_PRIVATE (ShellScreenshot, shell_screenshot, G_TYPE_OBJECT);
 
+static void
+grab_screenshot (ClutterActor *stage,
+                 GTask        *result);
+
 static void
 shell_screenshot_class_init (ShellScreenshotClass *screenshot_class)
 {
@@ -78,6 +77,8 @@ on_screenshot_written (GObject      *source,
   g_clear_pointer (&priv->image, cairo_surface_destroy);
   g_clear_object (&priv->stream);
   g_clear_pointer (&priv->datetime, g_date_time_unref);
+
+  meta_enable_unredirect_for_display (shell_global_get_display (priv->global));
 }
 
 static void
@@ -120,49 +121,63 @@ write_screenshot_thread (GTask        *result,
 }
 
 static void
-do_grab_screenshot (ShellScreenshot     *screenshot,
+do_grab_screenshot (ShellScreenshot *screenshot,
-                    int                  x,
+                    ClutterStage    *stage,
-                    int                  y,
+                    int               x,
-                    int                  width,
+                    int               y,
-                    int                  height,
+                    int               width,
-                    ShellScreenshotFlag  flags)
+                    int               height)
 {
   ShellScreenshotPrivate *priv = screenshot->priv;
-  ClutterStage *stage = shell_global_get_stage (priv->global);
   cairo_rectangle_int_t screenshot_rect = { x, y, width, height };
-  int image_width;
+  ClutterCapture *captures;
-  int image_height;
+  int n_captures;
-  float scale;
+  int i;
-  cairo_surface_t *image;
-  ClutterPaintFlag paint_flags = CLUTTER_PAINT_FLAG_NONE;
-  g_autoptr (GError) error = NULL;
 
-  clutter_stage_get_capture_final_size (stage, &screenshot_rect,
+  if (!clutter_stage_capture (stage, FALSE,
-                                        &image_width,
+                              &screenshot_rect,
-                                        &image_height,
+                              &captures,
-                                        &scale);
+                              &n_captures))
-  image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+    return;
-                                      image_width, image_height);
 
-  if (flags & SHELL_SCREENSHOT_FLAG_INCLUDE_CURSOR)
+  if (n_captures == 1)
-    paint_flags |= CLUTTER_PAINT_FLAG_FORCE_CURSORS;
+    priv->image = cairo_surface_reference (captures[0].image);
   else
-    paint_flags |= CLUTTER_PAINT_FLAG_NO_CURSORS;
-  if (!clutter_stage_paint_to_buffer (stage, &screenshot_rect, scale,
-                                      cairo_image_surface_get_data (image),
-                                      cairo_image_surface_get_stride (image),
-                                      CLUTTER_CAIRO_FORMAT_ARGB32,
-                                      paint_flags,
-                                      &error))
     {
-      cairo_surface_destroy (image);
+      float target_scale;
-      g_warning ("Failed to take screenshot: %s", error->message);
+
-      return;
+      clutter_stage_get_capture_final_size (stage, &screenshot_rect,
+                                            &width, &height, &target_scale);
+      priv->image = shell_util_composite_capture_images (captures,
+                                                         n_captures,
+                                                         x, y,
+                                                         width, height,
+                                                         target_scale);
     }
 
-  priv->image = image;
-
   priv->datetime = g_date_time_new_now_local ();
+
+  for (i = 0; i < n_captures; i++)
+    cairo_surface_destroy (captures[i].image);
+
+  g_free (captures);
+}
+
+static gboolean
+should_draw_cursor_image (ShellScreenshotMode mode)
+{
+  if (mode == SHELL_SCREENSHOT_WINDOW || !meta_is_wayland_compositor ())
+    {
+      StSettings *settings = st_settings_get ();
+      gboolean magnifier_active = FALSE;
+
+      g_object_get (settings, "magnifier-active", &magnifier_active, NULL);
+
+      if (!magnifier_active)
+        return TRUE;
+    }
+
+  return FALSE;
 }
 
 static void
@@ -181,7 +196,6 @@ draw_cursor_image (cairo_surface_t       *surface,
   int x, y;
   int xhot, yhot;
   double xscale, yscale;
-  graphene_point_t point;
 
   display = shell_global_get_display (shell_global_get ());
   tracker = meta_cursor_tracker_get_for_display (display);
@@ -191,11 +205,9 @@ draw_cursor_image (cairo_surface_t       *surface,
     return;
 
   screenshot_region = cairo_region_create_rectangle (&area);
-  meta_cursor_tracker_get_pointer (tracker, &point, NULL);
+  meta_cursor_tracker_get_pointer (tracker, &x, &y, NULL);
-  x = point.x;
-  y = point.y;
 
-  if (!cairo_region_contains_point (screenshot_region, point.x, point.y))
+  if (!cairo_region_contains_point (screenshot_region, x, y))
     {
       cairo_region_destroy (screenshot_region);
       return;
@@ -244,37 +256,116 @@ draw_cursor_image (cairo_surface_t       *surface,
 }
 
 static void
-grab_screenshot (ShellScreenshot     *screenshot,
+on_paint (ClutterActor        *actor,
-                 ShellScreenshotFlag  flags,
+          ClutterPaintContext *paint_context,
-                 GTask               *result)
+          GTask               *result)
+{
+  grab_screenshot (actor, result);
+}
+
+static void
+on_actors_painted (ClutterActor *actor,
+                   GTask        *result)
+{
+  grab_screenshot (actor, result);
+}
+
+static void
+grab_screenshot (ClutterActor *stage,
+                 GTask        *result)
 {
-  ShellScreenshotPrivate *priv = screenshot->priv;
   MetaDisplay *display;
   int width, height;
+  ShellScreenshot *screenshot = g_task_get_source_object (result);
+  ShellScreenshotPrivate *priv = screenshot->priv;
   GTask *task;
 
   display = shell_global_get_display (priv->global);
   meta_display_get_size (display, &width, &height);
 
-  do_grab_screenshot (screenshot,
+  do_grab_screenshot (screenshot, CLUTTER_STAGE (stage), 0, 0, width, height);
-                      0, 0, width, height,
+
-                      flags);
+  if (meta_display_get_n_monitors (display) > 1)
+    {
+      cairo_region_t *screen_region = cairo_region_create ();
+      cairo_region_t *stage_region;
+      MetaRectangle monitor_rect;
+      cairo_rectangle_int_t stage_rect;
+      int i;
+      cairo_t *cr;
+
+      for (i = meta_display_get_n_monitors (display) - 1; i >= 0; i--)
+        {
+          meta_display_get_monitor_geometry (display, i, &monitor_rect);
+          cairo_region_union_rectangle (screen_region,
+                                        (const cairo_rectangle_int_t *) &monitor_rect);
+        }
+
+      stage_rect.x = 0;
+      stage_rect.y = 0;
+      stage_rect.width = width;
+      stage_rect.height = height;
+
+      stage_region = cairo_region_create_rectangle ((const cairo_rectangle_int_t *) &stage_rect);
+      cairo_region_xor (stage_region, screen_region);
+      cairo_region_destroy (screen_region);
+
+      cr = cairo_create (priv->image);
+
+      for (i = 0; i < cairo_region_num_rectangles (stage_region); i++)
+        {
+          cairo_rectangle_int_t rect;
+          cairo_region_get_rectangle (stage_region, i, &rect);
+          cairo_rectangle (cr, (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
+          cairo_fill (cr);
+        }
+
+      cairo_destroy (cr);
+      cairo_region_destroy (stage_region);
+    }
 
   priv->screenshot_area.x = 0;
   priv->screenshot_area.y = 0;
   priv->screenshot_area.width = width;
   priv->screenshot_area.height = height;
 
+  if (priv->include_cursor)
+    draw_cursor_image (priv->image, priv->screenshot_area);
+
+  g_signal_handlers_disconnect_by_func (stage, on_paint, result);
+  g_signal_handlers_disconnect_by_func (stage, on_actors_painted, result);
+
   task = g_task_new (screenshot, NULL, on_screenshot_written, result);
   g_task_run_in_thread (task, write_screenshot_thread);
   g_object_unref (task);
 }
 
 static void
-grab_window_screenshot (ShellScreenshot     *screenshot,
+grab_area_screenshot (ClutterActor *stage,
-                        ShellScreenshotFlag  flags,
+                      GTask        *result)
-                        GTask               *result)
 {
+  ShellScreenshot *screenshot = g_task_get_source_object (result);
+  ShellScreenshotPrivate *priv = screenshot->priv;
+  GTask *task;
+
+  do_grab_screenshot (screenshot,
+                      CLUTTER_STAGE (stage),
+                      priv->screenshot_area.x,
+                      priv->screenshot_area.y,
+                      priv->screenshot_area.width,
+                      priv->screenshot_area.height);
+
+  g_signal_handlers_disconnect_by_func (stage, grab_area_screenshot, result);
+  task = g_task_new (screenshot, NULL, on_screenshot_written, result);
+  g_task_run_in_thread (task, write_screenshot_thread);
+  g_object_unref (task);
+}
+
+static void
+grab_window_screenshot (ClutterActor *stage,
+                        GTask        *result)
+{
+  ShellScreenshot *screenshot = g_task_get_source_object (result);
   ShellScreenshotPrivate *priv = screenshot->priv;
   GTask *task;
   MetaDisplay *display = shell_global_get_display (priv->global);
@@ -297,7 +388,7 @@ grab_window_screenshot (ShellScreenshot     *screenshot,
                                              NULL);
   priv->datetime = g_date_time_new_now_local ();
 
-  if (flags & SHELL_SCREENSHOT_FLAG_INCLUDE_CURSOR)
+  if (priv->include_cursor)
     {
       if (meta_window_get_client_type (window) == META_WINDOW_CLIENT_TYPE_WAYLAND)
         {
@@ -310,11 +401,33 @@ grab_window_screenshot (ShellScreenshot     *screenshot,
       draw_cursor_image (priv->image, priv->screenshot_area);
     }
 
+  g_signal_handlers_disconnect_by_func (stage, grab_window_screenshot, result);
   task = g_task_new (screenshot, NULL, on_screenshot_written, result);
   g_task_run_in_thread (task, write_screenshot_thread);
   g_object_unref (task);
 }
 
+static void
+grab_pixel (ClutterActor *stage,
+            GTask        *result)
+{
+  ShellScreenshot *screenshot = g_task_get_source_object (result);
+  ShellScreenshotPrivate *priv = screenshot->priv;
+
+  do_grab_screenshot (screenshot,
+                      CLUTTER_STAGE (stage),
+                      priv->screenshot_area.x,
+                      priv->screenshot_area.y,
+                      1,
+                      1);
+
+  meta_enable_unredirect_for_display (shell_global_get_display (priv->global));
+
+  g_signal_handlers_disconnect_by_func (stage, grab_pixel, result);
+  g_task_return_boolean (result, TRUE);
+  g_object_unref (result);
+}
+
 static gboolean
 finish_screenshot (ShellScreenshot        *screenshot,
                    GAsyncResult           *result,
@@ -352,9 +465,10 @@ shell_screenshot_screenshot (ShellScreenshot     *screenshot,
                              GAsyncReadyCallback  callback,
                              gpointer             user_data)
 {
+  ClutterActor *stage;
   ShellScreenshotPrivate *priv;
+  gboolean use_paint_signal = FALSE;
   GTask *result;
-  ShellScreenshotFlag flags;
 
   g_return_if_fail (SHELL_IS_SCREENSHOT (screenshot));
   g_return_if_fail (G_IS_OUTPUT_STREAM (stream));
@@ -378,12 +492,34 @@ shell_screenshot_screenshot (ShellScreenshot     *screenshot,
   g_task_set_source_tag (result, shell_screenshot_screenshot);
 
   priv->stream = g_object_ref (stream);
+  priv->include_cursor = FALSE;
+
+  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));
+
+  meta_disable_unredirect_for_display (shell_global_get_display (priv->global));
 
-  flags = SHELL_SCREENSHOT_FLAG_NONE;
   if (include_cursor)
-    flags |= SHELL_SCREENSHOT_FLAG_INCLUDE_CURSOR;
+    {
+      if (should_draw_cursor_image (SHELL_SCREENSHOT_SCREEN))
+        priv->include_cursor = TRUE;
+      else
+        use_paint_signal = TRUE;
+    }
 
-  grab_screenshot (screenshot, flags, result);
+  if (use_paint_signal)
+    {
+      g_signal_connect_after (stage, "paint",
+                              G_CALLBACK (on_paint),
+                              result);
+    }
+  else
+    {
+      g_signal_connect_after (stage, "actors-painted",
+                              G_CALLBACK (on_actors_painted),
+                              result);
+    }
+
+  clutter_actor_queue_redraw (stage);
 }
 
 /**
@@ -439,9 +575,9 @@ shell_screenshot_screenshot_area (ShellScreenshot     *screenshot,
                                   GAsyncReadyCallback  callback,
                                   gpointer             user_data)
 {
+  ClutterActor *stage;
   ShellScreenshotPrivate *priv;
   GTask *result;
-  g_autoptr (GTask) task = NULL;
 
   g_return_if_fail (SHELL_IS_SCREENSHOT (screenshot));
   g_return_if_fail (G_IS_OUTPUT_STREAM (stream));
@@ -470,15 +606,13 @@ shell_screenshot_screenshot_area (ShellScreenshot     *screenshot,
   priv->screenshot_area.width = width;
   priv->screenshot_area.height = height;
 
-  do_grab_screenshot (screenshot,
+  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));
-                      priv->screenshot_area.x,
-                      priv->screenshot_area.y,
-                      priv->screenshot_area.width,
-                      priv->screenshot_area.height,
-                      SHELL_SCREENSHOT_FLAG_NONE);
 
-  task = g_task_new (screenshot, NULL, on_screenshot_written, result);
+  meta_disable_unredirect_for_display (shell_global_get_display (shell_global_get ()));
-  g_task_run_in_thread (task, write_screenshot_thread);
+
+  g_signal_connect_after (stage, "actors-painted", G_CALLBACK (grab_area_screenshot), result);
+
+  clutter_actor_queue_redraw (stage);
 }
 
 /**
@@ -532,6 +666,7 @@ shell_screenshot_screenshot_window (ShellScreenshot     *screenshot,
 {
   ShellScreenshotPrivate *priv;
   MetaDisplay *display;
+  ClutterActor *stage;
   MetaWindow *window;
   GTask *result;
 
@@ -560,8 +695,16 @@ shell_screenshot_screenshot_window (ShellScreenshot     *screenshot,
 
   priv->stream = g_object_ref (stream);
   priv->include_frame = include_frame;
+  priv->include_cursor = include_cursor &&
+                         should_draw_cursor_image (SHELL_SCREENSHOT_WINDOW);
 
-  grab_window_screenshot (screenshot, include_cursor, result);
+  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));
+
+  meta_disable_unredirect_for_display (shell_global_get_display (shell_global_get ()));
+
+  g_signal_connect_after (stage, "actors-painted", G_CALLBACK (grab_window_screenshot), result);
+
+  clutter_actor_queue_redraw (stage);
 }
 
 /**
@@ -610,7 +753,9 @@ shell_screenshot_pick_color (ShellScreenshot     *screenshot,
                              gpointer             user_data)
 {
   ShellScreenshotPrivate *priv;
-  g_autoptr (GTask) result = NULL;
+  MetaDisplay *display;
+  ClutterActor *stage;
+  GTask *result;
 
   g_return_if_fail (SHELL_IS_SCREENSHOT (screenshot));
 
@@ -624,14 +769,14 @@ shell_screenshot_pick_color (ShellScreenshot     *screenshot,
   priv->screenshot_area.width = 1;
   priv->screenshot_area.height = 1;
 
-  do_grab_screenshot (screenshot,
+  display = shell_global_get_display (priv->global);
-                      priv->screenshot_area.x,
+  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));
-                      priv->screenshot_area.y,
-                      1,
-                      1,
-                      SHELL_SCREENSHOT_FLAG_NONE);
 
-  g_task_return_boolean (result, TRUE);
+  meta_disable_unredirect_for_display (display);
+
+  g_signal_connect_after (stage, "actors-painted", G_CALLBACK (grab_pixel), result);
+
+  clutter_actor_queue_redraw (stage);
 }
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN

src/shell-util.c

@@ -77,6 +77,61 @@ shell_util_set_hidden_from_pick (ClutterActor *actor,
     }
 }
 
+/**
+ * shell_util_get_transformed_allocation:
+ * @actor: a #ClutterActor
+ * @box: (out): location to store returned box in stage coordinates
+ *
+ * This function is similar to a combination of clutter_actor_get_transformed_position(),
+ * and clutter_actor_get_transformed_size(), but unlike
+ * clutter_actor_get_transformed_size(), it always returns a transform
+ * of the current allocation, while clutter_actor_get_transformed_size() returns
+ * bad values (the transform of the requested size) if a relayout has been
+ * queued.
+ *
+ * This function is more convenient to use than
+ * clutter_actor_get_abs_allocation_vertices() if no transformation is in effect
+ * and also works around limitations in the GJS binding of arrays.
+ */
+void
+shell_util_get_transformed_allocation (ClutterActor    *actor,
+                                       ClutterActorBox *box)
+{
+  /* Code adapted from clutter-actor.c:
+   * Copyright 2006, 2007, 2008 OpenedHand Ltd
+   */
+  graphene_point3d_t v[4];
+  gfloat x_min, x_max, y_min, y_max;
+  guint i;
+
+  g_return_if_fail (CLUTTER_IS_ACTOR (actor));
+
+  clutter_actor_get_abs_allocation_vertices (actor, v);
+
+  x_min = x_max = v[0].x;
+  y_min = y_max = v[0].y;
+
+  for (i = 1; i < G_N_ELEMENTS (v); ++i)
+    {
+      if (v[i].x < x_min)
+	x_min = v[i].x;
+
+      if (v[i].x > x_max)
+	x_max = v[i].x;
+
+      if (v[i].y < y_min)
+	y_min = v[i].y;
+
+      if (v[i].y > y_max)
+	y_max = v[i].y;
+    }
+
+  box->x1 = x_min;
+  box->y1 = y_min;
+  box->x2 = x_max;
+  box->y2 = y_max;
+}
+
 /**
  * shell_util_get_week_start:
  *
@@ -354,6 +409,34 @@ shell_util_create_pixbuf_from_data (const guchar      *data,
 
 typedef const gchar *(*ShellGLGetString) (GLenum);
 
+static const gchar *
+get_gl_vendor (void)
+{
+  static const gchar *vendor = NULL;
+
+  if (!vendor)
+    {
+      ShellGLGetString gl_get_string;
+      gl_get_string = (ShellGLGetString) cogl_get_proc_address ("glGetString");
+      if (gl_get_string)
+        vendor = gl_get_string (GL_VENDOR);
+    }
+
+  return vendor;
+}
+
+gboolean
+shell_util_need_background_refresh (void)
+{
+  if (!clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
+    return FALSE;
+
+  if (g_strcmp0 (get_gl_vendor (), "NVIDIA Corporation") == 0)
+    return TRUE;
+
+  return FALSE;
+}
+
 static gboolean
 canvas_draw_cb (ClutterContent *content,
                 cairo_t        *cr,
@@ -570,57 +653,6 @@ shell_util_get_uid (void)
   return getuid ();
 }
 
-typedef struct {
-  GDBusConnection *connection;
-  gchar           *command;
-
-  GCancellable *cancellable;
-  gulong        cancel_id;
-
-  guint    job_watch;
-  gchar   *job;
-} SystemdCall;
-
-static void
-shell_util_systemd_call_data_free (SystemdCall *data)
-{
-  if (data->job_watch)
-    {
-      g_dbus_connection_signal_unsubscribe (data->connection, data->job_watch);
-      data->job_watch = 0;
-    }
-
-  if (data->cancellable)
-    {
-      g_cancellable_disconnect (data->cancellable, data->cancel_id);
-      g_clear_object (&data->cancellable);
-      data->cancel_id = 0;
-    }
-
-  g_clear_object (&data->connection);
-  g_clear_pointer (&data->job, g_free);
-  g_clear_pointer (&data->command, g_free);
-  g_free (data);
-}
-
-static void
-shell_util_systemd_call_cancelled_cb (GCancellable *cancellable,
-                                      GTask        *task)
-{
-  SystemdCall *data = g_task_get_task_data (task);
-
-  /* Task has returned, but data is not yet free'ed, ignore signal. */
-  if (g_task_get_completed (task))
-    return;
-
-  /* We are still in the DBus call; it will return the error. */
-  if (data->job == NULL)
-    return;
-
-  g_task_return_error_if_cancelled (task);
-  g_object_unref (task);
-}
-
 static void
 on_systemd_call_cb (GObject      *source,
                     GAsyncResult *res,
@@ -628,143 +660,46 @@ on_systemd_call_cb (GObject      *source,
 {
   g_autoptr (GVariant) reply = NULL;
   g_autoptr (GError) error = NULL;
-  GTask *task = G_TASK (user_data);
+  const gchar *command = user_data;
-  SystemdCall *data;
 
   reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source),
                                          res, &error);
-
+  if (error)
-  data = g_task_get_task_data (task);
+    g_warning ("Could not issue '%s' systemd call", command);
-
-  if (error) {
-    g_warning ("Could not issue '%s' systemd call", data->command);
-    g_task_return_error (task, g_steal_pointer (&error));
-    g_object_unref (task);
-
-    return;
-  }
-
-  g_assert (data->job == NULL);
-  g_variant_get (reply, "(o)", &data->job);
-
-  /* And we wait for the JobRemoved notification. */
 }
 
-static void
+static gboolean
-on_systemd_job_removed_cb (GDBusConnection *connection,
+shell_util_systemd_call (const char  *command,
-                           const gchar *sender_name,
+                         const char  *unit,
-                           const gchar *object_path,
+                         const char  *mode,
-                           const gchar *interface_name,
+                         GError     **error)
-                           const gchar *signal_name,
-                           GVariant *parameters,
-                           gpointer user_data)
 {
-  GTask *task = G_TASK (user_data);
-  SystemdCall *data;
-  guint32 id;
-  const char *path, *unit, *result;
-
-  /* Task has returned, but data is not yet free'ed, ignore signal. */
-  if (g_task_get_completed (task))
-    return;
-
-  data = g_task_get_task_data (task);
-
-  /* No job information yet, ignore. */
-  if (data->job == NULL)
-    return;
-
-  g_variant_get (parameters, "(u&o&s&s)", &id, &path, &unit, &result);
-
-  /* Is it the job we are waiting for? */
-  if (g_strcmp0 (path, data->job) != 0)
-    return;
-
-  /* Task has completed; return the result of the job */
-  if (g_strcmp0 (result, "done") == 0)
-    g_task_return_boolean (task, TRUE);
-  else
-    g_task_return_new_error (task,
-                             G_IO_ERROR,
-                             G_IO_ERROR_FAILED,
-                             "Systemd job completed with status \"%s\"",
-                             result);
-
-  g_object_unref (task);
-}
-
-static void
-shell_util_systemd_call (const char           *command,
-                         const char           *unit,
-                         const char           *mode,
-                         GCancellable         *cancellable,
-                         GAsyncReadyCallback   callback,
-                         gpointer              user_data)
-{
-  g_autoptr (GTask) task = g_task_new (NULL, cancellable, callback, user_data);
-
 #ifdef HAVE_SYSTEMD
   g_autoptr (GDBusConnection) connection = NULL;
-  GError *error = NULL;
-  SystemdCall *data;
   g_autofree char *self_unit = NULL;
   int res;
 
-  connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-
-  if (connection == NULL) {
-    g_task_return_error (task, error);
-    return;
-  }
-
-  /* We look up the systemd unit that our own process is running in here.
-   * This way we determine whether the session is managed using systemd.
-   */
   res = sd_pid_get_user_unit (getpid (), &self_unit);
 
   if (res == -ENODATA)
     {
-      g_task_return_new_error (task,
+      g_debug ("Not systemd-managed, not doing '%s' on '%s'", mode, unit);
-                               G_IO_ERROR,
+      return FALSE;
-                               G_IO_ERROR_NOT_SUPPORTED,
-                               "Not systemd managed");
-      return;
     }
   else if (res < 0)
     {
-      g_task_return_new_error (task,
+      g_set_error (error,
-                               G_IO_ERROR,
+                   G_IO_ERROR,
-                               g_io_error_from_errno (-res),
+                   g_io_error_from_errno (-res),
-                               "Error fetching own systemd unit: %s",
+                   "Error trying to start systemd unit '%s': %s",
-                               g_strerror (-res));
+                   unit, g_strerror (-res));
-      return;
+      return FALSE;
     }
 
-  data = g_new0 (SystemdCall, 1);
+  connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error);
-  data->command = g_strdup (command);
-  data->connection = g_object_ref (connection);
-  data->job_watch = g_dbus_connection_signal_subscribe (connection,
-                                                        "org.freedesktop.systemd1",
-                                                        "org.freedesktop.systemd1.Manager",
-                                                        "JobRemoved",
-                                                        "/org/freedesktop/systemd1",
-                                                        NULL,
-                                                        G_DBUS_SIGNAL_FLAGS_NONE,
-                                                        on_systemd_job_removed_cb,
-                                                        task,
-                                                        NULL);
-  g_task_set_task_data (task,
-                        data,
-                        (GDestroyNotify) shell_util_systemd_call_data_free);
 
-  if (cancellable)
+  if (connection == NULL)
-    {
+    return FALSE;
-      data->cancellable = g_object_ref (cancellable);
-      data->cancel_id = g_cancellable_connect (cancellable,
-                                               G_CALLBACK (shell_util_systemd_call_cancelled_cb),
-                                               task,
-                                               NULL);
-    }
 
   g_dbus_connection_call (connection,
                           "org.freedesktop.systemd1",
@@ -773,53 +708,31 @@ shell_util_systemd_call (const char           *command,
                           command,
                           g_variant_new ("(ss)",
                                          unit, mode),
-                          G_VARIANT_TYPE ("(o)"),
+                          NULL,
                           G_DBUS_CALL_FLAGS_NONE,
-                          -1, cancellable,
+                          -1, NULL,
                           on_systemd_call_cb,
-                          g_steal_pointer (&task));
+                          (gpointer) command);
-#else /* HAVE_SYSTEMD */
+  return TRUE;
-  g_task_return_new_error (task,
+#endif /* HAVE_SYSTEMD */
-                           G_IO_ERROR,
-                           G_IO_ERROR_NOT_SUPPORTED,
-                           "systemd not supported by gnome-shell");
-#endif /* !HAVE_SYSTEMD */
-}
 
-void
+  return FALSE;
-shell_util_start_systemd_unit (const char           *unit,
-                               const char           *mode,
-                               GCancellable         *cancellable,
-                               GAsyncReadyCallback   callback,
-                               gpointer              user_data)
-{
-  shell_util_systemd_call ("StartUnit", unit, mode,
-                           cancellable, callback, user_data);
 }
 
 gboolean
-shell_util_start_systemd_unit_finish (GAsyncResult  *res,
+shell_util_start_systemd_unit (const char  *unit,
-                                      GError       **error)
+                               const char  *mode,
+                               GError     **error)
 {
-  return g_task_propagate_boolean (G_TASK (res), error);
+  return shell_util_systemd_call ("StartUnit", unit, mode, error);
-}
-
-void
-shell_util_stop_systemd_unit (const char           *unit,
-                              const char           *mode,
-                              GCancellable         *cancellable,
-                              GAsyncReadyCallback   callback,
-                              gpointer              user_data)
-{
-  shell_util_systemd_call ("StopUnit", unit, mode,
-                           cancellable, callback, user_data);
 }
 
 gboolean
-shell_util_stop_systemd_unit_finish (GAsyncResult  *res,
+shell_util_stop_systemd_unit (const char  *unit,
-                                     GError       **error)
+                              const char  *mode,
+                              GError     **error)
 {
-  return g_task_propagate_boolean (G_TASK (res), error);
+  return shell_util_systemd_call ("StopUnit", unit, mode, error);
 }
 
 void

src/shell-util.h

@@ -14,6 +14,9 @@ G_BEGIN_DECLS
 void     shell_util_set_hidden_from_pick       (ClutterActor     *actor,
                                                 gboolean          hidden);
 
+void     shell_util_get_transformed_allocation (ClutterActor     *actor,
+                                                ClutterActorBox  *box);
+
 int      shell_util_get_week_start             (void);
 
 const char *shell_util_translate_time_string   (const char *str);
@@ -46,6 +49,8 @@ GdkPixbuf *shell_util_create_pixbuf_from_data (const guchar      *data,
                                                int                height,
                                                int                rowstride);
 
+gboolean shell_util_need_background_refresh (void);
+
 ClutterContent * shell_util_get_content_for_window_actor (MetaWindowActor *window_actor,
                                                           MetaRectangle   *window_rect);
 
@@ -59,21 +64,12 @@ cairo_surface_t * shell_util_composite_capture_images (ClutterCapture  *captures
 
 void shell_util_check_cloexec_fds (void);
 
-void   shell_util_start_systemd_unit          (const char           *unit,
+gboolean shell_util_start_systemd_unit (const char  *unit,
-                                               const char           *mode,
+                                        const char  *mode,
-                                               GCancellable         *cancellable,
+                                        GError     **error);
-                                               GAsyncReadyCallback   callback,
+gboolean shell_util_stop_systemd_unit  (const char  *unit,
-                                               gpointer              user_data);
+                                        const char  *mode,
-gboolean shell_util_start_systemd_unit_finish (GAsyncResult         *res,
+                                        GError     **error);
-                                               GError              **error);
-
-void  shell_util_stop_systemd_unit           (const char           *unit,
-                                              const char           *mode,
-                                              GCancellable         *cancellable,
-                                              GAsyncReadyCallback   callback,
-                                              gpointer              user_data);
-gboolean shell_util_stop_systemd_unit_finish (GAsyncResult         *res,
-                                              GError              **error);
 
 void shell_util_sd_notify (void);