Bump version to 3.29.92

Update NEWS.

HACKING.md

@@ -1,19 +1,16 @@
-Coding guide
+# Coding guide
-============
 
 Our goal is to have all JavaScript code in GNOME follow a consistent style. In
 a dynamic language like JavaScript, it is essential to be rigorous about style
 (and unit tests), or you rapidly end up with a spaghetti-code mess.
 
-A quick note
+## A quick note
-------------
 
 Life isn't fun if you can't break the rules. If a rule seems unnecessarily
 restrictive while you're coding, ignore it, and let the patch reviewer decide
 what to do.
 
-Indentation and whitespace
+## Indentation and whitespace
---------------------------
 
 Use four-space indents. Braces are on the same line as their associated
 statements.  You should only omit braces if *both* sides of the statement are
@@ -22,7 +19,7 @@ on one line.
 * One space after the `function` keyword.  No space between the function name
 * in a declaration or a call.  One space before the parens in the `if`
 * statements, or `while`, or `for` loops.
-
+```javascript
     function foo(a, b) {
         let bar;
 
@@ -39,22 +36,20 @@ on one line.
             print(20);
         }
     }
+```
 
-Semicolons
+## Semicolons
-----------
 
 JavaScript allows omitting semicolons at the end of lines, but don't. Always
 end statements with a semicolon.
 
-js2-mode
+## js2-mode
---------
 
 If using Emacs, do not use js2-mode. It is outdated and hasn't worked for a
 while. emacs now has a built-in JavaScript mode, js-mode, based on
 espresso-mode. It is the de facto emacs mode for JavaScript.
 
-File naming and creation
+## File naming and creation
-------------------------
 
 For JavaScript files, use lowerCamelCase-style names, with a `.js` extension.
 
@@ -67,14 +62,13 @@ library name followed by a dash, e.g. `shell-app-system.c`. Create a
 `-private.h` header when you want to share code internally in the
 library. These headers are not installed, distributed or introspected.
 
-Imports
+## Imports
--------
 
 Use UpperCamelCase when importing modules to distinguish them from ordinary
 variables, e.g.
-
+```javascript
     const GLib = imports.gi.GLib;
-
+```
 Imports should be categorized into one of two places. The top-most import block
 should contain only "environment imports". These are either modules from
 gobject-introspection or modules added by gjs itself.
@@ -85,7 +79,7 @@ e.g. `imports.ui.popupMenu`.
 
 Each import block should be sorted alphabetically. Don't import modules you
 don't use.
-
+```javascript
     const GLib = imports.gi.GLib;
     const Gio = imports.gi.Gio;
     const Lang = imports.lang;
@@ -95,23 +89,22 @@ don't use.
     const Params = imports.misc.params;
     const Tweener = imports.ui.tweener;
     const Util = imports.misc.util;
-
+```
 The alphabetical ordering should be done independently of the location of the
 location. Never reference `imports` in actual code.
 
-Constants
+## Constants
----------
 
 We use CONSTANTS_CASE to define constants. All constants should be directly
 under the imports:
-
+```javascript
     const MY_DBUS_INTERFACE = 'org.my.Interface';
+```
 
-Variable declaration
+## Variable declaration
---------------------
 
 Always use either `const` or `let` when defining a variable.
-
+```javascript
     // Iterating over an array
     for (let i = 0; i < arr.length; ++i) {
         let item = arr[i];
@@ -121,17 +114,17 @@ Always use either `const` or `let` when defining a variable.
     for (let prop in someobj) {
         ...
     }
+```
 
 If you use "var" then the variable is added to function scope, not block scope.
 See [What's new in JavaScript 1.7](https://developer.mozilla.org/en/JavaScript/New_in_JavaScript/1.7#Block_scope_with_let_%28Merge_into_let_Statement%29)
 
-Classes
+## Classes
--------
 
 There are many approaches to classes in JavaScript. We use our own class framework
 (sigh), which is built in gjs. The advantage is that it supports inheriting from
 GObjects, although this feature isn't used very often in the Shell itself.
-
+```javascript
     var IconLabelMenuItem = new Lang.Class({
         Name: 'IconLabelMenuItem',
         Extends: PopupMenu.PopupMenuBaseItem,
@@ -146,6 +139,7 @@ GObjects, although this feature isn't used very often in the Shell itself.
             log("menu opened!");
         }
     });
+```
 
 * 'Name' is required. 'Extends' is optional. If you leave it out, you will
   automatically inherit from Object.
@@ -162,13 +156,12 @@ GObjects, although this feature isn't used very often in the Shell itself.
   still a giant function call, even though it may resemble a more
   conventional syntax.
 
-GObject Introspection
+## GObject Introspection
----------------------
 
 GObject Introspection is a powerful feature that allows us to have native
 bindings for almost any library built around GObject. If a library requires
 you to inherit from a type to use it, you can do so:
-
+```javascript
     var MyClutterActor = new Lang.Class({
         Name: 'MyClutterActor',
         Extends: Clutter.Actor,
@@ -188,9 +181,9 @@ you to inherit from a type to use it, you can do so:
                             alloc.x2, alloc.y2);
         }
     });
+```
 
-Translatable strings, `environment.js`
+## Translatable strings, `environment.js`
---------------------------------------
 
 We use gettext to translate the GNOME Shell into all the languages that GNOME
 supports. The `gettext` function is aliased globally as `_`, you do not need to
@@ -204,8 +197,7 @@ and "double quotes" for strings that the user may see. This allows us to
 quickly find untranslated or mistranslated strings by grepping through the
 sources for double quotes without a gettext call around them.
 
-`actor` and `_delegate`
+## `actor` and `_delegate`
------------------------
 
 gjs allows us to set so-called "expando properties" on introspected objects,
 allowing us to treat them like any other. Because the Shell was built before
@@ -214,7 +206,7 @@ that has a property called `actor`. We call this wrapper class the "delegate".
 
 We sometimes use expando properties to set a property called `_delegate` on
 the actor itself:
-
+```javascript
     var MyClass = new Lang.Class({
         Name: 'MyClass',
 
@@ -229,6 +221,7 @@ the actor itself:
             actor.set_label("You clicked the button!");
         }
     });
+```
 
 The 'delegate' property is important for anything which trying to get the
 delegate object from an associated actor. For instance, the drag and drop
@@ -236,16 +229,14 @@ system calls the `handleDragOver` function on the delegate of a "drop target"
 when the user drags an item over it. If you do not set the `_delegate`
 property, your actor will not be able to be dropped onto.
 
-Functional style
+## Functional style
-----------------
 
 JavaScript Array objects offer a lot of common functional programming
 capabilities such as forEach, map, filter and so on. You can use these when
 they make sense, but please don't have a spaghetti mess of function programming
 messed in a procedural style. Use your best judgment.
 
-Closures
+## Closures
---------
 
 `this` will not be captured in a closure, it is relative to how the closure is
 invoked, not to the value of this where the closure is created, because "this"
@@ -254,15 +245,16 @@ variable that can be captured in closures.
 
 All closures should be wrapped with Function.prototype.bind or use arrow
 notation.
-
+```javascript
     const Lang = imports.lang;
 
     let closure1 = () => { this._fnorbate(); };
     let closure2 = this._fnorbate.bind(this);
+```
 
 A more realistic example would be connecting to a signal on a method of a
 prototype:
-
+```javascript
     const Lang = imports.lang;
     const FnorbLib = imports.fborbLib;
 
@@ -276,19 +268,21 @@ prototype:
             this._updateFnorb();
         }
     });
+```
 
-Object literal syntax
+## Object literal syntax
----------------------
 
 In JavaScript, these are equivalent:
-
+```javascript
     foo = { 'bar': 42 };
     foo = { bar: 42 };
+```
 
 and so are these:
-
+```javascript
     var b = foo['bar'];
     var b = foo.bar;
+```
 
 If your usage of an object is like an object, then you're defining "member
 variables." For member variables, use the no-quotes no-brackets syntax: `{ bar:
@@ -298,14 +292,13 @@ If your usage of an object is like a hash table (and thus conceptually the keys
 can have special chars in them), don't use quotes, but use brackets: `{ bar: 42
 }`, `foo['bar']`.
 
-Getters, setters, and Tweener
+## Getters, setters, and Tweener
------------------------------
 
 Getters and setters should be used when you are dealing with an API that is
 designed around setting properties, like Tweener. If you want to animate an
 arbitrary property, create a getter and setter, and use Tweener to animate the
 property.
-
+```javascript
     var ANIMATION_TIME = 2000;
 
     var MyClass = new Lang.Class({
@@ -331,3 +324,4 @@ property.
                      { position: 100,
                        time: ANIMATION_TIME,
                        transition: 'easeOutQuad' });
+```

MAINTAINERS

@@ -1,7 +0,0 @@
-Owen Taylor
-E-mail: otaylor@redhat.com
-Userid: otaylor
-
-Colin Walters
-E-mail: walters@verbum.org
-Userid: walters

NEWS

@@ -1,3 +1,106 @@
+3.29.92
+=======
+* Choose some actors to cache on the GPU [Daniel; #792633]
+* inputMethod: Hide preedit text if requested [Takao; #431]
+* Fix forced fallback app-menus on wayland [Jonas; #276]
+
+Contributors:
+  Jonas Ådahl, Takao Fujiwara, Mohammed Sadiq, Marco Trevisan (Treviño),
+  Daniel van Vugt
+
+Translators:
+  Baurzhan Muftakhidinov [kk], Kukuh Syafaat [id], Milo Casagrande [it],
+  Changwoo Ryu [ko], Marek Cernocky [cs]
+
+3.29.91
+=======
+* Fix handling of 0/false options in ShowOSD D-Bus API [Florian; #791669]
+* overview: Fix handling of confirmation dialogs on wayland [verdre; !180]
+* Avoid some full relayout/redraws [Carlos; !197]
+* Keep workspace switcher slid out when workspaces are in use [Florian; !161]
+* Ignore auto-repeat for some keybindings [Andrea; #373]
+* Misc. bug fixes [Carlos, Florian, Pascal; #464, !189, !191, !192, !162]
+
+Contributors:
+  Andrea Azzarone, Olivier Blin, Carlos Garnacho, Florian Müllner,
+  Pascal Nowack, verdre
+
+Translators:
+  Bruno Lopes da Silva [pt_BR], Matej Urbančič [sl], Piotr Drąg [pl],
+  Aurimas Černius [lt], Emin Tufan Çetin [tr], Fabio Tomat [fur],
+  Alexandre Franke [fr], Yi-Jyun Pan [zh_TW], Bernd Homuth [de],
+  Andre Klapper [cs], Jordi Mas [ca], Daniel Șerbănescu [ro],
+  Bruce Cowan [en_GB]
+
+3.29.90
+=======
+* Add remote access indication on wayland [Jonas; !160]
+* Fix wrong window positions in overview on wayland [Marco; #776588]
+* Add gesture to unfullscreen a window [Jan-Michael; !123]
+* Add PickColor method to screenshot D-Bus interface [Florian; #286]
+* Consider "new-window" action when opening new windows [Florian; #756844]
+* Make workspace switching gestures follow motion [Carlos; #788994]
+* Support audio volumes above 100% [Didier; #790280]
+* Misc. bug fixes [Florian, Daniel; #424, !132, !182, #433, !179, #786496]
+
+Contributors:
+  Jonas Ådahl, Jan-Michael Brummer, Piotr Drąg, Daniel Drake, Carlos Garnacho,
+  Florian Müllner, Georges Basile Stavracas Neto, Didier Roche, Jakub Steiner,
+  Marco Trevisan (Treviño)
+
+Translators:
+  Charles Monzat [fr], Daniel Mustieles [es]
+
+3.29.4
+======
+* Fix "Clear All" for calendar events [Florian; #325]
+* Allow cancelling direct switch operations [Xavier; #315]
+* Support being started by systemd --user [Iain; !137, !138]
+* Support key event forwarding required by some input methods [Carlos; #275]
+* Misc. bug fixes and cleanups [Jasper, Andrea, Florian; #663461, #372, !112,
+  #414, !151]
+
+Contributors:
+  Andrea Azzarone, Carlos Garnacho, Xavier Johnson, Iain Lane, Florian Müllner,
+  Jasper St. Pierre
+
+Translators:
+  Stas Solovey [ru]
+
+3.29.3
+======
+* Save creation time in screenshot metadata [Florian; #790481]
+* Improve consistency between ctrl- and middle-click on app icons [Xavier; #316]
+* Add support for font-feature-settings CSS property [Ryan; #34]
+* Adjust to MetaScreen removal [Jonas; #759538]
+* Misc. bug fixes [Florian, Marco, Sam; #298, #788931, #26, #76, !54, #788882,
+  #791233]
+
+Contributors:
+  Jonas Ådahl, Ryan Hendrickson, Xavier Johnson, Florian Müllner, Joe Rabinoff,
+  Sam Spilsbury, Marco Trevisan (Treviño)
+
+Translators:
+  Gun Chleoc [gd], Yi-Jyun Pan [zh_TW], Cédric Valmary [oc], Jordi Mas [ca]
+
+3.29.2
+======
+* Guard against untimely keyboard map changes [Carlos; #240]
+* Fix icons in search provider results [Florian; #249]
+* Fix blurriness of OSD under some resolutions [Silvère; #782011]
+* Fix lagging pointer when zoomed [Daniel; #682013]
+* Misc. bug fixes [Milan, Xiaoguang, Florian, Mario, Ole; #244, #787871,
+  #781471, #136, #214, #294]
+
+Contributors:
+  Ole Jørgen Brønner, Milan Crha, Carlos Garnacho, Yussuf Khalil,
+  Silvère Latchurié, Florian Müllner, Mario Sanchez Prada, Ray Strode,
+  Daniel van Vugt, Xiaoguang Wang
+
+Translators:
+  Rafael Fontenelle [pt_BR], Kukuh Syafaat [id], Marcos Lans [gl],
+  Anders Jonsson [sv], Mingcong Bai [zh_CN]
+
 3.29.1
 ======
 * Support icons in app-menu [Florian; #760985]

README.md

@@ -1,3 +1,4 @@
+# GNOME Shell
 GNOME Shell provides core user interface functions for the GNOME 3 desktop,
 like switching to windows and launching applications. GNOME Shell takes
 advantage of the capabilities of modern graphics hardware and introduces
@@ -6,15 +7,14 @@ easy to use experience.
 
 For more information about GNOME Shell, including instructions on how
 to build GNOME Shell from source and how to get involved with the project,
-see:
+see the [project wiki][wiki]
 
- https://wiki.gnome.org/Projects/GnomeShell
+Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
 
-Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
+## License
-product.
-
-License
-=======
 GNOME Shell is distributed under the terms of the GNU General Public License,
-version 2 or later. See the COPYING file for details.
+version 2 or later. See the [COPYING][license] file for details.
 
+[project-wiki]: https://wiki.gnome.org/Projects/GnomeShell
+[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell/issues
+[license]: COPYING

browser-plugin/README.md

@@ -4,14 +4,14 @@ the extensions repository to provide good integration, letting the website
 know which extensions are enabled and disabled, and allowing the website to
 enable, disable and install them.
 
-Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
+Bugs should be reported to the GNOME [bug tracking system][bug-tracker].
-product.
 
-License
+## License
-=======
 The GNOME Shell Browser Plugin, like GNOME Shell itself is distributed under
 the GNU General Public License, version 2 or later. The plugin also contains
 header files from the "NPAPI SDK" project, tri-licensed under MPL 1.1, GPL 2.0
 and LGPL 2.1. These headers are third-party sources and can be retrieved from:
 
   http://code.google.com/p/npapi-sdk/
+
+[bug-tracker]: https://gitlab.gnome.org/GNOME/gnome-shell/issues

config.h.meson

@@ -24,3 +24,9 @@
 
 /* Define if _NL_TIME_FIRST_WEEKDATE is available */
 #mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
+
+/* Define if you have the `g_desktop_app_info_launch_uris_as_manager_with_fds` function */
+#mesondefine HAVE_GIO_DESKTOP_LAUNCH_URIS_WITH_FDS
+
+/* Define if fdwalk is available in libc */
+#mesondefine HAVE_FDWALK

data/00_org.gnome.shell.gschema.override

@@ -0,0 +1,6 @@
+[org.gnome.mutter:GNOME]
+attach-modal-dialogs=true
+edge-tiling=true
+dynamic-workspaces=true
+workspaces-only-on-primary=true
+focus-change-on-pointer-rest=true

data/gnome-shell-osk-layouts.gresource.xml

@@ -22,6 +22,7 @@
     <file>id.json</file>
     <file>il.json</file>
     <file>in+bolnagri.json</file>
+    <file>in+mal.json</file>
     <file>ir.json</file>
     <file>is.json</file>
     <file>it.json</file>

data/gnome-shell-overrides-migration.desktop.in

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Name=GNOME settings overrides migration
+NoDisplay=true
+Exec=@libexecdir@/gnome-shell-overrides-migration.sh

data/gnome-shell-wayland.target

@@ -0,0 +1,5 @@
+[Unit]
+Description=GNOME Shell (wayland sync point)
+After=gnome-shell.service
+BindsTo=gnome-shell.service
+Conflicts=gnome-shell-x11.target

data/gnome-shell-x11.target

@@ -0,0 +1,5 @@
+[Unit]
+Description=GNOME Shell (x11 sync point)
+After=gnome-shell.service
+BindsTo=gnome-shell.service
+Conflicts=gnome-shell-wayland.target

data/gnome-shell.service.in

@@ -0,0 +1,11 @@
+[Unit]
+Description=GNOME Shell
+Wants=gnome-session.service
+After=graphical-session-pre.target gnome-session-bus.target
+PartOf=graphical-session.target
+
+[Service]
+Type=dbus
+ExecStart=@bindir@/gnome-shell
+Restart=on-failure
+BusName=org.gnome.Shell

data/meson.build

@@ -92,6 +92,33 @@ schema = configure_file(
   configuration: schemaconf,
   install_dir: schemadir
 )
+install_data('00_org.gnome.shell.gschema.override', install_dir: schemadir)
+
+overrides_migration_conf = configuration_data()
+overrides_migration_conf.set('libexecdir', libexecdir)
+overrides_migration = configure_file(
+  input: 'gnome-shell-overrides-migration.desktop.in',
+  output: 'gnome-shell-overrides-migration.desktop',
+  configuration: overrides_migration_conf,
+  install_dir: autostartdir
+)
+
+if have_systemd
+  unitconf = configuration_data()
+  unitconf.set('bindir', bindir)
+
+  unit = configure_file(
+    input: 'gnome-shell.service.in',
+    output: 'gnome-shell.service',
+    configuration: unitconf,
+    install_dir: systemduserunitdir
+  )
+
+  units = files('gnome-shell-wayland.target',
+                'gnome-shell-x11.target')
+
+  install_data(units, install_dir: systemduserunitdir)
+endif
 
 # for unit tests - gnome.compile_schemas() only looks in srcdir
 custom_target('compile-schemas',

data/org.gnome.Shell.Screenshot.xml

@@ -91,6 +91,23 @@
       <arg type="s" direction="out" name="filename_used"/>
     </method>
 
+    <!--
+        PickColor:
+
+        Picks a color and returns the result.
+
+        The @result vardict contains:
+        <variablelist>
+          <varlistentry>
+            <term>color (ddd)</term>
+            <listitem><para>The color, RGB values in the range [0,1].</para></listitem>
+          </varlistentry>
+        </variablelist>
+    -->
+    <method name="PickColor">
+      <arg type="a{sv}" direction="out" name="result"/>
+    </method>
+
     <!--
         FlashArea:
         @x: the X coordinate of the area to flash

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

@@ -190,6 +190,7 @@
     </key>
   </schema>
 
+  <!-- unused, change 00_org.gnome.shell.gschema.override instead -->
   <schema id="org.gnome.shell.overrides" path="/org/gnome/shell/overrides/"
 	  gettext-domain="@GETTEXT_PACKAGE@">
     <key name="attach-modal-dialogs" type="b">

data/osk-layouts/in+mal.json

@@ -0,0 +1,559 @@
+{
+  "levels": [
+    {
+      "level": "",
+      "mode": "default",
+      "rows": [
+        [
+          [
+            "െ"
+          ],
+          [
+            "ൌ"
+          ],
+          [
+            "ൈ"
+          ],
+          [
+            "ാ"
+          ],
+          [
+            "ീ"
+          ],
+          [
+            "ൂ"
+          ],
+          [
+            "ബ"
+          ],
+          [
+            "ഹ"
+          ],
+          [
+            "ഗ"
+          ],
+          [
+            "ദ"
+          ],
+          [
+            "ജ"
+          ],
+          [
+            "ഡ"
+          ],
+          [
+            "‍"
+          ]
+        ],
+        [
+          [
+            "ോ"
+          ],
+          [
+            "േ"
+          ],
+          [
+            "്"
+          ],
+          [
+            "ി"
+          ],
+          [
+            "ു"
+          ],
+          [
+            "പ"
+          ],
+          [
+            "ര"
+          ],
+          [
+            "ക"
+          ],
+          [
+            "ത"
+          ],
+          [
+            "ച"
+          ],
+          [
+            "ട"
+          ]
+        ],
+        [
+          [
+            "െ"
+          ],
+          [
+            "ം"
+          ],
+          [
+            "മ",
+            "ç"
+          ],
+          [
+            "ന"
+          ],
+          [
+            "വ"
+          ],
+          [
+            "ല",
+            "ñ"
+          ],
+          [
+            "സ"
+          ],
+          [
+            "ഷ"
+          ],
+          [
+            "യ"
+          ]
+        ],
+        [
+          [
+            ","
+          ],
+          [
+            " "
+          ],
+          [
+            ".",
+            "#",
+            "!",
+            ",",
+            "?",
+            "-",
+            ":",
+            "'",
+            "@"
+          ]
+        ]
+      ]
+    },
+    {
+      "level": "shift",
+      "mode": "latched",
+      "rows": [
+        [
+          [
+            "ഔ"
+          ],
+          [
+            "ഐ"
+          ],
+          [
+            "ആ"
+          ],
+          [
+            "ഈ"
+          ],
+          [
+            "ഊ"
+          ],
+          [
+            "ഭ"
+          ],
+          [
+            "ങ"
+          ],
+          [
+            "ഘ"
+          ],
+          [
+            "ധ"
+          ],
+          [
+            "ഝ"
+          ],
+          [
+            "ഢ"
+          ],
+          [
+            "ഞ"
+          ]
+        ],
+        [
+          [
+            "ഓ"
+          ],
+          [
+            "ഏ"
+          ],
+          [
+            "അ"
+          ],
+          [
+            "ഇ"
+          ],
+          [
+            "ഉ"
+          ],
+          [
+            "ഫ"
+          ],
+          [
+            "റ"
+          ],
+          [
+            "ഖ"
+          ],
+          [
+            "ഥ"
+          ],
+          [
+            "ഛ"
+          ],
+          [
+            "ഠ"
+          ]
+        ],
+        [
+          [
+            "എ"
+          ],
+          [
+            "​"
+          ],
+          [
+            "ണ"
+          ],
+          [
+            "ന"
+          ],
+          [
+            "ഴ"
+          ],
+          [
+            "ള"
+          ],
+          [
+            "ശ"
+          ],
+          [
+            "ഷ"
+          ],
+          [
+            "യ"
+          ]
+        ],
+        [
+          [
+            ","
+          ],
+          [
+            " "
+          ],
+          [
+            ".",
+            "#",
+            "!",
+            ",",
+            "?",
+            "-",
+            ":",
+            "'",
+            "@"
+          ]
+        ]
+      ]
+    },
+    {
+      "level": "opt",
+      "mode": "locked",
+      "rows": [
+        [
+          [
+            "൧",
+            "1",
+            "¹",
+            "½",
+            "⅓",
+            "¼",
+            "⅛"
+          ],
+          [
+            "൨",
+            "2",
+            "²",
+            "⅔"
+          ],
+          [
+            "൩",
+            "3",
+            "³",
+            "¾",
+            "⅜"
+          ],
+          [
+            "൪",
+            "4",
+            "⁴"
+          ],
+          [
+            "൫",
+            "5",
+            "⅝"
+          ],
+          [
+            "൬",
+            "6"
+          ],
+          [
+            "൭",
+            "7",
+            "⅞"
+          ],
+          [
+            "൮",
+            "8"
+          ],
+          [
+            "൯",
+            "9"
+          ],
+          [
+            "൦",
+            "0",
+            "ⁿ",
+            "∅"
+          ]
+        ],
+        [
+          [
+            "@"
+          ],
+          [
+            "#"
+          ],
+          [
+            "₹",
+            "$",
+            "¢",
+            "£",
+            "€",
+            "¥",
+            "₱"
+          ],
+          [
+            "%",
+            "‰"
+          ],
+          [
+            "&"
+          ],
+          [
+            "-",
+            "_",
+            "–",
+            "—",
+            "·"
+          ],
+          [
+            "+",
+            "±"
+          ],
+          [
+            "(",
+            "<",
+            "{",
+            "["
+          ],
+          [
+            ")",
+            ">",
+            "}",
+            "]"
+          ]
+        ],
+        [
+          [
+            "*",
+            "†",
+            "‡",
+            "★"
+          ],
+          [
+            "\"",
+            "“",
+            "”",
+            "«",
+            "»"
+          ],
+          [
+            "'",
+            "‘",
+            "’",
+            "‹",
+            "›"
+          ],
+          [
+            ":"
+          ],
+          [
+            ";"
+          ],
+          [
+            "!",
+            "¡"
+          ],
+          [
+            "?",
+            "¿"
+          ]
+        ],
+        [
+          [
+            "_"
+          ],
+          [
+            "/"
+          ],
+          [
+            " "
+          ],
+          [
+            ","
+          ],
+          [
+            ".",
+            "…"
+          ]
+        ]
+      ]
+    },
+    {
+      "level": "opt+shift",
+      "mode": "locked",
+      "rows": [
+        [
+          [
+            "~"
+          ],
+          [
+            "`"
+          ],
+          [
+            "|"
+          ],
+          [
+            "•",
+            "♪",
+            "♥",
+            "♠",
+            "♦",
+            "♣"
+          ],
+          [
+            "√"
+          ],
+          [
+            "Π",
+            "π"
+          ],
+          [
+            "÷"
+          ],
+          [
+            "×"
+          ],
+          [
+            "¶",
+            "§"
+          ],
+          [
+            "∆"
+          ]
+        ],
+        [
+          [
+            "£"
+          ],
+          [
+            "¢"
+          ],
+          [
+            "€"
+          ],
+          [
+            "¥"
+          ],
+          [
+            "^",
+            "↑",
+            "↓",
+            "←",
+            "→"
+          ],
+          [
+            "°",
+            "′",
+            "″"
+          ],
+          [
+            "=",
+            "≠",
+            "≈",
+            "∞"
+          ],
+          [
+            "{"
+          ],
+          [
+            "}"
+          ]
+        ],
+        [
+          [
+            "\\"
+          ],
+          [
+            "©"
+          ],
+          [
+            "®"
+          ],
+          [
+            "™"
+          ],
+          [
+            "℅"
+          ],
+          [
+            "["
+          ],
+          [
+            "]"
+          ]
+        ],
+        [
+          [
+            "<",
+            "‹",
+            "≤",
+            "«"
+          ],
+          [
+            ">",
+            "›",
+            "≥",
+            "»"
+          ],
+          [
+            " "
+          ],
+          [
+            ","
+          ],
+          [
+            ".",
+            "…"
+          ]
+        ]
+      ]
+    }
+  ],
+  "locale": "ml",
+  "name": "Malayalam"
+}

data/theme/HACKING

@@ -1,3 +0,0 @@
-To generate the css files, from the project directory:
-
-sass --sourcemap=none --update .

data/theme/README

