Bump version to 3.29.4

Update NEWS.
inputMethod: Handle IBusInputContext::forward-key-press
2018-07-18 17:46:36 +02:00 · 2018-07-17 23:27:24 +00:00 · 2018-07-17 18:10:06 +00:00 · 2018-07-17 17:02:39 +00:00 · 2018-07-17 17:44:18 +02:00 · 2018-07-17 01:44:18 +02:00
66 changed files with 2086 additions and 1120 deletions
--- a/32
+++ b/32
@ -1,3 +1,35 @@
+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]
--- a/data/gnome-shell-wayland.target
+++ b/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
--- a/data/gnome-shell-x11.target
+++ b/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
--- a/data/gnome-shell.service.in
+++ b/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
--- a/data/meson.build
+++ b/data/meson.build
@ -93,6 +93,23 @@ schema = configure_file(
  install_dir: schemadir
 )

+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',
  input: schema,
--- a/js/gdm/util.js
+++ b/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;
               }
--- a/js/misc/ibusManager.js
+++ b/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
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@ -15,6 +15,8 @@ var InputMethod = new Lang.Class({
        this._purpose = 0;
        this._enabled = true;
        this._currentFocus = null;
+        this._currentEvent = null;
+        this._doForwardEvent = false;
        this._ibus = IBus.Bus.new_async();
        this._ibus.connect('connected', this._onConnected.bind(this));
        this._ibus.connect('disconnected', this._clear.bind(this));
@ -25,6 +27,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 +69,7 @@ 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('forward-key-event', this._onForwardKeyEvent.bind(this));

        this._updateCapabilities();
    },
@ -96,6 +102,24 @@ var InputMethod = new Lang.Class({
        this.set_preedit_text(str, pos);
    },

+    _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) {
        this._currentFocus = focus;
        if (this._context) {
@ -197,13 +221,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);
                                                  }
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@ -40,14 +40,24 @@ const SystemdLoginSessionIface = '<node> \
 <signal name="Lock" /> \
 <signal name="Unlock" /> \
 <property name="Active" type="b" access="read" /> \
+<property name="Class" type="s" access="read" /> \
+<property name="Id" type="s" access="read" /> \
 <method name="SetLockedHint"> \
    <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 +119,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 +134,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.');
-            return;
+            log('Unset XDG_SESSION_ID, getCurrentSessionProxy() called outside a user session. Asking logind directly.');
+            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) => {
--- a/js/ui/altTab.js
+++ b/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
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@ -1862,7 +1862,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++) {
--- a/js/ui/background.js
+++ b/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',
-                                                        this._onMonitorsChanged.bind(this));
+        let monitorManager = Meta.MonitorManager.get();
+        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,
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@ -821,6 +821,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 +877,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);
-            message.connect('close', () => {
-                this._ignoreEvent(event);
-            });
-            this.addMessage(message, false);
+            let message = this._messageById.get(event.id);
+            if (!message) {
+                message = new EventMessage(event, this._date);
+                message.connect('close', () => {
+                    this._ignoreEvent(event);
+                });
+                this._messageById.set(event.id, message);
+                this.addMessage(message, false);
+            } else {
+                this.moveMessage(message, i, false);
+            }
        }

        this._reloading = false;
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@ -100,7 +100,7 @@ var CloseDialog = new Lang.Class({
        if (this._dialog != null)
            return;

-        Meta.disable_unredirect_for_screen(global.screen);
+        Meta.disable_unredirect_for_display(global.display);

        this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, ALIVE_TIMEOUT,
            () => {
@ -128,7 +128,7 @@ var CloseDialog = new Lang.Class({
        if (this._dialog == null)
            return;

-        Meta.enable_unredirect_for_screen(global.screen);
+        Meta.enable_unredirect_for_display(global.display);

        GLib.source_remove(this._timeoutId);
        this._timeoutId = 0;
--- a/js/ui/ctrlAltTab.js
+++ b/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 = screen.get_display();
-            let windows = display.get_tab_list(Meta.TabList.DOCKS, screen.get_active_workspace ());
+            let display = global.display;
+            let workspaceManager = global.workspace_manager;
+            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);
    }
 });

--- a/js/ui/dnd.js
+++ b/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) {
--- a/js/ui/edgeDragAction.js
+++ b/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) {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@ -697,7 +697,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),
--- a/js/ui/keyboard.js
+++ b/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;
@ -484,6 +485,79 @@ var KeyboardModel = new Lang.Class({
    }
 });

+var FocusTracker = new Lang.Class({
+    Name: 'FocusTracker',
+
+    _init() {
+        this._currentWindow = null;
+        this._currentWindowPositionId = 0;
+
+        global.display.connect('notify::focus-window', () => {
+            this._setCurrentWindow(global.display.focus_window);
+            this.emit('window-changed', this._currentWindow);
+        });
+
+        /* 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) {
+        if (this._currentWindow)
+            this._currentWindow.disconnect(this._currentWindowPositionId);
+
+        this._currentWindow = window;
+        if (window) {
+            this._currentWindowPositionId = this._currentWindow.connect('position-changed', () => {
+                if (global.display.get_grab_op() == Meta.GrabOp.NONE)
+                    this.emit('position-changed');
+                else
+                    this.emit('reset');
+            });
+        }
+    },
+
+    _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 +565,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 +579,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 +609,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) {
-        if (this._caretTrackingEnabled == enabled)
-            return;
-
-        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);
+    _onFocusPositionChanged(focusTracker) {
+        let rect = focusTracker.getCurrentRect();
+        this.setCursorLocation(focusTracker.currentWindow, rect.x, rect.y, rect.width, rect.height);
    },

    _lastDeviceIsTouchscreen() {
@ -650,8 +640,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 +924,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 +1017,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 +1095,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 +1118,39 @@ var Keyboard = new Lang.Class({
        }
    },

-    setCursorLocation(window, x, y , w, h) {
-        if (window == this._oskFocusWindow)
+    _setAnimationWindow(window) {
+        if (this._animFocusedWindow == window)
            return;

-        if (this._oskFocusWindow) {
-            let display = global.screen.get_display();
+        if (this._animFocusedWindow)
+            this._animateWindow(this._animFocusedWindow, false);
+        if (window)
+            this._animateWindow(window, true);

-            if (display.get_grab_op() == Meta.GrabOp.NONE ||
-                display.get_focus_window() != this._oskFocusWindow)
-                this._animateWindow(this._oskFocusWindow, false, this._oskFocusWindowDelta);
+        this._animFocusedWindow = window;
+    },

-            this._oskFocusWindow = null;
-            this._oskFocusWindowDelta = null;
-        }
+    setCursorLocation(window, x, y , w, h) {
+        let monitor = Main.layoutManager.keyboardMonitor;

-        if (window) {
-            let monitor = Main.layoutManager.keyboardMonitor;
+        if (window && monitor) {
            let keyboardHeight = Main.layoutManager.keyboardBox.height;
-            let frameRect = window.get_frame_rect();
-            let windowActor = window.get_compositor_private();
-            let delta = 0;
+            let focusObscured = false;

-            if (frameRect.y + y + h >= monitor.height - keyboardHeight)
-                delta = keyboardHeight;
-
-            this._animateWindow(window, true, delta);
-            this._oskFocusWindow = window;
-            this._oskFocusWindowDelta = delta;
+            if (y + h >= monitor.y + monitor.height - keyboardHeight) {
+                if (this._keyboardVisible)
+                    this._setAnimationWindow(window);
+                else
+                    this._delayedAnimFocusWindow = window;
+            } else if (y < keyboardHeight) {
+                this._delayedAnimFocusWindow = null;
+                this._setAnimationWindow(null);
+            }
+        } else {
+            this._setAnimationWindow(null);
        }
+
+        this._oskFocusWindow = window;
    },
 });

--- a/js/ui/layout.js
+++ b/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);
    }
 })

@ -259,7 +260,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 +270,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',
-                              this._queueUpdateRegions.bind(this));
-        global.screen.connect('restacked',
-                              this._windowsRestacked.bind(this));
-        global.screen.connect('monitors-changed',
-                              this._monitorsChanged.bind(this));
-        global.screen.connect('in-fullscreen-changed',
-                              this._updateFullscreen.bind(this));
+        let workspaceManager = global.workspace_manager;
+        workspaceManager.connect('notify::n-workspaces',
+                                 this._queueUpdateRegions.bind(this));
+
+        let display = global.display;
+        display.connect('restacked',
+                        this._windowsRestacked.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 +325,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 +339,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 +544,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 +563,8 @@ var LayoutManager = new Lang.Class({
    },

    get focusMonitor() {
+        if (this.focusIndex < 0)
+            return null;
        return this.monitors[this.focusIndex];
    },

@ -909,7 +917,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 +928,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 +1061,9 @@ var LayoutManager = new Lang.Class({
        global.set_stage_input_region(rects);
        this._isPopupWindowVisible = isPopupMenuVisible;

-        let screen = global.screen;
-        for (let w = 0; w < screen.n_workspaces; w++) {
-            let workspace = screen.get_workspace_by_index(w);
+        let workspaceManager = global.workspace_manager;
+        for (let w = 0; w < workspaceManager.n_workspaces; w++) {
+            let workspace = workspaceManager.get_workspace_by_index(w);
            workspace.set_builtin_struts(struts);
        }

--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@ -61,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();
@ -116,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();
            }
        }
--- a/js/ui/main.js
+++ b/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);
--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@ -96,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;
@ -110,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;
        });
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@ -917,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));

--- a/js/ui/modalDialog.js
+++ b/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;

--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@ -831,8 +831,10 @@ var GtkNotificationDaemon = new Lang.Class({
                let source;
                try {
                    source = this._ensureAppSource(appId);
-                } catch(e if e instanceof InvalidAppError) {
-                    return;
+                } catch(e) {
+                    if (e instanceof InvalidAppError)
+                        return;
+                    throw e;
                }

                notifications.forEach(([notificationId, notification]) => {
@ -863,9 +865,12 @@ var GtkNotificationDaemon = new Lang.Class({
        let source;
        try {
            source = this._ensureAppSource(appId);
-        } catch(e if e instanceof InvalidAppError) {
-            invocation.return_dbus_error('org.gtk.Notifications.InvalidApp', 'The app by ID "%s" could not be found'.format(appId));
-            return;
+        } catch(e) {
+            if (e instanceof InvalidAppError) {
+                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();
--- a/js/ui/osdMonitorLabeler.js
+++ b/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);
    }
 });

--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@ -145,7 +145,7 @@ var OsdWindow = new Lang.Class({
            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 +179,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;
--- a/js/ui/overview.js
+++ b/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) {
@ -550,7 +552,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 +637,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();
--- a/js/ui/panel.js
+++ b/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))
@ -796,6 +797,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 +820,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 +941,13 @@ var Panel = new Lang.Class({
        if (event.get_source() != actor)
            return Clutter.EVENT_PROPAGATE;

-        let button = event.get_button();
-        if (button != 1)
+        let type = event.type();
+        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 +968,7 @@ var Panel = new Lang.Class({
        if (!allowDrag)
            return Clutter.EVENT_PROPAGATE;

-        global.display.begin_grab_op(global.screen,
-                                     dragWindow,
+        global.display.begin_grab_op(dragWindow,
                                     Meta.GrabOp.MOVING,
                                     false, /* pointer grab */
                                     true, /* frame action */
@ -977,7 +983,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 +1081,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() &&
--- a/js/ui/popupMenu.js
+++ b/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;
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@ -172,9 +172,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) &&
-                           !e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))) {
-                log(e);
+            } catch (e) {
+                if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND) &&
+                    !e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))
+                    log(e);
            } finally {
                return results;
            }
--- a/js/ui/screenShield.js
+++ b/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();
    },
--- a/js/ui/screencast.js
+++ b/js/ui/screencast.js
@ -56,7 +56,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));
--- a/js/ui/screenshot.js
+++ b/js/ui/screenshot.js
@ -261,7 +261,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 +330,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, () => {
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@ -216,12 +216,14 @@ function _step(g, finish, onError) {
                         if (onError)
                             onError(err);
                     });
-    } catch (err if err instanceof StopIteration) {
-        if (finish)
-            finish();
    } catch (err) {
-        if (onError)
-            onError(err);
+        if (err instanceof StopIteration) {
+            if (finish)
+                finish();
+        } else {
+            if (onError)
+                onError(err);
+        }
    }
 }

--- a/js/ui/status/keyboard.js
+++ b/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;

