Initial experiment unifying app menus.

.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

HACKING.md

@@ -131,7 +131,7 @@ whenever possible, that is when not inheriting from GObjects.
     };
 ```
 
-For GObject inheritance, we use the GObject.registerClass() function provided
+For GObject inheritence, we use the GObject.registerClass() function provided
 by gjs.
 ```javascript
     var MyActor = GObject.registerClass(

NEWS

@@ -1,93 +1,3 @@
-3.37.91
-=======
-* Fix potential stack overflow in libcroco [Michael; !1404]
-* Fix page removal in app picker [Georges; !1406]
-* Fix "old style" VPN authentication [Florian; !1407]
-* Fix X11 session login [Benjamin; !1418]
-* Fix week number alignment when using font-scaling [Joonas; !1415]
-* Fix lock screen on systems without GLSL shader support [Zephaniah; #3071]
-* Misc. bug fixes and cleanups [Florian, Jonas, Georges, Andre, Will, Björn;
-  !1396, !1359, !1408, !1409, !1414, !1413, !1416, #3073]
-
-Contributors:
-  Jonas Ådahl, Benjamin Berg, Michael Catanzaro, Björn Daase, Joonas Henriksson,
-  Zephaniah E. Loss-Cutler-Hull, Andre Moreira Magalhaes, Florian Müllner,
-  Georges Basile Stavracas Neto, Will Thompson
-
-Translators:
-  Fran Dieguez [gl], Jordi Mas [ca], Daniel Mustieles [es],
-  Florentina Mușat [ro], Akarshan Biswas [bn_IN], Baurzhan Muftakhidinov [kk],
-  Piotr Drąg [pl], Rafael Fontenelle [pt_BR], Emin Tufan Çetin [tr],
-  sicklylife [ja], Danial Behzadi [fa], Jiri Grönroos [fi], Goran Vidović [hr],
-  Matej Urbančič [sl], Boyuan Yang [zh_CN]
-
-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]
@@ -285,7 +195,7 @@ Translators:
 * Handle extension updates [Florian; !945]
 * Animate showing and hiding caps-lock warning [Jonas; !952]
 * Support "auto" lengths in CSS [Florian; !971]
-* Turn extension-prefs into the official Extensions app [Florian; #1968]
+* Turn extension-prefs into the offical Extensions app [Florian; #1968]
 * Sandbox the portal helper [Michael; !983]
 * Misc. bug fixes and cleanups [Florian, Björn, Jakub, Alexander, Daniel V.,
   Jonas, nana-4, Carlos, Sebastian, Daniel G., Georges, Piotr; !918, !917,
@@ -574,7 +484,7 @@ Translators:
 ======
 * Fix keeping actors visible in scrollviews [Marco; #1061]
 * Move some chrome above popup windows [Jonas D.; !358]
-* Include 'sandboxed-app-id' in window introspection info [Florian; #1289]
+* Include 'sandboxed-app-id' in winodw introspection info [Florian; #1289]
 * Port to libecal-2.0 [Milan; !501]
 * Support TCRYPT in mount password dialog [segfault; !126]
 * Misc. bug fixes and cleanups [Florian, Marco, Veerasamy; !517, #745, !499,
@@ -1123,7 +1033,7 @@ Translations:
 * gdm: Fix "Not listed" focus indication [Florian; #784040]
 * Fix missing icons in freedesktop notifications [Florian; #784245]
 * gdm: Disable user list when empty [Xiaoguang; #731320]
-* gdm: Allow empty response to PAM messages [Ray; #784360]
+* gdm: Allow empty reponse to PAM messages [Ray; #784360]
 * Fix blocked clicks in shutdown dialog [Florian; #781738]
 * Show OSD popup when changing volume via scroll wheel [Florian; #781028]
 * Refine list search results [Rares; #749957]
@@ -2583,7 +2493,7 @@ Translations:
 * Merge the wayland branch [Giovanni, Neil; #707467]
 * Make search entry behave better in RTL locales [Matthias, Florian; #705779]
 * Allow to change app pages with pageUp/pageDown keys [Carlos; #707979]
-* Set appropriate a11y states on expandable menu items [Alejandro; #708038]
+* Set approriate a11y states on expandable menu items [Alejandro; #708038]
 * Improve page indicator animation [Carlos; #707565]
 * Misc bug fixes and cleanups [Florian, Olivier, Jasper, Giovanni, Magdalen,
   Adel, Carlos, Rico, Joanmarie; #707308, #707430, #707508, #707557, #707600,
@@ -3867,7 +3777,7 @@ Translations:
 * Update the calendar code to use ECalClient [Giovanni; #671177]
 * Update jhbuild script to use the main moduleset [Owen, Will; #668440]
 * StTextureCache: code cleanup, evict unused icons, merge together
-  simultaneous requests for the same icon [Jasper; #670771, #671656, #672273]
+  simulataneous requests for the same icon [Jasper; #670771, #671656, #672273]
 * Clean up St for recent Clutter changes and fix bugs. StContainer and
   StGroup are removed [Jasper, Florian; #670034, #670640, #670904]
 * Code cleanup [Adel, Jasper, Rui; #613194, #671086, #671103]
@@ -4002,7 +3912,7 @@ Translations:
     [Stefano; #664201]
   - Delay rearranging windows in the overview as long as the pointer
     is over a window [Vit; #645325]
-* Add a GConf => DConf migration file for overridden Mutter settings
+* Add a GConf => DConf migration file for overriden Mutter settings
   [Florian; #667636]
 * When a VPN connection is active, show that as the network icon
   [Giovanni; #665115]
@@ -4249,7 +4159,7 @@ Translations:
   - Add fingerprint reader support [Ray; #657823]
   - Add a power button offering the choice of Suspend/Restart/Power off
     [Ray; #657822]
-  - Remove the option to view the current keyboard layout [Matthias; #659164]
+  - Remove the option to view the current keyboad layout [Matthias; #659164]
   - Make Control-Alt-Tab work for full keyboard access [Ray; #659177]
 * Frequently initiate a full garbage collection; Spidermonkey isn't very good
   at tracking the amount of resources we have allocated so this hopefully will
@@ -4466,7 +4376,7 @@ Translations:
 * Fix selection highlighting for light-on-dark entries [Jasper; #643768]
 * Make control-Return in the overview open a new window [Maxim]
 * Delay showing the alt-Tab switcher to reduce visual noise when
-  flipping between windows [Dan; #652346]
+  flipping betweeen windows [Dan; #652346]
 * When we have vertically stacked monitors, put the message tray
   on the bottom one [Dan; #636963]
 * Fix various problems with keynav and the Activities button
@@ -4617,7 +4527,7 @@ Translations:
   - Fix missing device descriptions with multiple devices of the
     same type [Giovanni]
     https://bugzilla.gnome.org/show_bug.cgi?id=646074
-  - Label ad-hoc networks with an appropriate icon [Dan]
+  - Label ad-hoc neworks with an appropriate icon [Dan]
     https://bugzilla.gnome.org/show_bug.cgi?id=646141
   - Fix displaying some devices states as "invalid" [Dan]
     https://bugzilla.gnome.org/show_bug.cgi?id=646946

data/cldr2json/cldr2json.py

@@ -123,7 +123,7 @@ def locale_to_xkb(locale, name):
         if xkb:
             return xkb
         else:
-            raise KeyError("layout %s explicitly disabled in overrides"
+            raise KeyError("layout %s explicitely disabled in overrides"
                            % locale)
     xkb_names = sorted(name_to_xkb.keys())
     if name in xkb_names:

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/scalable/status/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/scalable/actions/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/scalable/actions/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/scalable/status/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/scalable/status/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/eye-open-negative-filled-symbolic.svg">eye-open-negative-filled-symbolic.svg</file>
+    <file alias="icons/eye-not-looking-symbolic.svg">eye-not-looking-symbolic.svg</file>
+    <file alias="icons/pointer-double-click-symbolic.svg">pointer-double-click-symbolic.svg</file>
+    <file alias="icons/pointer-drag-symbolic.svg">pointer-drag-symbolic.svg</file>
+    <file alias="icons/pointer-primary-click-symbolic.svg">pointer-primary-click-symbolic.svg</file>
+    <file alias="icons/pointer-secondary-click-symbolic.svg">pointer-secondary-click-symbolic.svg</file>
+    <file alias="icons/keyboard-caps-lock-filled-symbolic.svg">keyboard-caps-lock-filled-symbolic.svg</file>
+    <file alias="icons/keyboard-enter-symbolic.svg">keyboard-enter-symbolic.svg</file>
+    <file alias="icons/keyboard-hide-symbolic.svg">keyboard-hide-symbolic.svg</file>
+    <file alias="icons/keyboard-layout-filled-symbolic.svg">keyboard-layout-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=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY'
+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

@@ -0,0 +1,10 @@
+[Unit]
+Description=GNOME Shell on Wayland
+DefaultDependencies=no
+
+Requisite=gnome-session-initialized.target
+PartOf=gnome-session-initialized.target
+Before=gnome-session-initialized.target
+
+Requires=gnome-shell-wayland.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

@@ -1,10 +1,10 @@
 [Unit]
-Description=GNOME Shell
+Description=GNOME Shell on X11
 DefaultDependencies=no
 
 Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
-Wants=org.gnome.Shell@wayland.service
-Wants=org.gnome.Shell@x11.service
+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',
-    output: 'org.gnome.Shell@x11.service',
+    input: 'gnome-shell-x11.service.in',
+    output: 'gnome-shell-x11.service',
     configuration: unitconf,
     install_dir: systemduserunitdir
   )
 
   configure_file(
-    input: 'org.gnome.Shell@wayland.service.in',
-    output: 'org.gnome.Shell@wayland.service',
+    input: 'gnome-shell-wayland.service.in',
+    output: 'gnome-shell-wayland.service',
     configuration: unitconf,
     install_dir: systemduserunitdir
   )
 
-  units = files('org.gnome.Shell.target',
-                'org.gnome.Shell-disable-extensions.service')
+  units = files('gnome-shell-x11.target',
+                '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/_drawing.scss

@@ -79,7 +79,7 @@
 
 @function draw_button_hilight_color($c) {
 //
-// calculate the right top highlight color for buttons
+// calculate the right top hilight color for buttons
 //
 // $c: base color;
 //

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

@@ -170,6 +170,7 @@
     height: 1.8em;
     width: 2.3em; 
     border-radius: 2px;
+    padding: 0.5em 0 0;
     margin: 6px;
     background-color: darken($bg_color, 2%);
     color: lighten($fg_color, 5%);
@@ -231,9 +232,7 @@
     color: $fg_color;
     font-feature-settings: "tnum";
     @include fontsize($base_font_size);
-
-    &:ltr { text-align: right; }
-    &:rtl { text-align: left; }
+    text-align: right;
   }
 
   // timezone offset label

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

@@ -38,7 +38,7 @@
     font-size: 18pt;
     font-weight: 800;
 
-    &.lightweight {
+    &.leightweight {
       font-size: 13pt;
       font-weight: 800;
     }

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; }
-  &:rtl { padding-right: 14px; text-align: right; }
+  &:ltr { padding-left: 14px; }
+  &: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/_notifications.scss

@@ -1,4 +1,4 @@
-/* Notifications & Message Tray */
+/* Notifications & Mesage Tray */
 
 $notification_banner_height: 64px;
 $notification_banner_width: 34em;

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/_slider.scss

@@ -16,7 +16,7 @@ $slider_size: 15px;
   -barlevel-overdrive-color: $destructive_color;
   -barlevel-overdrive-border-color: if($variant == 'light', darken($destructive_color, 4%), lighten($destructive_color, 2%)); //trough border when red;
   -barlevel-overdrive-separator-width:1px;
-  // slider handler
+  // slider hander
   -slider-handle-radius: $slider_size * 0.5; // half the size of the size
   -slider-handle-border-width: 1px;
   -slider-handle-border-color: if($variant == 'light', $borders_color, $fg_color);

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

@@ -1,7 +1,7 @@
 /* Window Picker */
 
-$window_picker_spacing: $base_spacing; // 6px
-$window_picker_padding: $base_padding * 2; // 12px
+$window_picker_spacing: $base_spacing * 2; // 16px
+$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

@@ -6,11 +6,10 @@ const { Clutter, GObject, Pango, Shell, St } = imports.gi;
 const Animation = imports.ui.animation;
 const Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
-const OVirt = imports.gdm.oVirt;
+const Util = imports.misc.util;
 const Params = imports.misc.params;
 const ShellEntry = imports.ui.shellEntry;
 const UserWidget = imports.ui.userWidget;
-const Util = imports.misc.util;
 
 var DEFAULT_BUTTON_WELL_ICON_SIZE = 16;
 var DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1000;
@@ -72,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));
@@ -243,7 +242,7 @@ var AuthPrompt = GObject.registerClass({
         this.emit('prompted');
     }
 
-    _onCredentialManagerAuthenticated() {
+    _onOVirtUserAuthenticated() {
         if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED)
             this.reset();
     }
@@ -483,7 +482,7 @@ var AuthPrompt = GObject.registerClass({
             // The user is constant at the unlock screen, so it will immediately
             // respond to the request with the username
             beginRequestType = BeginRequestType.PROVIDE_USERNAME;
-        } else if (this._userVerifier.serviceIsForeground(OVirt.SERVICE_NAME) ||
+        } else if (this._userVerifier.serviceIsForeground(GdmUtil.OVIRT_SERVICE_NAME) ||
                    this._userVerifier.serviceIsForeground(GdmUtil.SMARTCARD_SERVICE_NAME)) {
             // We don't need to know the username if the user preempted the login screen
             // with a smartcard or with preauthenticated oVirt credentials

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

@@ -810,8 +810,8 @@ var LoginDialog = GObject.registerClass({
             return;
 
         this._logoBin.destroy_all_children();
-        const resourceScale = this._logoBin.get_resource_scale();
-        if (this._logoFile) {
+        const [valid, resourceScale] = this._logoBin.get_resource_scale();
+        if (this._logoFile && valid) {
             let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
             this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
                                                                        -1, -1,
@@ -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.token = token;
-            });
+                                        this._onUserAuthenticated.bind(this));
+    }
+
+    _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._credentialManagers[OVirt.SERVICE_NAME] = OVirt.getOVirtCredentialsManager();
-        this._credentialManagers[Vmware.SERVICE_NAME] = Vmware.getVmwareCredentialsManager();
+        this._oVirtCredentialsManager = OVirt.getOVirtCredentialsManager();
 
-        for (let service in this._credentialManagers) {
-            if (this._credentialManagers[service].token) {
-                this._onCredentialManagerAuthenticated(this._credentialManagers[service],
-                    this._credentialManagers[service].token);
-            }
+        if (this._oVirtCredentialsManager.hasToken())
+            this._oVirtUserAuthenticated(this._oVirtCredentialsManager.getToken());
 
-            this._credentialManagers[service]._authenticatedSignalId =
-                this._credentialManagers[service].connect('user-authenticated',
-                                                          this._onCredentialManagerAuthenticated.bind(this));
-        }
+        this._oVirtUserAuthenticatedId = this._oVirtCredentialsManager.connect('user-authenticated',
+                                                                               this._oVirtUserAuthenticated.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) {
-            let credentialManager = this._credentialManagers[service];
-            credentialManager.disconnect(credentialManager._authenticatedSignalId);
-            credentialManager = null;
-        }
+        this._oVirtCredentialsManager.disconnect(this._oVirtUserAuthenticatedId);
+        this._oVirtCredentialsManager = null;
     }
 
     answerQuery(serviceName, answer) {
@@ -321,9 +311,9 @@ var ShellUserVerifier = class {
             });
     }
 
-    _onCredentialManagerAuthenticated(credentialManager, _token) {
-        this._preemptingService = credentialManager.service;
-        this.emit('credential-manager-authenticated');
+    _oVirtUserAuthenticated(_token) {
+        this._preemptingService = OVIRT_SERVICE_NAME;
+        this.emit('ovirt-user-authenticated');
     }
 
     _checkForSmartcard() {
@@ -500,12 +490,9 @@ var ShellUserVerifier = class {
         if (!this.serviceIsForeground(serviceName))
             return;
 
-        let token = null;
-        if (this._credentialManagers[serviceName])
-            token = this._credentialManagers[serviceName].token;
-
-        if (token) {
-            this.answerQuery(serviceName, token);
+        if (serviceName == OVIRT_SERVICE_NAME) {
+            // The only question asked by this service is "Token?"
+            this.answerQuery(serviceName, this._oVirtCredentialsManager.getToken());
             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 =>
-            this.serviceIsForeground(service));
-        if (foregroundService) {
-            this._credentialManagers[foregroundService].token = null;
+        if (this.serviceIsForeground(OVIRT_SERVICE_NAME)) {
+            this._oVirtCredentialsManager.resetToken();
             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();
-        APP_ALLOWLIST.forEach(appName => {
+        this._whitelistMap = new Map();
+        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) => this._allowlistMap.delete(name));
+                (conn, name, owner) => this._whitelistMap.set(name, owner),
+                (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) {
-        return [...this._allowlistMap.values()].includes(sender);
+    _isSenderWhitelisted(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', 'can-power-off', 'can-power-off',
-            GObject.ParamFlags.READABLE,
-            false),
-        'can-restart': GObject.ParamSpec.boolean(
-            'can-restart', 'can-restart', 'can-restart',
-            GObject.ParamFlags.READABLE,
-            false),
-        'can-suspend': GObject.ParamSpec.boolean(
-            'can-suspend', 'can-suspend', 'can-suspend',
-            GObject.ParamFlags.READABLE,
-            false),
-        'can-lock-screen': GObject.ParamSpec.boolean(
-            'can-lock-screen', 'can-lock-screen', 'can-lock-screen',
-            GObject.ParamFlags.READABLE,
-            false),
-        'can-switch-user': GObject.ParamSpec.boolean(
-            'can-switch-user', 'can-switch-user', 'can-switch-user',
-            GObject.ParamFlags.READABLE,
-            false),
-        'can-logout': GObject.ParamSpec.boolean(
-            'can-logout', 'can-logout', 'can-logout',
-            GObject.ParamFlags.READABLE,
-            false),
-        'can-lock-orientation': GObject.ParamSpec.boolean(
-            'can-lock-orientation', 'can-lock-orientation', 'can-lock-orientation',
-            GObject.ParamFlags.READABLE,
-            false),
-        'orientation-lock-icon': GObject.ParamSpec.string(
-            'orientation-lock-icon', 'orientation-lock-icon', 'orientation-lock-icon',
-            GObject.ParamFlags.READWRITE,
-            null),
+        'can-power-off': GObject.ParamSpec.boolean('can-power-off',
+                                                   'can-power-off',
+                                                   'can-power-off',
+                                                   GObject.ParamFlags.READABLE,
+                                                   false),
+        'can-suspend': GObject.ParamSpec.boolean('can-suspend',
+                                                 'can-suspend',
+                                                 'can-suspend',
+                                                 GObject.ParamFlags.READABLE,
+                                                 false),
+        'can-lock-screen': GObject.ParamSpec.boolean('can-lock-screen',
+                                                     'can-lock-screen',
+                                                     'can-lock-screen',
+                                                     GObject.ParamFlags.READABLE,
+                                                     false),
+        'can-switch-user': GObject.ParamSpec.boolean('can-switch-user',
+                                                     'can-switch-user',
+                                                     'can-switch-user',
+                                                     GObject.ParamFlags.READABLE,
+                                                     false),
+        'can-logout': GObject.ParamSpec.boolean('can-logout',
+                                                'can-logout',
+                                                'can-logout',
+                                                GObject.ParamFlags.READABLE,
+                                                false),
+        'can-lock-orientation': GObject.ParamSpec.boolean('can-lock-orientation',
+                                                          'can-lock-orientation',
+                                                          'can-lock-orientation',
+                                                          GObject.ParamFlags.READABLE,
+                                                          false),
+        'orientation-lock-icon': GObject.ParamSpec.string('orientation-lock-icon',
+                                                          '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')),
-            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;')),
+            keywords: tokenizeKeywords(_('power off;shutdown;reboot;restart;halt;stop')),
             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() {
-    /* eslint-disable no-await-in-loop */
+function *run() {
     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();
-            await Scripting.sleep(1000);
-            await Scripting.waitLeisure();
+            yield Scripting.waitTestWindows();
+            yield Scripting.sleep(1000);
+            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();
-    await Scripting.sleep(1000);
+    yield Scripting.destroyTestWindows();
+    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() {
-    /* eslint-disable no-await-in-loop */
+function *run() {
     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 });
-    await Scripting.waitTestWindows();
+        yield Scripting.createTestWindow({ maximized: true });
+    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/altTab.js

@@ -716,7 +716,7 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
         let iconSpacing = labelNaturalHeight + iconPadding + iconBorder;
         let totalSpacing = this._list.spacing * (this._items.length - 1);
 
-        // We just assume the whole screen here due to weirdness happening with the passed width
+        // We just assume the whole screen here due to weirdness happing with the passed width
         let primary = Main.layoutManager.primaryMonitor;
         let parentPadding = this.get_parent().get_theme_node().get_horizontal_padding();
         let availWidth = primary.width - parentPadding - this.get_theme_node().get_horizontal_padding();
@@ -852,9 +852,6 @@ class AppSwitcher extends SwitcherPopup.SwitcherList {
         if (index === -1)
             return;
 
-        this._arrows[index].destroy();
-        this._arrows.splice(index, 1);
-
         this.icons.splice(index, 1);
         this.removeItem(index);
     }

js/ui/animation.js

@@ -60,7 +60,7 @@ class Animation extends St.Bin {
     }
 
     _loadFile(file, width, height) {
-        const resourceScale = this.get_resource_scale();
+        let [validResourceScale, resourceScale] = this.get_resource_scale();
         let wasPlaying = this._isPlaying;
 
         if (this._isPlaying)
@@ -69,6 +69,12 @@ class Animation extends St.Bin {
         this._isLoaded = false;
         this.destroy_all_children();
 
+        if (!validResourceScale) {
+            if (wasPlaying)
+                this.play();
+            return;
+        }
+
         let textureCache = St.TextureCache.get_default();
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         this._animations = textureCache.load_sliced_image(file, width, height,

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) {
@@ -714,18 +712,13 @@ var BackgroundManager = class BackgroundManager {
         }
 
         let newBackgroundActor = this._createBackgroundActor();
-
-        const oldContent = this.backgroundActor.content;
-        const newContent = newBackgroundActor.content;
-
-        newContent.vignette_sharpness = oldContent.vignette_sharpness;
-        newContent.brightness = oldContent.brightness;
-
+        newBackgroundActor.vignette_sharpness = this.backgroundActor.vignette_sharpness;
+        newBackgroundActor.brightness = this.backgroundActor.brightness;
         newBackgroundActor.visible = this.backgroundActor.visible;
 
         this._newBackgroundActor = newBackgroundActor;
 
-        const { background } = newBackgroundActor.content;
+        let background = newBackgroundActor.background;
 
         if (background.isLoaded) {
             this._swapBackgroundActor();
@@ -767,27 +760,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 sourceBottomRight = this._sourceExtents.get_bottom_right();
-        let sourceCenterX = sourceTopLeft.x + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
-        let sourceCenterY = sourceTopLeft.y + sourceContentBox.y1 + (sourceContentBox.y2 - sourceContentBox.y1) * this._sourceAlignment;
+        let sourceAllocation = this._sourceAllocation;
+        let sourceCenterX = sourceAllocation.x1 + sourceContentBox.x1 + (sourceContentBox.x2 - sourceContentBox.x1) * this._sourceAlignment;
+        let sourceCenterY = sourceAllocation.y1 + 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 sourceBottomRight = this._sourceExtents.get_bottom_right();
+        let sourceAllocation = this._sourceAllocation;
         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 &&
-                boxHeight < sourceTopLeft.y - workarea.y)
+            if (sourceAllocation.y2 + boxHeight > workarea.y + workarea.height &&
+                boxHeight < sourceAllocation.y1 - workarea.y)
                 return St.Side.BOTTOM;
             break;
         case St.Side.BOTTOM:
-            if (sourceTopLeft.y - boxHeight < workarea.y &&
-                boxHeight < workarea.y + workarea.height - sourceBottomRight.y)
+            if (sourceAllocation.y1 - boxHeight < workarea.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 &&
-                boxWidth < sourceTopLeft.x - workarea.x)
+            if (sourceAllocation.x2 + boxWidth > workarea.x + workarea.width &&
+                boxWidth < sourceAllocation.x1 - workarea.x)
                 return St.Side.RIGHT;
             break;
         case St.Side.RIGHT:
-            if (sourceTopLeft.x - boxWidth < workarea.x &&
-                boxWidth < workarea.x + workarea.width - sourceBottomRight.x)
+            if (sourceAllocation.x1 - boxWidth < workarea.x &&
+                boxWidth < workarea.x + workarea.width - sourceAllocation.x2)
                 return St.Side.LEFT;
             break;
         }

js/ui/calendar.js

@@ -680,7 +680,6 @@ var Calendar = GObject.registerClass({
                                            style_class: 'calendar-day-base calendar-week-number',
                                            can_focus: true });
                 let weekFormat = Shell.util_translate_time_string(N_("Week %V"));
-                label.clutter_text.y_align = Clutter.ActorAlign.CENTER;
                 label.accessible_name = iter.toLocaleFormat(weekFormat);
                 layout.attach(label, rtl ? 7 : 0, row, 1, 1);
             }

js/ui/components/networkAgent.js

@@ -2,7 +2,6 @@
 /* exported Component */
 
 const { Clutter, Gio, GLib, GObject, NM, Pango, Shell, St } = imports.gi;
-const ByteArray = imports.byteArray;
 const Signals = imports.signals;
 
 const Dialog = imports.ui.dialog;
@@ -494,7 +493,7 @@ var VPNRequestHandler = class {
             return;
         }
 
-        this._vpnChildProcessLineOldStyle(ByteArray.toString(line));
+        this._vpnChildProcessLineOldStyle(line);
 
         // try to read more!
         this._readStdoutOldStyle();
@@ -523,7 +522,13 @@ var VPNRequestHandler = class {
         let contentOverride;
 
         try {
-            data = ByteArray.toGBytes(this._dataStdout.peek_buffer());
+            data = this._dataStdout.peek_buffer();
+
+            if (data instanceof Uint8Array)
+                data = imports.byteArray.toGBytes(data);
+            else
+                data = data.toGBytes();
+
             keyfile.load_from_bytes(data, GLib.KeyFileFlags.NONE);
 
             if (keyfile.get_integer(VPN_UI_GROUP, 'Version') != 2)

js/ui/components/polkitAgent.js

@@ -44,7 +44,7 @@ var AuthenticationDialog = GObject.registerClass({
         let bodyContent = new Dialog.MessageDialogContent();
 
         if (userNames.length > 1) {
-            log('polkitAuthenticationAgent: Received %d '.format(userNames.length) +
+            log('polkitAuthenticationAgent: Received %d'.format(userNames.length) +
                 'identities that can be used for authentication. Only ' +
                 'considering one.');
         }

js/ui/components/telepathyClient.js

@@ -171,7 +171,7 @@ class TelepathyClient extends Tp.BaseClient {
         this.add_approver_filter(filter);
         this.add_handler_filter(filter);
 
-        // Allow other clients (such as Empathy) to preempt our channels if
+        // Allow other clients (such as Empathy) to pre-empt our channels if
         // needed
         this.set_delegated_channels_callback(
             this._delegatedChannelsCb.bind(this));

js/ui/dateMenu.js

@@ -784,7 +784,6 @@ class DateMenuButton extends PanelMenu.Button {
 
         this._clockDisplay = new St.Label({ style_class: 'clock' });
         this._clockDisplay.clutter_text.y_align = Clutter.ActorAlign.CENTER;
-        this._clockDisplay.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
 
         this._indicator = new MessagesIndicator();
 

js/ui/dialog.js

@@ -1,7 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported Dialog, MessageDialogContent, ListSection, ListSectionItem */
 
-const { Clutter, GLib, GObject, Meta, Pango, St } = imports.gi;
+const { Clutter, GObject, Meta, Pango, St } = imports.gi;
 
 function _setLabel(label, value) {
     label.set({
@@ -220,29 +220,23 @@ var MessageDialogContent = GObject.registerClass({
 
             this._updateTitleStyleLater = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
                 this._updateTitleStyleLater = 0;
-                this._title.add_style_class_name('lightweight');
-                return GLib.SOURCE_REMOVE;
+                this._title.add_style_class_name('leightweight');
+                return false;
             });
         }
 
     }
 
     set title(title) {
-        if (this._title.text === title)
-            return;
-
         _setLabel(this._title, title);
 
-        this._title.remove_style_class_name('lightweight');
+        this._title.remove_style_class_name('leightweight');
         this._updateTitleStyle();
 
         this.notify('title');
     }
 
     set description(description) {
-        if (this._description.text === description)
-            return;
-
         _setLabel(this._description, description);
         this.notify('description');
     }

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,
-                transformedExtents.get_height() / newAllocatedHeight);
+                transformedAllocation.get_width() / newAllocatedWidth,
+                transformedAllocation.get_height() / newAllocatedHeight);
 
-            this._dragOffsetX = transformedExtents.origin.x - this._dragStartX;
-            this._dragOffsetY = transformedExtents.origin.y - this._dragStartY;
+            this._dragOffsetX = transformedAllocation.x1 - this._dragStartX;
+            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(
-            '%s will be logged out automatically in %d second.',
-            '%s will be logged out automatically in %d seconds.',
-            seconds).format(user, seconds);
+        return ngettext("%s will be logged out automatically in %d second.",
+                        "%s will be logged out automatically in %d seconds.",
+                        seconds).format(user, seconds);
     },
     description(seconds) {
-        return ngettext(
-            'You will be logged out automatically in %d second.',
-            'You will be logged out automatically in %d seconds.',
-            seconds).format(seconds);
+        return ngettext("You will be logged out automatically in %d second.",
+                        "You will be logged out automatically in %d seconds.",
+                        seconds).format(seconds);
     },
     showBatteryWarning: false,
-    confirmButtons: [{
-        signal: 'ConfirmedLogout',
-        label: C_('button', 'Log Out'),
-    }],
+    confirmButtons: [{ signal: 'ConfirmedLogout',
+                       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(
-            'The system will power off automatically in %d second.',
-            'The system will power off automatically in %d seconds.',
-            seconds).format(seconds);
+        return ngettext("The system will power off automatically in %d second.",
+                        "The system will power off automatically in %d seconds.",
+                        seconds).format(seconds);
     },
     checkBoxText: C_("checkbox", "Install pending software updates"),
     showBatteryWarning: true,
-    confirmButtons: [{
-        signal: 'ConfirmedShutdown',
-        label: C_('button', 'Power Off'),
-    }],
+    confirmButtons: [{ signal: 'ConfirmedReboot',
+                       label: C_("button", "Restart") },
+                     { 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(
-            'The system will restart automatically in %d second.',
-            'The system will restart automatically in %d seconds.',
-            seconds).format(seconds);
+        return ngettext("The system will restart automatically in %d second.",
+                        "The system will restart automatically in %d seconds.",
+                        seconds).format(seconds);
     },
-    checkBoxText: C_('checkbox', 'Install pending software updates'),
-    showBatteryWarning: true,
-    confirmButtons: [{
-        signal: 'ConfirmedReboot',
-        label: C_('button', 'Restart'),
-    }],
+    showBatteryWarning: false,
+    confirmButtons: [{ 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(
-            'The system will automatically restart and install updates in %d second.',
-            'The system will automatically restart and install updates in %d seconds.',
-            seconds).format(seconds);
+        return ngettext("The system will automatically restart and install updates in %d second.",
+                        "The system will automatically restart and install updates in %d seconds.",
+                        seconds).format(seconds);
     },
     showBatteryWarning: true,
-    confirmButtons: [{
-        signal: 'ConfirmedReboot',
-        label: C_('button', 'Restart & Install'),
-    }],
+    confirmButtons: [{ signal: 'ConfirmedReboot',
+                       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: [{
-        signal: 'ConfirmedReboot',
-        label: C_('button', 'Restart & Install'),
-    }],
+    confirmButtons: [{ signal: 'ConfirmedReboot',
+                       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() {
-        if (this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
-        }
-        this._rebootButton = null;
-        this._rebootButtonAlt = null;
+        this.setButtons(buttons);
     }
 
     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)
-            this._checkBox.checked = this._checkBox.visible && this._updateInfo.UpdateTriggered && !this._isDischargingBattery();
-        else
-            this._checkBox.checked = this._checkBox.visible && !this._isBatteryLow();
-
-        this._batteryWarning.visible = this._shouldShowLowBatteryWarning(dialogContent);
+        // We show the warning either together with the checkbox, or when
+        // updates have already been triggered, but the user doesn't have
+        // enough permissions to cancel them.
+        this._batteryWarning.visible = dialogContent.showBatteryWarning &&
+                                        (this._checkBox.visible || updatePrepared && updateTriggered && !updatesAllowed);
 
         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 = () => {
-        Meta.disable_unredirect_for_display(global.display);
-        global.begin_work();
-    };
-    const cleanup = () => {
-        Meta.enable_unredirect_for_display(global.display);
-        global.end_work();
-    };
+    let cleanup = () => Meta.enable_unredirect_for_display(global.display);
     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 = () => {
-        Meta.disable_unredirect_for_display(global.display);
-        global.begin_work();
-    };
-    const cleanup = () => {
-        Meta.enable_unredirect_for_display(global.display);
-        global.end_work();
-    };
+    let cleanup = () => Meta.enable_unredirect_for_display(global.display);
     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] = {
-            version: extension.metadata.version,
-        };
+        metadatas[uuid] = extension.metadata;
     });
 
     if (Object.keys(metadatas).length === 0)

js/ui/extensionSystem.js

@@ -2,7 +2,6 @@
 /* exported init connect disconnect */
 
 const { GLib, Gio, GObject, Shell, St } = imports.gi;
-const ByteArray = imports.byteArray;
 const Signals = imports.signals;
 
 const ExtensionDownloader = imports.ui.extensionDownloader;
@@ -283,7 +282,8 @@ var ExtensionManager = class {
         let metadataContents, success_;
         try {
             [success_, metadataContents] = metadataFile.load_contents(null);
-            metadataContents = ByteArray.toString(metadataContents);
+            if (metadataContents instanceof Uint8Array)
+                metadataContents = imports.byteArray.toString(metadataContents);
         } catch (e) {
             throw new Error('Failed to load metadata.json: %s'.format(e.toString()));
         }

js/ui/iconGrid.js

@@ -31,7 +31,7 @@ var IconSize = {
 var APPICON_ANIMATION_OUT_SCALE = 3;
 var APPICON_ANIMATION_OUT_TIME = 250;
 
-const ICON_POSITION_DELAY = 10;
+const ICON_POSITION_DELAY = 25;
 
 const defaultGridModes = [
     {
@@ -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) {
@@ -468,12 +457,6 @@ var IconGridLayout = GObject.registerClass({
             this._unlinkItem(item);
         });
 
-        // Adjust the page indexes of items after this page
-        for (const itemData of this._items.values()) {
-            if (itemData.pageIndex > pageIndex)
-                itemData.pageIndex--;
-        }
-
         this._pages.splice(pageIndex, 1);
         this.emit('pages-changed');
     }
@@ -963,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;
@@ -1669,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

@@ -1,5 +1,5 @@
 /* exported InhibitShortcutsDialog */
-const { Clutter, Gio, GLib, GObject, Gtk, Meta, Pango, Shell, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, Gtk, Meta, Shell, St } = imports.gi;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
@@ -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';
@@ -90,8 +90,6 @@ var InhibitShortcutsDialog = GObject.registerClass({
                 text: _('You can restore shortcuts by pressing %s.').format(restoreAccel),
                 style_class: 'message-dialog-description',
             });
-            restoreLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            restoreLabel.clutter_text.line_wrap = true;
             content.add_child(restoreLabel);
         }
 
@@ -118,7 +116,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

@@ -2,7 +2,6 @@
 /* exported KeyboardManager */
 
 const { Clutter, Gio, GLib, GObject, Meta, St } = imports.gi;
-const ByteArray = imports.byteArray;
 const Signals = imports.signals;
 
 const InputSourceManager = imports.ui.status.keyboard;
@@ -43,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 }],
@@ -62,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();
@@ -533,7 +514,8 @@ var KeyboardModel = class {
     _loadModel(groupName) {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/osk-layouts/%s.json'.format(groupName));
         let [success_, contents] = file.load_contents(null);
-        contents = ByteArray.toString(contents);
+        if (contents instanceof Uint8Array)
+            contents = imports.byteArray.toString(contents);
 
         return JSON.parse(contents);
     }
@@ -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 },
-            { keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic', left: 3, top: 1, height: 2 },
+            { label: '⌫', keyval: Clutter.KEY_BackSpace, left: 3, top: 0 },
+            { 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);
-            const [, natHeight] = this.get_preferred_height(forWidth);
-            this.height = Math.min(maxHeight, natHeight);
+            this.height = Math.min(maxHeight, this.get_preferred_height(monitor.width));
         }
     }
 

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');
@@ -1202,8 +1204,7 @@ class HotCorner extends Clutter.Actor {
 
             if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
                 this._corner.set_position(this.width - this._corner.width, 0);
-                this.set_pivot_point(1.0, 0.0);
-                this.translation_x = -this.width;
+                this.set_anchor_point_from_gravity(Clutter.Gravity.NORTH_EAST);
             } else {
                 this._corner.set_position(0, 0);
             }
@@ -1228,9 +1229,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/magnifier.js

@@ -489,10 +489,7 @@ var Magnifier = class Magnifier {
     _updateMouseSprite() {
         this._updateSpriteTexture();
         let [xHot, yHot] = this._cursorTracker.get_hot();
-        this._mouseSprite.set({
-            translation_x: -xHot,
-            translation_y: -yHot,
-        });
+        this._mouseSprite.set_anchor_point(xHot, yHot);
     }
 
     _updateSpriteTexture() {

js/ui/main.js

@@ -3,10 +3,10 @@
             ctrlAltTabManager, padOsdService, osdWindowManager,
             osdMonitorLabeler, shellMountOpDBusService, shellDBusService,
             shellAccessDialogDBusService, shellAudioSelectionDBusService,
-            screenSaverDBus, uiGroup, magnifier, xdndHandler, keyboard,
-            kbdA11yDialog, introspectService, start, pushModal, popModal,
-            activateWindow, createLookingGlass, initializeDeferredWork,
-            getThemeStylesheet, setThemeStylesheet */
+            screenSaverDBus, screencastService, uiGroup, magnifier,
+            xdndHandler, keyboard, kbdA11yDialog, introspectService,
+            start, pushModal, popModal, activateWindow, createLookingGlass,
+            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/messageTray.js

@@ -1,6 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported NotificationPolicy, NotificationGenericPolicy,
-   NotificationApplicationPolicy, Source, SourceActor,
+   NotificationApplicationPolicy, Source, SourceActor, SourceActorWithLabel,
    SystemNotificationSource, MessageTray */
 
 const { Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
@@ -655,6 +655,77 @@ class SourceActor extends St.Widget {
     }
 });
 
+var SourceActorWithLabel = GObject.registerClass(
+class SourceActorWithLabel extends SourceActor {
+    _init(source, size) {
+        super._init(source, size);
+
+        this._counterLabel = new St.Label({ x_align: Clutter.ActorAlign.CENTER,
+                                            x_expand: true,
+                                            y_align: Clutter.ActorAlign.CENTER,
+                                            y_expand: true });
+
+        this._counterBin = new St.Bin({ style_class: 'summary-source-counter',
+                                        child: this._counterLabel,
+                                        layout_manager: new Clutter.BinLayout() });
+        this._counterBin.hide();
+
+        this._counterBin.connect('style-changed', () => {
+            let themeNode = this._counterBin.get_theme_node();
+            this._counterBin.translation_x = themeNode.get_length('-shell-counter-overlap-x');
+            this._counterBin.translation_y = themeNode.get_length('-shell-counter-overlap-y');
+        });
+
+        this.add_actor(this._counterBin);
+
+        this._countUpdatedId = this._source.connect('notify::count', this._updateCount.bind(this));
+        this._updateCount();
+
+        this.connect('destroy', () => {
+            this._source.disconnect(this._countUpdatedId);
+        });
+    }
+
+    vfunc_allocate(box) {
+        super.vfunc_allocate(box);
+
+        let childBox = new Clutter.ActorBox();
+
+        let [, , naturalWidth, naturalHeight] = this._counterBin.get_preferred_size();
+        let direction = this.get_text_direction();
+
+        if (direction == Clutter.TextDirection.LTR) {
+            // allocate on the right in LTR
+            childBox.x1 = box.x2 - naturalWidth;
+            childBox.x2 = box.x2;
+        } else {
+            // allocate on the left in RTL
+            childBox.x1 = 0;
+            childBox.x2 = naturalWidth;
+        }
+
+        childBox.y1 = box.y2 - naturalHeight;
+        childBox.y2 = box.y2;
+
+        this._counterBin.allocate(childBox);
+    }
+
+    _updateCount() {
+        if (this._actorDestroyed)
+            return;
+
+        this._counterBin.visible = this._source.countVisible;
+
+        let text;
+        if (this._source.count < 100)
+            text = this._source.count.toString();
+        else
+            text = String.fromCharCode(0x22EF); // midline horizontal ellipsis
+
+        this._counterLabel.set_text(text);
+    }
+});
+
 var Source = GObject.registerClass({
     Properties: {
         'count': GObject.ParamSpec.int(

js/ui/overview.js

@@ -4,10 +4,6 @@
 const { Clutter, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Signals = imports.signals;
 
-// Time for initial animation going into Overview mode;
-// this is defined here to make it available in imports.
-var ANIMATION_TIME = 250;
-
 const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const LayoutManager = imports.ui.layout;
@@ -18,6 +14,9 @@ const OverviewControls = imports.ui.overviewControls;
 const Params = imports.misc.params;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
 
+// Time for initial animation going into Overview mode
+var ANIMATION_TIME = 250;
+
 // Must be less than ANIMATION_TIME, since we switch to
 // or from the overview completely after ANIMATION_TIME,
 // and don't want the shading animation to get cut off
@@ -440,19 +439,19 @@ var Overview = class {
         this.emit('windows-restacked', stackIndices);
     }
 
-    beginItemDrag(source) {
-        this.emit('item-drag-begin', source);
+    beginItemDrag(_source) {
+        this.emit('item-drag-begin');
         this._inItemDrag = true;
     }
 
-    cancelledItemDrag(source) {
-        this.emit('item-drag-cancelled', source);
+    cancelledItemDrag(_source) {
+        this.emit('item-drag-cancelled');
     }
 
-    endItemDrag(source) {
+    endItemDrag(_source) {
         if (!this._inItemDrag)
             return;
-        this.emit('item-drag-end', source);
+        this.emit('item-drag-end');
         this._inItemDrag = false;
     }
 

js/ui/overviewControls.js

@@ -8,9 +8,8 @@ const Main = imports.ui.main;
 const Params = imports.misc.params;
 const ViewSelector = imports.ui.viewSelector;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
-const Overview = imports.ui.overview;
 
-var SIDE_CONTROLS_ANIMATION_TIME = Overview.ANIMATION_TIME;
+var SIDE_CONTROLS_ANIMATION_TIME = 160;
 
 function getRtlSlideDirection(direction, actor) {
     let rtl = actor.text_direction == Clutter.TextDirection.RTL;
@@ -233,7 +232,7 @@ class SlidingControl extends St.Widget {
         // When pageEmpty is received, there's no visible view in the
         // selector; this means we can now safely set the full slide for
         // the next page, since slideIn or slideOut might have been called,
-        // changing the visibility
+        // changing the visiblity
         this.remove_transition('@layout.slide-x');
         this.layout.slide_x = this._getSlide();
         this._updateTranslation();
@@ -423,7 +422,6 @@ class ControlsManager extends St.Widget {
         let activeWorkspaceIndex = workspaceManager.get_active_workspace_index();
 
         this._workspaceAdjustment = new St.Adjustment({
-            actor: this,
             value: activeWorkspaceIndex,
             lower: 0,
             page_increment: 1,
@@ -455,6 +453,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 +477,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/padOsd.js

@@ -3,7 +3,6 @@
 
 const { Atk, Clutter, GDesktopEnums, Gio,
         GLib, GObject, Gtk, Meta, Pango, Rsvg, St } = imports.gi;
-const ByteArray = imports.byteArray;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;
@@ -298,7 +297,8 @@ var PadDiagram = GObject.registerClass({
     _init(params) {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/pad-osd.css');
         let [success_, css] = file.load_contents(null);
-        css = ByteArray.toString(css);
+        if (css instanceof Uint8Array)
+            css = imports.byteArray.toString(css);
         this._curEdited = null;
         this._prevEdited = null;
         this._css = css;

js/ui/panel.js

@@ -5,6 +5,7 @@ const { Atk, Clutter, Gio, GLib, GObject, Meta, Shell, St } = imports.gi;
 const Cairo = imports.cairo;
 
 const Animation = imports.ui.animation;
+const AppDisplay = imports.ui.appDisplay;
 const Config = imports.misc.config;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const DND = imports.ui.dnd;
@@ -60,69 +61,20 @@ function _unpremultiply(color) {
     return new Clutter.Color({ red, green, blue, alpha: color.alpha });
 }
 
-class AppMenu extends PopupMenu.PopupMenu {
+class AppMenu extends AppDisplay.BaseAppMenu {
     constructor(sourceActor) {
-        super(sourceActor, 0.5, St.Side.TOP);
+        super(sourceActor, St.Side.TOP);
 
         this.actor.add_style_class_name('app-menu');
 
         this._app = null;
-        this._appSystem = Shell.AppSystem.get_default();
 
         this._windowsChangedId = 0;
 
-        /* Translators: This is the heading of a list of open windows */
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem(_("Open Windows")));
-
-        this._windowSection = new PopupMenu.PopupMenuSection();
-        this.addMenuItem(this._windowSection);
-
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        this._newWindowItem = this.addAction(_("New Window"), () => {
-            this._app.open_new_window(-1);
-        });
-
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        this._actionSection = new PopupMenu.PopupMenuSection();
-        this.addMenuItem(this._actionSection);
-
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        this._detailsItem = this.addAction(_('Show Details'), async () => {
-            let id = this._app.get_id();
-            let args = GLib.Variant.new('(ss)', [id, '']);
-            const bus = await Gio.DBus.get(Gio.BusType.SESSION, null);
-            bus.call(
-                'org.gnome.Software',
-                '/org/gnome/Software',
-                'org.gtk.Actions', 'Activate',
-                new GLib.Variant('(sava{sv})', ['details', [args], null]),
-                null, 0, -1, null);
-        });
-
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        this.addAction(_("Quit"), () => {
-            this._app.request_quit();
-        });
-
-        this._appSystem.connect('installed-changed', () => {
-            this._updateDetailsVisibility();
-        });
-        this._updateDetailsVisibility();
     }
 
-    _updateDetailsVisibility() {
-        let sw = this._appSystem.lookup_app('org.gnome.Software.desktop');
-        this._detailsItem.visible = sw != null;
-    }
-
-    isEmpty() {
-        if (!this._app)
-            return true;
-        return super.isEmpty();
+    get app() {
+        return this._app;
     }
 
     setApp(app) {
@@ -157,25 +109,6 @@ class AppMenu extends PopupMenu.PopupMenu {
         this._newWindowItem.visible =
             app && app.can_open_new_window() && !actions.includes('new-window');
     }
-
-    _updateWindowsSection() {
-        this._windowSection.removeAll();
-
-        if (!this._app)
-            return;
-
-        let windows = this._app.get_windows();
-        windows.forEach(window => {
-            let title = window.title || this._app.get_name();
-            let item = this._windowSection.addAction(title, event => {
-                Main.activateWindow(window, event.get_time());
-            });
-            let id = window.connect('notify::title', () => {
-                item.label.text = window.title || this._app.get_name();
-            });
-            item.connect('destroy', () => window.disconnect(id));
-        });
-    }
 }
 
 /**
@@ -675,7 +608,7 @@ class PanelCorner extends St.DrawingArea {
         let borderWidth = node.get_length('-panel-corner-border-width');
 
         this.set_size(cornerRadius, borderWidth + cornerRadius);
-        this.translation_y = -borderWidth;
+        this.set_anchor_point(0, borderWidth);
     }
 });
 
@@ -736,11 +669,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

@@ -208,7 +208,7 @@ var PopupBaseMenuItem = GObject.registerClass({
                 // Remove the CSS active state if the user press the button and
                 // while holding moves to another menu item, so we don't paint all items.
                 // The correct behaviour would be to set the new item with the CSS
-                // active state as well, but button-press-event is not triggered,
+                // active state as well, but button-press-event is not trigered,
                 // so we should track it in our own, which would involve some work
                 // in the container
                 this.remove_style_pseudo_class('active');
@@ -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 {
-        await scriptModule.run();
-    } catch (err) {
-        log(`Script failed: ${err}\n${err.stack}`);
-        Meta.exit(Meta.ExitCode.ERROR);
+    for (let step of scriptModule.run()) {
+        try {
+            await step; // eslint-disable-line no-await-in-loop
+        } catch (err) {
+            log(`Script failed: ${err}\n${err.stack}`);
+            Meta.exit(Meta.ExitCode.ERROR);
+        }
     }
 
     try {

js/ui/sessionMode.js

@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 /* exported SessionMode, listModes */
 
-const ByteArray = imports.byteArray;
 const GLib = imports.gi.GLib;
 const Signals = imports.signals;
 
@@ -106,17 +105,18 @@ function _loadMode(file, info) {
     let fileContent, success_, newMode;
     try {
         [success_, fileContent] = file.load_contents(null);
-        fileContent = ByteArray.toString(fileContent);
+        if (fileContent instanceof Uint8Array)
+            fileContent = imports.byteArray.toString(fileContent);
         newMode = JSON.parse(fileContent);
     } catch (e) {
         return;
     }
 
     _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/bluetooth.js

@@ -145,7 +145,7 @@ class Indicator extends PanelMenu.SystemIndicator {
 
         if (nConnectedDevices > 1)
             /* Translators: this is the number of connected bluetooth devices */
-            this._item.label.text = ngettext('%d Connected', '%d Connected', nConnectedDevices).format(nConnectedDevices);
+            this._item.label.text = ngettext('%d Connected", "%d Connected', nConnectedDevices).format(nConnectedDevices);
         else if (nConnectedDevices === 1)
             this._item.label.text = connectedDevices[0].name;
         else if (adapter === null)

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',
-                    this._device.get_path(), accessPoints[0].get_path());
+                Util.spawn(['gnome-control-center', 'wifi', 'connect-8021x-wifi',
+                            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._recordingIndicator = null;
+        this._indicator = 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._sharedIndicator.icon_name = 'screen-shared-symbolic';
-        this._sharedIndicator.add_style_class_name('remote-access-indicator');
-
-        this._sharedItem =
+        this._indicator = this._addIndicator();
+        this._indicator.icon_name = 'screen-shared-symbolic';
+        this._indicator.add_style_class_name('remote-access-indicator');
+        this._item =
             new PopupMenu.PopupSubMenuMenuItem(_("Screen is Being Shared"),
                                                true);
-        this._sharedItem.menu.addAction(_("Turn off"),
-            () => {
-                for (let handle of this._handles) {
-                    if (!handle.is_recording)
-                        handle.stop();
-                }
-            });
-        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);
+        this._item.menu.addAction(_("Turn off"),
+                                  () => {
+                                      for (let handle of this._handles)
+                                          handle.stop();
+                                  });
+        this._item.icon.icon_name = 'screen-shared-symbolic';
+        this.menu.addMenuItem(this._item);
     }
 
     _sync() {
-        if (this._isScreenShared()) {
-            this._sharedIndicator.visible = true;
-            this._sharedItem.visible = true;
+        if (this._handles.size == 0) {
+            this._indicator.visible = false;
+            this._item.visible = false;
         } else {
-            this._sharedIndicator.visible = false;
-            this._sharedItem.visible = false;
+            this._indicator.visible = true;
+            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();
-        this._sync();
+        if (this._handles.size == 1) {
+            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',
-            bindFlags);
+                                          this._orientationLockItem,
+                                          '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;
-            const name = app.app_info.get_name();
+            let [icon, name] = [app.app_info.get_icon().names[0],
+                                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',
-            bindFlags);
+                                          this._lockScreenItem,
+                                          '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.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 = 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',
-            bindFlags);
+                                          this._logoutItem,
+                                          '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',
-            bindFlags);
+                                          this._loginScreenItem,
+                                          '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/status/volume.js

@@ -62,7 +62,6 @@ var StreamSlider = class {
 
         this._stream = null;
         this._volumeCancellable = null;
-        this._icons = [];
     }
 
     get stream() {
@@ -183,15 +182,24 @@ var StreamSlider = class {
         if (!this._stream)
             return null;
 
+        let icons = ["audio-volume-muted-symbolic",
+                     "audio-volume-low-symbolic",
+                     "audio-volume-medium-symbolic",
+                     "audio-volume-high-symbolic",
+                     "audio-volume-overamplified-symbolic"];
+
         let volume = this._stream.volume;
         let n;
         if (this._stream.is_muted || volume <= 0) {
             n = 0;
         } else {
             n = Math.ceil(3 * volume / this._control.get_vol_max_norm());
-            n = Math.clamp(n, 1, this._icons.length - 1);
+            if (n < 1)
+                n = 1;
+            else if (n > 3)
+                n = 4;
         }
-        return this._icons[n];
+        return icons[n];
     }
 
     getLevel() {
@@ -215,13 +223,6 @@ var OutputStreamSlider = class extends StreamSlider {
     constructor(control) {
         super(control);
         this._slider.accessible_name = _("Volume");
-        this._icons = [
-            'audio-volume-muted-symbolic',
-            'audio-volume-low-symbolic',
-            'audio-volume-medium-symbolic',
-            'audio-volume-high-symbolic',
-            'audio-volume-overamplified-symbolic',
-        ];
     }
 
     _connectStream(stream) {
@@ -273,12 +274,6 @@ var InputStreamSlider = class extends StreamSlider {
         this._control.connect('stream-added', this._maybeShowInput.bind(this));
         this._control.connect('stream-removed', this._maybeShowInput.bind(this));
         this._icon.icon_name = 'audio-input-microphone-symbolic';
-        this._icons = [
-            'microphone-sensitivity-muted-symbolic',
-            'microphone-sensitivity-low-symbolic',
-            'microphone-sensitivity-medium-symbolic',
-            'microphone-sensitivity-high-symbolic',
-        ];
     }
 
     _connectStream(stream) {
@@ -324,7 +319,7 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {
 
         this._output = new OutputStreamSlider(this._control);
         this._output.connect('stream-updated', () => {
-            this.emit('output-icon-changed');
+            this.emit('icon-changed');
         });
         this.addMenuItem(this._output.item);
 
@@ -332,9 +327,6 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {
         this._input.item.connect('notify::visible', () => {
             this.emit('input-visible-changed');
         });
-        this._input.connect('stream-updated', () => {
-            this.emit('input-icon-changed');
-        });
         this.addMenuItem(this._input.item);
 
         this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@@ -351,7 +343,7 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {
             this._readInput();
             this._readOutput();
         } else {
-            this.emit('output-icon-changed');
+            this.emit('icon-changed');
         }
     }
 
@@ -363,14 +355,10 @@ var VolumeMenu = class extends PopupMenu.PopupMenuSection {
         this._input.stream = this._control.get_default_source();
     }
 
-    getOutputIcon() {
+    getIcon() {
         return this._output.getIcon();
     }
 
-    getInputIcon() {
-        return this._input.getIcon();
-    }
-
     getLevel() {
         return this._output.getLevel();
     }
@@ -394,24 +382,21 @@ class Indicator extends PanelMenu.SystemIndicator {
 
         this._control = getMixerControl();
         this._volumeMenu = new VolumeMenu(this._control);
-        this._volumeMenu.connect('output-icon-changed', () => {
-            let icon = this._volumeMenu.getOutputIcon();
+        this._volumeMenu.connect('icon-changed', () => {
+            let icon = this._volumeMenu.getIcon();
 
             if (icon != null)
                 this._primaryIndicator.icon_name = icon;
             this._primaryIndicator.visible = icon !== null;
         });
 
-        this._inputIndicator.visible = this._volumeMenu.getInputVisible();
+        this._inputIndicator.set({
+            icon_name: 'audio-input-microphone-symbolic',
+            visible: this._volumeMenu.getInputVisible(),
+        });
         this._volumeMenu.connect('input-visible-changed', () => {
             this._inputIndicator.visible = this._volumeMenu.getInputVisible();
         });
-        this._volumeMenu.connect('input-icon-changed', () => {
-            let icon = this._volumeMenu.getInputIcon();
-
-            if (icon !== null)
-                this._inputIndicator.icon_name = icon;
-        });
 
         this.menu.addMenuItem(this._volumeMenu);
     }
@@ -421,7 +406,7 @@ class Indicator extends PanelMenu.SystemIndicator {
         if (result == Clutter.EVENT_PROPAGATE || this.menu.actor.mapped)
             return result;
 
-        let gicon = new Gio.ThemedIcon({ name: this._volumeMenu.getOutputIcon() });
+        let gicon = new Gio.ThemedIcon({ name: this._volumeMenu.getIcon() });
         let level = this._volumeMenu.getLevel();
         let maxLevel = this._volumeMenu.getMaxLevel();
         Main.osdWindowManager.show(-1, gicon, null, level, maxLevel);

js/ui/unlockDialog.js

@@ -485,7 +485,6 @@ var UnlockDialog = GObject.registerClass({
         this._gdmClient = new Gdm.Client();
 
         this._adjustment = new St.Adjustment({
-            actor: this,
             lower: 0,
             upper: 2,
             page_size: 1,
@@ -525,10 +524,6 @@ var UnlockDialog = GObject.registerClass({
 
         this._bgManagers = [];
 
-        const themeContext = St.ThemeContext.get_for_stage(global.stage);
-        this._scaleChangedId = themeContext.connect('notify::scale-factor',
-            () => this._updateBackgroundEffects());
-
         this._updateBackgrounds();
         this._monitorsChangedId =
             Main.layoutManager.connect('monitors-changed', this._updateBackgrounds.bind(this));
@@ -573,9 +568,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));
 
@@ -629,7 +626,6 @@ var UnlockDialog = GObject.registerClass({
             y: monitor.y,
             width: monitor.width,
             height: monitor.height,
-            effect: new Shell.BlurEffect({ name: 'blur' }),
         });
 
         let bgManager = new Background.BackgroundManager({
@@ -641,21 +637,19 @@ var UnlockDialog = GObject.registerClass({
         this._bgManagers.push(bgManager);
 
         this._backgroundGroup.add_child(widget);
-    }
 
-    _updateBackgroundEffects() {
         const themeContext = St.ThemeContext.get_for_stage(global.stage);
 
-        for (const widget of this._backgroundGroup) {
-            const effect = widget.get_effect('blur');
+        let effect = new Shell.BlurEffect({
+            brightness: BLUR_BRIGHTNESS,
+            sigma: BLUR_SIGMA * themeContext.scale_factor,
+        });
 
-            if (effect) {
-                effect.set({
-                    brightness: BLUR_BRIGHTNESS,
-                    sigma: BLUR_SIGMA * themeContext.scale_factor,
-                });
-            }
-        }
+        this._scaleChangedId = themeContext.connect('notify::scale-factor', () => {
+            effect.sigma = BLUR_SIGMA * themeContext.scale_factor;
+        });
+
+        widget.add_effect(effect);
     }
 
     _updateBackgrounds() {
@@ -667,7 +661,6 @@ var UnlockDialog = GObject.registerClass({
 
         for (let i = 0; i < Main.layoutManager.monitors.length; i++)
             this._createBackground(i);
-        this._updateBackgroundEffects();
     }
 
     _ensureAuthPrompt() {

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 */
-            let cancellable = new Gio.Cancellable();
-            GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
-                cancellable.cancel();
-                return GLib.SOURCE_REMOVE;
-            });
+            try {
+                if (!Shell.util_start_systemd_unit('gsd-xsettings.target', 'fail'))
+                    log('Not starting gsd-xsettings; waiting for gnome-session to do so');
 
-            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;
-
-            this._stopX11Services(null);
-
+            try {
+                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));
@@ -1812,7 +1800,8 @@ var WindowManager = class {
             w.window.get_parent().remove_child(w.window);
             w.parent.add_child(w.window);
 
-            if (!w.window.get_meta_window().get_workspace().active)
+            if (w.window.get_meta_window().get_workspace() !=
+                global.workspace_manager.get_active_workspace())
                 w.window.hide();
         }
         switchData.container.destroy();
@@ -1996,7 +1985,7 @@ var WindowManager = class {
             duration,
             mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
             onComplete: () => {
-                if (!newWs.active)
+                if (newWs !== activeWorkspace)
                     this.actionMoveWorkspace(newWs);
                 this._finishWorkspaceSwitch(switchData);
             },
@@ -2196,7 +2185,10 @@ var WindowManager = class {
         if (!Main.sessionMode.hasWorkspaces)
             return;
 
-        if (!workspace.active)
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
+
+        if (activeWorkspace != workspace)
             workspace.activate(global.get_current_time());
     }
 
@@ -2204,7 +2196,10 @@ var WindowManager = class {
         if (!Main.sessionMode.hasWorkspaces)
             return;
 
-        if (!workspace.active) {
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
+
+        if (activeWorkspace != workspace) {
             // This won't have any effect for "always sticky" windows
             // (like desktop windows or docks)
 

js/ui/windowPreview.js

@@ -67,12 +67,8 @@ var WindowPreviewLayout = GObject.registerClass({
     vfunc_allocate(container, box) {
         // If the scale isn't 1, we weren't allocated our preferred size
         // and have to scale the children allocations accordingly.
-        const scaleX = this._boundingBox.get_width() > 0
-            ? box.get_width() / this._boundingBox.get_width()
-            : 1;
-        const scaleY = this._boundingBox.get_height() > 0
-            ? box.get_height() / this._boundingBox.get_height()
-            : 1;
+        const scaleX = box.get_width() / this._boundingBox.get_width();
+        const scaleY = box.get_height() / this._boundingBox.get_height();
 
         const childBox = new Clutter.ActorBox();
 
@@ -97,7 +93,7 @@ var WindowPreviewLayout = GObject.registerClass({
 
                 child.allocate(childBox);
             } else {
-                child.allocate_preferred_size(0, 0);
+                child.allocate_preferred_size();
             }
         }
     }
@@ -189,12 +185,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 +219,7 @@ var WindowPreview = GObject.registerClass({
 
         this._delegate = this;
 
+        this.slotId = 0;
         this._stackAbove = null;
 
         this._windowContainer.layout_manager.connect(
@@ -242,6 +233,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 +253,6 @@ var WindowPreview = GObject.registerClass({
         this.inDrag = false;
 
         this._selected = false;
-        this._overlayEnabled = true;
         this._closeRequested = false;
         this._idleHideOverlayId = 0;
 
@@ -353,14 +345,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 +399,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 +413,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 +427,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 +562,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({
-            style_class: 'workspace-switcher',
-            offscreen_redirect: Clutter.OffscreenRedirect.ALWAYS,
-        });
+        super._init({ style_class: 'workspace-switcher' });
 
         this._itemSpacing = 0;
         this._childHeight = 0;

js/ui/workspaceThumbnail.js

@@ -549,7 +549,9 @@ var WorkspaceThumbnail = GObject.registerClass({
             return;
 
         // a click on the already current workspace should go back to the main view
-        if (this.metaWorkspace.active)
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
+        if (this.metaWorkspace == activeWorkspace)
             Main.overview.hide();
         else
             this.metaWorkspace.activate(time);

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 } =
-            Main.layoutManager.getWorkAreaForMonitor(monitorIndex);
-
-        super._init({
-            style_class: 'workspaces-view',
-            x, y, width, height,
-        });
+        super._init({ style_class: 'workspaces-view', reactive: true });
         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) {
-        this.set_allocation(box);
+    setFullGeometry(geom) {
+        this._fullGeometry = geom;
+        this._syncFullGeometry();
+    }
 
-        for (const child of this)
-            child.allocate_available_size(0, 0, box.get_width(), box.get_height());
+    setActualGeometry(geom) {
+        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._updateScrollPosition.bind(this));
+        this._onScrollId =
+            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(
-                    (ws, i) => this.set_child_at_index(ws, i));
+                this._updateWorkspaceActors(false);
             });
 
-        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) {
-        this.set_allocation(box);
+    _setReservedSlot(window) {
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].setReservedSlot(window);
+    }
 
-        if (this.get_n_children() === 0)
-            return;
+    _syncFullGeometry() {
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].setFullGeometry(this._fullGeometry);
+    }
 
-        const { workspaceManager } = global;
-        const { nWorkspaces } = workspaceManager;
-
-        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();
+    _syncActualGeometry() {
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].setActualGeometry(this._actualGeometry);
     }
 
     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() {
-        const { workspaceManager } = global;
-        const active = workspaceManager.get_active_workspace_index();
+    // Update workspace actors parameters
+    // @showAnimation: iff %true, transition between states
+    _updateWorkspaceActors(showAnimation) {
+        let workspaceManager = global.workspace_manager;
+        let active = workspaceManager.get_active_workspace_index();
 
-        this._animating = true;
-        this._updateVisibility();
+        this._animating = showAnimation;
 
-        this._scrollAdjustment.remove_transition('value');
-        this._scrollAdjustment.ease(active, {
-            duration: WORKSPACE_SWITCH_TIME,
-            mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
-            onComplete: () => {
-                this._animating = false;
-                this._updateVisibility();
-            },
-        });
+        for (let w = 0; w < this._workspaces.length; w++) {
+            let workspace = this._workspaces[w];
+
+            workspace.remove_all_transitions();
+
+            let params = {};
+            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() {
-        if (!this.has_allocation())
+    _onScroll(adj) {
+        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;
-        const rtl = this.text_direction === Clutter.TextDirection.RTL;
-        const progress = vertical || !rtl
-            ? adj.value : adj.upper - adj.value;
+        let last = this._workspaces.length - 1;
 
-        for (const ws of this._workspaces) {
-            if (vertical)
-                ws.translation_y = -progress * this.height;
-            else
-                ws.translation_x = -progress * this.width;
+        if (workspaceManager.layout_rows == -1) {
+            let firstWorkspaceY = this._workspaces[0].y;
+            let lastWorkspaceY = this._workspaces[last].y;
+            let workspacesHeight = lastWorkspaceY - firstWorkspaceY;
+
+            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() {
@@ -464,11 +508,25 @@ class WorkspacesDisplay extends St.Widget {
             workspaceManager.get_active_workspace_index();
     }
 
-    _activeWorkspaceChanged(_wm, _from, to, _direction) {
+    _activeWorkspaceChanged(_wm, _from, _to, _direction) {
         if (this._gestureActive)
             return;
 
-        this._scrollAdjustment.ease(to, {
+        this._scrollToActive();
+    }
+
+    _scrollToActive() {
+        let workspaceManager = global.workspace_manager;
+        let active = workspaceManager.get_active_workspace_index();
+
+        this._updateScrollAdjustment(active);
+    }
+
+    _updateScrollAdjustment(index) {
+        if (this._gestureActive)
+            return;
+
+        this._scrollAdjustment.ease(index, {
             mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
             duration: WORKSPACE_SWITCH_TIME,
         });
@@ -506,8 +564,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(
@@ -527,13 +588,14 @@ class WorkspacesDisplay extends St.Widget {
         this._clickAction.release();
 
         let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
         let newWs = workspaceManager.get_workspace_by_index(endProgress);
 
         this._scrollAdjustment.ease(endProgress, {
             mode: Clutter.AnimationMode.EASE_OUT_CUBIC,
             duration,
             onComplete: () => {
-                if (!newWs.active)
+                if (newWs !== activeWorkspace)
                     newWs.activate(global.get_current_time());
                 this._endTouchGesture();
             },
@@ -554,20 +616,17 @@ class WorkspacesDisplay extends St.Widget {
         this.show();
         this._updateWorkspacesViews();
 
-        for (let i = 0; i < this._workspacesViews.length; i++) {
-            let animationType;
-            if (fadeOnPrimary && i == this._primaryIndex)
-                animationType = AnimationType.FADE;
-            else
-                animationType = AnimationType.ZOOM;
-            this._workspacesViews[i].animateToOverview(animationType);
+        if (this._actualGeometry && this._fullGeometry) {
+            for (let i = 0; i < this._workspacesViews.length; i++) {
+                let animationType;
+                if (fadeOnPrimary && i == this._primaryIndex)
+                    animationType = AnimationType.FADE;
+                else
+                    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 +646,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 +675,6 @@ class WorkspacesDisplay extends St.Widget {
             return;
 
         this._updateWorkspacesViews();
-        this._syncWorkspacesActualGeometry();
     }
 
     _updateWorkspacesViews() {
@@ -644,9 +691,19 @@ class WorkspacesDisplay extends St.Widget {
             else
                 view = new WorkspacesView(i, this._scrollAdjustment);
 
+            // HACK: Avoid spurious allocation changes while updating views
+            view.hide();
+
             this._workspacesViews.push(view);
             Main.layoutManager.overviewGroup.add_actor(view);
         }
+
+        this._workspacesViews.forEach(v => v.show());
+
+        if (this._fullGeometry)
+            this._syncWorkspacesFullGeometry();
+        if (this._actualGeometry)
+            this._syncWorkspacesActualGeometry();
     }
 
     _getMonitorIndexForEvent(event) {
@@ -693,35 +750,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 };
-
-        if (this._syncActualGeometryLater > 0)
-            return;
-
-        this._syncActualGeometryLater =
-            Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => {
-                this._syncWorkspacesActualGeometry();
-
-                this._syncActualGeometryLater = 0;
-                return GLib.SOURCE_REMOVE;
-            });
+        this._syncWorkspacesActualGeometry();
     }
 
     _syncWorkspacesActualGeometry() {
-        const primaryView = this._getPrimaryView();
-        if (!primaryView || this._inWindowFade)
+        if (!this._workspacesViews.length)
             return;
 
-        primaryView.ease({
-            ...this._actualGeometry,
-            duration: Main.overview.animationInProgress ? ANIMATION_TIME : 0,
-            mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-        });
+        let monitors = Main.layoutManager.monitors;
+        for (let i = 0; i < monitors.length; i++) {
+            let geometry = i === this._primaryIndex ? this._actualGeometry : monitors[i];
+            this._workspacesViews[i].setActualGeometry(geometry);
+        }
     }
 
     _onRestacked(overview, stackIndices) {

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.37.91',
+  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.91'
+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