@@ -1,31 +0,0 @@
-Summary
--------
-
-* Do not edit the CSS directly, edit the source SCSS files and the CSS files will be generated
-  automatically when building with meson + ninja and left inside the build directory to be
-  incorporated into the gresource XML (you'll need to have sassc installed).
-
-How to tweak the theme
-----------------------
-
-Adwaita is a complex theme, so to keep it maintainable it's written and processed in SASS, the
-generated CSS is then transformed into a gresource file during gtk build and used at runtime in a 
-non-legible or editable form.
-
-It is very likely your change will happen in the _common.scss file. That's where all the widget 
-selectors are defined. Here's a rundown of the "supporting" stylesheets, that are unlikely to be the 
-right place for a drive by stylesheet fix:
-
-_colors.scss        - global color definitions. We keep the number of defined colors to a necessary minimum, 
-                      most colors are derived from a handful of basics. It is an exact copy of the gtk+ 
-                      counterpart. Light theme is used for the classic theme and dark is for GNOME3 shell 
-                      default.
-
-_drawing.scss       - drawing helper mixings/functions to allow easier definition of widget drawing under
-                      specific context. This is why Adwaita isn't 15000 LOC.
-
-_common.scss        - actual definitions of style for each widget. This is where you are likely to add/remove
-                      your changes.
-                      
-You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the
-_common.scss file, you can run ninja to generate the final CSS files.

data/theme/README.md

@@ -0,0 +1,32 @@
+## Summary
+
+Do not edit the CSS directly, edit the source SCSS files and the CSS files
+will be generated automatically when building with meson + ninja and left
+inside the build directory to be incorporated into the gresource XML (you'll
+need to have sassc installed).
+
+## How to tweak the theme
+
+Adwaita is a complex theme, so to keep it maintainable it's written and
+processed in SASS, the generated CSS is then transformed into a gresource
+file during gtk build and used at runtime in a non-legible or editable form.
+
+It is very likely your change will happen in the [_common.scss][common] file.
+That's where all the widget selectors are defined. Here's a rundown of
+the "supporting" stylesheets, that are unlikely to be the right place
+for a drive by stylesheet fix:
+
+| File                     | Description       |
+| ------------------------ | ----------------- |
+| [_colors.scss][colors]   | global color definitions. We keep the number of defined colors to a necessary minimum,  most colors are derived from a handful of basics. It is an exact copy of the gtk+ counterpart. Light theme is used for the classic theme and dark is for GNOME3 shell default. |
+| [_drawing.scss][drawing] | drawing helper mixings/functions to allow easier definition of widget drawing under specific context. This is why Adwaita isn't 15000 LOC. |
+| [_common.scss][common]   | actual definitions of style for each widget. This is where you are likely to add/remove your changes. |
+
+You can read about SASS on its [web page][sass-web]. Once you make your
+changes to the [_common.scss][common] file, you can run ninja to generate the
+final CSS files.
+
+[common]: data/theme/gnome-shell-sass/_common.scss
+[colors]: data/theme/gnome-shell-sass/_colors.scss
+[drawing]: data/theme/gnome-shell-sass/_drawing.scss
+[sass-web]: http://sass-lang.com/documentation/

data/theme/gnome-shell-sass/HACKING

@@ -1,6 +0,0 @@
---- Generating the css file ---
-
-You need sass to generate the css file.
-
-To generate them run from a command line in the project directory:
-sass --sourcemap=none --update ./

data/theme/gnome-shell-sass/README

@@ -1,7 +0,0 @@
-GNOME Shell Sass is a project intended to allow the sharing of the theme sources in sass between gnome-shell and other projects like gnome-shell-extensions.
-
-License
-=======
-GNOME Shell Sass is distributed under the terms of the GNU General Public License,
-version 2 or later. See the COPYING file for details.
-

data/theme/gnome-shell-sass/README.md

@@ -0,0 +1,16 @@
+# GNOME Shell Sass
+GNOME Shell Sass is a project intended to allow the sharing of the
+theme sources in sass between gnome-shell and other projects like
+gnome-shell-extensions.
+
+Any changes should be done in the [GNOME Shell subtree][shell-subtree]
+and not the stand-alone [gnome-shell-sass repository][sass-repo]. They
+will then be synchronized periodically before releases.
+
+## License
+GNOME Shell Sass is distributed under the terms of the GNU General Public
+License, version 2 or later. See the [COPYING][license] file for details.
+
+[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
+[sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
+[license]: COPYING

data/theme/gnome-shell-sass/_common.scss

@@ -128,12 +128,15 @@ StScrollBar {
 
 .slider {
   height: 1em;
-  -slider-height: 0.3em;
+  -barlevel-height: 0.3em;
-  -slider-background-color: $insensitive_bg_color; //background of the trough
+  -barlevel-background-color: $insensitive_bg_color; //background of the trough
-  -slider-border-color: $borders_color; //trough border color
+  -barlevel-border-color: $borders_color; //trough border color
-  -slider-active-background-color: $selected_bg_color; //active trough fill
+  -barlevel-active-background-color: $selected_bg_color; //active trough fill
-  -slider-active-border-color: darken($selected_bg_color,10%); //active trough border
+  -barlevel-active-border-color: darken($selected_bg_color,10%); //active trough border
-  -slider-border-width: 1px;
+  -barlevel-overdrive-color: $destructive_color;
+  -barlevel-overdrive-border-color: darken($destructive_color,10%);
+  -barlevel-overdrive-separator-width: 0.2em;
+  -barlevel-border-width: 1px;
   -slider-handle-radius: 6px;
 }
 
@@ -585,13 +588,11 @@ StScrollBar {
   .osd-monitor-label { font-size: 3em; }
   .level {
     height: 0.6em;
-    border-radius: 0.3em;
+    -barlevel-height: 0.6em;
-    background-color: transparentize(darken($osd_bg_color,15%),0.5);
+    -barlevel-background-color: transparentize(darken($osd_bg_color,15%),0.5);
-    color: $osd_fg_color;
+    -barlevel-active-background-color: $osd_fg_color;
-  }
+    -barlevel-overdrive-color: $destructive_color;
-  .level-bar {
+    -barlevel-overdrive-separator-width: 0.2em;
-    background-color: $osd_fg_color;
-    border-radius: 0.3em;
   }
 }
 
@@ -733,6 +734,7 @@ StScrollBar {
   transition-duration: 500ms;
   font-weight: bold;
   height: 1.86em;
+  font-feature-settings: "tnum";
 
   &.unlock-screen,
   &.login-screen,
@@ -824,6 +826,8 @@ StScrollBar {
 
   .screencast-indicator { color: $warning_color; }
 
+  .remote-access-indicator { color: $warning_color; }
+
   &.solid {
     background-color: black;
     /* transition from transparent to solid */
@@ -958,6 +962,7 @@ StScrollBar {
       padding: 0.1em;
       margin: 2px;
       border-radius: 1.4em;
+      font-feature-settings: "tnum";
       &:hover,&:focus { background-color: lighten($bg_color,5%); }
       &:active,&:selected {
         color: lighten($selected_fg_color,5%);
@@ -1120,6 +1125,7 @@ StScrollBar {
   }
 
   .system-menu-action {
+    -st-icon-style: symbolic;
     color: $fg_color;
     border-radius: 32px; /* wish we could do 50% */
     padding: 13px;
@@ -1867,6 +1873,7 @@ StScrollBar {
 .screen-shield-clock-time {
   font-size: 72pt;
   text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
+  font-feature-settings: "tnum";
 }
 
 .screen-shield-clock-date { 

data/theme/key-layout.svg

@@ -14,7 +14,7 @@
    id="svg7384"
    height="32"
    sodipodi:docname="key-layout.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -24,17 +24,21 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1919"
+     inkscape:window-width="3440"
-     inkscape:window-height="1011"
+     inkscape:window-height="1376"
      id="namedview19"
      showgrid="false"
-     inkscape:zoom="14.75"
+     inkscape:zoom="1"
-     inkscape:cx="1.220339"
+     inkscape:cx="46.246852"
-     inkscape:cy="11.842802"
+     inkscape:cy="17.474578"
      inkscape:window-x="0"
-     inkscape:window-y="55"
+     inkscape:window-y="27"
-     inkscape:window-maximized="0"
+     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7384" />
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid861" />
+  </sodipodi:namedview>
   <metadata
      id="metadata90">
     <rdf:RDF>
@@ -92,23 +96,34 @@
      style="display:inline"
      id="g4953" />
   <g
+     style="stroke-width:0.5;enable-background:new"
+     id="g3561"
      inkscape:label="preferences-desktop-locale"
-     id="g11728"
+     transform="matrix(2,0,0,2,135.99464,-895.9793)">
-     transform="matrix(2,0,0,2,-522.0004,-1086)"
-     style="display:inline;stroke-width:1">
-    <rect
-       style="fill:none;stroke:none;stroke-width:1"
-       id="rect11724"
-       width="16"
-       height="16"
-       x="20"
-       y="326"
-       transform="translate(241.0002,217)" />
     <path
-       style="fill:#e5e5e5;fill-opacity:1;stroke:none;stroke-width:1"
+       sodipodi:nodetypes="cc"
-       d="m 265.69612,545.23396 c -3.58218,0 -4.66582,1.39975 -4.66582,1.39975 v 10.04946 c 0,0 1.08364,-1.07673 4.66582,-1.07673 2.9161,0 4.47225,1.07673 7.17818,1.07673 2.08923,0 3.19429,-1.39975 3.19429,-1.39975 v -10.04946 c 0,0 -1.14095,1.04084 -3.23018,1.04084 -3.3734,0 -3.97619,-1.04084 -7.14229,-1.04084 z m 2.93145,2.77148 c 1.32876,0 2.375,1.08037 2.375,2.4375 0,1.35713 -1.04624,2.46875 -2.375,2.46875 -1.32876,0 -2.40625,-1.11162 -2.40625,-2.46875 0,-1.35713 1.07749,-2.4375 2.40625,-2.4375 z m -4.5625,0.96875 0.96875,1.03125 -0.9375,-0.0312 0.9375,1 -0.96875,-0.0312 0.96875,1.03125 -1,-0.0312 0.0312,-1 h -0.0312 l 0.0312,-0.9688 h -0.0312 z m 4.5625,0 c -0.794,0 -1.46875,0.6578 -1.46875,1.46875 0,0.81095 0.67475,1.46875 1.46875,1.46875 0.79399,0 1.4375,-0.6578 1.4375,-1.46875 0,-0.81095 -0.64351,-1.46875 -1.4375,-1.46875 z m 4.375,0 v 1 l 0.0312,0.96875 h -0.0312 l 0.0312,1 -1,0.0312 0.96875,-1.03125 -0.96875,0.0312 0.9375,-1 -0.9375,0.0312 z m -7.9375,2.96875 0.96875,1.03125 -1,-0.0312 z m 6.9375,0 0.0312,1 -1,0.0312 z m -5.9375,1 0.96875,1.03125 -1,-0.0312 z m 4.9375,0 0.0312,1 -1,0.0312 z"
-       id="path11726"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccssccsssssssccccccccccccsssssccccccccccccccccccccccccccc" />
+       id="path3535"
+       d="m -65,450 v 12"
+       style="fill:#e5e5e5;fill-opacity:1;fill-rule:evenodd;stroke:#e5e5e5;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path3537"
+       d="m -65,456 h 4 l 1,2 h 5 v -6 h -4 l -1,-2 h -5 z"
+       style="fill:none;fill-rule:evenodd;stroke:#e5e5e5;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="opacity:1;vector-effect:none;fill:#e5e5e5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m -65,456 h 4 l 1,2 h 5 v -6 h -4 l -1,-2 h -5 z"
+       id="path3539"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:0.89050001;marker:none;enable-background:new"
+       id="rect3543"
+       y="448"
+       x="-68"
+       height="16"
+       width="16" />
   </g>
 </svg>

data/theme/no-notifications.svg

@@ -13,10 +13,102 @@
    height="64px"
    id="svg3393"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="New document 2">
+   sodipodi:docname="no-notifications.svg">
   <defs
-     id="defs3395" />
+     id="defs3395">
+    <clipPath
+       id="clipPath6262-0"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+         id="rect6264-6"
+         width="3.8250003"
+         height="6.3750005"
+         x="26.849981"
+         y="220.75" />
+    </clipPath>
+    <clipPath
+       id="clipPath6258-0"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+         id="rect6260-6"
+         width="2.8977275"
+         height="5.3129687"
+         x="26.965673"
+         y="221.28162" />
+    </clipPath>
+    <clipPath
+       id="clipPath6254-6"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+         id="rect6256-6"
+         width="1.876245"
+         height="4.8783236"
+         x="26.998718"
+         y="221.50153" />
+    </clipPath>
+    <clipPath
+       id="clipPath8028-3"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -73,-30 -7,-7 v -4.5 h 16.5 v 4.5 l -7.5,7 z"
+         id="path8030-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6810-7-87-7">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         id="rect6812-2-4-5"
+         width="14"
+         height="11"
+         x="21"
+         y="281" />
+    </clipPath>
+    <clipPath
+       id="clipPath6262"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+         id="rect6264"
+         width="3.8250003"
+         height="6.3750005"
+         x="26.849981"
+         y="220.75" />
+    </clipPath>
+    <clipPath
+       id="clipPath6258"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none"
+         id="rect6260"
+         width="2.8977275"
+         height="5.3129687"
+         x="26.965673"
+         y="221.28162" />
+    </clipPath>
+    <clipPath
+       id="clipPath6254"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none"
+         id="rect6256"
+         width="1.876245"
+         height="4.8783236"
+         x="26.998718"
+         y="221.50153" />
+    </clipPath>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3951"
+       is_visible="true" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,17 +116,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
+     inkscape:zoom="1"
-     inkscape:cx="32"
+     inkscape:cx="125.08157"
-     inkscape:cy="32"
+     inkscape:cy="-13.805087"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="697"
+     inkscape:window-width="1664"
-     inkscape:window-height="613"
+     inkscape:window-height="1034"
-     inkscape:window-x="100"
+     inkscape:window-x="1479"
-     inkscape:window-y="77"
+     inkscape:window-y="252"
      inkscape:window-maximized="0" />
   <metadata
      id="metadata3398">
@@ -54,7 +146,7 @@
      inkscape:groupmode="layer">
     <g
        style="display:inline"
-       transform="matrix(4,0,0,4,0.29733827,-0.35415646)"
+       transform="matrix(4,0,0,4,-79.702662,-0.35415646)"
        id="g19245">
       <g
          id="g19247"
@@ -71,15 +163,15 @@
          transform="translate(-323.02908,-649.02581)">
         <path
            inkscape:connector-curvature="0"
-           d="m 331.9377,653 c 0.0187,0.16677 0.0625,0.32822 0.0625,0.5 0,2.48528 -2.01472,4.5 -4.5,4.5 -0.11769,0 -0.22834,-0.0224 -0.34375,-0.0312 l 0,2.21875 c 0,1.00412 0.80838,1.8125 1.8125,1.8125 l 1.54511,-5e-5 2,2.04688 2.0625,-2.04688 1.61114,0 c 1.00413,0 1.8125,-0.80838 1.8125,-1.8125 l 0,-5.375 c 0,-1.00412 -0.80837,-1.8125 -1.8125,-1.8125 z"
+           d="m 331.9377,653 c 0.0187,0.16677 0.0625,0.32822 0.0625,0.5 0,2.48528 -2.01472,4.5 -4.5,4.5 -0.11769,0 -0.22834,-0.0224 -0.34375,-0.0312 v 2.21875 c 0,1.00412 0.80838,1.8125 1.8125,1.8125 l 1.54511,-5e-5 2,2.04688 2.0625,-2.04688 h 1.61114 c 1.00413,0 1.8125,-0.80838 1.8125,-1.8125 v -5.375 c 0,-1.00412 -0.80837,-1.8125 -1.8125,-1.8125 z"
            id="path19253"
            sodipodi:nodetypes="csscsscccssssc"
-           style="opacity:0.5;color:#000000;fill:#c3c3c3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#c3c3c3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
         <path
            inkscape:connector-curvature="0"
-           d="m 327.5002,650 c -1.933,0 -3.5,1.567 -3.5,3.5 0,1.933 1.567,3.5 3.5,3.5 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m -0.53125,1 1.03125,0 -0.0625,1.375 a 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.125,0.125 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 l 1.15625,-0.75 0.5,0.90625 -1.21875,0.625 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0.0937 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0625 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0312 l 1.25,0.625 -0.53125,0.90625 -1.15625,-0.781 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,0 0.19951718,0.19951718 0 0 0 -0.125,0.0937 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0,0.0625 l 0.0625,1.3751 -1.03125,0 0.0937,-1.375 a 0.19951718,0.19951718 0 0 0 -0.0312,-0.0937 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0937,0.0312 l -1.1875,0.78125 -0.5,-0.90625 1.25,-0.625 a 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0312,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 l -1.25,-0.625 0.5,-0.90625 1.1875,0.75 a 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 L 326.96895,651 z"
+           d="m 327.5002,650 c -1.933,0 -3.5,1.567 -3.5,3.5 0,1.933 1.567,3.5 3.5,3.5 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.933 -1.567,-3.5 -3.5,-3.5 z m -0.53125,1 h 1.03125 l -0.0625,1.375 a 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.125,0.125 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 l 1.15625,-0.75 0.5,0.90625 -1.21875,0.625 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0.0937 0.19951718,0.19951718 0 0 0 0,0.0625 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0625 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0312,0.0312 l 1.25,0.625 -0.53125,0.90625 -1.15625,-0.781 a 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,0 0.19951718,0.19951718 0 0 0 -0.125,0.0937 0.19951718,0.19951718 0 0 0 -0.0312,0.0312 0.19951718,0.19951718 0 0 0 0,0.0312 0.19951718,0.19951718 0 0 0 0,0.0625 L 328.0002,656 h -1.03125 l 0.0937,-1.375 a 0.19951718,0.19951718 0 0 0 -0.0312,-0.0937 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0625,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 0.19951718,0.19951718 0 0 0 -0.0937,0.0312 l -1.1875,0.78125 -0.5,-0.90625 1.25,-0.625 a 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,-0.0625 0.19951718,0.19951718 0 0 0 -0.0312,-0.0312 0.19951718,0.19951718 0 0 0 -0.0312,0 l -1.25,-0.625 0.5,-0.90625 1.1875,0.75 a 0.19951718,0.19951718 0 0 0 0.0312,0.0312 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0625,0 0.19951718,0.19951718 0 0 0 0.0312,0 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0312 0.19951718,0.19951718 0 0 0 0,-0.0312 0.19951718,0.19951718 0 0 0 0.0312,-0.0625 0.19951718,0.19951718 0 0 0 0,-0.0312 z"
            id="path19255"
-           style="color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate" />
       </g>
       <g
          id="g19257"
@@ -110,5 +202,22 @@
          style="display:inline"
          transform="translate(-323.02908,-649.02581)" />
     </g>
+    <g
+       style="opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+       inkscape:label="preferences-system-notifications"
+       id="g13967"
+       transform="matrix(4,0,0,4,-1044.0008,-2172)">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 268.94244,544.94838 c -2.20914,0 -3.33013,1.5 -4,4 l -1,5 c -0.10831,0.54156 -0.44772,1 -1,1 v 1 h 12 v -1 c -0.55229,0 -0.89169,-0.45844 -1,-1 l -1,-5 c -0.53033,-2.5 -1.79086,-4 -4,-4 z"
+         id="path40220"
+         sodipodi:nodetypes="ccsccccscc"
+         style="opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 269.11822,556.94838 a 1.5,1.5 0 0 0 1.41211,1 1.5,1.5 0 0 0 1.41211,-1 z"
+         id="path40774"
+         style="opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal" />
+    </g>
   </g>
 </svg>

docs/reference/shell/meson.build

@@ -50,8 +50,7 @@ gnome.gtkdoc('shell',
     join_paths(meson.build_root(), 'src')
   ],
   scan_args: [
-    '--ignore-headers=' + ' '.join(private_headers + exclude_directories),
+    '--ignore-headers=' + ' '.join(private_headers + exclude_directories)
-    '--rebuild-types'
   ],
   install: true
 )

docs/reference/st/meson.build

@@ -17,8 +17,7 @@ gnome.gtkdoc('st',
   ],
   scan_args: [
     '--ignore-headers=' + ' '.join(private_headers),
-    '--rebuild-sections',
+    '--rebuild-sections'
-    '--rebuild-types'
   ],
   install: true
 )

js/extensionPrefs/main.js

@@ -14,15 +14,16 @@ const _ = Gettext.gettext;
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
 
-const GnomeShellIface = '<node> \
+const GnomeShellIface = `
-<interface name="org.gnome.Shell.Extensions"> \
+<node>
-<signal name="ExtensionStatusChanged"> \
+<interface name="org.gnome.Shell.Extensions">
-    <arg type="s" name="uuid"/> \
+<signal name="ExtensionStatusChanged">
-    <arg type="i" name="state"/> \
+    <arg type="s" name="uuid"/>
-    <arg type="s" name="error"/> \
+    <arg type="i" name="state"/>
-</signal> \
+    <arg type="s" name="error"/>
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
 const GnomeShellProxy = Gio.DBusProxy.makeProxyWrapper(GnomeShellIface);
 

js/gdm/authPrompt.js

@@ -242,11 +242,11 @@ var AuthPrompt = new Lang.Class({
         this.emit('prompted');
     },
 
-    _onVerificationFailed() {
+    _onVerificationFailed(userVerifier, canRetry) {
         this._queryingService = null;
         this.clear();
 
-        this.updateSensitivity(true);
+        this.updateSensitivity(canRetry);
         this.setActorInDefaultButtonWell(null);
         this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
     },
@@ -439,6 +439,7 @@ var AuthPrompt = new Lang.Class({
         this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
         this.cancelButton.reactive = true;
         this.nextButton.label = _("Next");
+        this._preemptiveAnswer = null;
 
         if (this._userVerifier)
             this._userVerifier.cancel();

js/gdm/fingerprint.js

@@ -5,13 +5,14 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const FprintManagerIface = '<node> \
+const FprintManagerIface = `
-<interface name="net.reactivated.Fprint.Manager"> \
+<node>
-<method name="GetDefaultDevice"> \
+<interface name="net.reactivated.Fprint.Manager">
-    <arg type="o" direction="out" /> \
+<method name="GetDefaultDevice">
-</method> \
+    <arg type="o" direction="out" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 const FprintManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(FprintManagerIface);
 

js/gdm/oVirt.js

@@ -4,13 +4,13 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-const OVirtCredentialsIface = '<node> \
+const OVirtCredentialsIface =`<node>
-<interface name="org.ovirt.vdsm.Credentials"> \
+<interface name="org.ovirt.vdsm.Credentials">
-<signal name="UserAuthenticated"> \
+<signal name="UserAuthenticated">
-    <arg type="s" name="token"/> \
+    <arg type="s" name="token"/>
-</signal> \
+</signal>
-</interface> \
+</interface>
-</node>';
+</node>`;
 
 const OVirtCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(OVirtCredentialsIface);
 

js/gdm/realmd.js

@@ -5,58 +5,61 @@ const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const ProviderIface = '<node> \
+const ProviderIface = `
-<interface name="org.freedesktop.realmd.Provider"> \
+<node>
-    <property name="Name" type="s" access="read"/> \
+<interface name="org.freedesktop.realmd.Provider">
-    <property name="Version" type="s" access="read"/> \
+    <property name="Name" type="s" access="read"/>
-    <property name="Realms" type="ao" access="read"/> \
+    <property name="Version" type="s" access="read"/>
-    <method name="Discover"> \
+    <property name="Realms" type="ao" access="read"/>
-        <arg name="string" type="s" direction="in"/> \
+    <method name="Discover">
-        <arg name="options" type="a{sv}" direction="in"/> \
+        <arg name="string" type="s" direction="in"/>
-        <arg name="relevance" type="i" direction="out"/> \
+        <arg name="options" type="a{sv}" direction="in"/>
-        <arg name="realm" type="ao" direction="out"/> \
+        <arg name="relevance" type="i" direction="out"/>
-    </method> \
+        <arg name="realm" type="ao" direction="out"/>
-</interface> \
+    </method>
-</node>';
+</interface>
+</node>`;
 const Provider = Gio.DBusProxy.makeProxyWrapper(ProviderIface);
 
-const ServiceIface = '<node> \
+const ServiceIface = `
-<interface name="org.freedesktop.realmd.Service"> \
+<node>
-    <method name="Cancel"> \
+<interface name="org.freedesktop.realmd.Service">
-        <arg name="operation" type="s" direction="in"/> \
+    <method name="Cancel">
-    </method> \
+        <arg name="operation" type="s" direction="in"/>
-    <method name="Release" /> \
+    </method>
-    <method name="SetLocale"> \
+    <method name="Release" />
-        <arg name="locale" type="s" direction="in"/> \
+    <method name="SetLocale">
-    </method> \
+        <arg name="locale" type="s" direction="in"/>
-    <signal name="Diagnostics"> \
+    </method>
-        <arg name="data" type="s"/> \
+    <signal name="Diagnostics">
-        <arg name="operation" type="s"/> \
+        <arg name="data" type="s"/>
-    </signal> \
+        <arg name="operation" type="s"/>
-</interface> \
+    </signal>
-</node>';
+</interface>
+</node>`;
 const Service = Gio.DBusProxy.makeProxyWrapper(ServiceIface);
 
-const RealmIface = '<node> \
+const RealmIface = `
-<interface name="org.freedesktop.realmd.Realm"> \
+<node>
-    <property name="Name" type="s" access="read"/> \
+<interface name="org.freedesktop.realmd.Realm">
-    <property name="Configured" type="s" access="read"/> \
+    <property name="Name" type="s" access="read"/>
-    <property name="Details" type="a(ss)" access="read"/> \
+    <property name="Configured" type="s" access="read"/>
-    <property name="LoginFormats" type="as" access="read"/> \
+    <property name="Details" type="a(ss)" access="read"/>
-    <property name="LoginPolicy" type="s" access="read"/> \
+    <property name="LoginFormats" type="as" access="read"/>
-    <property name="PermittedLogins" type="as" access="read"/> \
+    <property name="LoginPolicy" type="s" access="read"/>
-    <property name="SupportedInterfaces" type="as" access="read"/> \
+    <property name="PermittedLogins" type="as" access="read"/>
-    <method name="ChangeLoginPolicy"> \
+    <property name="SupportedInterfaces" type="as" access="read"/>
-        <arg name="login_policy" type="s" direction="in"/> \
+    <method name="ChangeLoginPolicy">
-        <arg name="permitted_add" type="as" direction="in"/> \
+        <arg name="login_policy" type="s" direction="in"/>
-        <arg name="permitted_remove" type="as" direction="in"/> \
+        <arg name="permitted_add" type="as" direction="in"/>
-        <arg name="options" type="a{sv}" direction="in"/> \
+        <arg name="permitted_remove" type="as" direction="in"/>
-    </method> \
+        <arg name="options" type="a{sv}" direction="in"/>
-    <method name="Deconfigure"> \
+    </method>
-        <arg name="options" type="a{sv}" direction="in"/> \
+    <method name="Deconfigure">
-    </method> \
+        <arg name="options" type="a{sv}" direction="in"/>
-</interface> \
+    </method>
-</node>';
+</interface>
+</node>`;
 const Realm = Gio.DBusProxy.makeProxyWrapper(RealmIface);
 
 var Manager = new Lang.Class({

js/gdm/util.js

@@ -350,16 +350,19 @@ var ShellUserVerifier = new Lang.Class({
         try {
             this._clearUserVerifier();
             this._userVerifier = client.open_reauthentication_channel_finish(result);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-            return;
-        } catch(e if e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
-                !this._reauthOnly) {
-            // Gdm emits org.freedesktop.DBus.Error.AccessDenied when there is
-            // no session to reauthenticate. Fall back to performing verification
-            // from this login session
-            client.get_user_verifier(this._cancellable, this._userVerifierGot.bind(this));
-            return;
         } catch(e) {
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                return;
+            if (e.matches(Gio.DBusError, Gio.DBusError.ACCESS_DENIED) &&
+                !this._reauthOnly) {
+                // Gdm emits org.freedesktop.DBus.Error.AccessDenied when there
+                // is no session to reauthenticate. Fall back to performing
+                // verification from this login session
+                client.get_user_verifier(this._cancellable,
+                                         this._userVerifierGot.bind(this));
+                return;
+            }
+
             this._reportInitError('Failed to open reauthentication channel', e);
             return;
         }
@@ -374,9 +377,9 @@ var ShellUserVerifier = new Lang.Class({
         try {
             this._clearUserVerifier();
             this._userVerifier = client.get_user_verifier_finish(result);
-        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-            return;
         } catch(e) {
+            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                return;
             this._reportInitError('Failed to obtain user verifier', e);
             return;
         }
@@ -434,9 +437,9 @@ var ShellUserVerifier = new Lang.Class({
                                                                (obj, result) => {
                try {
                    obj.call_begin_verification_for_user_finish(result);
-               } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                   return;
                } catch(e) {
+                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                       return;
                    this._reportInitError('Failed to start verification for user', e);
                    return;
                }
@@ -449,9 +452,9 @@ var ShellUserVerifier = new Lang.Class({
                                                       (obj, result) => {
                try {
                    obj.call_begin_verification_finish(result);
-               } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
-                   return;
                } catch(e) {
+                   if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+                       return;
                    this._reportInitError('Failed to start verification', e);
                    return;
                }
@@ -534,12 +537,13 @@ var ShellUserVerifier = new Lang.Class({
     _verificationFailed(retry) {
         // For Not Listed / enterprise logins, immediately reset
         // the dialog
-        // Otherwise, we allow ALLOWED_FAILURES attempts. After that, we
+        // Otherwise, when in login mode we allow ALLOWED_FAILURES attempts.
-        // go back to the welcome screen.
+        // After that, we go back to the welcome screen.
 
         this._failCounter++;
         let canRetry = retry && this._userName &&
-            this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
+            (this._reauthOnly ||
+             this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY));
 
         if (canRetry) {
             if (!this.hasPendingMessages) {
@@ -562,7 +566,7 @@ var ShellUserVerifier = new Lang.Class({
             }
         }
 
-        this.emit('verification-failed');
+        this.emit('verification-failed', canRetry);
     },
 
     _onConversationStopped(client, serviceName) {

js/js-resources.gresource.xml

@@ -9,8 +9,6 @@
     <file>gdm/realmd.js</file>
     <file>gdm/util.js</file>
 
-    <file>extensionPrefs/main.js</file>
-
     <file>misc/config.js</file>
     <file>misc/extensionUtils.js</file>
     <file>misc/fileUtils.js</file>
@@ -33,8 +31,6 @@
     <file>perf/core.js</file>
     <file>perf/hwtest.js</file>
 
-    <file>portalHelper/main.js</file>
-
     <file>ui/accessDialog.js</file>
     <file>ui/altTab.js</file>
     <file>ui/animation.js</file>
@@ -43,6 +39,7 @@
     <file>ui/audioDeviceSelection.js</file>
     <file>ui/backgroundMenu.js</file>
     <file>ui/background.js</file>
+    <file>ui/barLevel.js</file>
     <file>ui/boxpointer.js</file>
     <file>ui/calendar.js</file>
     <file>ui/checkBox.js</file>
@@ -130,6 +127,7 @@
     <file>ui/status/rfkill.js</file>
     <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>

js/meson.build

@@ -6,3 +6,17 @@ js_resources = gnome.compile_resources(
   c_name: 'shell_js_resources',
   dependencies: [config_js]
 )
+
+portal_resources = gnome.compile_resources(
+  'portal-resources', 'portal-resources.gresource.xml',
+  source_dir: ['.', meson.current_build_dir()],
+  c_name: 'portal_js_resources',
+  dependencies: [config_js]
+)
+
+prefs_resources = gnome.compile_resources(
+  'prefs-resources', 'prefs-resources.gresource.xml',
+  source_dir: ['.', meson.current_build_dir()],
+  c_name: 'prefs_js_resources',
+  dependencies: [config_js]
+)

js/misc/extensionUtils.js

@@ -112,6 +112,8 @@ function createExtensionObject(uuid, dir, type) {
     let metadataContents, success, tag;
     try {
         [success, metadataContents, tag] = metadataFile.load_contents(null);
+        if (metadataContents instanceof Uint8Array)
+            metadataContents = imports.byteArray.toString(metadataContents);
     } catch (e) {
         throw new Error('Failed to load metadata.json: ' + e);
     }

js/misc/gnomeSession.js

@@ -4,17 +4,18 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Signals = imports.signals;
 
-const PresenceIface = '<node> \
+const PresenceIface = `
-<interface name="org.gnome.SessionManager.Presence"> \
+<node>
-<method name="SetStatus"> \
+<interface name="org.gnome.SessionManager.Presence">
-    <arg type="u" direction="in"/> \
+<method name="SetStatus">
-</method> \
+    <arg type="u" direction="in"/>
-<property name="status" type="u" access="readwrite"/> \
+</method>
-<signal name="StatusChanged"> \
+<property name="status" type="u" access="readwrite"/>
-    <arg type="u" direction="out"/> \
+<signal name="StatusChanged">
-</signal> \
+    <arg type="u" direction="out"/>
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
 var PresenceStatus = {
     AVAILABLE: 0,
@@ -32,16 +33,17 @@ function Presence(initCallback, cancellable) {
 // Note inhibitors are immutable objects, so they don't
 // change at runtime (changes always come in the form
 // of new inhibitors)
-const InhibitorIface = '<node> \
+const InhibitorIface = `
-<interface name="org.gnome.SessionManager.Inhibitor"> \
+<node>
-<method name="GetAppId"> \
+<interface name="org.gnome.SessionManager.Inhibitor">
-    <arg type="s" direction="out" /> \
+<method name="GetAppId">
-</method> \
+    <arg type="s" direction="out" />
-<method name="GetReason"> \
+</method>
-    <arg type="s" direction="out" /> \
+<method name="GetReason">
-</method> \
+    <arg type="s" direction="out" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface);
 function Inhibitor(objectPath, initCallback, cancellable) {
@@ -49,29 +51,30 @@ function Inhibitor(objectPath, initCallback, cancellable) {
 }
 
 // Not the full interface, only the methods we use
-const SessionManagerIface = '<node> \
+const SessionManagerIface = `
-<interface name="org.gnome.SessionManager"> \
+<node>
-<method name="Logout"> \
+<interface name="org.gnome.SessionManager">
-    <arg type="u" direction="in" /> \
+<method name="Logout">
-</method> \
+    <arg type="u" direction="in" />
-<method name="Shutdown" /> \
+</method>
-<method name="Reboot" /> \
+<method name="Shutdown" />
-<method name="CanShutdown"> \
+<method name="Reboot" />
-    <arg type="b" direction="out" /> \
+<method name="CanShutdown">
-</method> \
+    <arg type="b" direction="out" />
-<method name="IsInhibited"> \
+</method>
-    <arg type="u" direction="in" /> \
+<method name="IsInhibited">
-    <arg type="b" direction="out" /> \
+    <arg type="u" direction="in" />
-</method> \
+    <arg type="b" direction="out" />
-<property name="SessionIsActive" type="b" access="read"/> \
+</method>
-<signal name="InhibitorAdded"> \
+<property name="SessionIsActive" type="b" access="read"/>
-    <arg type="o" direction="out"/> \
+<signal name="InhibitorAdded">
-</signal> \
+    <arg type="o" direction="out"/>
-<signal name="InhibitorRemoved"> \
+</signal>
-    <arg type="o" direction="out"/> \
+<signal name="InhibitorRemoved">
-</signal> \
+    <arg type="o" direction="out"/>
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
 var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface);
 function SessionManager(initCallback, cancellable) {

js/misc/ibusManager.js

@@ -115,6 +115,11 @@ var IBusManager = new Lang.Class({
                                                          object_path: IBus.PATH_PANEL });
             this._candidatePopup.setPanelService(this._panelService);
             this._panelService.connect('update-property', this._updateProperty.bind(this));
+            this._panelService.connect('set-cursor-location', (ps, x, y, w, h) => {
+                let cursorLocation = { x, y, width: w, height: h };
+                this.emit('set-cursor-location', cursorLocation);
+            });
+
             try {
                 // IBus versions older than 1.5.10 have a bug which
                 // causes spurious set-content-type emissions when

js/misc/inputMethod.js

@@ -15,6 +15,10 @@ var InputMethod = new Lang.Class({
         this._purpose = 0;
         this._enabled = true;
         this._currentFocus = null;
+        this._currentEvent = null;
+        this._doForwardEvent = false;
+        this._preeditStr = '';
+        this._preeditPos = 0;
         this._ibus = IBus.Bus.new_async();
         this._ibus.connect('connected', this._onConnected.bind(this));
         this._ibus.connect('disconnected', this._clear.bind(this));
@@ -25,6 +29,9 @@ var InputMethod = new Lang.Class({
                                                                  this._onSourceChanged.bind(this));
         this._currentSource = this._inputSourceManager.currentSource;
 
+        let deviceManager = Clutter.DeviceManager.get_default();
+        this._virtualDevice = deviceManager.create_virtual_device(Clutter.InputDeviceType.KEYBOARD_DEVICE);
+
         if (this._ibus.is_connected())
             this._onConnected();
     },
@@ -64,6 +71,9 @@ var InputMethod = new Lang.Class({
         this._context.connect('commit-text', this._onCommitText.bind(this));
         this._context.connect('delete-surrounding-text', this._onDeleteSurroundingText.bind(this));
         this._context.connect('update-preedit-text', this._onUpdatePreeditText.bind(this));
+        this._context.connect('show-preedit-text', this._onShowPreeditText.bind(this));
+        this._context.connect('hide-preedit-text', this._onHidePreeditText.bind(this));
+        this._context.connect('forward-key-event', this._onForwardKeyEvent.bind(this));
 
         this._updateCapabilities();
     },
@@ -73,6 +83,8 @@ var InputMethod = new Lang.Class({
         this._hints = 0;
         this._purpose = 0;
         this._enabled = false;
+        this._preeditStr = ''
+        this._preeditPos = 0;
     },
 
     _emitRequestSurrounding() {
@@ -89,11 +101,40 @@ var InputMethod = new Lang.Class({
     },
 
     _onUpdatePreeditText(context, text, pos, visible) {
-        let str = null;
+        if (text == null)
-        if (visible && text != null)
+            return;
-            str = text.get_text();
+        this._preeditStr = text.get_text();
+        this._preeditPos = pos;
+        if (visible)
+            this.set_preedit_text(this._preeditStr, pos);
+        else
+            this.set_preedit_text(null, pos);
+    },
 
-        this.set_preedit_text(str, pos);
+    _onShowPreeditText(context) {
+        this.set_preedit_text(this._preeditStr, this._preeditPos);
+    },
+
+    _onHidePreeditText(context) {
+        this.set_preedit_text(null, this._preeditPos);
+    },
+
+    _onForwardKeyEvent(context, keyval, keycode, state) {
+        let press = (state & IBus.ModifierType.RELEASE_MASK) == 0;
+
+        if (this._currentEvent) {
+            // If we are handling this same event in filter_key_press(),
+            // just let it go through, sending the same event again will
+            // be silenced away because the key counts as pressed.
+            if (this._currentEvent.get_key_symbol() == keyval &&
+                (this._currentEvent.type() == Clutter.EventType.KEY_PRESS) == press) {
+                this._doForwardEvent = true;
+                return;
+            }
+        }
+
+        this._virtualDevice.notify_key(Clutter.get_current_event_time(), keycode,
+                                       press ? Clutter.KeyState.PRESSED : Clutter.KeyState.RELEASED);
     },
 
     vfunc_focus_in(focus) {
@@ -197,13 +238,23 @@ var InputMethod = new Lang.Class({
 
         if (event.type() == Clutter.EventType.KEY_RELEASE)
             state |= IBus.ModifierType.RELEASE_MASK;
+
+        this._currentEvent = event;
+        this._doForwardEvent = false;
+
         this._context.process_key_event_async(event.get_key_symbol(),
                                               event.get_key_code() - 8, // Convert XKB keycodes to evcodes
                                               state, -1, null,
                                               (context, res) => {
                                                   try {
                                                       let retval = context.process_key_event_async_finish(res);
+
+                                                      if (this._doForwardEvent)
+                                                          retval = false;
+
                                                       this.notify_key_event(event, retval);
+                                                      this._doForwardEvent = false;
+                                                      this._currentEvent = null;
                                                   } catch (e) {
                                                       log('Error processing key on IM: ' + e.message);
                                                   }

js/misc/loginManager.js

@@ -7,47 +7,60 @@ const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const SystemdLoginManagerIface = '<node> \
+const SystemdLoginManagerIface = `
-<interface name="org.freedesktop.login1.Manager"> \
+<node>
-<method name="Suspend"> \
+<interface name="org.freedesktop.login1.Manager">
-    <arg type="b" direction="in"/> \
+<method name="Suspend">
-</method> \
+    <arg type="b" direction="in"/>
-<method name="CanSuspend"> \
+</method>
-    <arg type="s" direction="out"/> \
+<method name="CanSuspend">
-</method> \
+    <arg type="s" direction="out"/>
-<method name="Inhibit"> \
+</method>
-    <arg type="s" direction="in"/> \
+<method name="Inhibit">
-    <arg type="s" direction="in"/> \
+    <arg type="s" direction="in"/>
-    <arg type="s" direction="in"/> \
+    <arg type="s" direction="in"/>
-    <arg type="s" direction="in"/> \
+    <arg type="s" direction="in"/>
-    <arg type="h" direction="out"/> \
+    <arg type="s" direction="in"/>
-</method> \
+    <arg type="h" direction="out"/>
-<method name="GetSession"> \
+</method>
-    <arg type="s" direction="in"/> \
+<method name="GetSession">
-    <arg type="o" direction="out"/> \
+    <arg type="s" direction="in"/>
-</method> \
+    <arg type="o" direction="out"/>
-<method name="ListSessions"> \
+</method>
-    <arg name="sessions" type="a(susso)" direction="out"/> \
+<method name="ListSessions">
-</method> \
+    <arg name="sessions" type="a(susso)" direction="out"/>
-<signal name="PrepareForSleep"> \
+</method>
-    <arg type="b" direction="out"/> \
+<signal name="PrepareForSleep">
-</signal> \
+    <arg type="b" direction="out"/>
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
-const SystemdLoginSessionIface = '<node> \
+const SystemdLoginSessionIface = `
-<interface name="org.freedesktop.login1.Session"> \
+<node>
-<signal name="Lock" /> \
+<interface name="org.freedesktop.login1.Session">
-<signal name="Unlock" /> \
+<signal name="Lock" />
-<property name="Active" type="b" access="read" /> \
+<signal name="Unlock" />
-<method name="SetLockedHint"> \
+<property name="Active" type="b" access="read" />
-    <arg type="b" direction="in"/> \
+<property name="Class" type="s" access="read" />
-</method> \
+<property name="Id" type="s" access="read" />
-</interface> \
+<method name="SetLockedHint">
-</node>';
+    <arg type="b" direction="in"/>
+</method>
+</interface>
+</node>`;
+
+const SystemdLoginUserIface = `
+<node>
+<interface name="org.freedesktop.login1.User">
+<property name="Display" type="(so)" access="read" />
+<property name="Sessions" type="a(so)" access="read" />
+</interface>
+</node>`;
 
 const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
 const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
+const SystemdLoginUser = Gio.DBusProxy.makeProxyWrapper(SystemdLoginUserIface);
 
 function haveSystemd() {
     return GLib.access("/run/systemd/seats", 0) >= 0;
@@ -109,6 +122,9 @@ var LoginManagerSystemd = new Lang.Class({
         this._proxy = new SystemdLoginManager(Gio.DBus.system,
                                               'org.freedesktop.login1',
                                               '/org/freedesktop/login1');
+        this._userProxy = new SystemdLoginUser(Gio.DBus.system,
+                                               'org.freedesktop.login1',
+                                               '/org/freedesktop/login1/user/self');
         this._proxy.connectSignal('PrepareForSleep',
                                   this._prepareForSleep.bind(this));
     },
@@ -121,8 +137,31 @@ var LoginManagerSystemd = new Lang.Class({
 
         let sessionId = GLib.getenv('XDG_SESSION_ID');
         if (!sessionId) {
-            log('Unset XDG_SESSION_ID, getCurrentSessionProxy() called outside a user session.');
+            log('Unset XDG_SESSION_ID, getCurrentSessionProxy() called outside a user session. Asking logind directly.');
-            return;
+            let [session, objectPath] = this._userProxy.Display;
+            if (session) {
+                log(`Will monitor session ${session}`);
+                sessionId = session;
+            } else {
+                log('Failed to find "Display" session; are we the greeter?');
+
+                for (let [session, objectPath] of this._userProxy.Sessions) {
+                    let sessionProxy = new SystemdLoginSession(Gio.DBus.system,
+                                                               'org.freedesktop.login1',
+                                                               objectPath);
+                    log(`Considering ${session}, class=${sessionProxy.Class}`);
+                    if (sessionProxy.Class == 'greeter') {
+                        log(`Yes, will monitor session ${session}`);
+                        sessionId = session;
+                        break;
+                    }
+                }
+
+                if (!sessionId) {
+                    log('No, failed to get session from logind.');
+                    return;
+                }
+            }
         }
 
         this._proxy.GetSessionRemote(sessionId, (result, error) => {

js/misc/modemManager.js

@@ -92,41 +92,43 @@ function _findProviderForSid(sid) {
 // The following are not the complete interfaces, just the methods we need
 // (or may need in the future)
 
-const ModemGsmNetworkInterface = '<node> \
+const ModemGsmNetworkInterface = `
-<interface name="org.freedesktop.ModemManager.Modem.Gsm.Network"> \
+<node>
-<method name="GetRegistrationInfo"> \
+<interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
-    <arg type="(uss)" direction="out" /> \
+<method name="GetRegistrationInfo">
-</method> \
+    <arg type="(uss)" direction="out" />
-<method name="GetSignalQuality"> \
+</method>
-    <arg type="u" direction="out" /> \
+<method name="GetSignalQuality">
-</method> \
+    <arg type="u" direction="out" />
-<property name="AccessTechnology" type="u" access="read" /> \
+</method>
-<signal name="SignalQuality"> \
+<property name="AccessTechnology" type="u" access="read" />
-    <arg type="u" direction="out" /> \
+<signal name="SignalQuality">
-</signal> \
+    <arg type="u" direction="out" />
-<signal name="RegistrationInfo"> \
+</signal>
-    <arg type="u" direction="out" /> \
+<signal name="RegistrationInfo">
-    <arg type="s" direction="out" /> \
+    <arg type="u" direction="out" />
-    <arg type="s" direction="out" /> \
+    <arg type="s" direction="out" />
-</signal> \
+    <arg type="s" direction="out" />
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
 const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface);
 
-const ModemCdmaInterface = '<node> \
+const ModemCdmaInterface = `
-<interface name="org.freedesktop.ModemManager.Modem.Cdma"> \
+<node>
-<method name="GetSignalQuality"> \
+<interface name="org.freedesktop.ModemManager.Modem.Cdma">
-    <arg type="u" direction="out" /> \
+<method name="GetSignalQuality">
-</method> \
+    <arg type="u" direction="out" />
-<method name="GetServingSystem"> \
+</method>
-    <arg type="(usu)" direction="out" /> \
+<method name="GetServingSystem">
-</method> \
+    <arg type="(usu)" direction="out" />
-<signal name="SignalQuality"> \
+</method>
-    <arg type="u" direction="out" /> \
+<signal name="SignalQuality">
-</signal> \
+    <arg type="u" direction="out" />
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
 const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
 
@@ -222,26 +224,29 @@ Signals.addSignalMethods(ModemCdma.prototype);
 // Support for the new ModemManager1 interface (MM >= 0.7)
 //------------------------------------------------------------------------------
 
-const BroadbandModemInterface = '<node> \
+const BroadbandModemInterface = `
-<interface name="org.freedesktop.ModemManager1.Modem"> \
+<node>
-<property name="SignalQuality" type="(ub)" access="read" /> \
+<interface name="org.freedesktop.ModemManager1.Modem">
-</interface> \
+<property name="SignalQuality" type="(ub)" access="read" />
-</node>';
+</interface>
+</node>`;
 const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface);
 
-const BroadbandModem3gppInterface = '<node> \
+const BroadbandModem3gppInterface = `
-<interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp"> \
+<node>
-<property name="OperatorCode" type="s" access="read" /> \
+<interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp">
-<property name="OperatorName" type="s" access="read" /> \
+<property name="OperatorCode" type="s" access="read" />
-</interface> \
+<property name="OperatorName" type="s" access="read" />
-</node>';
+</interface>
+</node>`;
 const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gppInterface);
 
-const BroadbandModemCdmaInterface = '<node> \
+const BroadbandModemCdmaInterface = `
-<interface name="org.freedesktop.ModemManager1.Modem.ModemCdma"> \
+<node>
-<property name="Sid" type="u" access="read" /> \
+<interface name="org.freedesktop.ModemManager1.Modem.ModemCdma">
-</interface> \
+<property name="Sid" type="u" access="read" />
-</node>';
+</interface>
+</node>`;
 const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface);
 
 var BroadbandModem = new Lang.Class({

js/misc/objectManager.js

@@ -8,21 +8,22 @@ const Signals = imports.signals;
 
 // Specified in the D-Bus specification here:
 // http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager
-const ObjectManagerIface = '<node> \
+const ObjectManagerIface = `
-<interface name="org.freedesktop.DBus.ObjectManager"> \
+<node>
-  <method name="GetManagedObjects"> \
+<interface name="org.freedesktop.DBus.ObjectManager">
-    <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/> \
+  <method name="GetManagedObjects">
-  </method> \
+    <arg name="objects" type="a{oa{sa{sv}}}" direction="out"/>
-  <signal name="InterfacesAdded"> \
+  </method>
-    <arg name="objectPath" type="o"/> \
+  <signal name="InterfacesAdded">
-    <arg name="interfaces" type="a{sa{sv}}" /> \
+    <arg name="objectPath" type="o"/>
-  </signal> \
+    <arg name="interfaces" type="a{sa{sv}}" />
-  <signal name="InterfacesRemoved"> \
+  </signal>
-    <arg name="objectPath" type="o"/> \
+  <signal name="InterfacesRemoved">
-    <arg name="interfaces" type="as" /> \
+    <arg name="objectPath" type="o"/>
-  </signal> \
+    <arg name="interfaces" type="as" />
-</interface> \
+  </signal>
-</node>';
+</interface>
+</node>`;
 
 const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);
 

js/misc/permissionStore.js

@@ -2,30 +2,31 @@
 
 const Gio = imports.gi.Gio;
 
-const PermissionStoreIface = '<node> \
+const PermissionStoreIface = `
-  <interface name="org.freedesktop.impl.portal.PermissionStore"> \
+<node>
-    <method name="Lookup"> \
+  <interface name="org.freedesktop.impl.portal.PermissionStore">
-      <arg name="table" type="s" direction="in"/> \
+    <method name="Lookup">
-      <arg name="id" type="s" direction="in"/> \
+      <arg name="table" type="s" direction="in"/>
-      <arg name="permissions" type="a{sas}" direction="out"/> \
+      <arg name="id" type="s" direction="in"/>
-      <arg name="data" type="v" direction="out"/> \
+      <arg name="permissions" type="a{sas}" direction="out"/>
-    </method> \
+      <arg name="data" type="v" direction="out"/>
-    <method name="Set"> \
+    </method>
-      <arg name="table" type="s" direction="in"/> \
+    <method name="Set">
-      <arg name="create" type="b" direction="in"/> \
+      <arg name="table" type="s" direction="in"/>
-      <arg name="id" type="s" direction="in"/> \
+      <arg name="create" type="b" direction="in"/>
-      <arg name="app_permissions" type="a{sas}" direction="in"/> \
+      <arg name="id" type="s" direction="in"/>
-      <arg name="data" type="v" direction="in"/> \
+      <arg name="app_permissions" type="a{sas}" direction="in"/>
-    </method> \
+      <arg name="data" type="v" direction="in"/>
-    <signal name="Changed"> \
+    </method>
-      <arg name="table" type="s" direction="out"/> \
+    <signal name="Changed">
-      <arg name="id" type="s" direction="out"/> \
+      <arg name="table" type="s" direction="out"/>
-      <arg name="deleted" type="b" direction="out"/> \
+      <arg name="id" type="s" direction="out"/>
-      <arg name="data" type="v" direction="out"/> \
+      <arg name="deleted" type="b" direction="out"/>
-      <arg name="permissions" type="a{sas}" direction="out"/> \
+      <arg name="data" type="v" direction="out"/>
-    </signal> \
+      <arg name="permissions" type="a{sas}" direction="out"/>
-  </interface> \
+    </signal>
-</node>';
+  </interface>
+</node>`;
 
 const PermissionStoreProxy = Gio.DBusProxy.makeProxyWrapper(PermissionStoreIface);
 

js/misc/smartcardManager.js

@@ -7,14 +7,15 @@ const Signals = imports.signals;
 
 const ObjectManager = imports.misc.objectManager;
 
-const SmartcardTokenIface = '<node> \
+const SmartcardTokenIface = `
-<interface name="org.gnome.SettingsDaemon.Smartcard.Token"> \
+<node>
-  <property name="Name" type="s" access="read"/> \
+<interface name="org.gnome.SettingsDaemon.Smartcard.Token">
-  <property name="Driver" type="o" access="read"/> \
+  <property name="Name" type="s" access="read"/>
-  <property name="IsInserted" type="b" access="read"/> \
+  <property name="Driver" type="o" access="read"/>
-  <property name="UsedToLogin" type="b" access="read"/> \
+  <property name="IsInserted" type="b" access="read"/>
-</interface> \
+  <property name="UsedToLogin" type="b" access="read"/>
-</node>';
+</interface>
+</node>`;
 
 let _smartcardManager = null;
 

js/misc/systemActions.js

@@ -22,11 +22,12 @@ const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
 const SENSOR_BUS_NAME = 'net.hadess.SensorProxy';
 const SENSOR_OBJECT_PATH = '/net/hadess/SensorProxy';
 
-const SensorProxyInterface = '<node> \
+const SensorProxyInterface = `
-<interface name="net.hadess.SensorProxy"> \
+<node>
-  <property name="HasAccelerometer" type="b" access="read"/> \
+<interface name="net.hadess.SensorProxy">
-</interface> \
+  <property name="HasAccelerometer" type="b" access="read"/>
-</node>';
+</interface>
+</node>`;
 
 const POWER_OFF_ACTION_ID        = 'power-off';
 const LOCK_SCREEN_ACTION_ID      = 'lock-screen';

js/portal-resources.gresource.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell">
+    <file>misc/config.js</file>
+    <file>portalHelper/main.js</file>
+  </gresource>
+</gresources>

js/portalHelper/main.js

@@ -30,25 +30,26 @@ const CONNECTIVITY_CHECK_HOST = 'nmcheck.gnome.org';
 const CONNECTIVITY_CHECK_URI = 'http://' + CONNECTIVITY_CHECK_HOST;
 const CONNECTIVITY_RECHECK_RATELIMIT_TIMEOUT = 30 * GLib.USEC_PER_SEC;
 
-const HelperDBusInterface = '<node> \
+const HelperDBusInterface = `
-<interface name="org.gnome.Shell.PortalHelper"> \
+<node>
-<method name="Authenticate"> \
+<interface name="org.gnome.Shell.PortalHelper">
-    <arg type="o" direction="in" name="connection" /> \
+<method name="Authenticate">
-    <arg type="s" direction="in" name="url" /> \
+    <arg type="o" direction="in" name="connection" />
-    <arg type="u" direction="in" name="timestamp" /> \
+    <arg type="s" direction="in" name="url" />
-</method> \
+    <arg type="u" direction="in" name="timestamp" />
-<method name="Close"> \
+</method>
-    <arg type="o" direction="in" name="connection" /> \
+<method name="Close">
-</method> \
+    <arg type="o" direction="in" name="connection" />
-<method name="Refresh"> \
+</method>
-    <arg type="o" direction="in" name="connection" /> \
+<method name="Refresh">
-</method> \
+    <arg type="o" direction="in" name="connection" />
-<signal name="Done"> \
+</method>
-    <arg type="o" name="connection" /> \
+<signal name="Done">
-    <arg type="u" name="result" /> \
+    <arg type="o" name="connection" />
-</signal> \
+    <arg type="u" name="result" />
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
 var PortalHeaderBar = new Lang.Class({
     Name: 'PortalHeaderBar',

js/prefs-resources.gresource.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/shell">
+    <file>extensionPrefs/main.js</file>
+
+    <file>misc/config.js</file>
+    <file>misc/extensionUtils.js</file>
+    <file>misc/fileUtils.js</file>
+    <file>misc/params.js</file>
+  </gresource>
+</gresources>

js/ui/accessDialog.js

@@ -10,27 +10,29 @@ const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
 
-const RequestIface = '<node> \
+const RequestIface = `
-<interface name="org.freedesktop.impl.portal.Request"> \
+<node>
-<method name="Close"/> \
+<interface name="org.freedesktop.impl.portal.Request">
-</interface> \
+<method name="Close"/>
-</node>';
+</interface>
+</node>`;
 
-const AccessIface = '<node> \
+const AccessIface = `
-<interface name="org.freedesktop.impl.portal.Access"> \
+<node>
-<method name="AccessDialog"> \
+<interface name="org.freedesktop.impl.portal.Access">
-  <arg type="o" name="handle" direction="in"/> \
+<method name="AccessDialog">
-  <arg type="s" name="app_id" direction="in"/> \
+  <arg type="o" name="handle" direction="in"/>
-  <arg type="s" name="parent_window" direction="in"/> \
+  <arg type="s" name="app_id" direction="in"/>
-  <arg type="s" name="title" direction="in"/> \
+  <arg type="s" name="parent_window" direction="in"/>
-  <arg type="s" name="subtitle" direction="in"/> \
+  <arg type="s" name="title" direction="in"/>
-  <arg type="s" name="body" direction="in"/> \
+  <arg type="s" name="subtitle" direction="in"/>
-  <arg type="a{sv}" name="options" direction="in"/> \
+  <arg type="s" name="body" direction="in"/>
-  <arg type="u" name="response" direction="out"/> \
+  <arg type="a{sv}" name="options" direction="in"/>
-  <arg type="a{sv}" name="results" direction="out"/> \
+  <arg type="u" name="response" direction="out"/>
-</method> \
+  <arg type="a{sv}" name="results" direction="out"/>
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 var DialogResponse = {
     OK: 0,

js/ui/altTab.js

@@ -502,7 +502,8 @@ var CyclerPopup = new Lang.Class({
     _finish() {
         let window = this._items[this._selectedIndex];
         let ws = window.get_workspace();
-        let activeWs = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let activeWs = workspaceManager.get_active_workspace();
 
         if (window.minimized) {
             Main.wm.skipNextEffect(window.get_compositor_private());
@@ -572,7 +573,14 @@ var WindowSwitcherPopup = new Lang.Class({
     },
 
     _getWindowList() {
-        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
+        let workspace = null;
+
+        if (this._settings.get_boolean('current-workspace-only')) {
+            let workspaceManager = global.workspace_manager;
+
+            workspace = workspaceManager.get_active_workspace();
+        }
+
         return getWindows(workspace);
     },
 
@@ -620,7 +628,14 @@ var WindowCyclerPopup = new Lang.Class({
     },
 
     _getWindows() {
-        let workspace = this._settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace() : null;
+        let workspace = null;
+
+        if (this._settings.get_boolean('current-workspace-only')) {
+            let workspaceManager = global.workspace_manager;
+
+            workspace = workspaceManager.get_active_workspace();
+        }
+
         return getWindows(workspace);
     },
 
@@ -669,8 +684,14 @@ var AppSwitcher = new Lang.Class({
 
         let windowTracker = Shell.WindowTracker.get_default();
         let settings = new Gio.Settings({ schema_id: 'org.gnome.shell.app-switcher' });
-        let workspace = settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace()
+
-                                                                       : null;
+        let workspace = null;
+        if (settings.get_boolean('current-workspace-only')) {
+            let workspaceManager = global.workspace_manager;
+
+            workspace = workspaceManager.get_active_workspace();
+        }
+
         let allWindows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
 
         // Construct the AppIcons, add to the popup

js/ui/appDisplay.js

@@ -66,11 +66,12 @@ var PAGE_SWITCH_TIME = 0.3;
 const SWITCHEROO_BUS_NAME = 'net.hadess.SwitcherooControl';
 const SWITCHEROO_OBJECT_PATH = '/net/hadess/SwitcherooControl';
 
-const SwitcherooProxyInterface = '<node> \
+const SwitcherooProxyInterface = `
-<interface name="net.hadess.SwitcherooControl"> \
+<node>
-  <property name="HasDualGpu" type="b" access="read"/> \
+<interface name="net.hadess.SwitcherooControl">
-</interface> \
+  <property name="HasDualGpu" type="b" access="read"/>
-</node>';
+</interface>
+</node>`;
 
 const SwitcherooProxy = Gio.DBusProxy.makeProxyWrapper(SwitcherooProxyInterface);
 let discreteGpuAvailable = false;
@@ -1778,10 +1779,11 @@ var AppIcon = new Lang.Class({
     activate(button) {
         let event = Clutter.get_current_event();
         let modifiers = event ? event.get_state() : 0;
-        let openNewWindow = this.app.can_open_new_window () &&
+        let isMiddleButton = button && button == Clutter.BUTTON_MIDDLE;
-                            modifiers & Clutter.ModifierType.CONTROL_MASK &&
+        let isCtrlPressed = (modifiers & Clutter.ModifierType.CONTROL_MASK) != 0;
-                            this.app.state == Shell.AppState.RUNNING ||
+        let openNewWindow = this.app.can_open_new_window() &&
-                            button && button == 2;
+                            this.app.state == Shell.AppState.RUNNING &&
+                            (isCtrlPressed || isMiddleButton);
 
         if (this.app.state == Shell.AppState.STOPPED || openNewWindow)
             this.animateLaunch();
@@ -1861,7 +1863,8 @@ var AppIconMenu = new Lang.Class({
 
         // Display the app windows menu items and the separator between windows
         // of the current desktop and other windows.
-        let activeWorkspace = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
         let separatorShown = windows.length > 0 && windows[0].get_workspace() != activeWorkspace;
 
         for (let i = 0; i < windows.length; i++) {
@@ -1870,7 +1873,9 @@ var AppIconMenu = new Lang.Class({
                 this._appendSeparator();
                 separatorShown = true;
             }
-            let item = this._appendMenuItem(window.title);
+            let title = window.title ? window.title
+                                     : this._source.app.get_name();
+            let item = this._appendMenuItem(title);
             item.connect('activate', () => {
                 this.emit('activate-window', window);
             });

js/ui/audioDeviceSelection.js

@@ -15,18 +15,19 @@ var AudioDevice = {
     MICROPHONE: 1 << 2
 };
 
-const AudioDeviceSelectionIface = '<node> \
+const AudioDeviceSelectionIface = `
-<interface name="org.gnome.Shell.AudioDeviceSelection"> \
+<node>
-<method name="Open"> \
+<interface name="org.gnome.Shell.AudioDeviceSelection">
-    <arg name="devices" direction="in" type="as" /> \
+<method name="Open">
-</method> \
+    <arg name="devices" direction="in" type="as" />
-<method name="Close"> \
+</method>
-</method> \
+<method name="Close">
-<signal name="DeviceSelected"> \
+</method>
-    <arg name="device" type="s" /> \
+<signal name="DeviceSelected">
-</signal> \
+    <arg name="device" type="s" />
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
 var AudioDeviceSelectionDialog = new Lang.Class({
     Name: 'AudioDeviceSelectionDialog',

js/ui/background.js

@@ -240,7 +240,7 @@ var Background = new Lang.Class({
                                         file: null,
                                         style: null });
 
-        this.background = new Meta.Background({ meta_screen: global.screen });
+        this.background = new Meta.Background({ meta_display: global.display });
         this.background._delegate = this;
 
         this._settings = params.settings;
@@ -499,12 +499,12 @@ var SystemBackground = new Lang.Class({
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
 
         if (_systemBackground == null) {
-            _systemBackground = new Meta.Background({ meta_screen: global.screen });
+            _systemBackground = new Meta.Background({ meta_display: global.display });
             _systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
             _systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
         }
 
-        this.actor = new Meta.BackgroundActor({ meta_screen: global.screen,
+        this.actor = new Meta.BackgroundActor({ meta_display: global.display,
                                                 monitor: 0,
                                                 background: _systemBackground });
 
@@ -538,8 +538,10 @@ var BackgroundSource = new Lang.Class({
         this._settings = new Gio.Settings({ schema_id: settingsSchema });
         this._backgrounds = [];
 
-        this._monitorsChangedId = global.screen.connect('monitors-changed',
+        let monitorManager = Meta.MonitorManager.get();
-                                                        this._onMonitorsChanged.bind(this));
+        this._monitorsChangedId =
+            monitorManager.connect('monitors-changed',
+                                   this._onMonitorsChanged.bind(this));
     },
 
     _onMonitorsChanged() {
@@ -604,7 +606,8 @@ var BackgroundSource = new Lang.Class({
     },
 
     destroy() {
-        global.screen.disconnect(this._monitorsChangedId);
+        let monitorManager = Meta.MonitorManager.get();
+        monitorManager.disconnect(this._monitorsChangedId);
 
         for (let monitorIndex in this._backgrounds) {
             let background = this._backgrounds[monitorIndex];
@@ -751,7 +754,7 @@ var BackgroundManager = new Lang.Class({
 
     _createBackgroundActor() {
         let background = this._backgroundSource.getBackground(this._monitorIndex);
-        let backgroundActor = new Meta.BackgroundActor({ meta_screen: global.screen,
+        let backgroundActor = new Meta.BackgroundActor({ meta_display: global.display,
                                                          monitor: this._monitorIndex,
                                                          background: background.background,
                                                          vignette: this._vignette,

js/ui/barLevel.js

@@ -0,0 +1,210 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Atk = imports.gi.Atk;
+const Cairo = imports.cairo;
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const St = imports.gi.St;
+const Signals = imports.signals;
+
+var BarLevel = new Lang.Class({
+    Name: "BarLevel",
+
+    _init(value, params) {
+        if (isNaN(value))
+            // Avoid spreading NaNs around
+            throw TypeError('The bar level value must be a number');
+        this._maxValue = 1;
+        this._value = Math.max(Math.min(value, this._maxValue), 0);
+        this._overdriveStart = 1;
+        this._barLevelWidth = 0;
+
+        if (params == undefined)
+            params = {}
+
+        this.actor = new St.DrawingArea({ styleClass: params['styleClass'] || 'barlevel',
+                                          can_focus: params['canFocus'] || false,
+                                          reactive: params['reactive'] || false,
+                                          accessible_role: params['accessibleRole'] || Atk.Role.LEVEL_BAR });
+        this.actor.connect('repaint', this._barLevelRepaint.bind(this));
+        this.actor.connect('allocation-changed', (actor, box) => {
+            this._barLevelWidth = box.get_width();
+        });
+
+        this._customAccessible = St.GenericAccessible.new_for_actor(this.actor);
+        this.actor.set_accessible(this._customAccessible);
+
+        this._customAccessible.connect('get-current-value', this._getCurrentValue.bind(this));
+        this._customAccessible.connect('get-minimum-value', this._getMinimumValue.bind(this));
+        this._customAccessible.connect('get-maximum-value', this._getMaximumValue.bind(this));
+        this._customAccessible.connect('set-current-value', this._setCurrentValue.bind(this));
+
+        this.connect('value-changed', this._valueChanged.bind(this));
+    },
+
+    setValue(value) {
+        if (isNaN(value))
+            throw TypeError('The bar level value must be a number');
+
+        this._value = Math.max(Math.min(value, this._maxValue), 0);
+        this.actor.queue_repaint();
+    },
+
+    setMaximumValue(value) {
+        if (isNaN(value))
+            throw TypeError('The bar level max value must be a number');
+
+        this._maxValue = Math.max(value, 1);
+        this._overdriveStart = Math.min(this._overdriveStart, this._maxValue);
+        this.actor.queue_repaint();
+    },
+
+    setOverdriveStart(value) {
+        if (isNaN(value))
+            throw TypeError('The overdrive limit value must be a number');
+        if (value > this._maxValue)
+            throw new Error(`Tried to set overdrive value to ${value}, ` +
+                `which is a number greater than the maximum allowed value ${this._maxValue}`);
+
+        this._overdriveStart = value;
+        this._value = Math.max(Math.min(value, this._maxValue), 0);
+        this.actor.queue_repaint();
+    },
+
+    _barLevelRepaint(area) {
+        let cr = area.get_context();
+        let themeNode = area.get_theme_node();
+        let [width, height] = area.get_surface_size();
+
+        let barLevelHeight = themeNode.get_length('-barlevel-height');
+        let barLevelBorderRadius = Math.min(width, barLevelHeight) / 2;
+        let fgColor = themeNode.get_foreground_color();
+
+        let barLevelColor = themeNode.get_color('-barlevel-background-color');
+        let barLevelActiveColor = themeNode.get_color('-barlevel-active-background-color');
+        let barLevelOverdriveColor = themeNode.get_color('-barlevel-overdrive-color');
+
+        let barLevelBorderWidth = Math.min(themeNode.get_length('-barlevel-border-width'), 1);
+        let [hasBorderColor, barLevelBorderColor] =
+            themeNode.lookup_color('-barlevel-border-color', false);
+        if (!hasBorderColor)
+            barLevelBorderColor = barLevelColor;
+        let [hasActiveBorderColor, barLevelActiveBorderColor] =
+            themeNode.lookup_color('-barlevel-active-border-color', false);
+        if (!hasActiveBorderColor)
+            barLevelActiveBorderColor = barLevelActiveColor;
+        let [hasOverdriveBorderColor, barLevelOverdriveBorderColor] =
+            themeNode.lookup_color('-barlevel-overdrive-border-color', false);
+        if (!hasOverdriveBorderColor)
+            barLevelOverdriveBorderColor = barLevelOverdriveColor;
+
+        const TAU = Math.PI * 2;
+
+        let endX = 0;
+        if (this._maxValue > 0)
+            endX = barLevelBorderRadius + (width - 2 * barLevelBorderRadius) * this._value / this._maxValue;
+
+        let overdriveSeparatorX = barLevelBorderRadius + (width - 2 * barLevelBorderRadius) * this._overdriveStart / this._maxValue;
+        let overdriveActive = this._overdriveStart !== this._maxValue;
+        let overdriveSeparatorWidth = 0;
+        if (overdriveActive)
+            overdriveSeparatorWidth = themeNode.get_length('-barlevel-overdrive-separator-width');
+
+        /* background bar */
+        cr.arc(width - barLevelBorderRadius - barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
+        cr.lineTo(endX, (height + barLevelHeight) / 2);
+        cr.lineTo(endX, (height - barLevelHeight) / 2);
+        cr.lineTo(width - barLevelBorderRadius - barLevelBorderWidth, (height - barLevelHeight) / 2);
+        Clutter.cairo_set_source_color(cr, barLevelColor);
+        cr.fillPreserve();
+        Clutter.cairo_set_source_color(cr, barLevelBorderColor);
+        cr.setLineWidth(barLevelBorderWidth);
+        cr.stroke();
+
+        /* normal progress bar */
+        let x = Math.min(endX, overdriveSeparatorX - overdriveSeparatorWidth / 2);
+        cr.arc(barLevelBorderRadius + barLevelBorderWidth, height / 2, barLevelBorderRadius, TAU * 1 / 4, TAU * 3 / 4);
+        cr.lineTo(x, (height - barLevelHeight) / 2);
+        cr.lineTo(x, (height + barLevelHeight) / 2);
+        cr.lineTo(barLevelBorderRadius + barLevelBorderWidth, (height + barLevelHeight) / 2);
+        Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+        cr.fillPreserve();
+        Clutter.cairo_set_source_color(cr, barLevelActiveBorderColor);
+        cr.setLineWidth(barLevelBorderWidth);
+        cr.stroke();
+
+        /* overdrive progress barLevel */
+        x = Math.min(endX, overdriveSeparatorX) + overdriveSeparatorWidth / 2;
+        if (this._value > this._overdriveStart) {
+            cr.moveTo(x, (height - barLevelHeight) / 2);
+            cr.lineTo(endX, (height - barLevelHeight) / 2);
+            cr.lineTo(endX, (height + barLevelHeight) / 2);
+            cr.lineTo(x, (height + barLevelHeight) / 2);
+            cr.lineTo(x, (height - barLevelHeight) / 2);
+            Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
+            cr.fillPreserve();
+            Clutter.cairo_set_source_color(cr, barLevelOverdriveBorderColor);
+            cr.setLineWidth(barLevelBorderWidth);
+            cr.stroke();
+        }
+
+        /* end progress bar arc */
+        if (this._value <= this._overdriveStart)
+            Clutter.cairo_set_source_color(cr, barLevelActiveColor);
+        else
+            Clutter.cairo_set_source_color(cr, barLevelOverdriveColor);
+        cr.arc(endX, height / 2, barLevelBorderRadius, TAU * 3 / 4, TAU * 1 / 4);
+        cr.lineTo(Math.floor(endX), (height + barLevelHeight) / 2);
+        cr.lineTo(Math.floor(endX), (height - barLevelHeight) / 2);
+        cr.lineTo(endX, (height - barLevelHeight) / 2);
+        cr.fillPreserve();
+        cr.setLineWidth(barLevelBorderWidth);
+        cr.stroke();
+
+        /* draw overdrive separator */
+        if (overdriveActive) {
+            cr.moveTo(overdriveSeparatorX - overdriveSeparatorWidth / 2, (height - barLevelHeight) / 2);
+            cr.lineTo(overdriveSeparatorX + overdriveSeparatorWidth / 2, (height - barLevelHeight) / 2);
+            cr.lineTo(overdriveSeparatorX + overdriveSeparatorWidth / 2, (height + barLevelHeight) / 2);
+            cr.lineTo(overdriveSeparatorX - overdriveSeparatorWidth / 2, (height + barLevelHeight) / 2);
+            cr.lineTo(overdriveSeparatorX - overdriveSeparatorWidth / 2, (height - barLevelHeight) / 2);
+            if (this._value <= this._overdriveStart)
+                Clutter.cairo_set_source_color(cr, fgColor);
+            else
+                Clutter.cairo_set_source_color(cr, barLevelColor);
+            cr.fill();
+        }
+
+        cr.$dispose();
+    },
+
+    _getCurrentValue(actor) {
+        return this._value;
+    },
+
+    _getOverdriveStart(actor) {
+        return this._overdriveStart;
+    },
+
+    _getMinimumValue(actor) {
+        return 0;
+    },
+
+    _getMaximumValue(actor) {
+        return this._maxValue;
+    },
+
+    _setCurrentValue(actor, value) {
+        this._value = value;
+    },
+
+    _valueChanged(barLevel, value, property) {
+        this._customAccessible.notify("accessible-value");
+    },
+
+    get value() {
+        return this._value;
+    }
+});
+
+Signals.addSignalMethods(BarLevel.prototype);

js/ui/boxpointer.js

@@ -44,6 +44,7 @@ var BoxPointer = new Lang.Class({
                                   y_fill: true });
         this._container = new Shell.GenericContainer();
         this.actor.set_child(this._container);
+        this.actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
         this._container.connect('get-preferred-width', this._getPreferredWidth.bind(this));
         this._container.connect('get-preferred-height', this._getPreferredHeight.bind(this));
         this._container.connect('allocate', this._allocate.bind(this));

js/ui/calendar.js

@@ -134,18 +134,19 @@ var EmptyEventSource = new Lang.Class({
 });
 Signals.addSignalMethods(EmptyEventSource.prototype);
 
-const CalendarServerIface = '<node> \
+const CalendarServerIface = `
-<interface name="org.gnome.Shell.CalendarServer"> \
+<node>
-<method name="GetEvents"> \
+<interface name="org.gnome.Shell.CalendarServer">
-    <arg type="x" direction="in" /> \
+<method name="GetEvents">
-    <arg type="x" direction="in" /> \
+    <arg type="x" direction="in" />
-    <arg type="b" direction="in" /> \
+    <arg type="x" direction="in" />
-    <arg type="a(sssbxxa{sv})" direction="out" /> \
+    <arg type="b" direction="in" />
-</method> \
+    <arg type="a(sssbxxa{sv})" direction="out" />
-<property name="HasCalendars" type="b" access="read" /> \
+</method>
-<signal name="Changed" /> \
+<property name="HasCalendars" type="b" access="read" />
-</interface> \
+<signal name="Changed" />
-</node>';
+</interface>
+</node>`;
 
 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
 
@@ -821,6 +822,8 @@ var EventsSection = new Lang.Class({
         this._desktopSettings.connect('changed', this._reloadEvents.bind(this));
         this._eventSource = new EmptyEventSource();
 
+        this._messageById = new Map();
+
         this.parent();
 
         this._title = new St.Button({ style_class: 'events-section-title',
@@ -875,20 +878,32 @@ var EventsSection = new Lang.Class({
 
         this._reloading = true;
 
-        this._list.destroy_all_children();
-
         let periodBegin = _getBeginningOfDay(this._date);
         let periodEnd = _getEndOfDay(this._date);
         let events = this._eventSource.getEvents(periodBegin, periodEnd);
 
+        let ids = events.map(e => e.id);
+        this._messageById.forEach((message, id) => {
+            if (ids.includes(id))
+                return;
+            this._messageById.delete(id);
+            this.removeMessage(message);
+        });
+
         for (let i = 0; i < events.length; i++) {
             let event = events[i];
 
-            let message = new EventMessage(event, this._date);
+            let message = this._messageById.get(event.id);
-            message.connect('close', () => {
+            if (!message) {
-                this._ignoreEvent(event);
+                message = new EventMessage(event, this._date);
-            });
+                message.connect('close', () => {
-            this.addMessage(message, false);
+                    this._ignoreEvent(event);
+                });
+                this._messageById.set(event.id, message);
+                this.addMessage(message, false);
+            } else {
+                this.moveMessage(message, i, false);
+            }
         }
 
         this._reloading = false;

js/ui/closeDialog.js

@@ -2,6 +2,7 @@
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
@@ -13,6 +14,7 @@ const Tweener = imports.ui.tweener;
 
 var FROZEN_WINDOW_BRIGHTNESS = -0.3
 var DIALOG_TRANSITION_TIME = 0.15
+var ALIVE_TIMEOUT = 5000;
 
 var CloseDialog = new Lang.Class({
     Name: 'CloseDialog',
@@ -26,6 +28,7 @@ var CloseDialog = new Lang.Class({
         this.parent();
         this._window = window;
         this._dialog = null;
+        this._timeoutId = 0;
     },
 
     get window() {
@@ -97,6 +100,14 @@ var CloseDialog = new Lang.Class({
         if (this._dialog != null)
             return;
 
+        Meta.disable_unredirect_for_display(global.display);
+
+        this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, ALIVE_TIMEOUT,
+            () => {
+                this._window.check_alive(global.display.get_current_time_roundtrip());
+                return GLib.SOURCE_CONTINUE;
+            });
+
         this._addWindowEffect();
         this._initDialog();
 
@@ -117,6 +128,11 @@ var CloseDialog = new Lang.Class({
         if (this._dialog == null)
             return;
 
+        Meta.enable_unredirect_for_display(global.display);
+
+        GLib.source_remove(this._timeoutId);
+        this._timeoutId = 0;
+
         let dialog = this._dialog;
         this._dialog = null;
         this._removeWindowEffect();

js/ui/components/autorunManager.js

@@ -74,14 +74,15 @@ function startAppForMount(app, mount) {
 
 /******************************************/
 
-const HotplugSnifferIface = '<node> \
+const HotplugSnifferIface = `
-<interface name="org.gnome.Shell.HotplugSniffer"> \
+<node>
-<method name="SniffURI"> \
+<interface name="org.gnome.Shell.HotplugSniffer">
-    <arg type="s" direction="in" /> \
+<method name="SniffURI">
-    <arg type="as" direction="out" /> \
+    <arg type="s" direction="in" />
-</method> \
+    <arg type="as" direction="out" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface);
 function HotplugSniffer() {

js/ui/components/networkAgent.js

@@ -506,8 +506,12 @@ var VPNRequestHandler = new Lang.Class({
         try {
             data = this._dataStdout.peek_buffer();
 
-            keyfile.load_from_data(data.toString(), data.length,
+            if (data instanceof Uint8Array)
-                                   GLib.KeyFileFlags.NONE);
+                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)
                 throw new Error('Invalid plugin keyfile version, is %d');

js/ui/ctrlAltTab.js

@@ -85,9 +85,11 @@ var CtrlAltTabManager = new Lang.Class({
 
         // And add the windows metacity would show in its Ctrl-Alt-Tab list
         if (Main.sessionMode.hasWindows && !Main.overview.visible) {
-            let screen = global.screen;
+            let display = global.display;
-            let display = screen.get_display();
+            let workspaceManager = global.workspace_manager;
-            let windows = display.get_tab_list(Meta.TabList.DOCKS, screen.get_active_workspace ());
+            let activeWorkspace = workspaceManager.get_active_workspace();
+            let windows = display.get_tab_list(Meta.TabList.DOCKS,
+                                               activeWorkspace);
             let windowTracker = Shell.WindowTracker.get_default();
             let textureCache = St.TextureCache.get_default();
             for (let i = 0; i < windows.length; i++) {
@@ -131,7 +133,7 @@ var CtrlAltTabManager = new Lang.Class({
     },
 
     _focusWindows(timestamp) {
-        global.screen.focus_default_window(timestamp);
+        global.display.focus_default_window(timestamp);
     }
 });
 

js/ui/dash.js

@@ -402,6 +402,7 @@ var Dash = new Lang.Class({
                                        clip_to_allocation: true });
         this._box._delegate = this;
         this._container.add_actor(this._box);
+        this._container.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._showAppsIcon = new ShowAppsIcon();
         this._showAppsIcon.childScale = 1;

js/ui/dialog.js

@@ -40,6 +40,7 @@ var Dialog = new Lang.Class({
         // mode accordingly so wrapped labels are handled correctly during
         // size requests.
         this._dialog.request_mode = Clutter.RequestMode.HEIGHT_FOR_WIDTH;
+        this._dialog.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this.contentLayout = new St.BoxLayout({ vertical: true,
                                                 style_class: "modal-dialog-content-box" });

js/ui/dnd.js

@@ -280,7 +280,7 @@ var _Draggable = new Lang.Class({
 
         this._touchSequence = sequence;
         this._grabEvents();
-        global.screen.set_cursor(Meta.Cursor.DND_IN_DRAG);
+        global.display.set_cursor(Meta.Cursor.DND_IN_DRAG);
 
         this._dragX = this._dragStartX = stageX;
         this._dragY = this._dragStartY = stageY;
@@ -412,7 +412,7 @@ var _Draggable = new Lang.Class({
             if (motionFunc) {
                 let result = motionFunc(dragEvent);
                 if (result != DragMotionResult.CONTINUE) {
-                    global.screen.set_cursor(DRAG_CURSOR_MAP[result]);
+                    global.display.set_cursor(DRAG_CURSOR_MAP[result]);
                     return GLib.SOURCE_REMOVE;
                 }
             }
@@ -430,13 +430,13 @@ var _Draggable = new Lang.Class({
                                                              targY,
                                                              0);
                 if (result != DragMotionResult.CONTINUE) {
-                    global.screen.set_cursor(DRAG_CURSOR_MAP[result]);
+                    global.display.set_cursor(DRAG_CURSOR_MAP[result]);
                     return GLib.SOURCE_REMOVE;
                 }
             }
             target = target.get_parent();
         }
-        global.screen.set_cursor(Meta.Cursor.DND_IN_DRAG);
+        global.display.set_cursor(Meta.Cursor.DND_IN_DRAG);
         return GLib.SOURCE_REMOVE;
     },
 
@@ -509,7 +509,7 @@ var _Draggable = new Lang.Class({
                     }
 
                     this._dragInProgress = false;
-                    global.screen.set_cursor(Meta.Cursor.DEFAULT);
+                    global.display.set_cursor(Meta.Cursor.DEFAULT);
                     this.emit('drag-end', event.get_time(), true);
                     this._dragComplete();
                     return true;
@@ -561,7 +561,7 @@ var _Draggable = new Lang.Class({
         let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();
 
         if (this._actorDestroyed) {
-            global.screen.set_cursor(Meta.Cursor.DEFAULT);
+            global.display.set_cursor(Meta.Cursor.DEFAULT);
             if (!this._buttonDown)
                 this._dragComplete();
             this.emit('drag-end', eventTime, false);
@@ -620,7 +620,7 @@ var _Draggable = new Lang.Class({
         if (!this._buttonDown)
             this._dragComplete();
 
-        global.screen.set_cursor(Meta.Cursor.DEFAULT);
+        global.display.set_cursor(Meta.Cursor.DEFAULT);
     },
 
     _onAnimationComplete(dragActor, eventTime) {

js/ui/edgeDragAction.js

@@ -27,9 +27,9 @@ var EdgeDragAction = new Lang.Class({
 
     _getMonitorRect(x, y) {
         let rect = new Meta.Rectangle({ x: x - 1, y: y - 1, width: 1, height: 1 });
-        let monitorIndex = global.screen.get_monitor_index_for_rect(rect);
+        let monitorIndex = global.display.get_monitor_index_for_rect(rect);
 
-        return global.screen.get_monitor_geometry(monitorIndex);
+        return global.display.get_monitor_geometry(monitorIndex);
     },
 
     vfunc_gesture_prepare(action, actor) {

js/ui/endSessionDialog.js

@@ -43,22 +43,23 @@ const _DIALOG_ICON_SIZE = 48;
 
 var GSM_SESSION_MANAGER_LOGOUT_FORCE = 2;
 
-const EndSessionDialogIface = '<node> \
+const EndSessionDialogIface = `
-<interface name="org.gnome.SessionManager.EndSessionDialog"> \
+<node>
-<method name="Open"> \
+<interface name="org.gnome.SessionManager.EndSessionDialog">
-    <arg type="u" direction="in" /> \
+<method name="Open">
-    <arg type="u" direction="in" /> \
+    <arg type="u" direction="in" />
-    <arg type="u" direction="in" /> \
+    <arg type="u" direction="in" />
-    <arg type="ao" direction="in" /> \
+    <arg type="u" direction="in" />
-</method> \
+    <arg type="ao" direction="in" />
-<method name="Close" /> \
+</method>
-<signal name="ConfirmedLogout" /> \
+<method name="Close" />
-<signal name="ConfirmedReboot" /> \
+<signal name="ConfirmedLogout" />
-<signal name="ConfirmedShutdown" /> \
+<signal name="ConfirmedReboot" />
-<signal name="Canceled" /> \
+<signal name="ConfirmedShutdown" />
-<signal name="Closed" /> \
+<signal name="Canceled" />
-</interface> \
+<signal name="Closed" />
-</node>';
+</interface>
+</node>`;
 
 const logoutDialogContent = {
     subjectWithUser: C_("title", "Log Out %s"),
@@ -168,39 +169,42 @@ const DialogContent = {
 
 var MAX_USERS_IN_SESSION_DIALOG = 5;
 
-const LogindSessionIface = '<node> \
+const LogindSessionIface = `
-<interface name="org.freedesktop.login1.Session"> \
+<node>
-    <property name="Id" type="s" access="read"/> \
+<interface name="org.freedesktop.login1.Session">
-    <property name="Remote" type="b" access="read"/> \
+    <property name="Id" type="s" access="read"/>
-    <property name="Class" type="s" access="read"/> \
+    <property name="Remote" type="b" access="read"/>
-    <property name="Type" type="s" access="read"/> \
+    <property name="Class" type="s" access="read"/>
-    <property name="State" type="s" access="read"/> \
+    <property name="Type" type="s" access="read"/>
-</interface> \
+    <property name="State" type="s" access="read"/>
-</node>';
+</interface>
+</node>`;
 
 const LogindSession = Gio.DBusProxy.makeProxyWrapper(LogindSessionIface);
 
-const PkOfflineIface = '<node> \
+const PkOfflineIface = `
-<interface name="org.freedesktop.PackageKit.Offline"> \
+<node>
-    <property name="UpdatePrepared" type="b" access="read"/> \
+<interface name="org.freedesktop.PackageKit.Offline">
-    <property name="UpdateTriggered" type="b" access="read"/> \
+    <property name="UpdatePrepared" type="b" access="read"/>
-    <property name="UpgradePrepared" type="b" access="read"/> \
+    <property name="UpdateTriggered" type="b" access="read"/>
-    <property name="UpgradeTriggered" type="b" access="read"/> \
+    <property name="UpgradePrepared" type="b" access="read"/>
-    <property name="PreparedUpgrade" type="a{sv}" access="read"/> \
+    <property name="UpgradeTriggered" type="b" access="read"/>
-    <method name="Trigger"> \
+    <property name="PreparedUpgrade" type="a{sv}" access="read"/>
-        <arg type="s" name="action" direction="in"/> \
+    <method name="Trigger">
-    </method> \
+        <arg type="s" name="action" direction="in"/>
-    <method name="Cancel"/> \
+    </method>
-</interface> \
+    <method name="Cancel"/>
-</node>';
+</interface>
+</node>`;
 
 const PkOfflineProxy = Gio.DBusProxy.makeProxyWrapper(PkOfflineIface);
 
-const UPowerIface = '<node> \
+const UPowerIface = `
-<interface name="org.freedesktop.UPower"> \
+<node>
-    <property name="OnBattery" type="b" access="read"/> \
+<interface name="org.freedesktop.UPower">
-</interface> \
+    <property name="OnBattery" type="b" access="read"/>
-</node>';
+</interface>
+</node>`;
 
 const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerIface);
 
@@ -697,7 +701,14 @@ var EndSessionDialog = new Lang.Class({
                 if (proxy.State == 'closing')
                     continue;
 
-                if (proxy.Id == GLib.getenv('XDG_SESSION_ID'))
+                let sessionId = GLib.getenv('XDG_SESSION_ID');
+                if (!sessionId)
+                    this._loginManager.getCurrentSessionProxy(currentSessionProxy => {
+                        sessionId = currentSessionProxy.Id;
+                        log(`endSessionDialog: No XDG_SESSION_ID, fetched from logind: ${sessionId}`);
+                    });
+
+                if (proxy.Id == sessionId)
                     continue;
 
                 let session = { user: this._userManager.get_user(userName),

js/ui/keyboard.js

@@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const FocusCaretTracker = imports.ui.focusCaretTracker;
 const Atspi = imports.gi.Atspi;
 const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
@@ -13,6 +12,7 @@ const Signals = imports.signals;
 const St = imports.gi.St;
 const InputSourceManager = imports.ui.status.keyboard;
 
+const IBusManager = imports.misc.ibusManager;
 const BoxPointer = imports.ui.boxpointer;
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
@@ -261,6 +261,7 @@ var Key = new Lang.Class({
         this._extended_keyboard = null;
         this._pressTimeoutId = 0;
         this._capturedPress = false;
+
         this._capturedEventId = 0;
         this._unmapId = 0;
         this._longPress = false;
@@ -471,6 +472,8 @@ var KeyboardModel = new Lang.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);
+        if (contents instanceof Uint8Array)
+            contents = imports.byteArray.toString(contents);
 
         return JSON.parse(contents);
     },
@@ -484,6 +487,73 @@ var KeyboardModel = new Lang.Class({
     }
 });
 
+var FocusTracker = new Lang.Class({
+    Name: 'FocusTracker',
+
+    _init() {
+        this._currentWindow = null;
+
+        global.display.connect('notify::focus-window', () => {
+            this._setCurrentWindow(global.display.focus_window);
+            this.emit('window-changed', this._currentWindow);
+        });
+
+        global.display.connect('grab-op-begin', (display, window, op) => {
+            if (window == this._currentWindow &&
+                (op == Meta.GrabOp.MOVING || op == Meta.GrabOp.KEYBOARD_MOVING))
+                this.emit('reset');
+        });
+
+        /* Valid for wayland clients */
+        Main.inputMethod.connect('cursor-location-changed', (o, rect) => {
+            let newRect = { x: rect.get_x(), y: rect.get_y(), width: rect.get_width(), height: rect.get_height() };
+            this._setCurrentRect(newRect);
+        });
+
+        this._ibusManager = IBusManager.getIBusManager();
+        this._ibusManager.connect('set-cursor-location', (manager, rect) => {
+            /* Valid for X11 clients only */
+            if (Main.inputMethod.currentFocus)
+                return;
+
+            this._setCurrentRect(rect);
+        });
+    },
+
+    get currentWindow() {
+        return this._currentWindow;
+    },
+
+    _setCurrentWindow(window) {
+        this._currentWindow = window;
+    },
+
+    _setCurrentRect(rect) {
+        if (this._currentWindow) {
+            let frameRect = this._currentWindow.get_frame_rect();
+            rect.x -= frameRect.x;
+            rect.y -= frameRect.y;
+        }
+
+        this._rect = rect;
+        this.emit('position-changed');
+    },
+
+    getCurrentRect() {
+        let rect = { x: this._rect.x, y: this._rect.y,
+                     width: this._rect.width, height: this._rect.height };
+
+        if (this._currentWindow) {
+            let frameRect = this._currentWindow.get_frame_rect();
+            rect.x += frameRect.x;
+            rect.y += frameRect.y;
+        }
+
+        return rect;
+    }
+});
+Signals.addSignalMethods(FocusTracker.prototype);
+
 var Keyboard = new Lang.Class({
     Name: 'Keyboard',
 
@@ -491,15 +561,10 @@ var Keyboard = new Lang.Class({
         this.actor = null;
         this._focusInExtendedKeys = false;
 
-        this._focusCaretTracker = new FocusCaretTracker.FocusCaretTracker();
-        this._focusCaretTracker.connect('focus-changed', this._onFocusChanged.bind(this));
-        this._focusCaretTracker.connect('caret-moved', this._onCaretMoved.bind(this));
         this._languagePopup = null;
-        this._currentAccessible = null;
-        this._caretTrackingEnabled = false;
-        this._updateCaretPositionId = 0;
         this._currentFocusWindow = null;
-        this._originalWindowY = null;
+        this._animFocusedWindow = null;
+        this._delayedAnimFocusWindow = null;
 
         this._enableKeyboard = false; // a11y settings value
         this._enabled = false; // enabled state (by setting or device type)
@@ -510,6 +575,14 @@ var Keyboard = new Lang.Class({
         this._lastDeviceId = null;
         this._suggestions = null;
 
+        this._focusTracker = new FocusTracker();
+        this._focusTracker.connect('position-changed', this._onFocusPositionChanged.bind(this));
+        this._focusTracker.connect('reset', () => {
+            this._delayedAnimFocusWindow = null;
+            this._animFocusedWindow = null;
+            this._oskFocusWindow = null;
+        });
+
         Meta.get_backend().connect('last-device-changed', 
             (backend, deviceId) => {
                 let manager = Clutter.DeviceManager.get_default();
@@ -532,102 +605,15 @@ var Keyboard = new Lang.Class({
         this._keyboardRestingId = 0;
 
         Main.layoutManager.connect('monitors-changed', this._relayout.bind(this));
-        //Main.inputMethod.connect('cursor-location-changed', (o, rect) => {
-        //    if (this._keyboardVisible) {
-        //        let currentWindow = global.screen.get_display().focus_window;
-        //        this.setCursorLocation(currentWindow, rect.get_x(), rect.get_y(),
-        //                               rect.get_width(), rect.get_height());
-        //    }
-        //});
     },
 
     get visible() {
         return this._keyboardVisible;
     },
 
-    _setCaretTrackerEnabled(enabled) {
+    _onFocusPositionChanged(focusTracker) {
-        if (this._caretTrackingEnabled == enabled)
+        let rect = focusTracker.getCurrentRect();
-            return;
+        this.setCursorLocation(focusTracker.currentWindow, rect.x, rect.y, rect.width, rect.height);
-
-        this._caretTrackingEnabled = enabled;
-
-        if (enabled) {
-            this._focusCaretTracker.registerFocusListener();
-            this._focusCaretTracker.registerCaretListener();
-        } else {
-            this._focusCaretTracker.deregisterFocusListener();
-            this._focusCaretTracker.deregisterCaretListener();
-        }
-    },
-
-    _updateCaretPosition(accessible) {
-        if (this._updateCaretPositionId)
-            GLib.source_remove(this._updateCaretPositionId);
-        if (!this._keyboardRequested)
-            return;
-        this._updateCaretPositionId = GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
-            this._updateCaretPositionId = 0;
-
-            let currentWindow = global.screen.get_display().focus_window;
-            if (!currentWindow) {
-                this.setCursorLocation(null);
-                return GLib.SOURCE_REMOVE;
-            }
-
-            let windowRect = currentWindow.get_frame_rect();
-            let text = accessible.get_text_iface();
-            let component = accessible.get_component_iface();
-
-            try {
-                let caretOffset = text.get_caret_offset();
-                let caretRect = text.get_character_extents(caretOffset, Atspi.CoordType.WINDOW);
-                let focusRect = component.get_extents(Atspi.CoordType.WINDOW);
-
-                if (caretRect.width == 0 && caretRect.height == 0)
-                    caretRect = focusRect;
-
-                this.setCursorLocation(currentWindow, caretRect.x, caretRect.y, caretRect.width, caretRect.height);
-            } catch (e) {
-                log('Error updating caret position for OSK: ' + e.message);
-            }
-
-            return GLib.SOURCE_REMOVE;
-        });
-
-        GLib.Source.set_name_by_id(this._updateCaretPositionId, '[gnome-shell] this._updateCaretPosition');
-    },
-
-    _focusIsTextEntry(accessible) {
-        try {
-            let role = accessible.get_role();
-            let stateSet = accessible.get_state_set();
-            return stateSet.contains(Atspi.StateType.EDITABLE) || role == Atspi.Role.TERMINAL;
-        } catch (e) {
-            log('Error determining accessible role: ' + e.message);
-            return false;
-        }
-    },
-
-    _onFocusChanged(caretTracker, event) {
-        let accessible = event.source;
-        if (!this._focusIsTextEntry(accessible))
-            return;
-
-        let focused = event.detail1 != 0;
-        if (focused) {
-            this._currentAccessible = accessible;
-            this._updateCaretPosition(accessible);
-            this.show(Main.layoutManager.focusIndex);
-        } else if (this._currentAccessible == accessible) {
-            this._currentAccessible = null;
-            this.hide();
-        }
-    },
-
-    _onCaretMoved(caretTracker, event) {
-        let accessible = event.source;
-        if (this._currentAccessible == accessible)
-            this._updateCaretPosition(accessible);
     },
 
     _lastDeviceIsTouchscreen() {
@@ -650,8 +636,6 @@ var Keyboard = new Lang.Class({
         if (!this._enabled && !this._keyboardController)
             return;
 
-        this._setCaretTrackerEnabled(this._enabled);
-
         if (this._enabled && !this._keyboardController)
             this._setupKeyboard();
         else if (!this._enabled)
@@ -936,9 +920,11 @@ var Keyboard = new Lang.Class({
     },
 
     _relayout() {
-        if (this.actor == null)
-            return;
         let monitor = Main.layoutManager.keyboardMonitor;
+
+        if (this.actor == null || monitor == null)
+            return;
+
         let maxHeight = monitor.height / 3;
         this.actor.width = monitor.width;
         this.actor.height = maxHeight;
@@ -1027,11 +1013,14 @@ var Keyboard = new Lang.Class({
         if (!this._keyboardRequested)
             return;
 
-        if (this._currentAccessible)
-            this._updateCaretPosition(this._currentAccessible);
         Main.layoutManager.keyboardIndex = monitor;
         this._relayout();
         Main.layoutManager.showKeyboard();
+
+        if (this._delayedAnimFocusWindow) {
+            this._setAnimationWindow(this._delayedAnimFocusWindow);
+            this._delayedAnimFocusWindow = null;
+        }
     },
 
     hide() {
@@ -1102,8 +1091,9 @@ var Keyboard = new Lang.Class({
         window.move_frame(true, frameRect.x, frameRect.y);
     },
 
-    _animateWindow(window, show, deltaY) {
+    _animateWindow(window, show) {
         let windowActor = window.get_compositor_private();
+        let deltaY = Main.layoutManager.keyboardBox.height;
         if (!windowActor)
             return;
 
@@ -1124,35 +1114,39 @@ var Keyboard = new Lang.Class({
         }
     },
 
-    setCursorLocation(window, x, y , w, h) {
+    _setAnimationWindow(window) {
-        if (window == this._oskFocusWindow)
+        if (this._animFocusedWindow == window)
             return;
 
-        if (this._oskFocusWindow) {
+        if (this._animFocusedWindow)
-            let display = global.screen.get_display();
+            this._animateWindow(this._animFocusedWindow, false);
+        if (window)
+            this._animateWindow(window, true);
 
-            if (display.get_grab_op() == Meta.GrabOp.NONE ||
+        this._animFocusedWindow = window;
-                display.get_focus_window() != this._oskFocusWindow)
+    },
-                this._animateWindow(this._oskFocusWindow, false, this._oskFocusWindowDelta);
 
-            this._oskFocusWindow = null;
+    setCursorLocation(window, x, y , w, h) {
-            this._oskFocusWindowDelta = null;
+        let monitor = Main.layoutManager.keyboardMonitor;
-        }
 
-        if (window) {
+        if (window && monitor) {
-            let monitor = Main.layoutManager.keyboardMonitor;
             let keyboardHeight = Main.layoutManager.keyboardBox.height;
-            let frameRect = window.get_frame_rect();
+            let focusObscured = false;
-            let windowActor = window.get_compositor_private();
-            let delta = 0;
 
-            if (frameRect.y + y + h >= monitor.height - keyboardHeight)
+            if (y + h >= monitor.y + monitor.height - keyboardHeight) {
-                delta = keyboardHeight;
+                if (this._keyboardVisible)
-
+                    this._setAnimationWindow(window);
-            this._animateWindow(window, true, delta);
+                else
-            this._oskFocusWindow = window;
+                    this._delayedAnimFocusWindow = window;
-            this._oskFocusWindowDelta = delta;
+            } else if (y < keyboardHeight) {
+                this._delayedAnimFocusWindow = null;
+                this._setAnimationWindow(null);
+            }
+        } else {
+            this._setAnimationWindow(null);
         }
+
+        this._oskFocusWindow = window;
     },
 });
 

js/ui/layout.js

@@ -109,7 +109,7 @@ var MonitorConstraint = new Lang.Class({
 
             if (!this._workareasChangedId) {
                 this._workareasChangedId =
-                    global.screen.connect('workareas-changed', () => {
+                    global.display.connect('workareas-changed', () => {
                         if (this._workArea)
                             this.actor.queue_relayout();
                     });
@@ -120,7 +120,7 @@ var MonitorConstraint = new Lang.Class({
             this._monitorsChangedId = 0;
 
             if (this._workareasChangedId)
-                global.screen.disconnect(this._workareasChangedId);
+                global.display.disconnect(this._workareasChangedId);
             this._workareasChangedId = 0;
         }
 
@@ -142,7 +142,8 @@ var MonitorConstraint = new Lang.Class({
 
         let rect;
         if (this._workArea) {
-            let ws = global.screen.get_workspace_by_index(0);
+            let workspaceManager = global.workspace_manager;
+            let ws = workspaceManager.get_workspace_by_index(0);
             rect = ws.get_work_area_for_monitor(index);
         } else {
             rect = Main.layoutManager.monitors[index];
@@ -164,7 +165,7 @@ var Monitor = new Lang.Class({
     },
 
     get inFullscreen() {
-        return global.screen.get_monitor_in_fullscreen(this.index);
+        return global.display.get_monitor_in_fullscreen(this.index);
     }
 })
 
@@ -203,6 +204,7 @@ var LayoutManager = new Lang.Class({
 
         // Set up stage hierarchy to group all UI actors under one container.
         this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
+        this.uiGroup.set_flags(Clutter.ActorFlags.NO_LAYOUT);
         this.uiGroup.connect('allocate', (actor, box, flags) => {
             let children = actor.get_children();
             for (let i = 0; i < children.length; i++)
@@ -259,7 +261,7 @@ var LayoutManager = new Lang.Class({
         global.stage.remove_actor(global.top_window_group);
         this.uiGroup.add_actor(global.top_window_group);
 
-        let feedbackGroup = Meta.get_feedback_group_for_screen(global.screen);
+        let feedbackGroup = Meta.get_feedback_group_for_display(global.display);
         global.stage.remove_actor(feedbackGroup);
         this.uiGroup.add_actor(feedbackGroup);
 
@@ -269,14 +271,19 @@ var LayoutManager = new Lang.Class({
         this._bgManagers = [];
 
         // Need to update struts on new workspaces when they are added
-        global.screen.connect('notify::n-workspaces',
+        let workspaceManager = global.workspace_manager;
-                              this._queueUpdateRegions.bind(this));
+        workspaceManager.connect('notify::n-workspaces',
-        global.screen.connect('restacked',
+                                 this._queueUpdateRegions.bind(this));
-                              this._windowsRestacked.bind(this));
+
-        global.screen.connect('monitors-changed',
+        let display = global.display;
-                              this._monitorsChanged.bind(this));
+        display.connect('restacked',
-        global.screen.connect('in-fullscreen-changed',
+                        this._windowsRestacked.bind(this));
-                              this._updateFullscreen.bind(this));
+        display.connect('in-fullscreen-changed',
+                        this._updateFullscreen.bind(this));
+
+        let monitorManager = Meta.MonitorManager.get();
+        monitorManager.connect('monitors-changed',
+                               this._monitorsChanged.bind(this));
         this._monitorsChanged();
 
         // NVIDIA drivers don't preserve FBO contents across
@@ -319,12 +326,12 @@ var LayoutManager = new Lang.Class({
     },
 
     _updateMonitors() {
-        let screen = global.screen;
+        let display = global.display;
 
         this.monitors = [];
-        let nMonitors = screen.get_n_monitors();
+        let nMonitors = display.get_n_monitors();
         for (let i = 0; i < nMonitors; i++)
-            this.monitors.push(new Monitor(i, screen.get_monitor_geometry(i)));
+            this.monitors.push(new Monitor(i, display.get_monitor_geometry(i)));
 
         if (nMonitors == 0) {
             this.primaryIndex = this.bottomIndex = -1;
@@ -333,7 +340,7 @@ var LayoutManager = new Lang.Class({
         } else {
             // If there are monitors below the primary, then we need
             // to split primary from bottom.
-            this.primaryIndex = this.bottomIndex = screen.get_primary_monitor();
+            this.primaryIndex = this.bottomIndex = display.get_primary_monitor();
             for (let i = 0; i < this.monitors.length; i++) {
                 let monitor = this.monitors[i];
                 if (this._isAboveOrBelowPrimary(monitor)) {
@@ -538,7 +545,7 @@ var LayoutManager = new Lang.Class({
     },
 
     get currentMonitor() {
-        let index = global.screen.get_current_monitor();
+        let index = global.display.get_current_monitor();
         return this.monitors[index];
     },
 
@@ -557,6 +564,8 @@ var LayoutManager = new Lang.Class({
     },
 
     get focusMonitor() {
+        if (this.focusIndex < 0)
+            return null;
         return this.monitors[this.focusIndex];
     },
 
@@ -909,7 +918,8 @@ var LayoutManager = new Lang.Class({
     getWorkAreaForMonitor(monitorIndex) {
         // Assume that all workspaces will have the same
         // struts and pick the first one.
-        let ws = global.screen.get_workspace_by_index(0);
+        let workspaceManager = global.workspace_manager;
+        let ws = workspaceManager.get_workspace_by_index(0);
         return ws.get_work_area_for_monitor(monitorIndex);
     },
 
@@ -919,7 +929,7 @@ var LayoutManager = new Lang.Class({
         let [x, y] = actor.get_transformed_position();
         let [w, h] = actor.get_transformed_size();
         let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h });
-        return global.screen.get_monitor_index_for_rect(rect);
+        return global.display.get_monitor_index_for_rect(rect);
     },
 
     findMonitorForActor(actor) {
@@ -1052,9 +1062,9 @@ var LayoutManager = new Lang.Class({
         global.set_stage_input_region(rects);
         this._isPopupWindowVisible = isPopupMenuVisible;
 
-        let screen = global.screen;
+        let workspaceManager = global.workspace_manager;
-        for (let w = 0; w < screen.n_workspaces; w++) {
+        for (let w = 0; w < workspaceManager.n_workspaces; w++) {
-            let workspace = screen.get_workspace_by_index(w);
+            let workspace = workspaceManager.get_workspace_by_index(w);
             workspace.set_builtin_struts(struts);
         }
 

js/ui/magnifier.js

@@ -19,7 +19,6 @@ const MagnifierDBus = imports.ui.magnifierDBus;
 const Params = imports.misc.params;
 const PointerWatcher = imports.ui.pointerWatcher;
 
-var MOUSE_POLL_FREQUENCY = 50;
 var CROSSHAIRS_CLIP_SIZE = [100, 100];
 var NO_CHANGE = 0.0;
 
@@ -62,7 +61,7 @@ var Magnifier = new Lang.Class({
         this._zoomRegions = [];
 
         // Create small clutter tree for the magnified mouse.
-        let cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
+        let cursorTracker = Meta.CursorTracker.get_for_display(global.display);
         this._mouseSprite = new Clutter.Texture();
         Shell.util_cursor_tracker_to_clutter(cursorTracker, this._mouseSprite);
         this._cursorRoot = new Clutter.Actor();
@@ -117,10 +116,10 @@ var Magnifier = new Lang.Class({
 
         if (isActive != activate) {
             if (activate) {
-                Meta.disable_unredirect_for_screen(global.screen);
+                Meta.disable_unredirect_for_display(global.display);
                 this.startTrackingMouse();
             } else {
-                Meta.enable_unredirect_for_screen(global.screen);
+                Meta.enable_unredirect_for_display(global.display);
                 this.stopTrackingMouse();
             }
         }
@@ -152,8 +151,10 @@ var Magnifier = new Lang.Class({
      * Turn on mouse tracking, if not already doing so.
      */
     startTrackingMouse() {
-        if (!this._pointerWatch)
+        if (!this._pointerWatch) {
-            this._pointerWatch = PointerWatcher.getPointerWatcher().addWatch(MOUSE_POLL_FREQUENCY, this.scrollToMousePos.bind(this));
+            let interval = 1000 / Clutter.get_default_frame_rate();
+            this._pointerWatch = PointerWatcher.getPointerWatcher().addWatch(interval, this.scrollToMousePos.bind(this));
+        }
     },
 
     /**

js/ui/magnifierDBus.js

@@ -9,89 +9,91 @@ const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
 
 // Subset of gnome-mag's Magnifier dbus interface -- to be expanded.  See:
 // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
-const MagnifierIface = '<node> \
+const MagnifierIface = `
-<interface name="org.gnome.Magnifier"> \
+<node>
-<method name="setActive"> \
+<interface name="org.gnome.Magnifier">
-    <arg type="b" direction="in" /> \
+<method name="setActive">
-</method> \
+    <arg type="b" direction="in" />
-<method name="isActive"> \
+</method>
-    <arg type="b" direction="out" /> \
+<method name="isActive">
-</method> \
+    <arg type="b" direction="out" />
-<method name="showCursor" /> \
+</method>
-<method name="hideCursor" /> \
+<method name="showCursor" />
-<method name="createZoomRegion"> \
+<method name="hideCursor" />
-    <arg type="d" direction="in" /> \
+<method name="createZoomRegion">
-    <arg type="d" direction="in" /> \
+    <arg type="d" direction="in" />
-    <arg type="ai" direction="in" /> \
+    <arg type="d" direction="in" />
-    <arg type="ai" direction="in" /> \
+    <arg type="ai" direction="in" />
-    <arg type="o" direction="out" /> \
+    <arg type="ai" direction="in" />
-</method> \
+    <arg type="o" direction="out" />
-<method name="addZoomRegion"> \
+</method>
-    <arg type="o" direction="in" /> \
+<method name="addZoomRegion">
-    <arg type="b" direction="out" /> \
+    <arg type="o" direction="in" />
-</method> \
+    <arg type="b" direction="out" />
-<method name="getZoomRegions"> \
+</method>
-    <arg type="ao" direction="out" /> \
+<method name="getZoomRegions">
-</method> \
+    <arg type="ao" direction="out" />
-<method name="clearAllZoomRegions" /> \
+</method>
-<method name="fullScreenCapable"> \
+<method name="clearAllZoomRegions" />
-    <arg type="b" direction="out" /> \
+<method name="fullScreenCapable">
-</method> \
+    <arg type="b" direction="out" />
-<method name="setCrosswireSize"> \
+</method>
-    <arg type="i" direction="in" /> \
+<method name="setCrosswireSize">
-</method> \
+    <arg type="i" direction="in" />
-<method name="getCrosswireSize"> \
+</method>
-    <arg type="i" direction="out" /> \
+<method name="getCrosswireSize">
-</method> \
+    <arg type="i" direction="out" />
-<method name="setCrosswireLength"> \
+</method>
-    <arg type="i" direction="in" /> \
+<method name="setCrosswireLength">
-</method> \
+    <arg type="i" direction="in" />
-<method name="getCrosswireLength"> \
+</method>
-    <arg type="i" direction="out" /> \
+<method name="getCrosswireLength">
-</method> \
+    <arg type="i" direction="out" />
-<method name="setCrosswireClip"> \
+</method>
-    <arg type="b" direction="in" /> \
+<method name="setCrosswireClip">
-</method> \
+    <arg type="b" direction="in" />
-<method name="getCrosswireClip"> \
+</method>
-    <arg type="b" direction="out" /> \
+<method name="getCrosswireClip">
-</method> \
+    <arg type="b" direction="out" />
-<method name="setCrosswireColor"> \
+</method>
-    <arg type="u" direction="in" /> \
+<method name="setCrosswireColor">
-</method> \
+    <arg type="u" direction="in" />
-<method name="getCrosswireColor"> \
+</method>
-    <arg type="u" direction="out" /> \
+<method name="getCrosswireColor">
-</method> \
+    <arg type="u" direction="out" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded.  See:
 // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
-const ZoomRegionIface = '<node> \
+const ZoomRegionIface = `
-<interface name="org.gnome.Magnifier.ZoomRegion"> \
+<node>
-<method name="setMagFactor"> \
+<interface name="org.gnome.Magnifier.ZoomRegion">
-    <arg type="d" direction="in" /> \
+<method name="setMagFactor">
-    <arg type="d" direction="in" /> \
+    <arg type="d" direction="in" />
-</method> \
+    <arg type="d" direction="in" />
-<method name="getMagFactor"> \
+</method>
-    <arg type="d" direction="out" /> \
+<method name="getMagFactor">
-    <arg type="d" direction="out" /> \
+    <arg type="d" direction="out" />
-</method> \
+    <arg type="d" direction="out" />
-<method name="setRoi"> \
+</method>
-    <arg type="ai" direction="in" /> \
+<method name="setRoi">
-</method> \
+    <arg type="ai" direction="in" />
-<method name="getRoi"> \
+</method>
-    <arg type="ai" direction="out" /> \
+<method name="getRoi">
-</method> \
+    <arg type="ai" direction="out" />
-<method name="shiftContentsTo"> \
+</method>
-    <arg type="i" direction="in" /> \
+<method name="shiftContentsTo">
-    <arg type="i" direction="in" /> \
+    <arg type="i" direction="in" />
-    <arg type="b" direction="out" /> \
+    <arg type="i" direction="in" />
-</method> \
+    <arg type="b" direction="out" />
-<method name="moveResize"> \
+</method>
-    <arg type="ai" direction="in" /> \
+<method name="moveResize">
-</method> \
+    <arg type="ai" direction="in" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 // For making unique ZoomRegion DBus proxy object paths of the form:
 // '/org/gnome/Magnifier/ZoomRegion/zoomer0',

js/ui/main.js

@@ -429,7 +429,7 @@ function pushModal(actor, params) {
             log('pushModal: invocation of begin_modal failed');
             return false;
         }
-        Meta.disable_unredirect_for_screen(global.screen);
+        Meta.disable_unredirect_for_display(global.display);
     }
 
     modalCount += 1;
@@ -528,7 +528,7 @@ function popModal(actor, timestamp) {
 
     layoutManager.modalEnded();
     global.end_modal(timestamp);
-    Meta.enable_unredirect_for_screen(global.screen);
+    Meta.enable_unredirect_for_display(global.display);
     actionMode = Shell.ActionMode.NORMAL;
 }
 
@@ -556,14 +556,15 @@ function openRunDialog() {
  * and switching out of the overview if it's currently active
  */
 function activateWindow(window, time, workspaceNum) {
-    let activeWorkspaceNum = global.screen.get_active_workspace_index();
+    let workspaceManager = global.workspace_manager;
+    let activeWorkspaceNum = workspaceManager.get_active_workspace_index();
     let windowWorkspaceNum = (workspaceNum !== undefined) ? workspaceNum : window.get_workspace().index();
 
     if (!time)
         time = global.get_current_time();
 
     if (windowWorkspaceNum != activeWorkspaceNum) {
-        let workspace = global.screen.get_workspace_by_index(windowWorkspaceNum);
+        let workspace = workspaceManager.get_workspace_by_index(windowWorkspaceNum);
         workspace.activate_with_focus(window, time);
     } else {
         window.activate(time);

js/ui/messageList.js

@@ -27,6 +27,7 @@ function _fixMarkup(text, allowMarkup) {
 
         // Support <b>, <i>, and <u>, escape anything else
         // so it displays as raw markup.
+        // Ref: https://developer.gnome.org/notification-spec/#markup
         _text = _text.replace(/<(?!\/?[biu]>)/g, '&lt;');
 
         try {
@@ -95,10 +96,10 @@ var URLHighlighter = new Lang.Class({
 
             let urlId = this._findUrlAtPos(event);
             if (urlId != -1 && !this._cursorChanged) {
-                global.screen.set_cursor(Meta.Cursor.POINTING_HAND);
+                global.display.set_cursor(Meta.Cursor.POINTING_HAND);
                 this._cursorChanged = true;
             } else if (urlId == -1) {
-                global.screen.set_cursor(Meta.Cursor.DEFAULT);
+                global.display.set_cursor(Meta.Cursor.DEFAULT);
                 this._cursorChanged = false;
             }
             return Clutter.EVENT_PROPAGATE;
@@ -109,7 +110,7 @@ var URLHighlighter = new Lang.Class({
 
             if (this._cursorChanged) {
                 this._cursorChanged = false;
-                global.screen.set_cursor(Meta.Cursor.DEFAULT);
+                global.display.set_cursor(Meta.Cursor.DEFAULT);
             }
             return Clutter.EVENT_PROPAGATE;
         });

js/ui/messageTray.js

@@ -315,10 +315,10 @@ var NotificationApplicationPolicy = new Lang.Class({
 // You can add a secondary icon to the banner with 'secondaryGIcon'. There
 // is no fallback for this icon.
 //
-// If @params contains 'bannerMarkup', with the value %true, then
+// If @params contains 'bannerMarkup', with the value %true, a subset (<b>,
-// the corresponding element is assumed to use pango markup. If the
+// <i> and <u>) of the markup in [1] will be interpreted within @banner. If
-// parameter is not present for an element, then anything that looks
+// the parameter is not present, then anything that looks like markup
-// like markup in that element will appear literally in the output.
+// in @banner will appear literally in the output.
 //
 // If @params contains a 'clear' parameter with the value %true, then
 // the content and the action area of the notification will be cleared.
@@ -328,6 +328,8 @@ var NotificationApplicationPolicy = new Lang.Class({
 // If @params contains 'soundName' or 'soundFile', the corresponding
 // event sound is played when the notification is shown (if the policy for
 // @source allows playing sounds).
+//
+// [1] https://developer.gnome.org/notification-spec/#markup 
 var Notification = new Lang.Class({
     Name: 'Notification',
 
@@ -915,7 +917,7 @@ var MessageTray = new Lang.Class({
         Main.layoutManager.addChrome(this.actor, { affectsInputRegion: false });
         Main.layoutManager.trackChrome(this._bannerBin, { affectsInputRegion: true });
 
-        global.screen.connect('in-fullscreen-changed', this._updateState.bind(this));
+        global.display.connect('in-fullscreen-changed', this._updateState.bind(this));
 
         Main.sessionMode.connect('updated', this._sessionUpdated.bind(this));
 

js/ui/modalDialog.js

@@ -116,7 +116,7 @@ var ModalDialog = new Lang.Class({
         if (onPrimary)
             this._monitorConstraint.primary = true;
         else
-            this._monitorConstraint.index = global.screen.get_current_monitor();
+            this._monitorConstraint.index = global.display.get_current_monitor();
 
         this.state = State.OPENING;
 

js/ui/mpris.js

@@ -8,41 +8,44 @@ const Calendar = imports.ui.calendar;
 const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;
 
-const DBusIface = '<node> \
+const DBusIface = `
-<interface name="org.freedesktop.DBus"> \
+<node>
-  <method name="ListNames"> \
+<interface name="org.freedesktop.DBus">
-    <arg type="as" direction="out" name="names" /> \
+  <method name="ListNames">
-  </method> \
+    <arg type="as" direction="out" name="names" />
-  <signal name="NameOwnerChanged"> \
+  </method>
-    <arg type="s" direction="out" name="name" /> \
+  <signal name="NameOwnerChanged">
-    <arg type="s" direction="out" name="oldOwner" /> \
+    <arg type="s" direction="out" name="name" />
-    <arg type="s" direction="out" name="newOwner" /> \
+    <arg type="s" direction="out" name="oldOwner" />
-  </signal> \
+    <arg type="s" direction="out" name="newOwner" />
-</interface> \
+  </signal>
-</node>';
+</interface>
+</node>`;
 const DBusProxy = Gio.DBusProxy.makeProxyWrapper(DBusIface);
 
-const MprisIface = '<node> \
+const MprisIface = `
-<interface name="org.mpris.MediaPlayer2"> \
+<node>
-  <method name="Raise" /> \
+<interface name="org.mpris.MediaPlayer2">
-  <property name="CanRaise" type="b" access="read" /> \
+  <method name="Raise" />
-  <property name="DesktopEntry" type="s" access="read" /> \
+  <property name="CanRaise" type="b" access="read" />
-</interface> \
+  <property name="DesktopEntry" type="s" access="read" />
-</node>';
+</interface>
+</node>`;
 const MprisProxy = Gio.DBusProxy.makeProxyWrapper(MprisIface);
 
-const MprisPlayerIface = '<node> \
+const MprisPlayerIface = `
-<interface name="org.mpris.MediaPlayer2.Player"> \
+<node>
-  <method name="PlayPause" /> \
+<interface name="org.mpris.MediaPlayer2.Player">
-  <method name="Next" /> \
+  <method name="PlayPause" />
-  <method name="Previous" /> \
+  <method name="Next" />
-  <property name="CanGoNext" type="b" access="read" /> \
+  <method name="Previous" />
-  <property name="CanGoPrevious" type="b" access="read" /> \
+  <property name="CanGoNext" type="b" access="read" />
-  <property name="CanPlay" type="b" access="read" /> \
+  <property name="CanGoPrevious" type="b" access="read" />
-  <property name="Metadata" type="a{sv}" access="read" /> \
+  <property name="CanPlay" type="b" access="read" />
-  <property name="PlaybackStatus" type="s" access="read" /> \
+  <property name="Metadata" type="a{sv}" access="read" />
-</interface> \
+  <property name="PlaybackStatus" type="s" access="read" />
-</node>';
+</interface>
+</node>`;
 const MprisPlayerProxy = Gio.DBusProxy.makeProxyWrapper(MprisPlayerIface);
 
 const MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.';

js/ui/notificationDaemon.js

@@ -17,55 +17,57 @@ const Params = imports.misc.params;
 const Util = imports.misc.util;
 
 // Should really be defined in Gio.js
-const BusIface = '<node> \
+const BusIface = `
-<interface name="org.freedesktop.DBus"> \
+<node>
-<method name="GetConnectionUnixProcessID"> \
+<interface name="org.freedesktop.DBus">
-    <arg type="s" direction="in" /> \
+<method name="GetConnectionUnixProcessID">
-    <arg type="u" direction="out" /> \
+    <arg type="s" direction="in" />
-</method> \
+    <arg type="u" direction="out" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface);
 function Bus() {
     return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus');
 }
 
-const FdoNotificationsIface = '<node> \
+const FdoNotificationsIface = `
-<interface name="org.freedesktop.Notifications"> \
+<node>
-<method name="Notify"> \
+<interface name="org.freedesktop.Notifications">
-    <arg type="s" direction="in"/> \
+<method name="Notify">
-    <arg type="u" direction="in"/> \
+    <arg type="s" direction="in"/>
-    <arg type="s" direction="in"/> \
+    <arg type="u" direction="in"/>
-    <arg type="s" direction="in"/> \
+    <arg type="s" direction="in"/>
-    <arg type="s" direction="in"/> \
+    <arg type="s" direction="in"/>
-    <arg type="as" direction="in"/> \
+    <arg type="s" direction="in"/>
-    <arg type="a{sv}" direction="in"/> \
+    <arg type="as" direction="in"/>
-    <arg type="i" direction="in"/> \
+    <arg type="a{sv}" direction="in"/>
-    <arg type="u" direction="out"/> \
+    <arg type="i" direction="in"/>
-</method> \
+    <arg type="u" direction="out"/>
-<method name="CloseNotification"> \
+</method>
-    <arg type="u" direction="in"/> \
+<method name="CloseNotification">
-</method> \
+    <arg type="u" direction="in"/>
-<method name="GetCapabilities"> \
+</method>
-    <arg type="as" direction="out"/> \
+<method name="GetCapabilities">
-</method> \
+    <arg type="as" direction="out"/>
-<method name="GetServerInformation"> \
+</method>
-    <arg type="s" direction="out"/> \
+<method name="GetServerInformation">
-    <arg type="s" direction="out"/> \
+    <arg type="s" direction="out"/>
-    <arg type="s" direction="out"/> \
+    <arg type="s" direction="out"/>
-    <arg type="s" direction="out"/> \
+    <arg type="s" direction="out"/>
-</method> \
+    <arg type="s" direction="out"/>
-<signal name="NotificationClosed"> \
+</method>
-    <arg type="u"/> \
+<signal name="NotificationClosed">
-    <arg type="u"/> \
+    <arg type="u"/>
-</signal> \
+    <arg type="u"/>
-<signal name="ActionInvoked"> \
+</signal>
-    <arg type="u"/> \
+<signal name="ActionInvoked">
-    <arg type="s"/> \
+    <arg type="u"/>
-</signal> \
+    <arg type="s"/>
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 
 var NotificationClosedReason = {
     EXPIRED: 1,
@@ -654,18 +656,19 @@ var GtkNotificationDaemonNotification = new Lang.Class({
     },
 });
 
-const FdoApplicationIface = '<node> \
+const FdoApplicationIface = `
-<interface name="org.freedesktop.Application"> \
+<node>
-<method name="ActivateAction"> \
+<interface name="org.freedesktop.Application">
-    <arg type="s" direction="in" /> \
+<method name="ActivateAction">
-    <arg type="av" direction="in" /> \
+    <arg type="s" direction="in" />
-    <arg type="a{sv}" direction="in" /> \
+    <arg type="av" direction="in" />
-</method> \
+    <arg type="a{sv}" direction="in" />
-<method name="Activate"> \
+</method>
-    <arg type="a{sv}" direction="in" /> \
+<method name="Activate">
-</method> \
+    <arg type="a{sv}" direction="in" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 const FdoApplicationProxy = Gio.DBusProxy.makeProxyWrapper(FdoApplicationIface);
 
 function objectPathFromAppId(appId) {
@@ -774,19 +777,20 @@ var GtkNotificationDaemonAppSource = new Lang.Class({
     },
 });
 
-const GtkNotificationsIface = '<node> \
+const GtkNotificationsIface = `
-<interface name="org.gtk.Notifications"> \
+<node>
-<method name="AddNotification"> \
+<interface name="org.gtk.Notifications">
-    <arg type="s" direction="in" /> \
+<method name="AddNotification">
-    <arg type="s" direction="in" /> \
+    <arg type="s" direction="in" />
-    <arg type="a{sv}" direction="in" /> \
+    <arg type="s" direction="in" />
-</method> \
+    <arg type="a{sv}" direction="in" />
-<method name="RemoveNotification"> \
+</method>
-    <arg type="s" direction="in" /> \
+<method name="RemoveNotification">
-    <arg type="s" direction="in" /> \
+    <arg type="s" direction="in" />
-</method> \
+    <arg type="s" direction="in" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 var GtkNotificationDaemon = new Lang.Class({
     Name: 'GtkNotificationDaemon',
@@ -831,8 +835,10 @@ var GtkNotificationDaemon = new Lang.Class({
                 let source;
                 try {
                     source = this._ensureAppSource(appId);
-                } catch(e if e instanceof InvalidAppError) {
+                } catch(e) {
-                    return;
+                    if (e instanceof InvalidAppError)
+                        return;
+                    throw e;
                 }
 
                 notifications.forEach(([notificationId, notification]) => {
@@ -863,9 +869,12 @@ var GtkNotificationDaemon = new Lang.Class({
         let source;
         try {
             source = this._ensureAppSource(appId);
-        } catch(e if e instanceof InvalidAppError) {
+        } catch(e) {
-            invocation.return_dbus_error('org.gtk.Notifications.InvalidApp', 'The app by ID "%s" could not be found'.format(appId));
+            if (e instanceof InvalidAppError) {
-            return;
+                invocation.return_dbus_error('org.gtk.Notifications.InvalidApp', 'The app by ID "%s" could not be found'.format(appId));
+                return;
+            }
+            throw e;
         }
 
         let timestamp = GLib.DateTime.new_now_local().to_unix();

js/ui/osdMonitorLabeler.js

@@ -32,7 +32,7 @@ var OsdMonitorLabel = new Lang.Class({
         Main.uiGroup.set_child_above_sibling(this._actor, null);
         this._position();
 
-        Meta.disable_unredirect_for_screen(global.screen);
+        Meta.disable_unredirect_for_display(global.display);
     },
 
     _position() {
@@ -48,7 +48,7 @@ var OsdMonitorLabel = new Lang.Class({
 
     destroy() {
         this._actor.destroy();
-        Meta.enable_unredirect_for_screen(global.screen);
+        Meta.enable_unredirect_for_display(global.display);
     }
 });
 

js/ui/osdWindow.js

@@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const St = imports.gi.St;
 
+const BarLevel = imports.ui.barLevel;
 const Lang = imports.lang;
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
@@ -17,16 +18,18 @@ var LEVEL_ANIMATION_TIME = 0.1;
 
 var LevelBar = new Lang.Class({
     Name: 'LevelBar',
+    Extends: BarLevel.BarLevel,
 
     _init() {
         this._level = 0;
+        this._maxLevel = 100;
 
-        this.actor = new St.Bin({ style_class: 'level',
+        let params = {
-                                  x_align: St.Align.START,
+            styleClass: 'level',
-                                  y_fill: true });
+        }
-        this._bar = new St.Widget({ style_class: 'level-bar' });
+        this.parent(this._level, params);
 
-        this.actor.set_child(this._bar);
+        this.actor.accessible_name = _("Volume");
 
         this.actor.connect('notify::width', () => { this.level = this.level; });
     },
@@ -36,12 +39,19 @@ var LevelBar = new Lang.Class({
     },
 
     set level(value) {
-        this._level = Math.max(0, Math.min(value, 100));
+        this._level = Math.max(0, Math.min(value, this._maxLevel));
 
-        let alloc = this.actor.get_allocation_box();
+        this.setValue(this._level / 100);
-        let newWidth = Math.round((alloc.x2 - alloc.x1) * this._level / 100);
+    },
-        if (newWidth != this._bar.width)
+
-            this._bar.width = newWidth;
+    get maxLevel() {
+        return this._maxLevel;
+    },
+
+    set maxLevel(value) {
+        this._maxLevel = Math.max(100, value);
+
+        this.setMaximumValue(this._maxLevel / 100);
     }
 });
 
@@ -140,12 +150,18 @@ var OsdWindow = new Lang.Class({
         }
     },
 
+    setMaxLevel(maxLevel) {
+        if (maxLevel === undefined)
+            maxLevel = 100;
+        this._level.maxLevel = maxLevel;
+    },
+
     show() {
         if (!this._icon.gicon)
             return;
 
         if (!this.actor.visible) {
-            Meta.disable_unredirect_for_screen(global.screen);
+            Meta.disable_unredirect_for_display(global.display);
             this.actor.show();
             this.actor.opacity = 0;
             this.actor.get_parent().set_child_above_sibling(this.actor, null);
@@ -179,7 +195,7 @@ var OsdWindow = new Lang.Class({
                            transition: 'easeOutQuad',
                            onComplete: () => {
                               this._reset();
-                              Meta.enable_unredirect_for_screen(global.screen);
+                              Meta.enable_unredirect_for_display(global.display);
                            }
                          });
         return GLib.SOURCE_REMOVE;
@@ -189,6 +205,7 @@ var OsdWindow = new Lang.Class({
         this.actor.hide();
         this.setLabel(null);
         this.setLevel(null);
+        this.setMaxLevel(null);
     },
 
     _relayout() {
@@ -233,24 +250,25 @@ var OsdWindowManager = new Lang.Class({
         this._osdWindows.length = Main.layoutManager.monitors.length;
     },
 
-    _showOsdWindow(monitorIndex, icon, label, level) {
+    _showOsdWindow(monitorIndex, icon, label, level, maxLevel) {
         this._osdWindows[monitorIndex].setIcon(icon);
         this._osdWindows[monitorIndex].setLabel(label);
         this._osdWindows[monitorIndex].setLevel(level);
+        this._osdWindows[monitorIndex].setMaxLevel(maxLevel);
         this._osdWindows[monitorIndex].show();
     },
 
-    show(monitorIndex, icon, label, level) {
+    show(monitorIndex, icon, label, level, maxLevel) {
         if (monitorIndex != -1) {
             for (let i = 0; i < this._osdWindows.length; i++) {
                 if (i == monitorIndex)
-                    this._showOsdWindow(i, icon, label, level);
+                    this._showOsdWindow(i, icon, label, level, maxLevel);
                 else
                     this._osdWindows[i].cancel();
             }
         } else {
             for (let i = 0; i < this._osdWindows.length; i++)
-                this._showOsdWindow(i, icon, label, level);
+                this._showOsdWindow(i, icon, label, level, maxLevel);
         }
     },
 

js/ui/overview.js

@@ -157,7 +157,7 @@ var Overview = new Lang.Class({
         Main.xdndHandler.connect('drag-begin', this._onDragBegin.bind(this));
         Main.xdndHandler.connect('drag-end', this._onDragEnd.bind(this));
 
-        global.screen.connect('restacked', this._onRestacked.bind(this));
+        global.display.connect('restacked', this._onRestacked.bind(this));
 
         this._windowSwitchTimeoutId = 0;
         this._windowSwitchTimestamp = 0;
@@ -286,7 +286,8 @@ var Overview = new Lang.Class({
 
         DND.addDragMonitor(this._dragMonitor);
         // Remember the workspace we started from
-        this._lastActiveWorkspaceIndex = global.screen.get_active_workspace_index();
+        let workspaceManager = global.workspace_manager;
+        this._lastActiveWorkspaceIndex = workspaceManager.get_active_workspace_index();
     },
 
     _onDragEnd(time) {
@@ -296,7 +297,8 @@ var Overview = new Lang.Class({
         // we have to go back to where we started and hide
         // the overview
         if (this._shown) {
-            global.screen.get_workspace_by_index(this._lastActiveWorkspaceIndex).activate(time);
+            let workspaceManager = global.workspace_manager;
+            workspaceManager.get_workspace_by_index(this._lastActiveWorkspaceIndex).activate(time);
             this.hide();
         }
         this._resetWindowSwitchTimeout();
@@ -317,9 +319,9 @@ var Overview = new Lang.Class({
         let display = Gdk.Display.get_default();
         let deviceManager = display.get_device_manager();
         let pointer = deviceManager.get_client_pointer();
-        let [screen, pointerX, pointerY] = pointer.get_position();
+        let [gdkScreen, pointerX, pointerY] = pointer.get_position();
 
-        pointer.warp(screen, pointerX, pointerY);
+        pointer.warp(gdkScreen, pointerX, pointerY);
     },
 
     _onDragMotion(dragEvent) {
@@ -393,10 +395,8 @@ var Overview = new Lang.Class({
         if (!Main.layoutManager.primaryMonitor)
             return;
 
-        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+        this._coverPane.set_position(0, 0);
-
+        this._coverPane.set_size(global.screen_width, global.screen_height);
-        this._coverPane.set_position(0, workArea.y);
-        this._coverPane.set_size(workArea.width, workArea.height);
 
         this._updateBackgrounds();
     },
@@ -550,7 +550,7 @@ var Overview = new Lang.Class({
         this.visibleTarget = true;
         this._activationTime = GLib.get_monotonic_time() / GLib.USEC_PER_SEC;
 
-        Meta.disable_unredirect_for_screen(global.screen);
+        Meta.disable_unredirect_for_display(global.display);
         this.viewSelector.show();
 
         this._overview.opacity = 0;
@@ -635,7 +635,7 @@ var Overview = new Lang.Class({
 
     _hideDone() {
         // Re-enable unredirection
-        Meta.enable_unredirect_for_screen(global.screen);
+        Meta.enable_unredirect_for_display(global.display);
 
         this.viewSelector.hide();
         this._desktopFade.hide();

js/ui/overviewControls.js

@@ -253,13 +253,23 @@ var ThumbnailsSlider = new Lang.Class({
         this.actor.add_actor(this._thumbnailsBox.actor);
 
         Main.layoutManager.connect('monitors-changed', this._updateSlide.bind(this));
+        global.workspace_manager.connect('active-workspace-changed',
+                                         this._updateSlide.bind(this));
+        global.workspace_manager.connect('notify::n-workspaces',
+                                         this._updateSlide.bind(this));
         this.actor.connect('notify::hover', this._updateSlide.bind(this));
         this._thumbnailsBox.actor.bind_property('visible', this.actor, 'visible', GObject.BindingFlags.SYNC_CREATE);
     },
 
     _getAlwaysZoomOut() {
-        // Always show the pager on hover or during a drag
+        // Always show the pager on hover, during a drag, or if workspaces are
-        let alwaysZoomOut = this.actor.hover || this._inDrag;
+        // actually used, e.g. there are windows on any non-active workspace
+        let workspaceManager = global.workspace_manager;
+        let alwaysZoomOut = this.actor.hover ||
+                            this._inDrag ||
+                            !Meta.prefs_get_dynamic_workspaces() ||
+                            workspaceManager.n_workspaces > 2 ||
+                            workspaceManager.get_active_workspace_index() != 0;
 
         if (!alwaysZoomOut) {
             let monitors = Main.layoutManager.monitors;
@@ -284,6 +294,11 @@ var ThumbnailsSlider = new Lang.Class({
         return child.get_theme_node().get_length('visible-width');
     },
 
+    _onDragEnd() {
+        this.actor.sync_hover();
+        this.parent();
+    },
+
     _getSlide() {
         if (!this._visible)
             return 0;

js/ui/padOsd.js

@@ -313,6 +313,8 @@ var PadDiagram = new Lang.Class({
     _init(params) {
         let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/pad-osd.css');
         let [success, css, etag] = file.load_contents(null);
+        if (css instanceof Uint8Array)
+            css = imports.byteArray.toString(css);
         this._curEdited = null;
         this._prevEdited = null;
         this._css = css;
@@ -960,14 +962,15 @@ var PadOsd = new Lang.Class({
 });
 Signals.addSignalMethods(PadOsd.prototype);
 
-const PadOsdIface = '<node> \
+const PadOsdIface = `
-<interface name="org.gnome.Shell.Wacom.PadOsd"> \
+<node>
-<method name="Show"> \
+<interface name="org.gnome.Shell.Wacom.PadOsd">
-    <arg name="device_node" direction="in" type="o"/> \
+<method name="Show">
-    <arg name="edition_mode" direction="in" type="b"/> \
+    <arg name="device_node" direction="in" type="o"/>
-</method> \
+    <arg name="edition_mode" direction="in" type="b"/>
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 var PadOsdService = new Lang.Class({
     Name: 'PadOsdService',

js/ui/panel.js

@@ -265,7 +265,8 @@ var AppMenuButton = new Lang.Class({
     },
 
     _findTargetApp() {
-        let workspace = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let workspace = workspaceManager.get_active_workspace();
         let tracker = Shell.WindowTracker.get_default();
         let focusedApp = tracker.focus_app;
         if (focusedApp && focusedApp.is_on_workspace(workspace))
@@ -306,8 +307,11 @@ var AppMenuButton = new Lang.Class({
             }
         }
 
+        let shellShowsAppMenu = this._gtkSettings.gtk_shell_shows_app_menu;
+        Meta.prefs_set_show_fallback_app_menu(!shellShowsAppMenu);
+
         let visible = (this._targetApp != null &&
-                       this._gtkSettings.gtk_shell_shows_app_menu &&
+                       shellShowsAppMenu &&
                        !Main.overview.visibleTarget);
         if (visible)
             this.show();
@@ -709,6 +713,7 @@ var AggregateMenu = new Lang.Class({
             this._bluetooth = null;
         }
 
+        this._remoteAccess = new imports.ui.status.remoteAccess.RemoteAccessApplet();
         this._power = new imports.ui.status.power.Indicator();
         this._rfkill = new imports.ui.status.rfkill.Indicator();
         this._volume = new imports.ui.status.volume.Indicator();
@@ -729,6 +734,7 @@ var AggregateMenu = new Lang.Class({
         if (this._bluetooth) {
             this._indicators.add_child(this._bluetooth.indicators);
         }
+        this._indicators.add_child(this._remoteAccess.indicators);
         this._indicators.add_child(this._rfkill.indicators);
         this._indicators.add_child(this._volume.indicators);
         this._indicators.add_child(this._power.indicators);
@@ -743,6 +749,7 @@ var AggregateMenu = new Lang.Class({
         if (this._bluetooth) {
             this.menu.addMenuItem(this._bluetooth.menu);
         }
+        this.menu.addMenuItem(this._remoteAccess.menu);
         this.menu.addMenuItem(this._location.menu);
         this.menu.addMenuItem(this._rfkill.menu);
         this.menu.addMenuItem(this._power.menu);
@@ -772,6 +779,7 @@ var Panel = new Lang.Class({
         this.actor = new Shell.GenericContainer({ name: 'panel',
                                                   reactive: true });
         this.actor._delegate = this;
+        this.actor.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
 
         this._sessionStyle = null;
 
@@ -796,6 +804,7 @@ var Panel = new Lang.Class({
         this.actor.connect('get-preferred-height', this._getPreferredHeight.bind(this));
         this.actor.connect('allocate', this._allocate.bind(this));
         this.actor.connect('button-press-event', this._onButtonPress.bind(this));
+        this.actor.connect('touch-event', this._onButtonPress.bind(this));
         this.actor.connect('key-press-event', this._onKeyPress.bind(this));
 
         Main.overview.connect('showing', () => {
@@ -818,7 +827,7 @@ var Panel = new Lang.Class({
         global.window_group.connect('actor-removed', this._onWindowActorRemoved.bind(this));
         global.window_manager.connect('switch-workspace', this._updateSolidStyle.bind(this));
 
-        global.screen.connect('workareas-changed', () => { this.actor.queue_relayout(); });
+        global.display.connect('workareas-changed', () => { this.actor.queue_relayout(); });
         this._updatePanel();
     },
 
@@ -939,8 +948,13 @@ var Panel = new Lang.Class({
         if (event.get_source() != actor)
             return Clutter.EVENT_PROPAGATE;
 
-        let button = event.get_button();
+        let type = event.type();
-        if (button != 1)
+        let isPress = type == Clutter.EventType.BUTTON_PRESS;
+        if (!isPress && type != Clutter.EventType.TOUCH_BEGIN)
+            return Clutter.EVENT_PROPAGATE;
+
+        let button = isPress ? event.get_button() : -1;
+        if (isPress && button != 1)
             return Clutter.EVENT_PROPAGATE;
 
         let focusWindow = global.display.focus_window;
@@ -961,8 +975,7 @@ var Panel = new Lang.Class({
         if (!allowDrag)
             return Clutter.EVENT_PROPAGATE;
 
-        global.display.begin_grab_op(global.screen,
+        global.display.begin_grab_op(dragWindow,
-                                     dragWindow,
                                      Meta.GrabOp.MOVING,
                                      false, /* pointer grab */
                                      true, /* frame action */
@@ -977,7 +990,7 @@ var Panel = new Lang.Class({
     _onKeyPress(actor, event) {
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Escape) {
-            global.screen.focus_default_window(event.get_time());
+            global.display.focus_default_window(event.get_time());
             return Clutter.EVENT_STOP;
         }
 
@@ -1075,7 +1088,8 @@ var Panel = new Lang.Class({
             return;
 
         /* Get all the windows in the active workspace that are in the primary monitor and visible */
-        let activeWorkspace = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
         let windows = activeWorkspace.list_windows().filter(metaWindow => {
             return metaWindow.is_on_primary_monitor() &&
                    metaWindow.showing_on_its_workspace() &&

js/ui/popupMenu.js

@@ -141,8 +141,17 @@ var PopupBaseMenuItem = new Lang.Class({
     },
 
     _onKeyPressEvent(actor, event) {
-        let symbol = event.get_key_symbol();
+        let state = event.get_state();
 
+        // if user has a modifier down (except capslock)
+        // then don't handle the key press here
+        state &= ~Clutter.ModifierType.LOCK_MASK;
+        state &= Clutter.ModifierType.MODIFIER_MASK;
+
+        if (state)
+            return Clutter.EVENT_PROPAGATE;
+
+        let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_space || symbol == Clutter.KEY_Return) {
             this.activate(event);
             return Clutter.EVENT_STOP;

js/ui/remoteSearch.js

@@ -12,53 +12,55 @@ const Search = imports.ui.search;
 
 const KEY_FILE_GROUP = 'Shell Search Provider';
 
-const SearchProviderIface = '<node> \
+const SearchProviderIface = `
-<interface name="org.gnome.Shell.SearchProvider"> \
+<node>
-<method name="GetInitialResultSet"> \
+<interface name="org.gnome.Shell.SearchProvider">
-    <arg type="as" direction="in" /> \
+<method name="GetInitialResultSet">
-    <arg type="as" direction="out" /> \
+    <arg type="as" direction="in" />
-</method> \
+    <arg type="as" direction="out" />
-<method name="GetSubsearchResultSet"> \
+</method>
-    <arg type="as" direction="in" /> \
+<method name="GetSubsearchResultSet">
-    <arg type="as" direction="in" /> \
+    <arg type="as" direction="in" />
-    <arg type="as" direction="out" /> \
+    <arg type="as" direction="in" />
-</method> \
+    <arg type="as" direction="out" />
-<method name="GetResultMetas"> \
+</method>
-    <arg type="as" direction="in" /> \
+<method name="GetResultMetas">
-    <arg type="aa{sv}" direction="out" /> \
+    <arg type="as" direction="in" />
-</method> \
+    <arg type="aa{sv}" direction="out" />
-<method name="ActivateResult"> \
+</method>
-    <arg type="s" direction="in" /> \
+<method name="ActivateResult">
-</method> \
+    <arg type="s" direction="in" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
-const SearchProvider2Iface = '<node> \
+const SearchProvider2Iface = `
-<interface name="org.gnome.Shell.SearchProvider2"> \
+<node>
-<method name="GetInitialResultSet"> \
+<interface name="org.gnome.Shell.SearchProvider2">
-    <arg type="as" direction="in" /> \
+<method name="GetInitialResultSet">
-    <arg type="as" direction="out" /> \
+    <arg type="as" direction="in" />
-</method> \
+    <arg type="as" direction="out" />
-<method name="GetSubsearchResultSet"> \
+</method>
-    <arg type="as" direction="in" /> \
+<method name="GetSubsearchResultSet">
-    <arg type="as" direction="in" /> \
+    <arg type="as" direction="in" />
-    <arg type="as" direction="out" /> \
+    <arg type="as" direction="in" />
-</method> \
+    <arg type="as" direction="out" />
-<method name="GetResultMetas"> \
+</method>
-    <arg type="as" direction="in" /> \
+<method name="GetResultMetas">
-    <arg type="aa{sv}" direction="out" /> \
+    <arg type="as" direction="in" />
-</method> \
+    <arg type="aa{sv}" direction="out" />
-<method name="ActivateResult"> \
+</method>
-    <arg type="s" direction="in" /> \
+<method name="ActivateResult">
-    <arg type="as" direction="in" /> \
+    <arg type="s" direction="in" />
-    <arg type="u" direction="in" /> \
+    <arg type="as" direction="in" />
-</method> \
+    <arg type="u" direction="in" />
-<method name="LaunchSearch"> \
+</method>
-    <arg type="as" direction="in" /> \
+<method name="LaunchSearch">
-    <arg type="u" direction="in" /> \
+    <arg type="as" direction="in" />
-</method> \
+    <arg type="u" direction="in" />
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 var SearchProviderProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProviderIface);
 var SearchProvider2ProxyInfo = Gio.DBusInterfaceInfo.new_for_xml(SearchProvider2Iface);

js/ui/runDialog.js

@@ -62,7 +62,11 @@ var RunDialog = new Lang.Class({
                                    'rt': () => {
                                        Main.reloadThemeResource();
                                        Main.loadTheme();
-                                   }
+                                   },
+
+                                   'check_cloexec_fds': () => {
+                                       Shell.util_check_cloexec_fds();
+                                   },
                                  };
 
 
@@ -114,18 +118,16 @@ var RunDialog = new Lang.Class({
 
         this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
                                                      entry: this._entryText });
+        this._entryText.connect('activate', (o) => {
+            this.popModal();
+            this._run(o.get_text(),
+                      Clutter.get_current_event().get_state() & Clutter.ModifierType.CONTROL_MASK);
+            if (!this._commandError ||
+                !this.pushModal())
+                this.close();
+        });
         this._entryText.connect('key-press-event', (o, e) => {
             let symbol = e.get_key_symbol();
-            if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
-                this.popModal();
-                this._run(o.get_text(),
-                          e.get_state() & Clutter.ModifierType.CONTROL_MASK);
-                if (!this._commandError ||
-                    !this.pushModal())
-                    this.close();
-
-                return Clutter.EVENT_STOP;
-            }
             if (symbol == Clutter.Tab) {
                 let text = o.get_text();
                 let prefix;
@@ -172,9 +174,10 @@ var RunDialog = new Lang.Class({
                     if (name.slice(0, text.length) == text)
                         results.push(name);
                 }
-            } catch (e if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND) &&
+            } catch (e) {
-                           !e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))) {
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND) &&
-                log(e);
+                    !e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))
+                    log(e);
             } finally {
                 return results;
             }

js/ui/screenShield.js

@@ -570,7 +570,7 @@ var ScreenShield = new Lang.Class({
         this._shortLightbox.connect('shown', this._onShortLightboxShown.bind(this));
 
         this.idleMonitor = Meta.IdleMonitor.get_core();
-        this._cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
+        this._cursorTracker = Meta.CursorTracker.get_for_display(global.display);
 
         this._syncInhibitor();
     },

js/ui/screencast.js

@@ -8,29 +8,30 @@ const Signals = imports.signals;
 
 const Main = imports.ui.main;
 
-const ScreencastIface = '<node> \
+const ScreencastIface = `
-<interface name="org.gnome.Shell.Screencast"> \
+<node>
-<method name="Screencast"> \
+<interface name="org.gnome.Shell.Screencast">
-    <arg type="s" direction="in" name="file_template"/> \
+<method name="Screencast">
-    <arg type="a{sv}" direction="in" name="options"/> \
+    <arg type="s" direction="in" name="file_template"/>
-    <arg type="b" direction="out" name="success"/> \
+    <arg type="a{sv}" direction="in" name="options"/>
-    <arg type="s" direction="out" name="filename_used"/> \
+    <arg type="b" direction="out" name="success"/>
-</method> \
+    <arg type="s" direction="out" name="filename_used"/>
-<method name="ScreencastArea"> \
+</method>
-    <arg type="i" direction="in" name="x"/> \
+<method name="ScreencastArea">
-    <arg type="i" direction="in" name="y"/> \
+    <arg type="i" direction="in" name="x"/>
-    <arg type="i" direction="in" name="width"/> \
+    <arg type="i" direction="in" name="y"/>
-    <arg type="i" direction="in" name="height"/> \
+    <arg type="i" direction="in" name="width"/>
-    <arg type="s" direction="in" name="file_template"/> \
+    <arg type="i" direction="in" name="height"/>
-    <arg type="a{sv}" direction="in" name="options"/> \
+    <arg type="s" direction="in" name="file_template"/>
-    <arg type="b" direction="out" name="success"/> \
+    <arg type="a{sv}" direction="in" name="options"/>
-    <arg type="s" direction="out" name="filename_used"/> \
+    <arg type="b" direction="out" name="success"/>
-</method> \
+    <arg type="s" direction="out" name="filename_used"/>
-<method name="StopScreencast"> \
+</method>
-    <arg type="b" direction="out" name="success"/> \
+<method name="StopScreencast">
-</method> \
+    <arg type="b" direction="out" name="success"/>
-</interface> \
+</method>
-</node>';
+</interface>
+</node>`;
 
 var ScreencastService = new Lang.Class({
     Name: 'ScreencastService',
@@ -56,7 +57,7 @@ var ScreencastService = new Lang.Class({
         let recorder = this._recorders.get(sender);
         if (!recorder) {
             recorder = new Shell.Recorder({ stage: global.stage,
-                                            screen: global.screen });
+                                            display: global.display });
             recorder._watchNameId =
                 Gio.bus_watch_name(Gio.BusType.SESSION, sender, 0, null,
                                    this._onNameVanished.bind(this));

js/ui/screenshot.js

@@ -16,47 +16,51 @@ const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
-const ScreenshotIface = '<node> \
+const ScreenshotIface = `
-<interface name="org.gnome.Shell.Screenshot"> \
+<node>
-<method name="ScreenshotArea"> \
+<interface name="org.gnome.Shell.Screenshot">
-    <arg type="i" direction="in" name="x"/> \
+<method name="ScreenshotArea">
-    <arg type="i" direction="in" name="y"/> \
+    <arg type="i" direction="in" name="x"/>
-    <arg type="i" direction="in" name="width"/> \
+    <arg type="i" direction="in" name="y"/>
-    <arg type="i" direction="in" name="height"/> \
+    <arg type="i" direction="in" name="width"/>
-    <arg type="b" direction="in" name="flash"/> \
+    <arg type="i" direction="in" name="height"/>
-    <arg type="s" direction="in" name="filename"/> \
+    <arg type="b" direction="in" name="flash"/>
-    <arg type="b" direction="out" name="success"/> \
+    <arg type="s" direction="in" name="filename"/>
-    <arg type="s" direction="out" name="filename_used"/> \
+    <arg type="b" direction="out" name="success"/>
-</method> \
+    <arg type="s" direction="out" name="filename_used"/>
-<method name="ScreenshotWindow"> \
+</method>
-    <arg type="b" direction="in" name="include_frame"/> \
+<method name="ScreenshotWindow">
-    <arg type="b" direction="in" name="include_cursor"/> \
+    <arg type="b" direction="in" name="include_frame"/>
-    <arg type="b" direction="in" name="flash"/> \
+    <arg type="b" direction="in" name="include_cursor"/>
-    <arg type="s" direction="in" name="filename"/> \
+    <arg type="b" direction="in" name="flash"/>
-    <arg type="b" direction="out" name="success"/> \
+    <arg type="s" direction="in" name="filename"/>
-    <arg type="s" direction="out" name="filename_used"/> \
+    <arg type="b" direction="out" name="success"/>
-</method> \
+    <arg type="s" direction="out" name="filename_used"/>
-<method name="Screenshot"> \
+</method>
-    <arg type="b" direction="in" name="include_cursor"/> \
+<method name="Screenshot">
-    <arg type="b" direction="in" name="flash"/> \
+    <arg type="b" direction="in" name="include_cursor"/>
-    <arg type="s" direction="in" name="filename"/> \
+    <arg type="b" direction="in" name="flash"/>
-    <arg type="b" direction="out" name="success"/> \
+    <arg type="s" direction="in" name="filename"/>
-    <arg type="s" direction="out" name="filename_used"/> \
+    <arg type="b" direction="out" name="success"/>
-</method> \
+    <arg type="s" direction="out" name="filename_used"/>
-<method name="SelectArea"> \
+</method>
-    <arg type="i" direction="out" name="x"/> \
+<method name="SelectArea">
-    <arg type="i" direction="out" name="y"/> \
+    <arg type="i" direction="out" name="x"/>
-    <arg type="i" direction="out" name="width"/> \
+    <arg type="i" direction="out" name="y"/>
-    <arg type="i" direction="out" name="height"/> \
+    <arg type="i" direction="out" name="width"/>
-</method> \
+    <arg type="i" direction="out" name="height"/>
-<method name="FlashArea"> \
+</method>
-    <arg type="i" direction="in" name="x"/> \
+<method name="FlashArea">
-    <arg type="i" direction="in" name="y"/> \
+    <arg type="i" direction="in" name="x"/>
-    <arg type="i" direction="in" name="width"/> \
+    <arg type="i" direction="in" name="y"/>
-    <arg type="i" direction="in" name="height"/> \
+    <arg type="i" direction="in" name="width"/>
-</method> \
+    <arg type="i" direction="in" name="height"/>
-</interface> \
+</method>
-</node>';
+<method name="PickColor">
+    <arg type="a{sv}" direction="out" name="result"/>
+</method>
+</interface>
+</node>`;
 
 var ScreenshotService = new Lang.Class({
     Name: 'ScreenshotService',
@@ -72,10 +76,13 @@ var ScreenshotService = new Lang.Class({
         Gio.DBus.session.own_name('org.gnome.Shell.Screenshot', Gio.BusNameOwnerFlags.REPLACE, null, null);
     },
 
-    _createScreenshot(invocation) {
+    _createScreenshot(invocation, needsDisk=true) {
+        let lockedDown = false;
+        if (needsDisk)
+            lockedDown = this._lockdownSettings.get_boolean('disable-save-to-disk')
+
         let sender = invocation.get_sender();
-        if (this._screenShooter.has(sender) ||
+        if (this._screenShooter.has(sender) || lockedDown) {
-            this._lockdownSettings.get_boolean('disable-save-to-disk')) {
             invocation.return_value(GLib.Variant.new('(bs)', [false, '']));
             return null;
         }
@@ -110,7 +117,7 @@ var ScreenshotService = new Lang.Class({
                y + height <= global.screen_height;
     },
 
-    _onScreenshotComplete(obj, result, area, filenameUsed, flash, invocation) {
+    _onScreenshotComplete(result, area, filenameUsed, flash, invocation) {
         if (result) {
             if (flash) {
                 let flashspot = new Flashspot(area);
@@ -157,9 +164,15 @@ var ScreenshotService = new Lang.Class({
         if (!screenshot)
             return;
         screenshot.screenshot_area (x, y, width, height, filename,
-            (obj, result, area, filenameUsed) => {
+            (o, res) => {
-                this._onScreenshotComplete(obj, result, area, filenameUsed,
+                try {
-                                           flash, invocation);
+                    let [result, area, filenameUsed] =
+                        screenshot.screenshot_area_finish(res);
+                    this._onScreenshotComplete(result, area, filenameUsed,
+                                               flash, invocation);
+                } catch (e) {
+                    invocation.return_gerror (e);
+                }
             });
     },
 
@@ -169,9 +182,15 @@ var ScreenshotService = new Lang.Class({
         if (!screenshot)
             return;
         screenshot.screenshot_window (include_frame, include_cursor, filename,
-            (obj, result, area, filenameUsed) => {
+            (o, res) => {
-                this._onScreenshotComplete(obj, result, area, filenameUsed,
+                try {
-                                           flash, invocation);
+                    let [result, area, filenameUsed] =
+                        screenshot.screenshot_window_finish(res);
+                    this._onScreenshotComplete(result, area, filenameUsed,
+                                               flash, invocation);
+                } catch (e) {
+                    invocation.return_gerror (e);
+                }
             });
     },
 
@@ -181,9 +200,15 @@ var ScreenshotService = new Lang.Class({
         if (!screenshot)
             return;
         screenshot.screenshot(include_cursor, filename,
-            (obj, result, area, filenameUsed) => {
+            (o, res) => {
-                this._onScreenshotComplete(obj, result, area, filenameUsed,
+                try {
-                                           flash, invocation);
+                    let [result, area, filenameUsed] =
+                        screenshot.screenshot_finish(res);
+                    this._onScreenshotComplete(result, area, filenameUsed,
+                                               flash, invocation);
+                } catch (e) {
+                    invocation.return_gerror (e);
+                }
             });
     },
 
@@ -215,6 +240,34 @@ var ScreenshotService = new Lang.Class({
         let flashspot = new Flashspot({ x : x, y : y, width: width, height: height});
         flashspot.fire();
         invocation.return_value(null);
+    },
+
+    PickColorAsync(params, invocation) {
+        let pickPixel = new PickPixel();
+        pickPixel.show();
+        pickPixel.connect('finished', (pickPixel, coords) => {
+            if (coords) {
+                let screenshot = this._createScreenshot(invocation, false);
+                if (!screenshot)
+                    return;
+                screenshot.pick_color(...coords, (o, res) => {
+                    let [success, color] = screenshot.pick_color_finish(res);
+                    let { red, green, blue } = color;
+                    let retval = GLib.Variant.new('(a{sv})', [{
+                        color: GLib.Variant.new('(ddd)', [
+                            red / 255.0,
+                            green / 255.0,
+                            blue / 255.0
+                        ])
+                    }]);
+                    this._removeShooterForSender(invocation.get_sender());
+                    invocation.return_value(retval);
+                });
+            } else {
+                invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
+                    "Operation was cancelled");
+            }
+        });
     }
 });
 
@@ -261,7 +314,7 @@ var SelectArea = new Lang.Class({
                                      onUngrab: this._onUngrab.bind(this) }))
             return;
 
-        global.screen.set_cursor(Meta.Cursor.CROSSHAIR);
+        global.display.set_cursor(Meta.Cursor.CROSSHAIR);
         Main.uiGroup.set_child_above_sibling(this._group, null);
         this._group.visible = true;
     },
@@ -330,7 +383,7 @@ var SelectArea = new Lang.Class({
     },
 
     _onUngrab() {
-        global.screen.set_cursor(Meta.Cursor.DEFAULT);
+        global.display.set_cursor(Meta.Cursor.DEFAULT);
         this.emit('finished', this._result);
 
         GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
@@ -341,6 +394,54 @@ var SelectArea = new Lang.Class({
 });
 Signals.addSignalMethods(SelectArea.prototype);
 
+var PickPixel = new Lang.Class({
+    Name: 'PickPixel',
+
+    _init() {
+        this._result = null;
+
+        this._group = new St.Widget({ visible: false,
+                                      reactive: true });
+        Main.uiGroup.add_actor(this._group);
+
+        this._grabHelper = new GrabHelper.GrabHelper(this._group);
+
+        this._group.connect('button-release-event',
+                            this._onButtonRelease.bind(this));
+
+        let constraint = new Clutter.BindConstraint({ source: global.stage,
+                                                      coordinate: Clutter.BindCoordinate.ALL });
+        this._group.add_constraint(constraint);
+    },
+
+    show() {
+        if (!this._grabHelper.grab({ actor: this._group,
+                                     onUngrab: this._onUngrab.bind(this) }))
+            return;
+
+        global.display.set_cursor(Meta.Cursor.CROSSHAIR);
+        Main.uiGroup.set_child_above_sibling(this._group, null);
+        this._group.visible = true;
+    },
+
+    _onButtonRelease(actor, event) {
+        this._result = event.get_coords();
+        this._grabHelper.ungrab();
+        return Clutter.EVENT_PROPAGATE;
+    },
+
+    _onUngrab() {
+        global.display.set_cursor(Meta.Cursor.DEFAULT);
+        this.emit('finished', this._result);
+
+        GLib.idle_add(GLib.PRIORITY_DEFAULT, () => {
+            this._group.destroy();
+            return GLib.SOURCE_REMOVE;
+        });
+    }
+});
+Signals.addSignalMethods(PickPixel.prototype);
+
 var FLASHSPOT_ANIMATION_OUT_TIME = 0.5; // seconds
 
 var Flashspot = new Lang.Class({

js/ui/scripting.js

@@ -68,19 +68,20 @@ function waitLeisure() {
     return callback => { cb = callback; };
 }
 
-const PerfHelperIface = '<node> \
+const PerfHelperIface = `
-<interface name="org.gnome.Shell.PerfHelper"> \
+<node>
-<method name="CreateWindow"> \
+<interface name="org.gnome.Shell.PerfHelper">
-    <arg type="i" direction="in" /> \
+<method name="CreateWindow">
-    <arg type="i" direction="in" /> \
+    <arg type="i" direction="in" />
-    <arg type="b" direction="in" /> \
+    <arg type="i" direction="in" />
-    <arg type="b" direction="in" /> \
+    <arg type="b" direction="in" />
-    <arg type="b" direction="in" /> \
+    <arg type="b" direction="in" />
-</method> \
+    <arg type="b" direction="in" />
-<method name="WaitWindows" /> \
+</method>
-<method name="DestroyWindows" /> \
+<method name="WaitWindows" />
-</interface> \
+<method name="DestroyWindows" />
-</node>';
+</interface>
+</node>`;
 
 var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface);
 function PerfHelper() {
@@ -216,12 +217,14 @@ function _step(g, finish, onError) {
                          if (onError)
                              onError(err);
                      });
-    } catch (err if err instanceof StopIteration) {
-        if (finish)
-            finish();
     } catch (err) {
-        if (onError)
+        if (err instanceof StopIteration) {
-            onError(err);
+            if (finish)
+                finish();
+        } else {
+            if (onError)
+                onError(err);
+        }
     }
 }
 

js/ui/sessionMode.js

@@ -117,6 +117,8 @@ function _loadMode(file, info) {
     let fileContent, success, tag, newMode;
     try {
         [success, fileContent, tag] = file.load_contents(null);
+        if (fileContent instanceof Uint8Array)
+            fileContent = imports.byteArray.toString(fileContent);
         newMode = JSON.parse(fileContent);
     } catch(e) {
         return;

js/ui/shellDBus.js

@@ -14,70 +14,72 @@ const Main = imports.ui.main;
 const Screenshot = imports.ui.screenshot;
 const ViewSelector = imports.ui.viewSelector;
 
-const GnomeShellIface = '<node> \
+const GnomeShellIface = `
-<interface name="org.gnome.Shell"> \
+<node>
-<method name="Eval"> \
+<interface name="org.gnome.Shell">
-    <arg type="s" direction="in" name="script" /> \
+<method name="Eval">
-    <arg type="b" direction="out" name="success" /> \
+    <arg type="s" direction="in" name="script" />
-    <arg type="s" direction="out" name="result" /> \
+    <arg type="b" direction="out" name="success" />
-</method> \
+    <arg type="s" direction="out" name="result" />
-<method name="FocusSearch"/> \
+</method>
-<method name="ShowOSD"> \
+<method name="FocusSearch"/>
-    <arg type="a{sv}" direction="in" name="params"/> \
+<method name="ShowOSD">
-</method> \
+    <arg type="a{sv}" direction="in" name="params"/>
-<method name="ShowMonitorLabels"> \
+</method>
-    <arg type="a{uv}" direction="in" name="params" /> \
+<method name="ShowMonitorLabels">
-</method> \
+    <arg type="a{uv}" direction="in" name="params" />
-<method name="ShowMonitorLabels2"> \
+</method>
-    <arg type="a{sv}" direction="in" name="params" /> \
+<method name="ShowMonitorLabels2">
-</method> \
+    <arg type="a{sv}" direction="in" name="params" />
-<method name="HideMonitorLabels" /> \
+</method>
-<method name="FocusApp"> \
+<method name="HideMonitorLabels" />
-    <arg type="s" direction="in" name="id"/> \
+<method name="FocusApp">
-</method> \
+    <arg type="s" direction="in" name="id"/>
-<method name="ShowApplications" /> \
+</method>
-<method name="GrabAccelerator"> \
+<method name="ShowApplications" />
-    <arg type="s" direction="in" name="accelerator"/> \
+<method name="GrabAccelerator">
-    <arg type="u" direction="in" name="flags"/> \
+    <arg type="s" direction="in" name="accelerator"/>
-    <arg type="u" direction="out" name="action"/> \
+    <arg type="u" direction="in" name="flags"/>
-</method> \
+    <arg type="u" direction="out" name="action"/>
-<method name="GrabAccelerators"> \
+</method>
-    <arg type="a(su)" direction="in" name="accelerators"/> \
+<method name="GrabAccelerators">
-    <arg type="au" direction="out" name="actions"/> \
+    <arg type="a(su)" direction="in" name="accelerators"/>
-</method> \
+    <arg type="au" direction="out" name="actions"/>
-<method name="UngrabAccelerator"> \
+</method>
-    <arg type="u" direction="in" name="action"/> \
+<method name="UngrabAccelerator">
-    <arg type="b" direction="out" name="success"/> \
+    <arg type="u" direction="in" name="action"/>
-</method> \
+    <arg type="b" direction="out" name="success"/>
-<signal name="AcceleratorActivated"> \
+</method>
-    <arg name="action" type="u" /> \
+<signal name="AcceleratorActivated">
-    <arg name="parameters" type="a{sv}" /> \
+    <arg name="action" type="u" />
-</signal> \
+    <arg name="parameters" type="a{sv}" />
-<property name="Mode" type="s" access="read" /> \
+</signal>
-<property name="OverviewActive" type="b" access="readwrite" /> \
+<property name="Mode" type="s" access="read" />
-<property name="ShellVersion" type="s" access="read" /> \
+<property name="OverviewActive" type="b" access="readwrite" />
-</interface> \
+<property name="ShellVersion" type="s" access="read" />
-</node>';
+</interface>
+</node>`;
 
-const ScreenSaverIface = '<node> \
+const ScreenSaverIface = `
-<interface name="org.gnome.ScreenSaver"> \
+<node>
-<method name="Lock"> \
+<interface name="org.gnome.ScreenSaver">
-</method> \
+<method name="Lock">
-<method name="GetActive"> \
+</method>
-    <arg name="active" direction="out" type="b" /> \
+<method name="GetActive">
-</method> \
+    <arg name="active" direction="out" type="b" />
-<method name="SetActive"> \
+</method>
-    <arg name="value" direction="in" type="b" /> \
+<method name="SetActive">
-</method> \
+    <arg name="value" direction="in" type="b" />
-<method name="GetActiveTime"> \
+</method>
-    <arg name="value" direction="out" type="u" /> \
+<method name="GetActiveTime">
-</method> \
+    <arg name="value" direction="out" type="u" />
-<signal name="ActiveChanged"> \
+</method>
-    <arg name="new_value" type="b" /> \
+<signal name="ActiveChanged">
-</signal> \
+    <arg name="new_value" type="b" />
-<signal name="WakeUpScreen" /> \
+</signal>
-</interface> \
+<signal name="WakeUpScreen" />
-</node>';
+</interface>
+</node>`;
 
 var GnomeShell = new Lang.Class({
     Name: 'GnomeShellDBus',
@@ -145,15 +147,20 @@ var GnomeShell = new Lang.Class({
         for (let param in params)
             params[param] = params[param].deep_unpack();
 
-        let monitorIndex = params['monitor'] || -1;
+        let { monitor: monitorIndex,
-        let label = params['label'] || undefined;
+              label,
-        let level = params['level'] || undefined;
+              level,
+              max_level: maxLevel,
+              icon: serializedIcon } = params;
+
+        if (monitorIndex === undefined)
+            monitorIndex = -1;
 
         let icon = null;
-        if (params['icon'])
+        if (serializedIcon)
-            icon = Gio.Icon.new_for_string(params['icon']);
+            icon = Gio.Icon.new_for_string(serializedIcon);
 
-        Main.osdWindowManager.show(monitorIndex, icon, label, level);
+        Main.osdWindowManager.show(monitorIndex, icon, label, level, maxLevel);
     },
 
     FocusApp(id) {
@@ -288,43 +295,44 @@ var GnomeShell = new Lang.Class({
     ShellVersion: Config.PACKAGE_VERSION
 });
 
-const GnomeShellExtensionsIface = '<node> \
+const GnomeShellExtensionsIface = `
-<interface name="org.gnome.Shell.Extensions"> \
+<node>
-<method name="ListExtensions"> \
+<interface name="org.gnome.Shell.Extensions">
-    <arg type="a{sa{sv}}" direction="out" name="extensions" /> \
+<method name="ListExtensions">
-</method> \
+    <arg type="a{sa{sv}}" direction="out" name="extensions" />
-<method name="GetExtensionInfo"> \
+</method>
-    <arg type="s" direction="in" name="extension" /> \
+<method name="GetExtensionInfo">
-    <arg type="a{sv}" direction="out" name="info" /> \
+    <arg type="s" direction="in" name="extension" />
-</method> \
+    <arg type="a{sv}" direction="out" name="info" />
-<method name="GetExtensionErrors"> \
+</method>
-    <arg type="s" direction="in" name="extension" /> \
+<method name="GetExtensionErrors">
-    <arg type="as" direction="out" name="errors" /> \
+    <arg type="s" direction="in" name="extension" />
-</method> \
+    <arg type="as" direction="out" name="errors" />
-<signal name="ExtensionStatusChanged"> \
+</method>
-    <arg type="s" name="uuid"/> \
+<signal name="ExtensionStatusChanged">
-    <arg type="i" name="state"/> \
+    <arg type="s" name="uuid"/>
-    <arg type="s" name="error"/> \
+    <arg type="i" name="state"/>
-</signal> \
+    <arg type="s" name="error"/>
-<method name="InstallRemoteExtension"> \
+</signal>
-    <arg type="s" direction="in" name="uuid"/> \
+<method name="InstallRemoteExtension">
-    <arg type="s" direction="out" name="result"/> \
+    <arg type="s" direction="in" name="uuid"/>
-</method> \
+    <arg type="s" direction="out" name="result"/>
-<method name="UninstallExtension"> \
+</method>
-    <arg type="s" direction="in" name="uuid"/> \
+<method name="UninstallExtension">
-    <arg type="b" direction="out" name="success"/> \
+    <arg type="s" direction="in" name="uuid"/>
-</method> \
+    <arg type="b" direction="out" name="success"/>
-<method name="LaunchExtensionPrefs"> \
+</method>
-    <arg type="s" direction="in" name="uuid"/> \
+<method name="LaunchExtensionPrefs">
-</method> \
+    <arg type="s" direction="in" name="uuid"/>
-<method name="ReloadExtension"> \
+</method>
-    <arg type="s" direction="in" name="uuid"/> \
+<method name="ReloadExtension">
-</method> \
+    <arg type="s" direction="in" name="uuid"/>
-<method name="CheckForUpdates"> \
+</method>
-</method> \
+<method name="CheckForUpdates">
-<property name="ShellVersion" type="s" access="read" /> \
+</method>
-</interface> \
+<property name="ShellVersion" type="s" access="read" />
-</node>';
+</interface>
+</node>`;
 
 var GnomeShellExtensions = new Lang.Class({
     Name: 'GnomeShellExtensionsDBus',

js/ui/shellMountOperation.js

@@ -436,38 +436,39 @@ var ShellProcessesDialog = new Lang.Class({
 });
 Signals.addSignalMethods(ShellProcessesDialog.prototype);
 
-const GnomeShellMountOpIface = '<node> \
+const GnomeShellMountOpIface = `
-<interface name="org.Gtk.MountOperationHandler"> \
+<node>
-<method name="AskPassword"> \
+<interface name="org.Gtk.MountOperationHandler">
-    <arg type="s" direction="in" name="object_id"/> \
+<method name="AskPassword">
-    <arg type="s" direction="in" name="message"/> \
+    <arg type="s" direction="in" name="object_id"/>
-    <arg type="s" direction="in" name="icon_name"/> \
+    <arg type="s" direction="in" name="message"/>
-    <arg type="s" direction="in" name="default_user"/> \
+    <arg type="s" direction="in" name="icon_name"/>
-    <arg type="s" direction="in" name="default_domain"/> \
+    <arg type="s" direction="in" name="default_user"/>
-    <arg type="u" direction="in" name="flags"/> \
+    <arg type="s" direction="in" name="default_domain"/>
-    <arg type="u" direction="out" name="response"/> \
+    <arg type="u" direction="in" name="flags"/>
-    <arg type="a{sv}" direction="out" name="response_details"/> \
+    <arg type="u" direction="out" name="response"/>
-</method> \
+    <arg type="a{sv}" direction="out" name="response_details"/>
-<method name="AskQuestion"> \
+</method>
-    <arg type="s" direction="in" name="object_id"/> \
+<method name="AskQuestion">
-    <arg type="s" direction="in" name="message"/> \
+    <arg type="s" direction="in" name="object_id"/>
-    <arg type="s" direction="in" name="icon_name"/> \
+    <arg type="s" direction="in" name="message"/>
-    <arg type="as" direction="in" name="choices"/> \
+    <arg type="s" direction="in" name="icon_name"/>
-    <arg type="u" direction="out" name="response"/> \
+    <arg type="as" direction="in" name="choices"/>
-    <arg type="a{sv}" direction="out" name="response_details"/> \
+    <arg type="u" direction="out" name="response"/>
-</method> \
+    <arg type="a{sv}" direction="out" name="response_details"/>
-<method name="ShowProcesses"> \
+</method>
-    <arg type="s" direction="in" name="object_id"/> \
+<method name="ShowProcesses">
-    <arg type="s" direction="in" name="message"/> \
+    <arg type="s" direction="in" name="object_id"/>
-    <arg type="s" direction="in" name="icon_name"/> \
+    <arg type="s" direction="in" name="message"/>
-    <arg type="ai" direction="in" name="application_pids"/> \
+    <arg type="s" direction="in" name="icon_name"/>
-    <arg type="as" direction="in" name="choices"/> \
+    <arg type="ai" direction="in" name="application_pids"/>
-    <arg type="u" direction="out" name="response"/> \
+    <arg type="as" direction="in" name="choices"/>
-    <arg type="a{sv}" direction="out" name="response_details"/> \
+    <arg type="u" direction="out" name="response"/>
-</method> \
+    <arg type="a{sv}" direction="out" name="response_details"/>
-<method name="Close"/> \
+</method>
-</interface> \
+<method name="Close"/>
-</node>';
+</interface>
+</node>`;
 
 var ShellMountOperationType = {
     NONE: 0,

js/ui/slider.js

@@ -7,55 +7,38 @@ const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;
 
+const BarLevel = imports.ui.barLevel;
+
 var SLIDER_SCROLL_STEP = 0.02; /* Slider scrolling step in % */
 
 var Slider = new Lang.Class({
     Name: "Slider",
+    Extends: BarLevel.BarLevel,
 
     _init(value) {
-        if (isNaN(value))
+        let params = {
-            // Avoid spreading NaNs around
+            styleClass: 'slider',
-            throw TypeError('The slider value must be a number');
+            canFocus: true,
-        this._value = Math.max(Math.min(value, 1), 0);
+            reactive: true,
-        this._sliderWidth = 0;
+            accessibleRole: Atk.Role.SLIDER,
+        }
+        this.parent(value, params)
 
-        this.actor = new St.DrawingArea({ style_class: 'slider',
-                                          can_focus: true,
-                                          reactive: true,
-                                          accessible_role: Atk.Role.SLIDER });
-        this.actor.connect('repaint', this._sliderRepaint.bind(this));
         this.actor.connect('button-press-event', this._startDragging.bind(this));
         this.actor.connect('touch-event', this._touchDragging.bind(this));
         this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
         this.actor.connect('key-press-event', this.onKeyPressEvent.bind(this));
-        this.actor.connect('allocation-changed', (actor, box) => {
-            this._sliderWidth = box.get_width();
-        });
 
         this._releaseId = this._motionId = 0;
         this._dragging = false;
 
-        this._customAccessible = St.GenericAccessible.new_for_actor(this.actor);
-        this.actor.set_accessible(this._customAccessible);
-
-        this._customAccessible.connect('get-current-value', this._getCurrentValue.bind(this));
-        this._customAccessible.connect('get-minimum-value', this._getMinimumValue.bind(this));
-        this._customAccessible.connect('get-maximum-value', this._getMaximumValue.bind(this));
         this._customAccessible.connect('get-minimum-increment', this._getMinimumIncrement.bind(this));
-        this._customAccessible.connect('set-current-value', this._setCurrentValue.bind(this));
-
-        this.connect('value-changed', this._valueChanged.bind(this));
     },
 
-    setValue(value) {
+    _barLevelRepaint(area) {
-        if (isNaN(value))
+        this.parent(area);
-            throw TypeError('The slider value must be a number');
 
-        this._value = Math.max(Math.min(value, 1), 0);
+        // Add handle
-        this.actor.queue_repaint();
-    },
-
-    _sliderRepaint(area) {
         let cr = area.get_context();
         let themeNode = area.get_theme_node();
         let [width, height] = area.get_surface_size();
@@ -66,41 +49,9 @@ var Slider = new Lang.Class({
         let [hasHandleColor, handleBorderColor] =
             themeNode.lookup_color('-slider-handle-border-color', false);
 
-        let sliderHeight = themeNode.get_length('-slider-height');
-
-        let sliderBorderWidth = themeNode.get_length('-slider-border-width');
-        let sliderBorderRadius = Math.min(width, sliderHeight) / 2;
-
-        let sliderBorderColor = themeNode.get_color('-slider-border-color');
-        let sliderColor = themeNode.get_color('-slider-background-color');
-
-        let sliderActiveBorderColor = themeNode.get_color('-slider-active-border-color');
-        let sliderActiveColor = themeNode.get_color('-slider-active-background-color');
-
         const TAU = Math.PI * 2;
 
-        let handleX = handleRadius + (width - 2 * handleRadius) * this._value;
+        let handleX = handleRadius + (width - 2 * handleRadius) * this._value / this._maxValue;
-
-        cr.arc(sliderBorderRadius + sliderBorderWidth, height / 2, sliderBorderRadius, TAU * 1/4, TAU * 3/4);
-        cr.lineTo(handleX, (height - sliderHeight) / 2);
-        cr.lineTo(handleX, (height + sliderHeight) / 2);
-        cr.lineTo(sliderBorderRadius + sliderBorderWidth, (height + sliderHeight) / 2);
-        Clutter.cairo_set_source_color(cr, sliderActiveColor);
-        cr.fillPreserve();
-        Clutter.cairo_set_source_color(cr, sliderActiveBorderColor);
-        cr.setLineWidth(sliderBorderWidth);
-        cr.stroke();
-
-        cr.arc(width - sliderBorderRadius - sliderBorderWidth, height / 2, sliderBorderRadius, TAU * 3/4, TAU * 1/4);
-        cr.lineTo(handleX, (height + sliderHeight) / 2);
-        cr.lineTo(handleX, (height - sliderHeight) / 2);
-        cr.lineTo(width - sliderBorderRadius - sliderBorderWidth, (height - sliderHeight) / 2);
-        Clutter.cairo_set_source_color(cr, sliderColor);
-        cr.fillPreserve();
-        Clutter.cairo_set_source_color(cr, sliderBorderColor);
-        cr.setLineWidth(sliderBorderWidth);
-        cr.stroke();
-
         let handleY = height / 2;
 
         let color = themeNode.get_foreground_color();
@@ -208,7 +159,7 @@ var Slider = new Lang.Class({
             delta = -dy * SLIDER_SCROLL_STEP;
         }
 
-        this._value = Math.min(Math.max(0, this._value + delta), 1);
+        this._value = Math.min(Math.max(0, this._value + delta), this._maxValue);
 
         this.actor.queue_repaint();
         this.emit('value-changed', this._value);
@@ -230,7 +181,7 @@ var Slider = new Lang.Class({
         let key = event.get_key_symbol();
         if (key == Clutter.KEY_Right || key == Clutter.KEY_Left) {
             let delta = key == Clutter.KEY_Right ? 0.1 : -0.1;
-            this._value = Math.max(0, Math.min(this._value + delta, 1));
+            this._value = Math.max(0, Math.min(this._value + delta, this._maxValue));
             this.actor.queue_repaint();
             this.emit('drag-begin');
             this.emit('value-changed', this._value);
@@ -246,7 +197,7 @@ var Slider = new Lang.Class({
         relX = absX - sliderX;
         relY = absY - sliderY;
 
-        let width = this._sliderWidth;
+        let width = this._barLevelWidth;
         let handleRadius = this.actor.get_theme_node().get_length('-slider-handle-radius');
 
         let newvalue;
@@ -256,38 +207,14 @@ var Slider = new Lang.Class({
             newvalue = 1;
         else
             newvalue = (relX - handleRadius) / (width - 2 * handleRadius);
-        this._value = newvalue;
+        this._value = newvalue * this._maxValue;
         this.actor.queue_repaint();
         this.emit('value-changed', this._value);
     },
 
-    _getCurrentValue(actor) {
-        return this._value;
-    },
-
-    _getMinimumValue(actor) {
-        return 0;
-    },
-
-    _getMaximumValue(actor) {
-        return 1;
-    },
-
     _getMinimumIncrement(actor) {
         return 0.1;
     },
-
-    _setCurrentValue(actor, value) {
-        this._value = value;
-    },
-
-    _valueChanged(slider, value, property) {
-        this._customAccessible.notify ("accessible-value");
-    },
-
-    get value() {
-        return this._value;
-    }
 });
 
 Signals.addSignalMethods(Slider.prototype);

js/ui/status/bluetooth.js

@@ -11,13 +11,14 @@ const PopupMenu = imports.ui.popupMenu;
 const BUS_NAME = 'org.gnome.SettingsDaemon.Rfkill';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Rfkill';
 
-const RfkillManagerInterface = '<node> \
+const RfkillManagerInterface = `
-<interface name="org.gnome.SettingsDaemon.Rfkill"> \
+<node>
-<property name="BluetoothAirplaneMode" type="b" access="readwrite" /> \
+<interface name="org.gnome.SettingsDaemon.Rfkill">
-<property name="BluetoothHasAirplaneMode" type="b" access="read" /> \
+<property name="BluetoothAirplaneMode" type="b" access="readwrite" />
-<property name="BluetoothHardwareAirplaneMode" type="b" access="readwrite" /> \
+<property name="BluetoothHasAirplaneMode" type="b" access="read" />
-</interface> \
+<property name="BluetoothHardwareAirplaneMode" type="b" access="readwrite" />
-</node>';
+</interface>
+</node>`;
 
 const RfkillManagerProxy = Gio.DBusProxy.makeProxyWrapper(RfkillManagerInterface);
 

js/ui/status/brightness.js

@@ -11,11 +11,12 @@ const Slider = imports.ui.slider;
 const BUS_NAME = 'org.gnome.SettingsDaemon.Power';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power';
 
-const BrightnessInterface = '<node> \
+const BrightnessInterface = `
-<interface name="org.gnome.SettingsDaemon.Power.Screen"> \
+<node>
-<property name="Brightness" type="i" access="readwrite"/> \
+<interface name="org.gnome.SettingsDaemon.Power.Screen">
-</interface> \
+<property name="Brightness" type="i" access="readwrite"/>
-</node>';
+</interface>
+</node>`;
 
 const BrightnessProxy = Gio.DBusProxy.makeProxyWrapper(BrightnessInterface);
 

js/ui/status/keyboard.js

@@ -398,7 +398,7 @@ var InputSourceManager = new Lang.Class({
         return true;
     },
 
-    _switchInputSource(display, screen, window, binding) {
+    _switchInputSource(display, window, binding) {
         if (this._mruSources.length < 2)
             return;
 

js/ui/status/location.js

@@ -40,29 +40,31 @@ function accuracyLevelToString(accuracyLevel) {
     return 'NONE';
 }
 
-var GeoclueIface = '<node> \
+var GeoclueIface = `
-  <interface name="org.freedesktop.GeoClue2.Manager"> \
+<node>
-    <property name="InUse" type="b" access="read"/> \
+  <interface name="org.freedesktop.GeoClue2.Manager">
-    <property name="AvailableAccuracyLevel" type="u" access="read"/> \
+    <property name="InUse" type="b" access="read"/>
-    <method name="AddAgent"> \
+    <property name="AvailableAccuracyLevel" type="u" access="read"/>
-      <arg name="id" type="s" direction="in"/> \
+    <method name="AddAgent">
-    </method> \
+      <arg name="id" type="s" direction="in"/>
-  </interface> \
+    </method>
-</node>';
+  </interface>
+</node>`;
 
 const GeoclueManager = Gio.DBusProxy.makeProxyWrapper(GeoclueIface);
 
-var AgentIface = '<node> \
+var AgentIface = `
-  <interface name="org.freedesktop.GeoClue2.Agent"> \
+<node>
-    <property name="MaxAccuracyLevel" type="u" access="read"/> \
+  <interface name="org.freedesktop.GeoClue2.Agent">
-    <method name="AuthorizeApp"> \
+    <property name="MaxAccuracyLevel" type="u" access="read"/>
-      <arg name="desktop_id" type="s" direction="in"/> \
+    <method name="AuthorizeApp">
-      <arg name="req_accuracy_level" type="u" direction="in"/> \
+      <arg name="desktop_id" type="s" direction="in"/>
-      <arg name="authorized" type="b" direction="out"/> \
+      <arg name="req_accuracy_level" type="u" direction="in"/>
-      <arg name="allowed_accuracy_level" type="u" direction="out"/> \
+      <arg name="authorized" type="b" direction="out"/>
-    </method> \
+      <arg name="allowed_accuracy_level" type="u" direction="out"/>
-  </interface> \
+    </method>
-</node>';
+  </interface>
+</node>`;
 
 var Indicator = new Lang.Class({
     Name: 'LocationIndicator',

js/ui/status/network.js

@@ -51,25 +51,26 @@ var PortalHelperResult = {
     RECHECK: 2
 };
 
-const PortalHelperIface = '<node> \
+const PortalHelperIface = `
-<interface name="org.gnome.Shell.PortalHelper"> \
+<node>
-<method name="Authenticate"> \
+<interface name="org.gnome.Shell.PortalHelper">
-    <arg type="o" direction="in" name="connection" /> \
+<method name="Authenticate">
-    <arg type="s" direction="in" name="url" /> \
+    <arg type="o" direction="in" name="connection" />
-    <arg type="u" direction="in" name="timestamp" /> \
+    <arg type="s" direction="in" name="url" />
-</method> \
+    <arg type="u" direction="in" name="timestamp" />
-<method name="Close"> \
+</method>
-    <arg type="o" direction="in" name="connection" /> \
+<method name="Close">
-</method> \
+    <arg type="o" direction="in" name="connection" />
-<method name="Refresh"> \
+</method>
-    <arg type="o" direction="in" name="connection" /> \
+<method name="Refresh">
-</method> \
+    <arg type="o" direction="in" name="connection" />
-<signal name="Done"> \
+</method>
-    <arg type="o" name="connection" /> \
+<signal name="Done">
-    <arg type="u" name="result" /> \
+    <arg type="o" name="connection" />
-</signal> \
+    <arg type="u" name="result" />
-</interface> \
+</signal>
-</node>';
+</interface>
+</node>`;
 const PortalHelperProxy = Gio.DBusProxy.makeProxyWrapper(PortalHelperIface);
 
 function signalToIcon(value) {
@@ -995,8 +996,16 @@ var NMWirelessDialog = new Lang.Class({
         else if (!oneHasConnection && twoHasConnection)
             return 1;
 
-        let oneStrength = one.accessPoints[0].strength;
+        let oneAp = one.accessPoints[0] || null;
-        let twoStrength = two.accessPoints[0].strength;
+        let twoAp = two.accessPoints[0] || null;
+
+        if (oneAp != null && twoAp == null)
+            return -1;
+        else if (oneAp == null && twoAp != null)
+            return 1;
+
+        let oneStrength = oneAp.strength;
+        let twoStrength = twoAp.strength;
 
         // place stronger connections first
         if (oneStrength != twoStrength)
@@ -1156,6 +1165,11 @@ var NMWirelessDialog = new Lang.Class({
             Util.ensureActorVisibleInScrollView(this._scrollView, network.item.actor);
             this._selectNetwork(network);
         });
+        network.item.actor.connect('destroy', () => {
+            let keyFocus = global.stage.key_focus;
+            if (keyFocus && keyFocus.contains(network.item.actor))
+                this._itemBox.grab_key_focus();
+        });
     },
 });
 
@@ -1944,6 +1958,7 @@ var NMApplet = new Lang.Class({
         this.indicators.visible = this._client.nm_running;
         this.menu.actor.visible = this._client.networking_enabled;
 
+        this._updateIcon();
         this._syncConnectivity();
     },
 

js/ui/status/nightLight.js

@@ -10,12 +10,13 @@ const PopupMenu = imports.ui.popupMenu;
 const BUS_NAME = 'org.gnome.SettingsDaemon.Color';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Color';
 
-const ColorInterface = '<node> \
+const ColorInterface = `
-<interface name="org.gnome.SettingsDaemon.Color"> \
+<node>
-  <property name="DisabledUntilTomorrow" type="b" access="readwrite"/> \
+<interface name="org.gnome.SettingsDaemon.Color">
-  <property name="NightLightActive" type="b" access="read"/> \
+  <property name="DisabledUntilTomorrow" type="b" access="readwrite"/>
-</interface> \
+  <property name="NightLightActive" type="b" access="read"/>
-</node>';
+</interface>
+</node>`;
 
 const ColorProxy = Gio.DBusProxy.makeProxyWrapper(ColorInterface);
 

js/ui/status/power.js

@@ -13,17 +13,18 @@ const PopupMenu = imports.ui.popupMenu;
 const BUS_NAME = 'org.freedesktop.UPower';
 const OBJECT_PATH = '/org/freedesktop/UPower/devices/DisplayDevice';
 
-const DisplayDeviceInterface = '<node> \
+const DisplayDeviceInterface = `
-<interface name="org.freedesktop.UPower.Device"> \
+<node>
-  <property name="Type" type="u" access="read"/> \
+<interface name="org.freedesktop.UPower.Device">
-  <property name="State" type="u" access="read"/> \
+  <property name="Type" type="u" access="read"/>
-  <property name="Percentage" type="d" access="read"/> \
+  <property name="State" type="u" access="read"/>
-  <property name="TimeToEmpty" type="x" access="read"/> \
+  <property name="Percentage" type="d" access="read"/>
-  <property name="TimeToFull" type="x" access="read"/> \
+  <property name="TimeToEmpty" type="x" access="read"/>
-  <property name="IsPresent" type="b" access="read"/> \
+  <property name="TimeToFull" type="x" access="read"/>
-  <property name="IconName" type="s" access="read"/> \
+  <property name="IsPresent" type="b" access="read"/>
-</interface> \
+  <property name="IconName" type="s" access="read"/>
-</node>';
+</interface>
+</node>`;
 
 const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(DisplayDeviceInterface);