--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@ -192,7 +192,9 @@ var SwitcherPopup = new Lang.Class({
        if (this._keyPressHandler(keysym, action) != Clutter.EVENT_PROPAGATE)
            return Clutter.EVENT_STOP;

-        if (keysym == Clutter.Escape)
+        // Note: pressing one of the below keys will destroy the popup only if
+        // that key is not used by the active popup's keyboard shortcut
+        if (keysym == Clutter.Escape || keysym == Clutter.Tab)
            this.destroy();

        return Clutter.EVENT_STOP;
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@ -200,12 +200,18 @@ var WorkspaceTracker = new Lang.Class({
        let tracker = Shell.WindowTracker.get_default();
        tracker.connect('startup-sequence-changed', this._queueCheckWorkspaces.bind(this));

-        global.screen.connect('notify::n-workspaces', this._nWorkspacesChanged.bind(this));
-        global.window_manager.connect('switch-workspace', this._queueCheckWorkspaces.bind(this));
+        let workspaceManager = global.workspace_manager;
+        workspaceManager.connect('notify::n-workspaces',
+                                 this._nWorkspacesChanged.bind(this));
+        global.window_manager.connect('switch-workspace',
+                                      this._queueCheckWorkspaces.bind(this));

-        global.screen.connect('window-entered-monitor', this._windowEnteredMonitor.bind(this));
-        global.screen.connect('window-left-monitor', this._windowLeftMonitor.bind(this));
-        global.screen.connect('restacked', this._windowsRestacked.bind(this));
+        global.display.connect('window-entered-monitor',
+                               this._windowEnteredMonitor.bind(this));
+        global.display.connect('window-left-monitor',
+                               this._windowLeftMonitor.bind(this));
+        global.display.connect('restacked',
+                               this._windowsRestacked.bind(this));

        this._workspaceSettings = this._getWorkspaceSettings();
        this._workspaceSettings.connect('changed::dynamic-workspaces', this._queueCheckWorkspaces.bind(this));
@ -230,6 +236,7 @@ var WorkspaceTracker = new Lang.Class({
    },

    _checkWorkspaces() {
+        let workspaceManager = global.workspace_manager;
        let i;
        let emptyWorkspaces = [];

@ -257,7 +264,7 @@ var WorkspaceTracker = new Lang.Class({
        let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
        for (i = 0; i < sequences.length; i++) {
            let index = sequences[i].get_workspace();
-            if (index >= 0 && index <= global.screen.n_workspaces)
+            if (index >= 0 && index <= workspaceManager.n_workspaces)
                emptyWorkspaces[index] = false;
        }

@ -275,17 +282,17 @@ var WorkspaceTracker = new Lang.Class({

        // If we don't have an empty workspace at the end, add one
        if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
-            global.screen.append_new_workspace(false, global.get_current_time());
+            workspaceManager.append_new_workspace(false, global.get_current_time());
            emptyWorkspaces.push(false);
        }

-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+        let activeWorkspaceIndex = workspaceManager.get_active_workspace_index();
        emptyWorkspaces[activeWorkspaceIndex] = false;

        // Delete other empty workspaces; do it from the end to avoid index changes
        for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
            if (emptyWorkspaces[i])
-                global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
+                workspaceManager.remove_workspace(this._workspaces[i], global.get_current_time());
        }

        this._checkWorkspacesId = 0;
@ -317,14 +324,14 @@ var WorkspaceTracker = new Lang.Class({
        GLib.Source.set_name_by_id(id, '[gnome-shell] this._queueCheckWorkspaces');
    },

-    _windowLeftMonitor(metaScreen, monitorIndex, metaWin) {
+    _windowLeftMonitor(metaDisplay, monitorIndex, metaWin) {
        // If the window left the primary monitor, that
        // might make that workspace empty
        if (monitorIndex == Main.layoutManager.primaryIndex)
            this._queueCheckWorkspaces();
    },

-    _windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
+    _windowEnteredMonitor(metaDisplay, monitorIndex, metaWin) {
        // If the window entered the primary monitor, that
        // might make that workspace non-empty
        if (monitorIndex == Main.layoutManager.primaryIndex)
@ -344,8 +351,9 @@ var WorkspaceTracker = new Lang.Class({
    },

    _nWorkspacesChanged() {
+        let workspaceManager = global.workspace_manager;
        let oldNumWorkspaces = this._workspaces.length;
-        let newNumWorkspaces = global.screen.n_workspaces;
+        let newNumWorkspaces = workspaceManager.n_workspaces;

        if (oldNumWorkspaces == newNumWorkspaces)
            return false;
@ -356,7 +364,7 @@ var WorkspaceTracker = new Lang.Class({

            // Assume workspaces are only added at the end
            for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
-                this._workspaces[w] = global.screen.get_workspace_by_index(w);
+                this._workspaces[w] = workspaceManager.get_workspace_by_index(w);

            for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
                let workspace = this._workspaces[w];
@ -370,7 +378,7 @@ var WorkspaceTracker = new Lang.Class({
            let removedIndex;
            let removedNum = oldNumWorkspaces - newNumWorkspaces;
            for (let w = 0; w < oldNumWorkspaces; w++) {
-                let workspace = global.screen.get_workspace_by_index(w);
+                let workspace = workspaceManager.get_workspace_by_index(w);
                if (this._workspaces[w] != workspace) {
                    removedIndex = w;
                    break;
@ -714,7 +722,7 @@ var WindowManager = new Lang.Class({
        this._shellwm.connect('confirm-display-change', this._confirmDisplayChange.bind(this));
        this._shellwm.connect('create-close-dialog', this._createCloseDialog.bind(this));
        this._shellwm.connect('create-inhibit-shortcuts-dialog', this._createInhibitShortcutsDialog.bind(this));
-        global.screen.connect('restacked', this._syncStacking.bind(this));
+        global.display.connect('restacked', this._syncStacking.bind(this));

        this._workspaceSwitcherPopup = null;
        this._tilePreview = null;
@ -970,8 +978,8 @@ var WindowManager = new Lang.Class({
        if (Main.sessionMode.hasWorkspaces)
            this._workspaceTracker = new WorkspaceTracker(this);

-        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
-                                                false, -1, 1);
+        global.workspace_manager.override_workspace_layout(Meta.DisplayCorner.TOPLEFT,
+                                                           false, -1, 1);

        let gesture = new WorkspaceSwitchAction();
        gesture.connect('activated', this._actionSwitchWorkspace.bind(this));
@ -1001,7 +1009,9 @@ var WindowManager = new Lang.Class({
    },

    _actionSwitchWorkspace(action, direction) {
-            let newWs = global.screen.get_active_workspace().get_neighbor(direction);
+            let workspaceManager = global.workspace_manager;
+            let activeWorkspace = workspaceManager.get_active_workspace();
+            let newWs = activeWorkspace.get_neighbor(direction);
            this.actionMoveWorkspace(newWs);
    },

@ -1017,8 +1027,10 @@ var WindowManager = new Lang.Class({
    _switchApp() {
        let windows = global.get_window_actors().filter(actor => {
            let win = actor.metaWindow;
+            let workspaceManager = global.workspace_manager;
+            let activeWorkspace = workspaceManager.get_active_workspace();
            return (!win.is_override_redirect() &&
-                    win.located_on_workspace(global.screen.get_active_workspace()));
+                    win.located_on_workspace(activeWorkspace));
        });

        if (windows.length == 0)
@ -1042,10 +1054,12 @@ var WindowManager = new Lang.Class({
    },

    insertWorkspace(pos) {
+        let workspaceManager = global.workspace_manager;
+
        if (!Meta.prefs_get_dynamic_workspaces())
            return;

-        global.screen.append_new_workspace(false, global.get_current_time());
+        workspaceManager.append_new_workspace(false, global.get_current_time());

        let windows = global.get_window_actors().map(a => a.meta_window);

@ -1069,9 +1083,9 @@ var WindowManager = new Lang.Class({

        // If the new workspace was inserted before the active workspace,
        // activate the workspace to which its windows went
-        let activeIndex = global.screen.get_active_workspace_index();
+        let activeIndex = workspaceManager.get_active_workspace_index();
        if (activeIndex >= pos) {
-            let newWs = global.screen.get_workspace_by_index(activeIndex + 1);
+            let newWs = workspaceManager.get_workspace_by_index(activeIndex + 1);
            this._blockAnimations = true;
            newWs.activate(global.get_current_time());
            this._blockAnimations = false;
@ -1173,6 +1187,10 @@ var WindowManager = new Lang.Class({
                yScale = geom.height / actor.height;
            } else {
                let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
+                if (!monitor) {
+                    this._minimizeWindowDone();
+                    return;
+                }
                xDest = monitor.x;
                yDest = monitor.y;
                if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
@ -1248,6 +1266,11 @@ var WindowManager = new Lang.Class({
                                geom.height / actor.height);
            } else {
                let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
+                if (!monitor) {
+                    actor.show();
+                    this._unminimizeWindowDone();
+                    return;
+                }
                actor.set_position(monitor.x, monitor.y);
                if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
                    actor.x += monitor.width;
@ -1820,7 +1843,7 @@ var WindowManager = new Lang.Class({
        this._windowMenuManager.showWindowMenuForWindow(window, menu, rect);
    },

-    _startSwitcher(display, screen, window, binding) {
+    _startSwitcher(display, window, binding) {
        let constructor = null;
        switch (binding.get_name()) {
            case 'switch-applications':
@ -1859,15 +1882,15 @@ var WindowManager = new Lang.Class({
            tabPopup.destroy();
    },

-    _startA11ySwitcher(display, screen, window, binding) {
+    _startA11ySwitcher(display, window, binding) {
        Main.ctrlAltTabManager.popup(binding.is_reversed(), binding.get_name(), binding.get_mask());
    },

-    _toggleAppMenu(display, screen, window, event, binding) {
+    _toggleAppMenu(display, window, event, binding) {
        Main.panel.toggleAppMenu();
    },

-    _toggleCalendar(display, screen, window, event, binding) {
+    _toggleCalendar(display, window, event, binding) {
        Main.panel.toggleCalendar();
    },

@ -1880,11 +1903,13 @@ var WindowManager = new Lang.Class({
            OrigTweener.resumeAllTweens();
    },

-    _showWorkspaceSwitcher(display, screen, window, binding) {
+    _showWorkspaceSwitcher(display, window, binding) {
+        let workspaceManager = display.get_workspace_manager();
+
        if (!Main.sessionMode.hasWorkspaces)
            return;

-        if (screen.n_workspaces == 1)
+        if (workspaceManager.n_workspaces == 1)
            return;

        let [action,,,target] = binding.get_name().split('-');
@ -1903,22 +1928,22 @@ var WindowManager = new Lang.Class({

        if (target == 'last') {
            direction = Meta.MotionDirection.DOWN;
-            newWs = screen.get_workspace_by_index(screen.n_workspaces - 1);
+            newWs = workspaceManager.get_workspace_by_index(workspaceManager.n_workspaces - 1);
        } else if (isNaN(target)) {
            // Prepend a new workspace dynamically
-            if (screen.get_active_workspace_index() == 0 &&
+            if (workspaceManager.get_active_workspace_index() == 0 &&
                action == 'move' && target == 'up' && this._isWorkspacePrepended == false) {
                this.insertWorkspace(0);
                this._isWorkspacePrepended = true;
            }

            direction = Meta.MotionDirection[target.toUpperCase()];
-            newWs = screen.get_active_workspace().get_neighbor(direction);
+            newWs = workspaceManager.get_active_workspace().get_neighbor(direction);
        } else if (target > 0) {
            target--;
-            newWs = screen.get_workspace_by_index(target);
+            newWs = workspaceManager.get_workspace_by_index(target);

-            if (screen.get_active_workspace().index() > target)
+            if (workspaceManager.get_active_workspace().index() > target)
                direction = Meta.MotionDirection.UP;
            else
                direction = Meta.MotionDirection.DOWN;
@ -1951,7 +1976,8 @@ var WindowManager = new Lang.Class({
        if (!Main.sessionMode.hasWorkspaces)
            return;

-        let activeWorkspace = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();

        if (activeWorkspace != workspace)
            workspace.activate(global.get_current_time());
@ -1961,7 +1987,8 @@ var WindowManager = new Lang.Class({
        if (!Main.sessionMode.hasWorkspaces)
            return;

-        let activeWorkspace = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();

        if (activeWorkspace != workspace) {
            // This won't have any effect for "always sticky" windows
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@ -126,16 +126,15 @@ var WindowMenu = new Lang.Class({
            }
        }

-        let screen = global.screen;
-        let nMonitors = screen.get_n_monitors();
-        if (nMonitors > 1) {
+        let display = global.display;
+        let nMonitors = display.get_n_monitors();
+        let monitorIndex = window.get_monitor();
+        if (nMonitors > 1 && monitorIndex >= 0) {
            this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

-            let monitorIndex = window.get_monitor();
-
            let dir = Meta.ScreenDirection.UP;
            let upMonitorIndex =
-                screen.get_monitor_neighbor_index(monitorIndex, dir);
+                display.get_monitor_neighbor_index(monitorIndex, dir);
            if (upMonitorIndex != -1) {
                this.addAction(_("Move to Monitor Up"), () => {
                    window.move_to_monitor(upMonitorIndex);
@ -144,7 +143,7 @@ var WindowMenu = new Lang.Class({

            dir = Meta.ScreenDirection.DOWN;
            let downMonitorIndex =
-                screen.get_monitor_neighbor_index(monitorIndex, dir);
+                display.get_monitor_neighbor_index(monitorIndex, dir);
            if (downMonitorIndex != -1) {
                this.addAction(_("Move to Monitor Down"), () => {
                    window.move_to_monitor(downMonitorIndex);
@ -153,7 +152,7 @@ var WindowMenu = new Lang.Class({

            dir = Meta.ScreenDirection.LEFT;
            let leftMonitorIndex =
-                screen.get_monitor_neighbor_index(monitorIndex, dir);
+                display.get_monitor_neighbor_index(monitorIndex, dir);
            if (leftMonitorIndex != -1) {
                this.addAction(_("Move to Monitor Left"), () => {
                    window.move_to_monitor(leftMonitorIndex);
@ -162,7 +161,7 @@ var WindowMenu = new Lang.Class({

            dir = Meta.ScreenDirection.RIGHT;
            let rightMonitorIndex =
-                screen.get_monitor_neighbor_index(monitorIndex, dir);
+                display.get_monitor_neighbor_index(monitorIndex, dir);
            if (rightMonitorIndex != -1) {
                this.addAction(_("Move to Monitor Right"), () => {
                    window.move_to_monitor(rightMonitorIndex);
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@ -1156,10 +1156,10 @@ var Workspace = new Lang.Class({
            this._windowRemovedId = this.metaWorkspace.connect('window-removed',
                                                               this._windowRemoved.bind(this));
        }
-        this._windowEnteredMonitorId = global.screen.connect('window-entered-monitor',
-                                                             this._windowEnteredMonitor.bind(this));
-        this._windowLeftMonitorId = global.screen.connect('window-left-monitor',
-                                                          this._windowLeftMonitor.bind(this));
+        this._windowEnteredMonitorId = global.display.connect('window-entered-monitor',
+                                                              this._windowEnteredMonitor.bind(this));
+        this._windowLeftMonitorId = global.display.connect('window-left-monitor',
+                                                           this._windowLeftMonitor.bind(this));
        this._repositionWindowsId = 0;

        this.leavingOverview = false;
@ -1305,7 +1305,8 @@ var Workspace = new Lang.Class({
        let area = padArea(this._actualGeometry, padding);
        let slots = strategy.computeWindowSlots(layout, area);

-        let currentWorkspace = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let currentWorkspace = workspaceManager.get_active_workspace();
        let isOnCurrentWorkspace = this.metaWorkspace == null || this.metaWorkspace == currentWorkspace;

        for (let i = 0; i < slots.length; i++) {
@ -1442,34 +1443,26 @@ var Workspace = new Lang.Class({
    _doRemoveWindow(metaWin) {
        let win = metaWin.get_compositor_private();

-        // find the position of the window in our list
-        let index = this._lookupIndex (metaWin);
+        let clone = this._removeWindowClone(metaWin);

-        if (index == -1)
-            return;
-
-        let clone = this._windows[index];
-
-        this._windows.splice(index, 1);
-        this._windowOverlays.splice(index, 1);
-
-        // If metaWin.get_compositor_private() returned non-NULL, that
-        // means the window still exists (and is just being moved to
-        // another workspace or something), so set its overviewHint
-        // accordingly. (If it returned NULL, then the window is being
-        // destroyed; we'd like to animate this, but it's too late at
-        // this point.)
-        if (win) {
-            let [stageX, stageY] = clone.actor.get_transformed_position();
-            let [stageWidth, stageHeight] = clone.actor.get_transformed_size();
-            win._overviewHint = {
-                x: stageX,
-                y: stageY,
-                scale: stageWidth / clone.actor.width
-            };
+        if (clone) {
+            // If metaWin.get_compositor_private() returned non-NULL, that
+            // means the window still exists (and is just being moved to
+            // another workspace or something), so set its overviewHint
+            // accordingly. (If it returned NULL, then the window is being
+            // destroyed; we'd like to animate this, but it's too late at
+            // this point.)
+            if (win) {
+                let [stageX, stageY] = clone.actor.get_transformed_position();
+                let [stageWidth, stageHeight] = clone.actor.get_transformed_size();
+                win._overviewHint = {
+                    x: stageX,
+                    y: stageY,
+                    scale: stageWidth / clone.actor.width
+                };
+            }
+            clone.destroy();
        }
-        clone.destroy();
-

        // We need to reposition the windows; to avoid shuffling windows
        // around while the user is interacting with the workspace, we delay
@ -1568,13 +1561,13 @@ var Workspace = new Lang.Class({
        this._doRemoveWindow(metaWin);
    },

-    _windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
+    _windowEnteredMonitor(metaDisplay, monitorIndex, metaWin) {
        if (monitorIndex == this.monitorIndex) {
            this._doAddWindow(metaWin);
        }
    },

-    _windowLeftMonitor(metaScreen, monitorIndex, metaWin) {
+    _windowLeftMonitor(metaDisplay, monitorIndex, metaWin) {
        if (monitorIndex == this.monitorIndex) {
            this._doRemoveWindow(metaWin);
        }
@ -1599,7 +1592,9 @@ var Workspace = new Lang.Class({
        if (this._windows.length == 0)
            return;

-        if (this.metaWorkspace != null && this.metaWorkspace != global.screen.get_active_workspace())
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
+        if (this.metaWorkspace != null && this.metaWorkspace != activeWorkspace)
            return;

        // Special case maximized windows, since it doesn't make sense
@ -1655,7 +1650,9 @@ var Workspace = new Lang.Class({
            this._repositionWindowsId = 0;
        }

-        if (this.metaWorkspace != null && this.metaWorkspace != global.screen.get_active_workspace())
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
+        if (this.metaWorkspace != null && this.metaWorkspace != activeWorkspace)
            return;

        // Special case maximized windows, since it doesn't make sense
@ -1725,7 +1722,8 @@ var Workspace = new Lang.Class({
    },

    zoomFromOverview() {
-        let currentWorkspace = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let currentWorkspace = workspaceManager.get_active_workspace();

        this.leavingOverview = true;

@ -1793,8 +1791,8 @@ var Workspace = new Lang.Class({
            this.metaWorkspace.disconnect(this._windowAddedId);
            this.metaWorkspace.disconnect(this._windowRemovedId);
        }
-        global.screen.disconnect(this._windowEnteredMonitorId);
-        global.screen.disconnect(this._windowLeftMonitorId);
+        global.display.disconnect(this._windowEnteredMonitorId);
+        global.display.disconnect(this._windowLeftMonitorId);

        if (this._repositionWindowsId > 0) {
            Mainloop.source_remove(this._repositionWindowsId);
@ -1859,6 +1857,9 @@ var Workspace = new Lang.Class({
        clone.connect('size-changed', () => {
            this._recalculateWindowPositions(WindowPositionFlags.NONE);
        });
+        clone.actor.connect('destroy', () => {
+            this._removeWindowClone(clone.metaWindow);
+        });

        this.actor.add_actor(clone.actor);

@ -1880,6 +1881,17 @@ var Workspace = new Lang.Class({
        return [clone, overlay];
    },

+    _removeWindowClone(metaWin) {
+        // find the position of the window in our list
+        let index = this._lookupIndex (metaWin);
+
+        if (index == -1)
+            return null;
+
+        this._windowOverlays.splice(index, 1);
+        return this._windows.splice(index, 1).pop();
+    },
+
    _onShowOverlayClose(windowOverlay) {
        for (let i = 0; i < this._windowOverlays.length; i++) {
            let overlay = this._windowOverlays[i];
@ -2015,7 +2027,8 @@ var Workspace = new Lang.Class({
            if (metaWindow.get_monitor() != this.monitorIndex)
                metaWindow.move_to_monitor(this.monitorIndex);

-            let index = this.metaWorkspace ? this.metaWorkspace.index() : global.screen.get_active_workspace_index();
+            let workspaceManager = global.workspace_manager;
+            let index = this.metaWorkspace ? this.metaWorkspace.index() : workspaceManager.get_active_workspace_index();
            metaWindow.change_workspace_by_index(index, false);
            return true;
        } else if (source.shellWorkspaceLaunch) {
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@ -47,9 +47,12 @@ var WorkspaceSwitcherPopup = new Lang.Class({

        this.actor.hide();

-        this._globalSignals = [];
-        this._globalSignals.push(global.screen.connect('workspace-added', this._redisplay.bind(this)));
-        this._globalSignals.push(global.screen.connect('workspace-removed', this._redisplay.bind(this)));
+        let workspaceManager = global.workspace_manager;
+        this._workspaceManagerSignals = [];
+        this._workspaceManagerSignals.push(workspaceManager.connect('workspace-added',
+                                                                    this._redisplay.bind(this)));
+        this._workspaceManagerSignals.push(workspaceManager.connect('workspace-removed',
+                                                                    this._redisplay.bind(this)));
    },

    _getPreferredHeight(actor, forWidth, alloc) {
@ -68,11 +71,12 @@ var WorkspaceSwitcherPopup = new Lang.Class({
            height += childNaturalHeight * workArea.width / workArea.height;
        }

-        let spacing = this._itemSpacing * (global.screen.n_workspaces - 1);
+        let workspaceManager = global.workspace_manager;
+        let spacing = this._itemSpacing * (workspaceManager.n_workspaces - 1);
        height += spacing;
        height = Math.min(height, availHeight);

-        this._childHeight = (height - spacing) / global.screen.n_workspaces;
+        this._childHeight = (height - spacing) / workspaceManager.n_workspaces;

        alloc.min_size = height;
        alloc.natural_size = height;
@ -104,9 +108,11 @@ var WorkspaceSwitcherPopup = new Lang.Class({
    },

    _redisplay() {
+        let workspaceManager = global.workspace_manager;
+
        this._list.destroy_all_children();

-        for (let i = 0; i < global.screen.n_workspaces; i++) {
+        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
            let indicator = null;

           if (i == this._activeWorkspaceIndex && this._direction == Meta.MotionDirection.UP)
@ -164,8 +170,9 @@ var WorkspaceSwitcherPopup = new Lang.Class({
            Mainloop.source_remove(this._timeoutId);
        this._timeoutId = 0;

-        for (let i = 0; i < this._globalSignals.length; i++)
-            global.screen.disconnect(this._globalSignals[i]);
+        let workspaceManager = global.workspace_manager;
+        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
+            workspaceManager.disconnect(this._workspaceManagerSignals[i]);

        this.actor.destroy();

--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@ -304,9 +304,9 @@ var WorkspaceThumbnail = new Lang.Class({
                                                          this._windowAdded.bind(this));
        this._windowRemovedId = this.metaWorkspace.connect('window-removed',
                                                           this._windowRemoved.bind(this));
-        this._windowEnteredMonitorId = global.screen.connect('window-entered-monitor',
-                                                           this._windowEnteredMonitor.bind(this));
-        this._windowLeftMonitorId = global.screen.connect('window-left-monitor',
+        this._windowEnteredMonitorId = global.display.connect('window-entered-monitor',
+                                                              this._windowEnteredMonitor.bind(this));
+        this._windowLeftMonitorId = global.display.connect('window-left-monitor',
                                                           this._windowLeftMonitor.bind(this));

        this.state = ThumbnailState.NORMAL;
@ -372,18 +372,9 @@ var WorkspaceThumbnail = new Lang.Class({
    },

    _doRemoveWindow(metaWin) {
-        let win = metaWin.get_compositor_private();
-
-        // find the position of the window in our list
-        let index = this._lookupIndex (metaWin);
-
-        if (index == -1)
-            return;
-
-        let clone = this._windows[index];
-        this._windows.splice(index, 1);
-
-        clone.destroy();
+        let clone = this._removeWindowClone(metaWin);
+        if (clone)
+            clone.destroy();
    },

    _doAddWindow(metaWin) {
@ -455,13 +446,13 @@ var WorkspaceThumbnail = new Lang.Class({
        this._doRemoveWindow(metaWin);
    },

-    _windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
+    _windowEnteredMonitor(metaDisplay, monitorIndex, metaWin) {
        if (monitorIndex == this.monitorIndex) {
            this._doAddWindow(metaWin);
        }
    },

-    _windowLeftMonitor(metaScreen, monitorIndex, metaWin) {
+    _windowLeftMonitor(metaDisplay, monitorIndex, metaWin) {
        if (monitorIndex == this.monitorIndex) {
            this._doRemoveWindow(metaWin);
        }
@ -487,8 +478,8 @@ var WorkspaceThumbnail = new Lang.Class({

        this.metaWorkspace.disconnect(this._windowAddedId);
        this.metaWorkspace.disconnect(this._windowRemovedId);
-        global.screen.disconnect(this._windowEnteredMonitorId);
-        global.screen.disconnect(this._windowLeftMonitorId);
+        global.display.disconnect(this._windowEnteredMonitorId);
+        global.display.disconnect(this._windowLeftMonitorId);

        for (let i = 0; i < this._allWindows.length; i++)
            this._allWindows[i].disconnect(this._minimizedChangedIds[i]);
@ -535,6 +526,9 @@ var WorkspaceThumbnail = new Lang.Class({
        clone.connect('drag-end', () => {
            Main.overview.endWindowDrag(clone.metaWindow);
        });
+        clone.actor.connect('destroy', () => {
+            this._removeWindowClone(clone.metaWindow);
+        });
        this._contents.add_actor(clone.actor);

        if (this._windows.length == 0)
@ -547,12 +541,24 @@ var WorkspaceThumbnail = new Lang.Class({
        return clone;
    },

+    _removeWindowClone(metaWin) {
+        // find the position of the window in our list
+        let index = this._lookupIndex (metaWin);
+
+        if (index == -1)
+            return null;
+
+        return this._windows.splice(index, 1).pop();
+    },
+
    activate(time) {
        if (this.state > ThumbnailState.NORMAL)
            return;

        // a click on the already current workspace should go back to the main view
-        if (this.metaWorkspace == global.screen.get_active_workspace())
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
+        if (this.metaWorkspace == activeWorkspace)
            Main.overview.hide();
        else
            this.metaWorkspace.activate(time);
@ -674,12 +680,19 @@ var ThumbnailsBox = new Lang.Class({
            this._updateSwitcherVisibility.bind(this));

        Main.layoutManager.connect('monitors-changed', this._rebuildThumbnails.bind(this));
+
+        this._switchWorkspaceNotifyId = 0;
+        this._nWorkspacesNotifyId = 0;
+        this._syncStackingId = 0;
+        this._workareasChangedId = 0;
    },

    _updateSwitcherVisibility() {
+        let workspaceManager = global.workspace_manager;
+
        this.actor.visible =
            this._settings.get_boolean('dynamic-workspaces') ||
-                global.screen.n_workspaces > 1;
+                workspaceManager.n_workspaces > 1;
    },

    _activateThumbnailAtPoint(stageX, stageY, time) {
@ -837,7 +850,8 @@ var ThumbnailsBox = new Lang.Class({
                // to open its first window within some time, as tracked by Shell.WindowTracker.
                // Here, we only add a very brief timeout to avoid the _immediate_ removal of the
                // workspace while we wait for the startup sequence to load.
-                Main.wm.keepWorkspaceAlive(global.screen.get_workspace_by_index(newWorkspaceIndex),
+                let workspaceManager = global.workspace_manager;
+                Main.wm.keepWorkspaceAlive(workspaceManager.get_workspace_by_index(newWorkspaceIndex),
                                           WORKSPACE_KEEP_ALIVE_TIME);
            }

@ -856,18 +870,21 @@ var ThumbnailsBox = new Lang.Class({
    },

    _createThumbnails() {
+        let workspaceManager = global.workspace_manager;
+
        this._switchWorkspaceNotifyId =
            global.window_manager.connect('switch-workspace',
                                          this._activeWorkspaceChanged.bind(this));
        this._nWorkspacesNotifyId =
-            global.screen.connect('notify::n-workspaces',
-                                  this._workspacesChanged.bind(this));
+            workspaceManager.connect('notify::n-workspaces',
+                                     this._workspacesChanged.bind(this));
        this._syncStackingId =
            Main.overview.connect('windows-restacked',
                                  this._syncStacking.bind(this));

        this._workareasChangedId =
-            global.screen.connect('workareas-changed', this._rebuildThumbnails.bind(this));
+            global.display.connect('workareas-changed',
+                                   this._rebuildThumbnails.bind(this));

        this._targetScale = 0;
        this._scale = 0;
@ -878,7 +895,7 @@ var ThumbnailsBox = new Lang.Class({
        for (let key in ThumbnailState)
            this._stateCounts[ThumbnailState[key]] = 0;

-        this.addThumbnails(0, global.screen.n_workspaces);
+        this.addThumbnails(0, workspaceManager.n_workspaces);

        this._updateSwitcherVisibility();
    },
@ -892,7 +909,8 @@ var ThumbnailsBox = new Lang.Class({
            this._switchWorkspaceNotifyId = 0;
        }
        if (this._nWorkspacesNotifyId > 0) {
-            global.screen.disconnect(this._nWorkspacesNotifyId);
+            let workspaceManager = global.workspace_manager;
+            workspaceManager.disconnect(this._nWorkspacesNotifyId);
            this._nWorkspacesNotifyId = 0;
        }

@ -902,7 +920,7 @@ var ThumbnailsBox = new Lang.Class({
        }

        if (this._workareasChangedId > 0) {
-            global.screen.disconnect(this._workareasChangedId);
+            global.display.disconnect(this._workareasChangedId);
            this._workareasChangedId = 0;
        }

@ -922,9 +940,10 @@ var ThumbnailsBox = new Lang.Class({
    _workspacesChanged() {
        let validThumbnails =
            this._thumbnails.filter(t => t.state <= ThumbnailState.NORMAL);
+        let workspaceManager = global.workspace_manager;
        let oldNumWorkspaces = validThumbnails.length;
-        let newNumWorkspaces = global.screen.n_workspaces;
-        let active = global.screen.get_active_workspace_index();
+        let newNumWorkspaces = workspaceManager.n_workspaces;
+        let active = workspaceManager.get_active_workspace_index();

        if (newNumWorkspaces > oldNumWorkspaces) {
            this.addThumbnails(oldNumWorkspaces, newNumWorkspaces - oldNumWorkspaces);
@ -932,7 +951,7 @@ var ThumbnailsBox = new Lang.Class({
            let removedIndex;
            let removedNum = oldNumWorkspaces - newNumWorkspaces;
            for (let w = 0; w < oldNumWorkspaces; w++) {
-                let metaWorkspace = global.screen.get_workspace_by_index(w);
+                let metaWorkspace = workspaceManager.get_workspace_by_index(w);
                if (this._thumbnails[w].metaWorkspace != metaWorkspace) {
                    removedIndex = w;
                    break;
@ -946,10 +965,12 @@ var ThumbnailsBox = new Lang.Class({
    },

    addThumbnails(start, count) {
+        let workspaceManager = global.workspace_manager;
+
        if (!this._ensurePorthole())
            return;
        for (let k = start; k < start + count; k++) {
-            let metaWorkspace = global.screen.get_workspace_by_index(k);
+            let metaWorkspace = workspaceManager.get_workspace_by_index(k);
            let thumbnail = new WorkspaceThumbnail(metaWorkspace);
            thumbnail.setPorthole(this._porthole.x, this._porthole.y,
                                  this._porthole.width, this._porthole.height);
@ -1135,10 +1156,11 @@ var ThumbnailsBox = new Lang.Class({
            return;
        }

+        let workspaceManager = global.workspace_manager;
        let themeNode = this.actor.get_theme_node();

        let spacing = themeNode.get_length('spacing');
-        let nWorkspaces = global.screen.n_workspaces;
+        let nWorkspaces = workspaceManager.n_workspaces;
        let totalSpacing = (nWorkspaces - 1) * spacing;

        alloc.min_size = totalSpacing;
@ -1152,10 +1174,11 @@ var ThumbnailsBox = new Lang.Class({
            return;
        }

+        let workspaceManager = global.workspace_manager;
        let themeNode = this.actor.get_theme_node();

        let spacing = this.actor.get_theme_node().get_length('spacing');
-        let nWorkspaces = global.screen.n_workspaces;
+        let nWorkspaces = workspaceManager.n_workspaces;
        let totalSpacing = (nWorkspaces - 1) * spacing;

        let avail = forHeight - totalSpacing;
@ -1186,6 +1209,7 @@ var ThumbnailsBox = new Lang.Class({
        if (this._thumbnails.length == 0) // not visible
            return;

+        let workspaceManager = global.workspace_manager;
        let themeNode = this.actor.get_theme_node();

        let portholeWidth = this._porthole.width;
@ -1193,7 +1217,7 @@ var ThumbnailsBox = new Lang.Class({
        let spacing = themeNode.get_length('spacing');

        // Compute the scale we'll need once everything is updated
-        let nWorkspaces = global.screen.n_workspaces;
+        let nWorkspaces = workspaceManager.n_workspaces;
        let totalSpacing = (nWorkspaces - 1) * spacing;
        let avail = (box.y2 - box.y1) - totalSpacing;

@ -1227,7 +1251,8 @@ var ThumbnailsBox = new Lang.Class({
        let indicatorY1 = this._indicatorY;
        let indicatorY2;
        // when not animating, the workspace position overrides this._indicatorY
-        let indicatorWorkspace = !this._animatingIndicator ? global.screen.get_active_workspace() : null;
+        let activeWorkspace = workspaceManager.get_active_workspace();
+        let indicatorWorkspace = !this._animatingIndicator ? activeWorkspace : null;
        let indicatorThemeNode = this._indicator.get_theme_node();

        let indicatorTopFullBorder = indicatorThemeNode.get_padding(St.Side.TOP) + indicatorThemeNode.get_border_width(St.Side.TOP);
@ -1318,7 +1343,8 @@ var ThumbnailsBox = new Lang.Class({

    _activeWorkspaceChanged(wm, from, to, direction) {
        let thumbnail;
-        let activeWorkspace = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let activeWorkspace = workspaceManager.get_active_workspace();
        for (let i = 0; i < this._thumbnails.length; i++) {
            if (this._thumbnails[i].metaWorkspace == activeWorkspace) {
                thumbnail = this._thumbnails[i];
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@ -91,25 +91,29 @@ var WorkspacesView = new Lang.Class({
    Extends: WorkspacesViewBase,

    _init(monitorIndex) {
+        let workspaceManager = global.workspace_manager;
+
        this.parent(monitorIndex);

        this._animating = false; // tweening
        this._scrolling = false; // swipe-scrolling
        this._animatingScroll = false; // programatically updating the adjustment

-        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+        let activeWorkspaceIndex = workspaceManager.get_active_workspace_index();
        this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
                                                    lower: 0,
                                                    page_increment: 1,
                                                    page_size: 1,
                                                    step_increment: 0,
-                                                    upper: global.screen.n_workspaces });
+                                                    upper: workspaceManager.n_workspaces });
        this.scrollAdjustment.connect('notify::value',
                                      this._onScroll.bind(this));

        this._workspaces = [];
        this._updateWorkspaces();
-        this._updateWorkspacesId = global.screen.connect('notify::n-workspaces', this._updateWorkspaces.bind(this));
+        this._updateWorkspacesId =
+            workspaceManager.connect('notify::n-workspaces',
+                                     this._updateWorkspaces.bind(this));

        this._overviewShownId =
            Main.overview.connect('shown', () => {
@ -138,7 +142,8 @@ var WorkspacesView = new Lang.Class({
    },

    getActiveWorkspace() {
-        let active = global.screen.get_active_workspace_index();
+        let workspaceManager = global.workspace_manager;
+        let active = workspaceManager.get_active_workspace_index();
        return this._workspaces[active];
    },

@ -169,7 +174,8 @@ var WorkspacesView = new Lang.Class({
    },

    _scrollToActive() {
-        let active = global.screen.get_active_workspace_index();
+        let workspaceManager = global.workspace_manager;
+        let active = workspaceManager.get_active_workspace_index();

        this._updateWorkspaceActors(true);
        this._updateScrollAdjustment(active);
@ -178,7 +184,8 @@ var WorkspacesView = new Lang.Class({
    // Update workspace actors parameters
    // @showAnimation: iff %true, transition between states
    _updateWorkspaceActors(showAnimation) {
-        let active = global.screen.get_active_workspace_index();
+        let workspaceManager = global.workspace_manager;
+        let active = workspaceManager.get_active_workspace_index();

        this._animating = showAnimation;

@ -214,7 +221,8 @@ var WorkspacesView = new Lang.Class({
    },

    _updateVisibility() {
-        let active = global.screen.get_active_workspace_index();
+        let workspaceManager = global.workspace_manager;
+        let active = workspaceManager.get_active_workspace_index();

        for (let w = 0; w < this._workspaces.length; w++) {
            let workspace = this._workspaces[w];
@ -246,13 +254,14 @@ var WorkspacesView = new Lang.Class({
    },

    _updateWorkspaces() {
-        let newNumWorkspaces = global.screen.n_workspaces;
+        let workspaceManager = global.workspace_manager;
+        let newNumWorkspaces = workspaceManager.n_workspaces;

        this.scrollAdjustment.upper = newNumWorkspaces;

        let needsUpdate = false;
        for (let j = 0; j < newNumWorkspaces; j++) {
-            let metaWorkspace = global.screen.get_workspace_by_index(j);
+            let metaWorkspace = workspaceManager.get_workspace_by_index(j);
            let workspace;

            if (j >= this._workspaces.length) { /* added */
@ -290,7 +299,8 @@ var WorkspacesView = new Lang.Class({
        this.scrollAdjustment.run_dispose();
        Main.overview.disconnect(this._overviewShownId);
        global.window_manager.disconnect(this._switchWorkspaceNotifyId);
-        global.screen.disconnect(this._updateWorkspacesId);
+        let workspaceManager = global.workspace_manager;
+        workspaceManager.disconnect(this._updateWorkspacesId);
    },

    startSwipeScroll() {
@ -311,7 +321,8 @@ var WorkspacesView = new Lang.Class({
        if (this._animatingScroll)
            return;

-        let active = global.screen.get_active_workspace_index();
+        let workspaceManager = global.workspace_manager;
+        let active = workspaceManager.get_active_workspace_index();
        let current = Math.round(adj.value);

        if (active != current) {
@ -593,7 +604,7 @@ var WorkspacesDisplay = new Lang.Class({
    _getMonitorIndexForEvent(event) {
        let [x, y] = event.get_coords();
        let rect = new Meta.Rectangle({ x: x, y: y, width: 1, height: 1 });
-        return global.screen.get_monitor_index_for_rect(rect);
+        return global.display.get_monitor_index_for_rect(rect);
    },

    _getPrimaryView() {
@ -679,7 +690,8 @@ var WorkspacesDisplay = new Lang.Class({
            this._getMonitorIndexForEvent(event) != this._primaryIndex)
            return Clutter.EVENT_PROPAGATE;

-        let activeWs = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let activeWs = workspaceManager.get_active_workspace();
        let ws;
        switch (event.get_scroll_direction()) {
        case Clutter.ScrollDirection.UP:
@ -698,7 +710,8 @@ var WorkspacesDisplay = new Lang.Class({
    _onKeyPressEvent(actor, event) {
        if (!this.actor.mapped)
            return Clutter.EVENT_PROPAGATE;
-        let activeWs = global.screen.get_active_workspace();
+        let workspaceManager = global.workspace_manager;
+        let activeWs = workspaceManager.get_active_workspace();
        let ws;
        switch (event.get_key_symbol()) {
        case Clutter.KEY_Page_Up:
--- a/meson.build
+++ b/meson.build
@ -1,12 +1,12 @@
 project('gnome-shell', 'c',
-  version: '3.29.2',
+  version: '3.29.4',
  meson_version: '>= 0.42.0',
  license: 'GPLv2+'
 )

 # We depend on a specific version of the libmutter API. The mutter variants of
 # the Cogl and Clutter libraries also use this API version.
-mutter_api_version = '2'
+mutter_api_version = '3'

 clutter_pc = 'mutter-clutter-' + mutter_api_version
 cogl_pc = 'mutter-cogl-' + mutter_api_version
@ -23,7 +23,7 @@ gi_req = '>= 1.49.1'
 gjs_req = '>= 1.47.0'
 gtk_req = '>= 3.15.0'
 json_glib_req = '>= 0.13.2'
-mutter_req = '>= 3.29.2'
+mutter_req = '>= 3.29.4'
 polkit_req = '>= 0.100'
 schemas_req = '>= 3.21.3'
 startup_req = '>= 0.11'
@ -59,6 +59,13 @@ servicedir = join_paths(datadir, 'dbus-1', 'services')

 plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir)

+# XXX: Once https://github.com/systemd/systemd/issues/9595 is fixed and we can
+# depend on this version, replace with something like:
+# systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
+#                                                         define_variable: ['prefix', prefix])
+# and uncomment systemd_dep below
+systemduserunitdir = join_paths(libdir, 'systemd', 'user')
+
 keybindings_dep = dependency('gnome-keybindings', required: false)
 if keybindings_dep.found()
  keysdir = keybindings_dep.get_pkgconfig_variable('keysdir')
@ -117,10 +124,12 @@ else
 endif

 if get_option('systemd')
-  systemd_dep = dependency('libsystemd')
-  have_systemd = systemd_dep.found()
+  libsystemd_dep = dependency('libsystemd')
+  # XXX: see systemduserunitdir
+  # systemd_dep = dependency('systemd')
+  have_systemd = true
 else
-  systemd_dep = []
+  libsystemd_dep = []
  have_systemd = false
 endif

--- a/po/ca.po
+++ b/po/ca.po
@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HEAD\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-03-10 12:32+0000\n"
+"POT-Creation-Date: 2018-04-13 19:54+0000\n"
 "PO-Revision-Date: 2018-03-10 21:24+0100\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@ -349,7 +349,7 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "S'ha produït un error en carregar el diàleg de preferències de %s:"

 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
-#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153
 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
 msgid "Cancel"
@ -669,12 +669,12 @@ msgstr "Afegeix als preferits"
 msgid "Show Details"
 msgstr "Mostra els detalls"

-#: js/ui/appFavorites.js:138
+#: js/ui/appFavorites.js:140
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "S'ha afegit %s als preferits."

-#: js/ui/appFavorites.js:172
+#: js/ui/appFavorites.js:174
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "S'ha suprimit %s dels preferits."
@ -869,7 +869,7 @@ msgstr "S'ha desconnectat un dispositiu extern"
 msgid "Open with %s"
 msgstr "Obre amb %s"

-#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295
 msgid "Password:"
 msgstr "Contrasenya:"

@ -957,15 +957,15 @@ msgstr "Cal introduir una contrasenya per connectar-vos a «%s»."
 msgid "Network Manager"
 msgstr "Gestor de connexions de xarxa"

-#: js/ui/components/polkitAgent.js:43
+#: js/ui/components/polkitAgent.js:48
 msgid "Authentication Required"
 msgstr "Cal autenticació"

-#: js/ui/components/polkitAgent.js:71
+#: js/ui/components/polkitAgent.js:76
 msgid "Administrator"
 msgstr "Administrador"

-#: js/ui/components/polkitAgent.js:151
+#: js/ui/components/polkitAgent.js:156
 msgid "Authenticate"
 msgstr "Autentica"

@ -973,7 +973,7 @@ msgstr "Autentica"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
+#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "No ha funcionat. Torneu-ho a provar."

@ -1021,7 +1021,7 @@ msgstr "Afegeix rellotges del món…"
 msgid "World Clocks"
 msgstr "Rellotges del món"

-#: js/ui/dateMenu.js:225
+#: js/ui/dateMenu.js:227
 msgid "Weather"
 msgstr "El temps"

@ -1029,7 +1029,7 @@ msgstr "El temps"
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:289
+#: js/ui/dateMenu.js:291
 #, javascript-format
 msgid "%s all day."
 msgstr "%s tot el dia."
@ -1038,7 +1038,7 @@ msgstr "%s tot el dia."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:295
+#: js/ui/dateMenu.js:297
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, llavors %s més tard."
@ -1047,30 +1047,30 @@ msgstr "%s, llavors %s més tard."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:301
+#: js/ui/dateMenu.js:303
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, llavors %s, seguit per %s més tard."

-#: js/ui/dateMenu.js:312
+#: js/ui/dateMenu.js:314
 msgid "Select a location…"
 msgstr "Trieu una ubicació…"

-#: js/ui/dateMenu.js:315
+#: js/ui/dateMenu.js:317
 msgid "Loading…"
 msgstr "S'està carregant…"

 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:321
+#: js/ui/dateMenu.js:323
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Sensació tèrmica de %s."

-#: js/ui/dateMenu.js:324
+#: js/ui/dateMenu.js:326
 msgid "Go online for weather information"
 msgstr "Vés en línia per a informació sobre el temps"

-#: js/ui/dateMenu.js:326
+#: js/ui/dateMenu.js:328
 msgid "Weather information is currently unavailable"
 msgstr "La informació sobre el temps no està disponible"

@ -1990,16 +1990,17 @@ msgid ""
 "New device has been detected while you were away. Please disconnect and "
 "reconnect the device to start using it."
 msgstr ""
-"El nou dispositiu s'ha detectat mentre estàveu absents. Desconnecteu i torneu a connectar el dispositiu per a començar a utilitzar-lo."
+"El nou dispositiu s'ha detectat mentre estàveu absents. Desconnecteu i "
+"torneu a connectar el dispositiu per a començar a utilitzar-lo."

 #: js/ui/status/thunderbolt.js:356
 msgid "Thunderbolt authorization error"
 msgstr "S'ha produït un error d'autorització a Thunderbolt"

 #: js/ui/status/thunderbolt.js:357
-#, javascript-format
-msgid "Could not authorize the thunderbolt device: %s"
-msgstr "No s'ha pogut autoritzar el dispositiu thunderbolt: %s"
+#,  javascript-format
+msgid "Could not authorize the Thunderbolt device: %s"
+msgstr "No s'ha pogut autoritzar el dispositiu Thunderbolt: %s"

 #: js/ui/status/volume.js:128
 msgid "Volume changed"
--- a/po/oc.po
+++ b/po/oc.po
--- a/po/ru.po
+++ b/po/ru.po
@ -12,14 +12,14 @@
 # Valery Kirichenko <valera5505@gmail.com>, 2014.
 # Yuri Myasoedov <ymyasoedov@yandex.ru>, 2012, 2013, 2014.
 # Ivan Komaritsyn <vantu5z@mail.ru>, 2015.
-# Stas Solovey <whats_up@tut.by>, 2011, 2013, 2014, 2015, 2016, 2017.
+# Stas Solovey <whats_up@tut.by>, 2011, 2013, 2014, 2015, 2016, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-04-13 18:31+0000\n"
-"PO-Revision-Date: 2018-04-19 23:31+0300\n"
+"POT-Creation-Date: 2018-04-19 20:33+0000\n"
+"PO-Revision-Date: 2018-07-17 00:25+0300\n"
 "Last-Translator: Stas Solovey <whats_up@tut.by>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
@ -28,7 +28,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.9\n"

 #: data/50-gnome-shell-system.xml:6
 msgid "System"
@ -364,20 +364,20 @@ msgctxt "button"
 msgid "Sign In"
 msgstr "Войти"

-#: js/gdm/loginDialog.js:315
+#: js/gdm/loginDialog.js:319
 msgid "Choose Session"
 msgstr "Выбрать сеанс"

 #. translators: this message is shown below the user list on the
 #. login screen. It can be activated to reveal an entry for
 #. manually entering the username.
-#: js/gdm/loginDialog.js:458
+#: js/gdm/loginDialog.js:462
 msgid "Not listed?"
 msgstr "Нет в списке?"

 #. Translators: this message is shown below the username entry field
 #. to clue the user in on how to login to the local network realm
-#: js/gdm/loginDialog.js:887
+#: js/gdm/loginDialog.js:891
 #, javascript-format
 msgid "(e.g., user or %s)"
 msgstr "(например, пользователь или %s)"
@ -385,12 +385,12 @@ msgstr "(например, пользователь или %s)"
 #. TTLS and PEAP are actually much more complicated, but this complication
 #. is not visible here since we only care about phase2 authentication
 #. (and don't even care of which one)
-#: js/gdm/loginDialog.js:892 js/ui/components/networkAgent.js:243
+#: js/gdm/loginDialog.js:896 js/ui/components/networkAgent.js:243
 #: js/ui/components/networkAgent.js:261
 msgid "Username: "
 msgstr "Имя пользователя: "

-#: js/gdm/loginDialog.js:1228
+#: js/gdm/loginDialog.js:1234
 msgid "Login Window"
 msgstr "Окно входа в систему"

@ -2053,7 +2053,7 @@ msgstr "Ошибка авторизации Thunderbolt"

 #: js/ui/status/thunderbolt.js:357
 #, javascript-format
-msgid "Could not authorize the thunderbolt device: %s"
+msgid "Could not authorize the Thunderbolt device: %s"
 msgstr "Не удалось авторизовать устройство Thunderbolt: %s"

 #: js/ui/status/volume.js:128
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@ -167,22 +167,19 @@ gnome_shell_plugin_init (GnomeShellPlugin *shell_plugin)
 static gboolean
 gnome_shell_plugin_has_swap_event (GnomeShellPlugin *shell_plugin)
 {
-  MetaPlugin *plugin = META_PLUGIN (shell_plugin);
  CoglDisplay *cogl_display =
    cogl_context_get_display (shell_plugin->cogl_context);
  CoglRenderer *renderer = cogl_display_get_renderer (cogl_display);
  const char * (* query_extensions_string) (Display *dpy, int screen);
  Bool (* query_extension) (Display *dpy, int *error, int *event);
-  MetaScreen *screen;
  Display *xdisplay;
+  int screen_number;
  const char *glx_extensions;

  /* We will only get swap events if Cogl is using GLX */
  if (cogl_renderer_get_winsys_id (renderer) != COGL_WINSYS_ID_GLX)
    return FALSE;

-  screen = meta_plugin_get_screen (plugin);
-
  xdisplay = clutter_x11_get_default_display ();

  query_extensions_string =
@ -194,9 +191,8 @@ gnome_shell_plugin_has_swap_event (GnomeShellPlugin *shell_plugin)
                   &shell_plugin->glx_error_base,
                   &shell_plugin->glx_event_base);

-  glx_extensions =
-    query_extensions_string (xdisplay,
-                             meta_screen_get_screen_number (screen));
+  screen_number = XDefaultScreen (xdisplay);
+  glx_extensions = query_extensions_string (xdisplay, screen_number);

  return strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL;
 }
--- a/src/meson.build
+++ b/src/meson.build
@ -53,7 +53,7 @@ gnome_shell_deps = [
  canberra_dep, canberra_gtk_dep,
  polkit_dep,
  gcr_dep,
-  systemd_dep
+  libsystemd_dep
 ]

 gnome_shell_deps += nm_deps
--- a/src/shell-app.c
+++ b/src/shell-app.c
@ -7,6 +7,8 @@
 #include <glib/gi18n-lib.h>

 #include <meta/display.h>
+#include <meta/meta-workspace-manager.h>
+#include <meta/meta-x11-display.h>

 #include "shell-app-private.h"
 #include "shell-enum-types.h"
@ -358,6 +360,17 @@ find_most_recent_transient_on_same_workspace (MetaDisplay *display,
  return result;
 }

+static MetaWorkspace *
+get_active_workspace (void)
+{
+  ShellGlobal *global = shell_global_get ();
+  MetaDisplay *display = shell_global_get_display (global);
+  MetaWorkspaceManager *workspace_manager =
+    meta_display_get_workspace_manager (display);
+
+  return meta_workspace_manager_get_active_workspace (workspace_manager);
+}
+
 /**
 * shell_app_activate_window:
 * @app: a #ShellApp
@ -391,9 +404,8 @@ shell_app_activate_window (ShellApp     *app,
    {
      GSList *windows_reversed, *iter;
      ShellGlobal *global = shell_global_get ();
-      MetaScreen *screen = shell_global_get_screen (global);
-      MetaDisplay *display = meta_screen_get_display (screen);
-      MetaWorkspace *active = meta_screen_get_active_workspace (screen);
+      MetaDisplay *display = shell_global_get_display (global);
+      MetaWorkspace *active = get_active_workspace ();
      MetaWorkspace *workspace = meta_window_get_workspace (window);
      guint32 last_user_timestamp = meta_display_get_last_user_time (display);
      MetaWindow *most_recent_transient;
@ -686,7 +698,7 @@ shell_app_get_windows (ShellApp *app)
    {
      CompareWindowsData data;
      data.app = app;
-      data.active_workspace = meta_screen_get_active_workspace (shell_global_get_screen (shell_global_get ()));
+      data.active_workspace = get_active_workspace ();
      app->running_state->windows = g_slist_sort_with_data (app->running_state->windows, shell_app_compare_windows, &data);
      app->running_state->window_sort_stale = FALSE;
    }
@ -922,11 +934,11 @@ shell_app_on_skip_taskbar_changed (MetaWindow *window,
 }

 static void
-shell_app_on_ws_switch (MetaScreen         *screen,
-                        int                 from,
-                        int                 to,
-                        MetaMotionDirection direction,
-                        gpointer            data)
+shell_app_on_ws_switch (MetaWorkspaceManager *workspace_manager,
+                        int                   from,
+                        int                   to,
+                        MetaMotionDirection   direction,
+                        gpointer              data)
 {
  ShellApp *app = SHELL_APP (data);

@ -1115,12 +1127,12 @@ _shell_app_handle_startup_sequence (ShellApp          *app,
   */
  if (starting && shell_app_get_state (app) == SHELL_APP_STATE_STOPPED)
    {
-      MetaScreen *screen = shell_global_get_screen (shell_global_get ());
-      MetaDisplay *display = meta_screen_get_display (screen);
+      MetaDisplay *display = shell_global_get_display (shell_global_get ());
+      MetaX11Display *x11_display = meta_display_get_x11_display (display);

      shell_app_state_transition (app, SHELL_APP_STATE_STARTING);
-      meta_display_focus_the_no_focus_window (display, screen,
-                                              sn_startup_sequence_get_timestamp (sequence));
+      meta_x11_display_focus_the_no_focus_window (x11_display,
+                                                  sn_startup_sequence_get_timestamp (sequence));
      app->started_on_workspace = sn_startup_sequence_get_workspace (sequence);
    }

@ -1290,15 +1302,17 @@ shell_app_get_app_info (ShellApp *app)
 static void
 create_running_state (ShellApp *app)
 {
-  MetaScreen *screen;
+  MetaDisplay *display = shell_global_get_display (shell_global_get ());
+  MetaWorkspaceManager *workspace_manager =
+    meta_display_get_workspace_manager (display);

  g_assert (app->running_state == NULL);

-  screen = shell_global_get_screen (shell_global_get ());
  app->running_state = g_slice_new0 (ShellAppRunningState);
  app->running_state->refcount = 1;
  app->running_state->workspace_switch_id =
-    g_signal_connect (screen, "workspace-switched", G_CALLBACK(shell_app_on_ws_switch), app);
+    g_signal_connect (workspace_manager, "workspace-switched",
+                      G_CALLBACK (shell_app_on_ws_switch), app);

  app->running_state->session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
  g_assert (app->running_state->session != NULL);
@ -1349,7 +1363,9 @@ shell_app_update_app_menu (ShellApp   *app,
 static void
 unref_running_state (ShellAppRunningState *state)
 {
-  MetaScreen *screen;
+  MetaDisplay *display = shell_global_get_display (shell_global_get ());
+  MetaWorkspaceManager *workspace_manager =
+    meta_display_get_workspace_manager (display);

  g_assert (state->refcount > 0);

@ -1357,8 +1373,7 @@ unref_running_state (ShellAppRunningState *state)
  if (state->refcount > 0)
    return;

-  screen = shell_global_get_screen (shell_global_get ());
-  g_signal_handler_disconnect (screen, state->workspace_switch_id);
+  g_signal_handler_disconnect (workspace_manager, state->workspace_switch_id);

  g_clear_object (&state->application_proxy);

--- a/src/shell-global.c
+++ b/src/shell-global.c
@ -28,6 +28,8 @@
 #include <meta/meta-shaped-texture.h>
 #include <meta/meta-cursor-tracker.h>
 #include <meta/meta-settings.h>
+#include <meta/meta-workspace-manager.h>
+#include <meta/meta-x11-display.h>

 #ifdef HAVE_SYSTEMD
 #include <systemd/sd-journal.h>
@ -60,9 +62,10 @@ struct _ShellGlobal {
  Window stage_xwindow;

  MetaDisplay *meta_display;
+  MetaWorkspaceManager *workspace_manager;
  GdkDisplay *gdk_display;
+  MetaX11Display *x11_display;
  Display *xdisplay;
-  MetaScreen *meta_screen;

  char *session_mode;

@ -96,8 +99,8 @@ enum {
  PROP_0,

  PROP_SESSION_MODE,
-  PROP_SCREEN,
  PROP_DISPLAY,
+  PROP_WORKSPACE_MANAGER,
  PROP_SCREEN_WIDTH,
  PROP_SCREEN_HEIGHT,
  PROP_STAGE,
@ -163,17 +166,17 @@ shell_global_get_property(GObject         *object,
    case PROP_SESSION_MODE:
      g_value_set_string (value, shell_global_get_session_mode (global));
      break;
-    case PROP_SCREEN:
-      g_value_set_object (value, global->meta_screen);
-      break;
    case PROP_DISPLAY:
      g_value_set_object (value, global->meta_display);
      break;
+    case PROP_WORKSPACE_MANAGER:
+      g_value_set_object (value, global->workspace_manager);
+      break;
    case PROP_SCREEN_WIDTH:
      {
        int width, height;

-        meta_screen_get_size (global->meta_screen, &width, &height);
+        meta_display_get_size (global->meta_display, &width, &height);
        g_value_set_int (value, width);
      }
      break;
@ -181,7 +184,7 @@ shell_global_get_property(GObject         *object,
      {
        int width, height;

-        meta_screen_get_size (global->meta_screen, &width, &height);
+        meta_display_get_size (global->meta_display, &width, &height);
        g_value_set_int (value, height);
      }
      break;
@ -189,10 +192,10 @@ shell_global_get_property(GObject         *object,
      g_value_set_object (value, global->stage);
      break;
    case PROP_WINDOW_GROUP:
-      g_value_set_object (value, meta_get_window_group_for_screen (global->meta_screen));
+      g_value_set_object (value, meta_get_window_group_for_display (global->meta_display));
      break;
    case PROP_TOP_WINDOW_GROUP:
-      g_value_set_object (value, meta_get_top_window_group_for_screen (global->meta_screen));
+      g_value_set_object (value, meta_get_top_window_group_for_display (global->meta_display));
      break;
    case PROP_WINDOW_MANAGER:
      g_value_set_object (value, global->wm);
@ -370,13 +373,6 @@ shell_global_class_init (ShellGlobalClass *klass)
                                                        "The session mode to use",
                                                        "user",
                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-  g_object_class_install_property (gobject_class,
-                                   PROP_SCREEN,
-                                   g_param_spec_object ("screen",
-                                                        "Screen",
-                                                        "Metacity screen object for the shell",
-                                                        META_TYPE_SCREEN,
-                                                        G_PARAM_READABLE));

  g_object_class_install_property (gobject_class,
                                   PROP_SCREEN_WIDTH,
@ -401,6 +397,14 @@ shell_global_class_init (ShellGlobalClass *klass)
                                                        META_TYPE_DISPLAY,
                                                        G_PARAM_READABLE));

+  g_object_class_install_property (gobject_class,
+                                   PROP_WORKSPACE_MANAGER,
+                                   g_param_spec_object ("workspace-manager",
+                                                        "Workspace manager",
+                                                        "Workspace manager",
+                                                        META_TYPE_WORKSPACE_MANAGER,
+                                                        G_PARAM_READABLE));
+
  g_object_class_install_property (gobject_class,
                                   PROP_STAGE,
                                   g_param_spec_object ("stage",
@ -564,7 +568,7 @@ focus_window_changed (MetaDisplay *display,

  /* If the stage window became unfocused, drop the key focus
   * on Clutter's side. */
-  if (!meta_stage_is_focused (global->meta_screen))
+  if (!meta_stage_is_focused (global->meta_display))
    clutter_stage_set_key_focus (global->stage, NULL);
 }

@ -594,14 +598,14 @@ sync_stage_window_focus (ShellGlobal *global)
  actor = get_key_focused_actor (global);

  /* An actor got key focus and the stage needs to be focused. */
-  if (actor != NULL && !meta_stage_is_focused (global->meta_screen))
-    meta_focus_stage_window (global->meta_screen,
+  if (actor != NULL && !meta_stage_is_focused (global->meta_display))
+    meta_focus_stage_window (global->meta_display,
                             get_current_time_maybe_roundtrip (global));

  /* An actor dropped key focus. Focus the default window. */
-  else if (actor == NULL && meta_stage_is_focused (global->meta_screen))
-    meta_screen_focus_default_window (global->meta_screen,
-                                      get_current_time_maybe_roundtrip (global));
+  else if (actor == NULL && meta_stage_is_focused (global->meta_display))
+    meta_display_focus_default_window (global->meta_display,
+                                       get_current_time_maybe_roundtrip (global));
 }

 static void
@ -616,12 +620,12 @@ focus_actor_changed (ClutterStage *stage,
 static void
 sync_input_region (ShellGlobal *global)
 {
-  MetaScreen *screen = global->meta_screen;
+  MetaDisplay *display = global->meta_display;

  if (global->has_modal)
-    meta_set_stage_input_region (screen, None);
+    meta_set_stage_input_region (display, None);
  else
-    meta_set_stage_input_region (screen, global->input_region);
+    meta_set_stage_input_region (display, global->input_region);
 }

 /**
@ -675,17 +679,6 @@ shell_global_get_stage (ShellGlobal  *global)
  return global->stage;
 }

-/**
- * shell_global_get_screen:
- *
- * Return value: (transfer none): The default #MetaScreen
- */
-MetaScreen *
-shell_global_get_screen (ShellGlobal  *global)
-{
-  return global->meta_screen;
-}
-
 /**
 * shell_global_get_display:
 *
@ -712,7 +705,7 @@ shell_global_get_window_actors (ShellGlobal *global)

  g_return_val_if_fail (SHELL_IS_GLOBAL (global), NULL);

-  for (l = meta_get_window_actors (global->meta_screen); l; l = l->next)
+  for (l = meta_get_window_actors (global->meta_display); l; l = l->next)
    if (!meta_window_actor_is_destroyed (l->data))
      filtered = g_list_prepend (filtered, l->data);

@ -838,13 +831,15 @@ entry_cursor_func (StEntry  *entry,
 {
  ShellGlobal *global = user_data;

-  meta_screen_set_cursor (global->meta_screen, use_ibeam ? META_CURSOR_IBEAM : META_CURSOR_DEFAULT);
+  meta_display_set_cursor (global->meta_display,
+                           use_ibeam ? META_CURSOR_IBEAM : META_CURSOR_DEFAULT);
 }

 void
 _shell_global_set_plugin (ShellGlobal *global,
                          MetaPlugin  *plugin)
 {
+  MetaDisplay *display;
  MetaBackend *backend;
  MetaSettings *settings;

@ -854,13 +849,15 @@ _shell_global_set_plugin (ShellGlobal *global,
  global->plugin = plugin;
  global->wm = shell_wm_new (plugin);

-  global->meta_screen = meta_plugin_get_screen (plugin);
-  global->meta_display = meta_screen_get_display (global->meta_screen);
-  global->xdisplay = meta_display_get_xdisplay (global->meta_display);
+  display = meta_plugin_get_display (plugin);
+  global->meta_display = display;
+  global->workspace_manager = meta_display_get_workspace_manager (display);
+  global->x11_display = meta_display_get_x11_display (display);
+  global->xdisplay = meta_x11_display_get_xdisplay (global->x11_display);

  global->gdk_display = gdk_x11_lookup_xdisplay (global->xdisplay);

-  global->stage = CLUTTER_STAGE (meta_get_stage_for_screen (global->meta_screen));
+  global->stage = CLUTTER_STAGE (meta_get_stage_for_display (display));

  if (meta_is_wayland_compositor ())
    {
@ -972,13 +969,13 @@ shell_global_end_modal (ShellGlobal *global,

  /* If the stage window is unfocused, ensure that there's no
   * actor focused on Clutter's side. */
-  if (!meta_stage_is_focused (global->meta_screen))
+  if (!meta_stage_is_focused (global->meta_display))
    clutter_stage_set_key_focus (global->stage, NULL);

  /* An actor dropped key focus. Focus the default window. */
-  else if (get_key_focused_actor (global) && meta_stage_is_focused (global->meta_screen))
-    meta_screen_focus_default_window (global->meta_screen,
-                                      get_current_time_maybe_roundtrip (global));
+  else if (get_key_focused_actor (global) && meta_stage_is_focused (global->meta_display))
+    meta_display_focus_default_window (global->meta_display,
+                                       get_current_time_maybe_roundtrip (global));

  sync_input_region (global);
 }
@ -1159,9 +1156,8 @@ shell_global_reexec_self (ShellGlobal *global)
   */
  pre_exec_close_fds ();

-  meta_display_unmanage_screen (shell_global_get_display (global),
-                                shell_global_get_screen (global),
-                                shell_global_get_current_time (global));
+  meta_display_close (shell_global_get_display (global),
+                      shell_global_get_current_time (global));

  execvp (arr->pdata[0], (char**)arr->pdata);
  g_warning ("failed to reexec: %s", g_strerror (errno));
@ -1246,7 +1242,7 @@ shell_global_notify_error (ShellGlobal  *global,
 */
 void shell_global_init_xdnd (ShellGlobal *global)
 {
-  Window output_window = meta_get_overlay_window (global->meta_screen);
+  Window output_window = meta_get_overlay_window (global->meta_display);
  long xdnd_version = 5;

  XChangeProperty (global->xdisplay, global->stage_xwindow,
@ -1284,7 +1280,7 @@ shell_global_get_pointer (ShellGlobal         *global,
  ClutterModifierType raw_mods;
  MetaCursorTracker *tracker;

-  tracker = meta_cursor_tracker_get_for_screen (global->meta_screen);
+  tracker = meta_cursor_tracker_get_for_display (global->meta_display);
  meta_cursor_tracker_get_pointer (tracker, x, y, &raw_mods);

  *mods = raw_mods & CLUTTER_MODIFIER_MASK;
@ -1432,7 +1428,12 @@ shell_global_create_app_launch_context (ShellGlobal *global,
  gdk_app_launch_context_set_timestamp (context, timestamp);

  if (workspace < 0)
-    workspace = meta_screen_get_active_workspace_index (global->meta_screen);
+    {
+      MetaWorkspaceManager *workspace_manager = global->workspace_manager;
+
+      workspace =
+        meta_workspace_manager_get_active_workspace_index (workspace_manager);
+    }
  gdk_app_launch_context_set_desktop (context, workspace);

  return (GAppLaunchContext *)context;
--- a/src/shell-global.h
+++ b/src/shell-global.h
@ -16,7 +16,6 @@ G_DECLARE_FINAL_TYPE (ShellGlobal, shell_global, SHELL, GLOBAL, GObject)
 ShellGlobal   *shell_global_get                       (void);

 ClutterStage  *shell_global_get_stage                 (ShellGlobal *global);
-MetaScreen    *shell_global_get_screen                (ShellGlobal *global);
 MetaDisplay   *shell_global_get_display               (ShellGlobal *global);
 GList         *shell_global_get_window_actors         (ShellGlobal *global);
 GSettings     *shell_global_get_settings              (ShellGlobal *global);
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@ -15,8 +15,8 @@
 #include <gdk/gdk.h>

 #include <cogl/cogl.h>
-#include <meta/screen.h>
 #include <meta/meta-cursor-tracker.h>
+#include <meta/display.h>
 #include <meta/compositor-mutter.h>

 #include "shell-global.h"
@ -112,7 +112,7 @@ static void recorder_remove_redraw_timeout (ShellRecorder *recorder);

 enum {
  PROP_0,
-  PROP_SCREEN,
+  PROP_DISPLAY,
  PROP_STAGE,
  PROP_FRAMERATE,
  PROP_PIPELINE,
@ -670,12 +670,12 @@ recorder_set_stage (ShellRecorder *recorder,
 }

 static void
-recorder_set_screen (ShellRecorder *recorder,
-                     MetaScreen    *screen)
+recorder_set_display (ShellRecorder *recorder,
+                      MetaDisplay   *display)
 {
  MetaCursorTracker *tracker;

-  tracker = meta_cursor_tracker_get_for_screen (screen);
+  tracker = meta_cursor_tracker_get_for_display (display);

  if (tracker == recorder->cursor_tracker)
    return;
@ -760,8 +760,8 @@ shell_recorder_set_property (GObject      *object,

  switch (prop_id)
    {
-    case PROP_SCREEN:
-      recorder_set_screen (recorder, g_value_get_object (value));
+    case PROP_DISPLAY:
+      recorder_set_display (recorder, g_value_get_object (value));
      break;
    case PROP_STAGE:
      recorder_set_stage (recorder, g_value_get_object (value));
@ -825,11 +825,11 @@ shell_recorder_class_init (ShellRecorderClass *klass)
  gobject_class->set_property = shell_recorder_set_property;

  g_object_class_install_property (gobject_class,
-                                   PROP_SCREEN,
-                                   g_param_spec_object ("screen",
-                                                        "Screen",
-                                                        "Screen to record",
-                                                        META_TYPE_SCREEN,
+                                   PROP_DISPLAY,
+                                   g_param_spec_object ("display",
+                                                        "Display",
+                                                        "Display to record",
+                                                        META_TYPE_DISPLAY,
                                                        G_PARAM_WRITABLE));

  g_object_class_install_property (gobject_class,
@ -1551,7 +1551,7 @@ shell_recorder_record (ShellRecorder  *recorder,
  recorder_add_update_pointer_timeout (recorder);

  /* Disable unredirection while we are recoring */
-  meta_disable_unredirect_for_screen (shell_global_get_screen (shell_global_get ()));
+  meta_disable_unredirect_for_display (shell_global_get_display (shell_global_get ()));

  /* Set up repaint hook */
  recorder->repaint_hook_id = clutter_threads_add_repaint_func(recorder_repaint_hook, recorder->stage, NULL);
@ -1602,7 +1602,7 @@ shell_recorder_close (ShellRecorder *recorder)
  recorder->state = RECORDER_STATE_CLOSED;

  /* Reenable after the recording */
-  meta_enable_unredirect_for_screen (shell_global_get_screen (shell_global_get ()));
+  meta_enable_unredirect_for_display (shell_global_get_display (shell_global_get ()));

  /* Release the refcount we took when we started recording */
  g_object_unref (recorder);
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@ -76,7 +76,7 @@ on_screenshot_written (GObject      *source,
  g_clear_pointer (&priv->filename_used, g_free);
  g_clear_pointer (&priv->datetime, g_date_time_unref);

-  meta_enable_unredirect_for_screen (shell_global_get_screen (priv->global));
+  meta_enable_unredirect_for_display (shell_global_get_display (priv->global));
 }

 /* called in an I/O thread */
@ -315,19 +315,19 @@ static void
 grab_screenshot (ClutterActor *stage,
                 ShellScreenshot *screenshot)
 {
-  MetaScreen *screen;
+  MetaDisplay *display;
  MetaCursorTracker *tracker;
  int width, height;
  GTask *result;
  GSettings *settings;
  ShellScreenshotPrivate *priv = screenshot->priv;

-  screen = shell_global_get_screen (priv->global);
-  meta_screen_get_size (screen, &width, &height);
+  display = shell_global_get_display (priv->global);
+  meta_display_get_size (display, &width, &height);

  do_grab_screenshot (screenshot, CLUTTER_STAGE (stage), 0, 0, width, height);

-  if (meta_screen_get_n_monitors (screen) > 1)
+  if (meta_display_get_n_monitors (display) > 1)
    {
      cairo_region_t *screen_region = cairo_region_create ();
      cairo_region_t *stage_region;
@ -336,10 +336,11 @@ grab_screenshot (ClutterActor *stage,
      int i;
      cairo_t *cr;

-      for (i = meta_screen_get_n_monitors (screen) - 1; i >= 0; i--)
+      for (i = meta_display_get_n_monitors (display) - 1; i >= 0; i--)
        {
-          meta_screen_get_monitor_geometry (screen, i, &monitor_rect);
-          cairo_region_union_rectangle (screen_region, (const cairo_rectangle_int_t *) &monitor_rect);
+          meta_display_get_monitor_geometry (display, i, &monitor_rect);
+          cairo_region_union_rectangle (screen_region,
+                                        (const cairo_rectangle_int_t *) &monitor_rect);
        }

      stage_rect.x = 0;
@ -374,7 +375,7 @@ grab_screenshot (ClutterActor *stage,
  if (priv->include_cursor &&
      !g_settings_get_boolean (settings, MAGNIFIER_ACTIVE_KEY))
    {
-      tracker = meta_cursor_tracker_get_for_screen (screen);
+      tracker = meta_cursor_tracker_get_for_display (display);
      _draw_cursor_image (tracker, priv->image, priv->screenshot_area);
    }
  g_object_unref (settings);
@ -413,9 +414,8 @@ grab_window_screenshot (ClutterActor *stage,
  ShellScreenshotPrivate *priv = screenshot->priv;
  GTask *result;
  GSettings *settings;
-  MetaScreen *screen = shell_global_get_screen (priv->global);
+  MetaDisplay *display = shell_global_get_display (priv->global);
  MetaCursorTracker *tracker;
-  MetaDisplay *display = meta_screen_get_display (screen);
  MetaWindow *window = meta_display_get_focus_window (display);
  ClutterActor *window_actor;
  gfloat actor_x, actor_y;
@ -446,7 +446,7 @@ grab_window_screenshot (ClutterActor *stage,
  settings = g_settings_new (A11Y_APPS_SCHEMA);
  if (priv->include_cursor && !g_settings_get_boolean (settings, MAGNIFIER_ACTIVE_KEY))
    {
-      tracker = meta_cursor_tracker_get_for_screen (screen);
+      tracker = meta_cursor_tracker_get_for_display (display);
      _draw_cursor_image (tracker, priv->image, priv->screenshot_area);
    }
  g_object_unref (settings);
@ -490,7 +490,7 @@ shell_screenshot_screenshot (ShellScreenshot *screenshot,

  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));

-  meta_disable_unredirect_for_screen (shell_global_get_screen (priv->global));
+  meta_disable_unredirect_for_display (shell_global_get_display (priv->global));

  g_signal_connect_after (stage, "paint", G_CALLBACK (grab_screenshot), (gpointer)screenshot);

@ -539,7 +539,7 @@ shell_screenshot_screenshot_area (ShellScreenshot *screenshot,

  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));

-  meta_disable_unredirect_for_screen (shell_global_get_screen (shell_global_get ()));
+  meta_disable_unredirect_for_display (shell_global_get_display (shell_global_get ()));

  g_signal_connect_after (stage, "paint", G_CALLBACK (grab_area_screenshot), (gpointer)screenshot);

@ -567,9 +567,8 @@ shell_screenshot_screenshot_window (ShellScreenshot *screenshot,
                                    ShellScreenshotCallback callback)
 {
  ShellScreenshotPrivate *priv = screenshot->priv;
-  MetaScreen *screen = shell_global_get_screen (priv->global);
+  MetaDisplay *display = shell_global_get_display (priv->global);
  ClutterActor *stage;
-  MetaDisplay *display = meta_screen_get_display (screen);
  MetaWindow *window = meta_display_get_focus_window (display);

  if (priv->filename != NULL || !window) {
@ -585,7 +584,7 @@ shell_screenshot_screenshot_window (ShellScreenshot *screenshot,

  stage = CLUTTER_ACTOR (shell_global_get_stage (priv->global));

-  meta_disable_unredirect_for_screen (shell_global_get_screen (shell_global_get ()));
+  meta_disable_unredirect_for_display (shell_global_get_display (shell_global_get ()));

  g_signal_connect_after (stage, "paint", G_CALLBACK (grab_window_screenshot), (gpointer)screenshot);

--- a/src/shell-tray-manager.c
+++ b/src/shell-tray-manager.c
@ -210,16 +210,13 @@ shell_tray_manager_style_changed (StWidget *theme_widget,

 void
 shell_tray_manager_manage_screen (ShellTrayManager *manager,
-                                  MetaScreen       *screen,
                                  StWidget         *theme_widget)
 {
  GdkDisplay *display;
  GdkScreen *gdk_screen;
-  int screen_number;

  display = gdk_display_get_default ();
-  screen_number = meta_screen_get_screen_number (screen);
-  gdk_screen = gdk_display_get_screen (display, screen_number);
+  gdk_screen = gdk_display_get_default_screen (display);

  na_tray_manager_manage_screen (manager->priv->na_manager, gdk_screen);

--- a/src/shell-tray-manager.h
+++ b/src/shell-tray-manager.h
@ -14,7 +14,6 @@ G_DECLARE_FINAL_TYPE (ShellTrayManager, shell_tray_manager,

 ShellTrayManager *shell_tray_manager_new          (void);
 void              shell_tray_manager_manage_screen (ShellTrayManager *manager,
-                                                    MetaScreen       *screen,
                                                    StWidget         *theme_widget);

 G_END_DECLS
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@ -13,6 +13,7 @@
 #include <meta/group.h>
 #include <meta/util.h>
 #include <meta/window.h>
+#include <meta/meta-workspace-manager.h>

 #define SN_API_NOT_YET_FROZEN 1
 #include <libsn/sn.h>
@ -587,13 +588,16 @@ shell_window_tracker_on_window_removed (MetaWorkspace   *workspace,
 static void
 load_initial_windows (ShellWindowTracker *tracker)
 {
-  GList *workspaces, *iter;
-  MetaScreen *screen = shell_global_get_screen (shell_global_get ());
-  workspaces = meta_screen_get_workspaces (screen);
+  MetaDisplay *display = shell_global_get_display (shell_global_get ());
+  MetaWorkspaceManager *workspace_manager =
+    meta_display_get_workspace_manager (display);
+  GList *workspaces;
+  GList *l;

-  for (iter = workspaces; iter; iter = iter->next)
+  workspaces = meta_workspace_manager_get_workspaces (workspace_manager);
+  for (l = workspaces; l; l = l->next)
    {
-      MetaWorkspace *workspace = iter->data;
+      MetaWorkspace *workspace = l->data;
      GList *windows = meta_workspace_list_windows (workspace);
      GList *window_iter;

@ -608,18 +612,18 @@ load_initial_windows (ShellWindowTracker *tracker)
 }

 static void
-shell_window_tracker_on_n_workspaces_changed (MetaScreen    *screen,
-                                           GParamSpec    *pspec,
-                                           gpointer       user_data)
+shell_window_tracker_on_n_workspaces_changed (MetaWorkspaceManager *workspace_manager,
+                                              GParamSpec           *pspec,
+                                              gpointer              user_data)
 {
  ShellWindowTracker *self = SHELL_WINDOW_TRACKER (user_data);
-  GList *workspaces, *iter;
+  GList *workspaces;
+  GList *l;

-  workspaces = meta_screen_get_workspaces (screen);
-
-  for (iter = workspaces; iter; iter = iter->next)
+  workspaces = meta_workspace_manager_get_workspaces (workspace_manager);
+  for (l = workspaces; l; l = l->next)
    {
-      MetaWorkspace *workspace = iter->data;
+      MetaWorkspace *workspace = l->data;

      /* This pair of disconnect/connect is idempotent if we were
       * already connected, while ensuring we get connected for
@ -642,20 +646,20 @@ shell_window_tracker_on_n_workspaces_changed (MetaScreen    *screen,
 static void
 init_window_tracking (ShellWindowTracker *self)
 {
-  MetaDisplay *display;
-  MetaScreen *screen = shell_global_get_screen (shell_global_get ());
+  MetaDisplay *display = shell_global_get_display (shell_global_get ());
+  MetaWorkspaceManager *workspace_manager =
+    meta_display_get_workspace_manager (display);

-  g_signal_connect (screen, "notify::n-workspaces",
+  g_signal_connect (workspace_manager, "notify::n-workspaces",
                    G_CALLBACK (shell_window_tracker_on_n_workspaces_changed), self);
-  display = meta_screen_get_display (screen);
  g_signal_connect (display, "notify::focus-window",
                    G_CALLBACK (on_focus_window_changed), self);

-  shell_window_tracker_on_n_workspaces_changed (screen, NULL, self);
+  shell_window_tracker_on_n_workspaces_changed (workspace_manager, NULL, self);
 }

 static void
-on_startup_sequence_changed (MetaScreen            *screen,
+on_startup_sequence_changed (MetaDisplay           *display,
                             SnStartupSequence     *sequence,
                             ShellWindowTracker    *self)
 {
@ -671,14 +675,13 @@ on_startup_sequence_changed (MetaScreen            *screen,
 static void
 shell_window_tracker_init (ShellWindowTracker *self)
 {
-  MetaScreen *screen;
+  MetaDisplay *display = shell_global_get_display (shell_global_get ());

  self->window_to_app = g_hash_table_new_full (g_direct_hash, g_direct_equal,
                                               NULL, (GDestroyNotify) g_object_unref);

-  screen = shell_global_get_screen (shell_global_get ());

-  g_signal_connect (G_OBJECT (screen), "startup-sequence-changed",
+  g_signal_connect (display, "startup-sequence-changed",
                    G_CALLBACK (on_startup_sequence_changed), self);

  load_initial_windows (self);
@ -795,8 +798,9 @@ GSList *
 shell_window_tracker_get_startup_sequences (ShellWindowTracker *self)
 {
  ShellGlobal *global = shell_global_get ();
-  MetaScreen *screen = shell_global_get_screen (global);
-  return meta_screen_get_startup_sequences (screen);
+  MetaDisplay *display = shell_global_get_display (global);
+
+  return meta_display_get_startup_sequences (display);
 }

 /* sn_startup_sequence_ref returns void, so make a
--- a/src/st/st-adjustment.c
+++ b/src/st/st-adjustment.c
@ -205,7 +205,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT));
+                                                        G_PARAM_CONSTRUCT |
+                                                        G_PARAM_EXPLICIT_NOTIFY));
  g_object_class_install_property (object_class,
                                   PROP_UPPER,
                                   g_param_spec_double ("upper",
@ -215,7 +216,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT));
+                                                        G_PARAM_CONSTRUCT |
+                                                        G_PARAM_EXPLICIT_NOTIFY));
  g_object_class_install_property (object_class,
                                   PROP_VALUE,
                                   g_param_spec_double ("value",
@ -225,7 +227,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT));
+                                                        G_PARAM_CONSTRUCT |
+                                                        G_PARAM_EXPLICIT_NOTIFY));
  g_object_class_install_property (object_class,
                                   PROP_STEP_INC,
                                   g_param_spec_double ("step-increment",
@ -235,7 +238,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT));
+                                                        G_PARAM_CONSTRUCT |
+                                                        G_PARAM_EXPLICIT_NOTIFY));
  g_object_class_install_property (object_class,
                                   PROP_PAGE_INC,
                                   g_param_spec_double ("page-increment",
@ -245,7 +249,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT));
+                                                        G_PARAM_CONSTRUCT |
+                                                        G_PARAM_EXPLICIT_NOTIFY));
  g_object_class_install_property (object_class,
                                   PROP_PAGE_SIZE,
                                   g_param_spec_double ("page-size",
@ -255,7 +260,8 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT));
+                                                        G_PARAM_CONSTRUCT |
+                                                        G_PARAM_EXPLICIT_NOTIFY));
  /**
   * StAdjustment::changed:
   * @self: the #StAdjustment
--- a/src/st/st-box-layout.c
+++ b/src/st/st-box-layout.c
@ -90,7 +90,7 @@ adjustment_value_notify_cb (StAdjustment *adjustment,
                            GParamSpec   *pspec,
                            StBoxLayout  *box)
 {
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (box));
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (box));
 }

 static void
@ -490,7 +490,7 @@ st_box_layout_get_paint_volume (ClutterActor       *actor,
                                ClutterPaintVolume *volume)
 {
  StBoxLayout *self = ST_BOX_LAYOUT (actor);
-  gdouble x, y;
+  gdouble x, y, lower, upper;
  StBoxLayoutPrivate *priv = self->priv;
  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
  ClutterActorBox allocation_box;
@ -505,13 +505,42 @@ st_box_layout_get_paint_volume (ClutterActor       *actor,
   * our paint volume on that. */
  if (priv->hadjustment || priv->vadjustment)
    {
+      gdouble width, height;
+
      clutter_actor_get_allocation_box (actor, &allocation_box);
      st_theme_node_get_content_box (theme_node, &allocation_box, &content_box);
      origin.x = content_box.x1 - allocation_box.x1;
      origin.y = content_box.y1 - allocation_box.y2;
      origin.z = 0.f;
-      clutter_paint_volume_set_width (volume, content_box.x2 - content_box.x1);
-      clutter_paint_volume_set_height (volume, content_box.y2 - content_box.y1);
+
+      if (priv->hadjustment)
+        {
+          g_object_get (priv->hadjustment,
+                        "lower", &lower,
+                        "upper", &upper,
+                        NULL);
+          width = upper - lower;
+        }
+      else
+        {
+          width = content_box.x2 - content_box.x1;
+        }
+
+      if (priv->vadjustment)
+        {
+          g_object_get (priv->vadjustment,
+                        "lower", &lower,
+                        "upper", &upper,
+                        NULL);
+          height = upper - lower;
+        }
+      else
+        {
+          height = content_box.y2 - content_box.y1;
+        }
+
+      clutter_paint_volume_set_width (volume, width);
+      clutter_paint_volume_set_height (volume, height);
    }
  else if (!CLUTTER_ACTOR_CLASS (st_box_layout_parent_class)->get_paint_volume (actor, volume))
    return FALSE;
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@ -905,6 +905,13 @@ st_entry_unmap (ClutterActor *actor)
  CLUTTER_ACTOR_CLASS (st_entry_parent_class)->unmap (actor);
 }

+static gboolean
+st_entry_get_paint_volume (ClutterActor       *actor,
+                           ClutterPaintVolume *volume)
+{
+  return clutter_paint_volume_set_from_allocation (volume, actor);
+}
+
 static void
 st_entry_class_init (StEntryClass *klass)
 {
@ -922,6 +929,7 @@ st_entry_class_init (StEntryClass *klass)
  actor_class->allocate = st_entry_allocate;
  actor_class->paint = st_entry_paint;
  actor_class->unmap = st_entry_unmap;
+  actor_class->get_paint_volume = st_entry_get_paint_volume;

  actor_class->key_press_event = st_entry_key_press_event;
  actor_class->key_focus_in = st_entry_key_focus_in;
--- a/src/st/st-icon.c
+++ b/src/st/st-icon.c
@ -56,12 +56,15 @@ struct _StIconPrivate

  CoglPipeline *shadow_pipeline;
  StShadow     *shadow_spec;
+  ClutterSize   shadow_size;
 };

 G_DEFINE_TYPE_WITH_PRIVATE (StIcon, st_icon, ST_TYPE_WIDGET)

 static void st_icon_update               (StIcon *icon);
 static gboolean st_icon_update_icon_size (StIcon *icon);
+static void st_icon_update_shadow_pipeline (StIcon *icon);
+static void st_icon_clear_shadow_pipeline (StIcon *icon);

 #define DEFAULT_ICON_SIZE 48

@ -158,20 +161,20 @@ st_icon_dispose (GObject *gobject)
 static void
 st_icon_paint (ClutterActor *actor)
 {
-  StIconPrivate *priv = ST_ICON (actor)->priv;
+  StIcon *icon = ST_ICON (actor);
+  StIconPrivate *priv = icon->priv;

  st_widget_paint_background (ST_WIDGET (actor));

  if (priv->icon_texture)
    {
+      st_icon_update_shadow_pipeline (icon);
+
      if (priv->shadow_pipeline)
        {
          ClutterActorBox allocation;
-          float width, height;

          clutter_actor_get_allocation_box (priv->icon_texture, &allocation);
-          clutter_actor_box_get_size (&allocation, &width, &height);
-
          _st_paint_shadow_with_opacity (priv->shadow_spec,
                                         priv->shadow_pipeline,
                                         &allocation,
@ -189,7 +192,7 @@ st_icon_style_changed (StWidget *widget)
  StThemeNode *theme_node = st_widget_get_theme_node (widget);
  StIconPrivate *priv = self->priv;

-  g_clear_pointer (&priv->shadow_pipeline, cogl_object_unref);
+  st_icon_clear_shadow_pipeline (self);
  g_clear_pointer (&priv->shadow_spec, st_shadow_unref);

  priv->shadow_spec = st_theme_node_get_shadow (theme_node, "icon-shadow");
@ -268,21 +271,49 @@ st_icon_init (StIcon *self)
 }

 static void
-st_icon_update_shadow_pipeline (StIcon *icon)
+st_icon_clear_shadow_pipeline (StIcon *icon)
 {
  StIconPrivate *priv = icon->priv;

  g_clear_pointer (&priv->shadow_pipeline, cogl_object_unref);
+  clutter_size_init (&priv->shadow_size, 0, 0);
+}

-  if (priv->shadow_spec)
-   priv->shadow_pipeline = _st_create_shadow_pipeline_from_actor (priv->shadow_spec, priv->icon_texture);
+static void
+st_icon_update_shadow_pipeline (StIcon *icon)
+{
+  StIconPrivate *priv = icon->priv;
+
+  if (priv->icon_texture && priv->shadow_spec)
+    {
+      ClutterActorBox box;
+      float width, height;
+
+      clutter_actor_get_allocation_box (CLUTTER_ACTOR (icon), &box);
+      clutter_actor_box_get_size (&box, &width, &height);
+
+      if (priv->shadow_pipeline == NULL ||
+          priv->shadow_size.width != width ||
+          priv->shadow_size.height != height)
+        {
+          st_icon_clear_shadow_pipeline (icon);
+
+          priv->shadow_pipeline =
+            _st_create_shadow_pipeline_from_actor (priv->shadow_spec,
+                                                   priv->icon_texture);
+
+          if (priv->shadow_pipeline)
+            clutter_size_init (&priv->shadow_size, width, height);
+        }
+    }
 }

 static void
 on_pixbuf_changed (ClutterTexture *texture,
                   StIcon         *icon)
 {
-  st_icon_update_shadow_pipeline (icon);
+  st_icon_clear_shadow_pipeline (icon);
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (icon));
 }

 static void
@ -307,7 +338,7 @@ st_icon_finish_update (StIcon *icon)
      /* Remove the temporary ref we added */
      g_object_unref (priv->icon_texture);

-      st_icon_update_shadow_pipeline (icon);
+      st_icon_clear_shadow_pipeline (icon);

      /* "pixbuf-change" is actually a misnomer for "texture-changed" */
      g_signal_connect_object (priv->icon_texture, "pixbuf-change",
--- a/src/st/st-private.c
+++ b/src/st/st-private.c
@ -432,6 +432,8 @@ _st_create_shadow_pipeline_from_actor (StShadow     *shadow_spec,
  CoglPipeline *shadow_pipeline = NULL;
  float width, height;

+  g_return_val_if_fail (clutter_actor_has_allocation (actor), NULL);
+
  clutter_actor_get_size (actor, &width, &height);

  if (width == 0 || height == 0)
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@ -304,6 +304,13 @@ st_scroll_view_pick (ClutterActor       *actor,
    clutter_actor_paint (priv->vscroll);
 }

+static gboolean
+st_scroll_view_get_paint_volume (ClutterActor       *actor,
+                                 ClutterPaintVolume *volume)
+{
+  return clutter_paint_volume_set_from_allocation (volume, actor);
+}
+
 static double
 get_scrollbar_width (StScrollView *scroll,
                     gfloat        for_height)
@ -793,6 +800,7 @@ st_scroll_view_class_init (StScrollViewClass *klass)

  actor_class->paint = st_scroll_view_paint;
  actor_class->pick = st_scroll_view_pick;
+  actor_class->get_paint_volume = st_scroll_view_get_paint_volume;
  actor_class->get_preferred_width = st_scroll_view_get_preferred_width;
  actor_class->get_preferred_height = st_scroll_view_get_preferred_height;
  actor_class->allocate = st_scroll_view_allocate;
--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@ -780,13 +780,13 @@ st_texture_cache_load (StTextureCache       *cache,
  if (!texture)
    {
      texture = load (cache, key, data, error);
-      if (texture)
+      if (texture && policy == ST_TEXTURE_CACHE_POLICY_FOREVER)
        g_hash_table_insert (cache->priv->keyed_cache, g_strdup (key), texture);
-      else
-        return NULL;
    }

-  cogl_object_ref (texture);
+  if (texture && policy == ST_TEXTURE_CACHE_POLICY_FOREVER)
+    cogl_object_ref (texture);
+
  return texture;
 }

--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@ -402,7 +402,7 @@ st_theme_node_lookup_corner (StThemeNode    *node,
    return COGL_INVALID_HANDLE;

  key = corner_to_string (&corner);
-  texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &corner, NULL);
+  texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_FOREVER, load_corner, &corner, NULL);

  if (texture)
    {
Author	SHA1	Message	Date
Florian Müllner	0221099e7e	Bump version to 3.29.4 Update NEWS.	2018-07-18 17:46:36 +02:00
Carlos Garnacho	374caade47	inputMethod: Handle IBusInputContext::forward-key-press The input method may hint that certain keycodes should be pressed/released besides the textual information in ::commit. An example is hitting space in some IMs to commit text, where both ::commit happens, and an space is visibly inserted. In order to handle this properly, we must honor ::forward-key-press. In order to cater for the case that a keypress is forwarded while handling that same keypress in a physical keyboard, check the current event being handled and just forward it as-is if it matches. This is necessary to prevent state from being doubly set, and the second event silenced away. https://gitlab.gnome.org/GNOME/gnome-shell/issues/275 Closes: #275	2018-07-17 23:27:24 +00:00
Iain Lane	a5937d1d6d	Add systemd units So that we can be started by systemd --user, instead of gnome-session. There are three units: - gnome-shell.service: Start gnome-shell itself. - gnome-shell-x11.target, gnome-shell-wayland.target: Sync points for units that need to care if x11 or wayland is in use. gnome-settings-daemon will use these, for example. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/138	2018-07-17 18:10:06 +00:00
Florian Müllner	e36ba874a8	Stop using conditional catch statements It is a mozilla extension that is going away in SpiderMonkey 60. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/151	2018-07-17 17:02:39 +00:00
Iain Lane	22392d1328	loginManager: Get the session ID from logind if XDG_SESSION_ID unset If we're started by systemd, we won't be in the user's display session. However, this is still the session that will get locked & unlocked. Ask logind what the 'display' or 'greeter' session is, and watch for the Unlock signal for that session to know when to unlock. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/137	2018-07-17 17:44:18 +02:00
Florian Müllner	0dee82fb9f	keyboard: Handle no-window case in FocusTracker For windows, the cursor location needs to be adjusted by the frame offsets. However we cannot assume that there is a window, as the shell itself can have the key focus. https://gitlab.gnome.org/GNOME/gnome-shell/issues/414	2018-07-17 01:44:18 +02:00
Stas Solovey	68f00f397f	Update Russian translation	2018-07-16 21:27:25 +00:00
Florian Müllner	905801b178	panel: Allow restoring maximized/tiled windows by touch Maximized and tiled windows can be restored with a drag gesture, not only from their titlebars, but also from any non-reactive parts of the top bar above the window. Currently this only works for actual pointer devices, extend the behavior to handle touch as well. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/112	2018-07-14 18:38:16 +00:00
Xavier Johnson	4a7082bb0f	switcherPopup: Cancel window cycling with Tab If the Escape key is used for a window/app cycler/switcher shortcut (such as "Switch windows directly"), then there is no way to cancel the switching/cycling operation with the keyboard. This change allows cancelling such an operation by pressing the Tab key, but only if Tab is not already being used by the current switcher/cycler shortcut. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/315	2018-07-14 14:35:05 +00:00
Andrea Azzarone	2e90c5fa4b	popupMenu: Don't handle key presses directly if there are modifiers Key events involved in a keyboard shortcut are not completely consumed by Mutter. That means that if the popupMenu is bound to a shortcut (e.g. Alt<Space>) and the user keeps the keys pressed, the same key-event will be delivered to the popupMenu. We can workaround this issue filtering out all the events where a a modifier is down (except capslock). Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/372	2018-07-14 14:04:18 +02:00
Jasper St. Pierre	50e849a186	st-texture-cache: Obey cache policy in st_texture_cache_load https://bugzilla.gnome.org/show_bug.cgi?id=663461	2018-07-13 20:50:08 +00:00
Florian Müllner	e7f2e92410	events: Re-use event messages where possible Destroying and recreating the entire events list on every change is not only wasteful, it also breaks the clear functionality as messages scheduled for removal are replaced with "new" messages after the first message has been removed. Address both issues by keeping track of all messages and re-use them whenever possible. https://gitlab.gnome.org/GNOME/gnome-shell/issues/325	2018-07-13 20:13:30 +00:00
Carlos Garnacho	b1b455ff1a	st-adjustment: Mark all properties as EXPLICIT_NOTIFY All adjustment setter functions take good care of avoiding emission of notify:: when it's not needed. The set_property() implementation already calls into the setter functions, so mark the properties as EXPLICITY_NOTIFY in order to optimize notify:: emission away through g_object_set (rather common from JS code).	2018-07-13 11:53:46 +00:00
Carlos Garnacho	ab4c72d758	st-box-layout: Queue relayout on adjustment changes The actor allocation doesn't change per-se, but apply_transform() will practically transform it. In order to have the paint volume update accordingly, queue a relayout.	2018-07-13 11:53:46 +00:00
Carlos Garnacho	86a520b880	st: Clip StEntry to allocation The default get_paint_volume() implementation will do the union of children, and the child ClutterText paint volume may expand beyond StEntry size when text overflows. We actually want all content to be clipped to the StEntry, so implement get_paint_volume() and tell it so.	2018-07-13 11:53:45 +00:00
Carlos Garnacho	4bf033a885	st: Make StScrollables' paint volume reflect the unconstrained view And constrain it in StScrollView instead (instead of falling back to an infinite paint volume, as the actor as paint/pick impls, but no corresponding get_paint_volume one). Fixes artifacts with the AppView (and possibly other places) when paint volumes are aggressively cached.	2018-07-13 11:53:45 +00:00
Carlos Garnacho	e3ebc8d0c6	keyboard: Remove stale references to global.screen (Re)introduced by the previous patch.	2018-07-11 18:46:49 +02:00
Carlos Garnacho	fc5ab44704	keyboard: Implement standalone FocusTracker And stop using FocusCaretTracker for caret position purposes. This new object uses 1) the text-input protocol in wayland and 2) Info from IBusPanelService for X11 (which is meant to work for XIM too). This drops the usage of AtspiEventListener for OSK purposes, which is best to avoid.	2018-07-11 18:32:32 +02:00
Florian Müllner	d5e8f174d4	Bump version to 3.29.3 Update NEWS.	2018-07-09 19:05:55 +02:00
Florian Müllner	d9a1434ae9	workspaceThumbnail: Don't keep stale clones in list If a clone gets destroyed before the corresponding MetaWindow is removed from the workspace, we will still find it in the list of clones and try to destroy it again. Avoid the resulting warnings by updating the list of clones immediately when a clone is destroyed. https://bugzilla.gnome.org/show_bug.cgi?id=791233	2018-07-09 13:00:35 +02:00
Florian Müllner	d0bdea3178	workspace: Don't keep stale clones in list If a clone gets destroyed before the corresponding MetaWindow is removed from the workspace, we will still find it in the list of clones and try to destroy it again. Avoid the resulting warnings by updating the list of clones immediately when a clone is destroyed. https://bugzilla.gnome.org/show_bug.cgi?id=791233	2018-07-09 13:00:17 +02:00
Marco Trevisan (Treviño)	ccadf6aca1	workspaceThumbnail: remove unused private win reference	2018-07-09 13:00:15 +02:00
Marco Trevisan (Treviño)	266b0e9dd0	keyboard: remove global.screen This is disabled code for now, but let's have it fixed once we'll use it	2018-07-08 17:43:15 +02:00
Marco Trevisan (Treviño)	f7355f593d	closeDialog: use {disable,enable}_unredirect_for_display Remove leftover global.screen presency	2018-07-08 17:43:15 +02:00
Jordi Mas	a301820258	Update Catalan translation	2018-07-08 09:23:29 +02:00
Jonas Ådahl	47ea10b7c9	Remove usage of MetaScreen Remove any usage of MetaScreen, as it has been removed from libmutter in the API version 3. The corresponding functionality has been moved into three different places: MetaDisplay, MetaX11Display (for X11 specific functionality) and MetaWorkspaceManager. https://bugzilla.gnome.org/show_bug.cgi?id=759538	2018-07-06 19:56:19 +02:00
Jonas Ådahl	2c0376c150	workspaceThumbnail: Initialize signal handler ids to 0 They are used in conditions, so initialize them first.	2018-07-06 19:55:07 +02:00
Cédric Valmary	ac58c4280b	Update Occitan translation	2018-07-05 09:51:43 +00:00
Marco Trevisan (Treviño)	e39d7152f2	st-private: Warn if creating shadow for unallocated actors	2018-06-29 11:00:25 +02:00
Marco Trevisan (Treviño)	e522e2e804	st-icon: Create shadow pipeline only at paint Don't try to allocate the shadow after allocation, just do it at paint as it's done by other shadowed widgets	2018-06-29 10:43:12 +02:00
Marco Trevisan (Treviño)	2ba26407f1	st-icon: Remove unused size values	2018-06-29 10:43:12 +02:00
Marco Trevisan (Treviño)	996dd74157	layoutManager: Return null monitor if focusIndex is invalid https://bugzilla.gnome.org/show_bug.cgi?id=788882	2018-06-28 17:05:30 +02:00
Marco Trevisan (Treviño)	878946962d	windowManager: Don't animate unmanaged windows on (un)minimization	2018-06-28 17:05:30 +02:00
Marco Trevisan (Treviño)	84d2d3feb3	keyboard: Check monitor validity before deferencing it Monitor could be invalid in headless mode. https://bugzilla.gnome.org/show_bug.cgi?id=788882	2018-06-28 17:05:30 +02:00
Sam Spilsbury	19e864ed3b	keyboard: Handle case where keyboardMonitor is unset This may be the case where keyboardIndex is -1, which may be the case where either the keyboard monitor hasn't been set yet, or the keyboard is being unmanaged and meta_window_get_monitor returns -1 https://bugzilla.gnome.org/show_bug.cgi?id=788882	2018-06-28 17:05:29 +02:00
Sam Spilsbury	c9bf72c5c4	windowMenu: Check if monitorIndex is valid before using it Calling meta_window_get_monitor on an unmanaged window may return -1, so we need to check the return value. https://bugzilla.gnome.org/show_bug.cgi?id=788882	2018-06-28 16:29:07 +02:00