st-texture-cache: purge on resume

With the proprietary nvidia driver, textures get garbled on suspend, so the texture cache needs to evict all textures in that situation.
background: rebuild background, not just animation on resume
2019-01-15 12:54:32 -05:00 · 2019-01-15 12:52:49 -05:00 · 2019-01-15 12:51:16 -05:00 · 2019-01-08 13:00:35 -05:00 · 2019-01-08 13:00:35 -05:00 · 2019-01-08 13:00:35 -05:00
56 changed files with 306 additions and 489 deletions
--- a/27
+++ b/27
@@ -1,30 +1,3 @@
-3.28.4
-======
-* Fix wrong window positions in overview on wayland [Marco; #776588]
-* overview: Fix handling of confirmation dialogs on wayland [verdre; !180]
-* Avoid some full relayout/redraws [Carlos; !197]
-* Keep workspace switcher slid out when workspaces are in use [Florian; !161]
-* Cancel search on overview hiding [Marco; !205]
-* Fix disappearing network icon [Iain; #140]
-* Improve performance of app icon animations [Daniel; !253]
-* notifications: Support icon theme names in 'image-path' hint [Marco; !285]
-* Avoid focus changes when updating keyboard options [Takao; #391]
-* Fix unresponsive-app dialog blocking input in other windows [Florian; #273]
-* Fix ellipsization in dialog subtitles/bodies [Marco; !531]
-* Misc. bug fixes [Marco, Andrea, Florian, Jasper, Sam, verdre, Jonas,
-  Cosimo, Carlos; #792681, #372, !112, !162, #414, #663461, #788882, #787260,
-  !188, #791233, #602, #632, !305, !286, !314, #781, #693, #618, #430, #799,
-  #783, !293, #298, #1015, #539, #1270]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Cosimo Cecchi, Takao Fujiwara, Carlos Garnacho,
-  Iain Lane, Florian Müllner, Georges Basile Stavracas Neto, Jasper St. Pierre,
-  Sam Spilsbury, Ray Strode, Will Thompson, Marco Trevisan (Treviño), verdre,
-  Daniel van Vugt
-
-Translators:
-  Marek Černocký [cs]
-
 3.28.3
 ======
 * Fix lagging pointer when zoomed [Daniel; #682013]
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -39,7 +39,7 @@
      </description>
    </key>
    <key name="favorite-apps" type="as">
-      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
+      <default>[ 'firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
      <summary>List of desktop file IDs for favorite applications</summary>
      <description>
        The applications corresponding to these identifiers
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -824,6 +824,8 @@ StScrollBar {

  .screencast-indicator { color: $warning_color; }

+  .remote-access-indicator { color: $warning_color; }
+
  &.solid {
    background-color: black;
    /* transition from transparent to solid */
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -242,11 +242,11 @@ var AuthPrompt = new Lang.Class({
        this.emit('prompted');
    },

-    _onVerificationFailed(userVerifier, canRetry) {
+    _onVerificationFailed() {
        this._queryingService = null;
        this.clear();

-        this.updateSensitivity(canRetry);
+        this.updateSensitivity(true);
        this.setActorInDefaultButtonWell(null);
        this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
    },
@@ -439,7 +439,6 @@ var AuthPrompt = new Lang.Class({
        this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
        this.cancelButton.reactive = true;
        this.nextButton.label = _("Next");
-        this._preemptiveAnswer = null;

        if (this._userVerifier)
            this._userVerifier.cancel();
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -534,13 +534,12 @@ var ShellUserVerifier = new Lang.Class({
    _verificationFailed(retry) {
        // For Not Listed / enterprise logins, immediately reset
        // the dialog
-        // Otherwise, when in login mode we allow ALLOWED_FAILURES attempts.
-        // After that, we go back to the welcome screen.
+        // Otherwise, we allow ALLOWED_FAILURES attempts. After that, we
+        // go back to the welcome screen.

        this._failCounter++;
        let canRetry = retry && this._userName &&
-            (this._reauthOnly ||
-             this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY));
+            this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);

        if (canRetry) {
            if (!this.hasPendingMessages) {
@@ -563,7 +562,7 @@ var ShellUserVerifier = new Lang.Class({
            }
        }

-        this.emit('verification-failed', canRetry);
+        this.emit('verification-failed');
    },

    _onConversationStopped(client, serviceName) {
--- a/js/js-resources.gresource.xml
+++ b/js/js-resources.gresource.xml
@@ -130,6 +130,7 @@
    <file>ui/status/rfkill.js</file>
    <file>ui/status/volume.js</file>
    <file>ui/status/bluetooth.js</file>
+    <file>ui/status/remoteAccess.js</file>
    <file>ui/status/screencast.js</file>
    <file>ui/status/system.js</file>
    <file>ui/status/thunderbolt.js</file>
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -205,7 +205,7 @@ var IBusManager = new Lang.Class({
        }

        this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
-                                           null, callback || null);
+                                           null, callback);
    },

    preloadEngines(ids) {
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -236,12 +236,11 @@ var ObjectManager = new Lang.Class({
    _onNameVanished() {
        let objectPaths = Object.keys(this._objects);
        for (let i = 0; i < objectPaths.length; i++) {
-            let objectPath = objectPaths[i];
-            let object = this._objects[objectPath];
+            let object = this._objects[objectPaths];

            let interfaceNames = Object.keys(object);
-            for (let j = 0; j < interfaceNames.length; j++) {
-                let interfaceName = interfaceNames[j];
+            for (let j = 0; i < interfaceNames.length; i++) {
+                let interfaceName = interfaceNames[i];

                if (object[interfaceName])
                    this._removeInterface(objectPath, interfaceName);
--- a/js/ui/appFavorites.js
+++ b/js/ui/appFavorites.js
@@ -41,6 +41,7 @@ const RENAMED_DESKTOP_IDS = {
    'gnotravex.desktop': 'gnome-tetravex.desktop',
    'gnotski.desktop': 'gnome-klotski.desktop',
    'gtali.desktop': 'tali.desktop',
+    'mozilla-firefox.desktop': 'firefox.desktop',
    'nautilus.desktop': 'org.gnome.Nautilus.desktop',
    'polari.desktop': 'org.gnome.Polari.desktop',
    'totem.desktop': 'org.gnome.Totem.desktop',
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -264,7 +264,7 @@ var Background = new Lang.Class({
            (lm, aboutToSuspend) => {
                if (aboutToSuspend)
                    return;
-                this._refreshAnimation();
+                this.emit('changed');
            });

        this._settingsChangedSignalId = this._settings.connect('changed', () => {
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -802,8 +802,6 @@ var NotificationMessage = new Lang.Class({
    },

    _onDestroy() {
-        this.parent();
-
        if (this._updatedId)
            this.notification.disconnect(this._updatedId);
        this._updatedId = 0;
--- a/js/ui/closeDialog.js
+++ b/js/ui/closeDialog.js
@@ -2,7 +2,6 @@

 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
@@ -14,7 +13,6 @@ const Tweener = imports.ui.tweener;

 var FROZEN_WINDOW_BRIGHTNESS = -0.3
 var DIALOG_TRANSITION_TIME = 0.15
-var ALIVE_TIMEOUT = 5000;

 var CloseDialog = new Lang.Class({
    Name: 'CloseDialog',
@@ -28,10 +26,6 @@ var CloseDialog = new Lang.Class({
        this.parent();
        this._window = window;
        this._dialog = null;
-        this._tracked = undefined;
-        this._timeoutId = 0;
-        this._windowFocusChangedId = 0;
-        this._keyFocusChangedId = 0;
    },

    get window() {
@@ -99,57 +93,10 @@ var CloseDialog = new Lang.Class({
        this.response(Meta.CloseDialogResponse.FORCE_CLOSE);
    },

-    _onFocusChanged() {
-        if (Meta.is_wayland_compositor())
-            return;
-
-        let focusWindow = global.display.focus_window;
-        let keyFocus = global.stage.key_focus;
-
-        let shouldTrack;
-        if (focusWindow != null)
-            shouldTrack = focusWindow == this._window;
-        else
-            shouldTrack = keyFocus && this._dialog.contains(keyFocus);
-
-        if (this._tracked === shouldTrack)
-            return;
-
-        if (shouldTrack)
-            Main.layoutManager.trackChrome(this._dialog,
-                                           { affectsInputRegion: true });
-        else
-            Main.layoutManager.untrackChrome(this._dialog);
-
-        // The buttons are broken when they aren't added to the input region,
-        // so disable them properly in that case
-        this._dialog.buttonLayout.get_children().forEach(b => {
-            b.reactive = shouldTrack;
-        });
-
-        this._tracked = shouldTrack;
-    },
-
    vfunc_show() {
        if (this._dialog != null)
            return;

-        Meta.disable_unredirect_for_screen(global.screen);
-
-        this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, ALIVE_TIMEOUT,
-            () => {
-                this._window.check_alive(global.display.get_current_time_roundtrip());
-                return GLib.SOURCE_CONTINUE;
-            });
-
-        this._windowFocusChangedId =
-            global.display.connect('notify::focus-window',
-                                   this._onFocusChanged.bind(this));
-
-        this._keyFocusChangedId =
-            global.stage.connect('notify::key-focus',
-                                 this._onFocusChanged.bind(this));
-
        this._addWindowEffect();
        this._initDialog();

@@ -160,7 +107,9 @@ var CloseDialog = new Lang.Class({
                         { scale_y: 1,
                           transition: 'linear',
                           time: DIALOG_TRANSITION_TIME,
-                           onComplete: this._onFocusChanged.bind(this)
+                           onComplete: () => {
+                               Main.layoutManager.trackChrome(this._dialog, { affectsInputRegion: true });
+                           }
                         });
    },

@@ -168,17 +117,6 @@ var CloseDialog = new Lang.Class({
        if (this._dialog == null)
            return;

-        Meta.enable_unredirect_for_screen(global.screen);
-
-        GLib.source_remove(this._timeoutId);
-        this._timeoutId = 0;
-
-        global.display.disconnect(this._windowFocusChangedId)
-        this._windowFocusChangedId = 0;
-
-        global.stage.disconnect(this._keyFocusChangedId);
-        this._keyFocusChangedId = 0;
-
        let dialog = this._dialog;
        this._dialog = null;
        this._removeWindowEffect();
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -210,10 +210,6 @@ var AutomountManager = new Lang.Class({
    },

    _onVolumeRemoved(monitor, volume) {
-        if (volume._allowAutorunExpireId && volume._allowAutorunExpireId > 0) {
-            Mainloop.source_remove(volume._allowAutorunExpireId);
-            delete volume._allowAutorunExpireId;
-        }
        this._volumeQueue = 
            this._volumeQueue.filter(element => (element != volume));
    },
@@ -238,10 +234,8 @@ var AutomountManager = new Lang.Class({
    _allowAutorunExpire(volume) {
        let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
            volume.allowAutorun = false;
-            delete volume._allowAutorunExpireId;
            return GLib.SOURCE_REMOVE;
        });
-        volume._allowAutorunExpireId = id;
        GLib.Source.set_name_by_id(id, '[gnome-shell] volume.allowAutorun');
    }
 });
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -52,8 +52,6 @@ var DashItemContainer = new Lang.Class({
        this.animatingOut = false;

        this.connect('destroy', () => {
-            if (this.child != null)
-                this.child.destroy();
            this.label.destroy();
        });
    },
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -183,7 +183,7 @@ var MessageDialogContent = new Lang.Class({
            this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
        });

-        let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
+        let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
                          line_wrap: true };
        Object.assign(this._subtitle.clutter_text, textProps);
        Object.assign(this._body.clutter_text, textProps);
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -125,16 +125,6 @@ var _Draggable = new Lang.Class({
    },

    _onTouchEvent(actor, event) {
-        // Here we only handle touch events on wayland. On X11
-        // we do get emulated pointer events, which already works
-        // for single-touch cases. Besides, the X11 passive touch grab
-        // set up by Mutter will make us see first the touch events
-        // and later the pointer events, so it will look like two
-        // unrelated series of events, we want to avoid double handling
-        // in these cases.
-        if (!Meta.is_wayland_compositor())
-            return Clutter.EVENT_PROPAGATE;
-
        if (event.type() != Clutter.EventType.TOUCH_BEGIN ||
            !global.display.is_pointer_emulating_sequence(event.get_event_sequence()))
            return Clutter.EVENT_PROPAGATE;
@@ -406,15 +396,10 @@ var _Draggable = new Lang.Class({
        return true;
    },

-    _pickTargetActor() {
-        return this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
-                                                            this._dragX, this._dragY);
-    },
-
    _updateDragHover() {
        this._updateHoverId = 0;
-        let target = this._pickTargetActor();
-
+        let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                                  this._dragX, this._dragY);
        let dragEvent = {
            x: this._dragX,
            y: this._dragY,
@@ -422,18 +407,6 @@ var _Draggable = new Lang.Class({
            source: this.actor._delegate,
            targetActor: target
        };
-
-        let targetActorDestroyHandlerId;
-        let handleTargetActorDestroyClosure;
-        handleTargetActorDestroyClosure = () => {
-            target = this._pickTargetActor();
-            dragEvent.targetActor = target;
-            targetActorDestroyHandlerId =
-                target.connect('destroy', handleTargetActorDestroyClosure);
-        };
-        targetActorDestroyHandlerId =
-            target.connect('destroy', handleTargetActorDestroyClosure);
-
        for (let i = 0; i < dragMonitors.length; i++) {
            let motionFunc = dragMonitors[i].dragMotion;
            if (motionFunc) {
@@ -444,7 +417,6 @@ var _Draggable = new Lang.Class({
                }
            }
        }
-        dragEvent.targetActor.disconnect(targetActorDestroyHandlerId);

        while (target) {
            if (target._delegate && target._delegate.handleDragOver) {
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -760,7 +760,7 @@ var EndSessionDialog = new Lang.Class({
        let updatePrepared = this._pkOfflineProxy.UpdatePrepared;
        let updatesAllowed = this._updatesPermission && this._updatesPermission.allowed;

-        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText || '');
+        _setCheckBoxLabel(this._checkBox, dialogContent.checkBoxText);
        this._checkBox.actor.visible = (dialogContent.checkBoxText && updatePrepared && updatesAllowed);
        this._checkBox.actor.checked = (updatePrepared && updateTriggered);

--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -76,7 +76,6 @@ function disableExtension(uuid) {
    if (extension.stylesheet) {
        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
        theme.unload_stylesheet(extension.stylesheet);
-        delete extension.stylesheet;
    }

    try {
@@ -116,18 +115,13 @@ function enableExtension(uuid) {
    extensionOrder.push(uuid);

    let stylesheetNames = [global.session_mode + '.css', 'stylesheet.css'];
-    let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
    for (let i = 0; i < stylesheetNames.length; i++) {
-        try {
-            let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
+        let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
+        if (stylesheetFile.query_exists(null)) {
+            let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
            theme.load_stylesheet(stylesheetFile);
            extension.stylesheet = stylesheetFile;
            break;
-        } catch (e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                continue; // not an error
-            log(`Failed to load stylesheet for extension ${uuid}: ${e.message}`);
-            return;
        }
    }

@@ -137,10 +131,6 @@ function enableExtension(uuid) {
        _signals.emit('extension-state-changed', extension);
        return;
    } catch(e) {
-        if (extension.stylesheet) {
-            theme.unload_stylesheet(extension.stylesheet);
-            delete extension.stylesheet;
-        }
        logExtensionError(uuid, e);
        return;
    }
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -418,11 +418,6 @@ var IconGrid = new Lang.Class({
    },

    _animationDone() {
-        this._clonesAnimating.forEach(clone => {
-            clone.source.reactive = true;
-            clone.source.opacity = 255;
-            clone.destroy();
-        });
        this._clonesAnimating = [];
        this.emit('animation-done');
    },
@@ -543,6 +538,10 @@ var IconGrid = new Lang.Class({
                                   onComplete: () => {
                                       if (isLastItem)
                                           this._animationDone();
+
+                                       actor.opacity = 255;
+                                       actor.reactive = true;
+                                       actorClone.destroy();
                                   }};
                fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
                               transition: 'easeInOutQuad',
@@ -563,8 +562,12 @@ var IconGrid = new Lang.Class({
                                   scale_x: scaleX,
                                   scale_y: scaleY,
                                   onComplete: () => {
-                                       if (isLastItem)
+                                       if (isLastItem) {
                                           this._animationDone();
+                                           this._restoreItemsOpacity();
+                                       }
+                                       actor.reactive = true;
+                                       actorClone.destroy();
                                   }};
                fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
                               transition: 'easeInOutQuad',
@@ -578,6 +581,12 @@ var IconGrid = new Lang.Class({
        }
    },

+    _restoreItemsOpacity() {
+        for (let index = 0; index < this._items.length; index++) {
+            this._items[index].actor.opacity = 255;
+        }
+    },
+
    _getAllocatedChildSizeAndSpacing(child) {
        let [,, natWidth, natHeight] = child.get_preferred_size();
        let width = Math.min(this._getHItemSize(), natWidth);
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -533,25 +533,17 @@ var FocusTracker = new Lang.Class({
    },

    _setCurrentRect(rect) {
-        if (this._currentWindow) {
-            let frameRect = this._currentWindow.get_frame_rect();
-            rect.x -= frameRect.x;
-            rect.y -= frameRect.y;
-        }
+        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;
-        }
+        let frameRect = this._currentWindow.get_frame_rect();
+        let rect = { x: this._rect.x + frameRect.x, y: this._rect.y + frameRect.y, width: this._rect.width, height: this._rect.height };

        return rect;
    }
@@ -924,11 +916,9 @@ var Keyboard = new Lang.Class({
    },

    _relayout() {
-        let monitor = Main.layoutManager.keyboardMonitor;
-
-        if (this.actor == null || monitor == null)
+        if (this.actor == null)
            return;
-
+        let monitor = Main.layoutManager.keyboardMonitor;
        let maxHeight = monitor.height / 3;
        this.actor.width = monitor.width;
        this.actor.height = maxHeight;
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -203,7 +203,6 @@ var LayoutManager = new Lang.Class({

        // Set up stage hierarchy to group all UI actors under one container.
        this.uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
-        this.uiGroup.set_flags(Clutter.ActorFlags.NO_LAYOUT);
        this.uiGroup.connect('allocate', (actor, box, flags) => {
            let children = actor.get_children();
            for (let i = 0; i < children.length; i++)
@@ -558,8 +557,6 @@ var LayoutManager = new Lang.Class({
    },

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

--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -207,7 +207,13 @@ function _initializeUI() {
        return true;
    });

-    global.display.connect('gl-video-memory-purged', loadTheme);
+    global.display.connect('gl-video-memory-purged', () => {
+	let cache = St.TextureCache.get_default();
+
+        cache.clear();
+
+        loadTheme();
+    });

    // Provide the bus object for gnome-session to
    // initiate logouts.
@@ -343,9 +349,6 @@ function loadTheme() {
    let theme = new St.Theme ({ application_stylesheet: _cssStylesheet,
                                default_stylesheet: _defaultCssStylesheet });

-    if (theme.default_stylesheet == null)
-        throw new Error("No valid stylesheet found for '%s'".format(sessionMode.stylesheetName));
-
    if (previousTheme) {
        let customStylesheets = previousTheme.get_custom_stylesheets();

--- a/js/ui/messageList.js
+++ b/js/ui/messageList.js
@@ -362,8 +362,7 @@ var Message = new Lang.Class({
        this.setBody(body);

        this._closeButton.connect('clicked', this.close.bind(this));
-        let actorHoverId = this.actor.connect('notify::hover', this._sync.bind(this));
-        this._closeButton.connect('destroy', this.actor.disconnect.bind(this.actor, actorHoverId));
+        this.actor.connect('notify::hover', this._sync.bind(this));
        this.actor.connect('clicked', this._onClicked.bind(this));
        this.actor.connect('destroy', this._onDestroy.bind(this));
        this._sync();
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1320,7 +1320,6 @@ var MessageTray = new Lang.Class({
        this._bannerBin.y = -this._banner.actor.height;
        this.actor.show();

-        Meta.disable_unredirect_for_screen(global.screen);
        this._updateShowingNotification();

        let [x, y, mods] = global.get_pointer();
@@ -1458,7 +1457,6 @@ var MessageTray = new Lang.Class({

        this._pointerInNotification = false;
        this._notificationRemoved = false;
-        Meta.enable_unredirect_for_screen(global.screen);

        this._banner.actor.destroy();
        this._banner = null;
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -117,8 +117,10 @@ var FdoNotificationDaemon = new Lang.Class({
                 bitsPerSample, nChannels, data] = hints['image-data'];
            return Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
                                                      bitsPerSample, width, height, rowStride);
+        } else if (hints['image-path']) {
+            return new Gio.FileIcon({ file: Gio.File.new_for_path(hints['image-path']) });
        }
-        return this._iconForNotificationData(hints['image-path']);
+        return null;
    },

    _fallbackIconForNotificationData(hints) {
--- a/js/ui/osdWindow.js
+++ b/js/ui/osdWindow.js
@@ -108,30 +108,15 @@ var OsdWindow = new Lang.Class({
        this._hideTimeoutId = 0;
        this._reset();

-        this.actor.connect('destroy', this._onDestroy.bind(this));
-
-        this._monitorsChangedId =
-            Main.layoutManager.connect('monitors-changed',
-                                       this._relayout.bind(this));
+        Main.layoutManager.connect('monitors-changed',
+                                   this._relayout.bind(this));
        let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        this._scaleChangedId =
-            themeContext.connect('notify::scale-factor',
-                                 this._relayout.bind(this));
+        themeContext.connect('notify::scale-factor',
+                             this._relayout.bind(this));
        this._relayout();
        Main.uiGroup.add_child(this.actor);
    },

-    _onDestroy() {
-        if (this._monitorsChangedId)
-            Main.layoutManager.disconnect(this._monitorsChangedId);
-        this._monitorsChangedId = 0;
-
-        let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        if (this._scaleChangedId)
-            themeContext.disconnect(this._scaleChangedId);
-        this._scaleChangedId = 0;
-    },
-
    setIcon(icon) {
        this._icon.gicon = icon;
    },
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -393,8 +393,10 @@ var Overview = new Lang.Class({
        if (!Main.layoutManager.primaryMonitor)
            return;

-        this._coverPane.set_position(0, 0);
-        this._coverPane.set_size(global.screen_width, global.screen_height);
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+
+        this._coverPane.set_position(0, workArea.y);
+        this._coverPane.set_size(workArea.width, workArea.height);

        this._updateBackgrounds();
    },
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -284,11 +284,6 @@ var ThumbnailsSlider = new Lang.Class({
        return child.get_theme_node().get_length('visible-width');
    },

-    _onDragEnd() {
-        this.actor.sync_hover();
-        this.parent();
-    },
-
    _getSlide() {
        if (!this._visible)
            return 0;
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -709,6 +709,7 @@ var AggregateMenu = new Lang.Class({
            this._bluetooth = null;
        }

+        this._remoteAccess = new imports.ui.status.remoteAccess.RemoteAccessApplet();
        this._power = new imports.ui.status.power.Indicator();
        this._rfkill = new imports.ui.status.rfkill.Indicator();
        this._volume = new imports.ui.status.volume.Indicator();
@@ -729,6 +730,7 @@ var AggregateMenu = new Lang.Class({
        if (this._bluetooth) {
            this._indicators.add_child(this._bluetooth.indicators);
        }
+        this._indicators.add_child(this._remoteAccess.indicators);
        this._indicators.add_child(this._rfkill.indicators);
        this._indicators.add_child(this._volume.indicators);
        this._indicators.add_child(this._power.indicators);
@@ -743,6 +745,7 @@ var AggregateMenu = new Lang.Class({
        if (this._bluetooth) {
            this.menu.addMenuItem(this._bluetooth.menu);
        }
+        this.menu.addMenuItem(this._remoteAccess.menu);
        this.menu.addMenuItem(this._location.menu);
        this.menu.addMenuItem(this._rfkill.menu);
        this.menu.addMenuItem(this._power.menu);
@@ -796,7 +799,6 @@ 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', () => {
@@ -940,13 +942,8 @@ var Panel = new Lang.Class({
        if (event.get_source() != actor)
            return Clutter.EVENT_PROPAGATE;

-        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)
+        let button = event.get_button();
+        if (button != 1)
            return Clutter.EVENT_PROPAGATE;

        let focusWindow = global.display.focus_window;
@@ -1085,7 +1082,6 @@ var Panel = new Lang.Class({
        let windows = activeWorkspace.list_windows().filter(metaWindow => {
            return metaWindow.is_on_primary_monitor() &&
                   metaWindow.showing_on_its_workspace() &&
-                   !metaWindow.is_hidden() &&
                   metaWindow.get_window_type() != Meta.WindowType.DESKTOP;
        });

--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -141,17 +141,8 @@ var PopupBaseMenuItem = new Lang.Class({
    },

    _onKeyPressEvent(actor, event) {
-        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
@@ -114,16 +114,18 @@ var RunDialog = new Lang.Class({

        this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
                                                     entry: this._entryText });
-        this._entryText.connect('activate', (o) => {
-            this.popModal();
-            this._run(o.get_text(),
-                      Clutter.get_current_event().get_state() & Clutter.ModifierType.CONTROL_MASK);
-            if (!this._commandError ||
-                !this.pushModal())
-                this.close();
-        });
        this._entryText.connect('key-press-event', (o, e) => {
            let symbol = e.get_key_symbol();
+            if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
+                this.popModal();
+                this._run(o.get_text(),
+                          e.get_state() & Clutter.ModifierType.CONTROL_MASK);
+                if (!this._commandError ||
+                    !this.pushModal())
+                    this.close();
+
+                return Clutter.EVENT_STOP;
+            }
            if (symbol == Clutter.Tab) {
                let text = o.get_text();
                let prefix;
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -192,7 +192,6 @@ var SearchResultsBase = new Lang.Class({
    },

    clear() {
-        this._cancellable.cancel();
        for (let resultId in this._resultDisplays)
            this._resultDisplays[resultId].actor.destroy();
        this._resultDisplays = {};
@@ -226,12 +225,6 @@ var SearchResultsBase = new Lang.Class({
            this._cancellable.reset();

            this.provider.getResultMetas(metasNeeded, metas => {
-                if (this._cancellable.is_cancelled()) {
-                    if (metas.length > 0)
-                        log(`Search provider ${this.provider.id} returned results after the request was canceled`);
-                    callback(false);
-                    return;
-                }
                if (metas.length != metasNeeded.length) {
                    log('Wrong number of result metas returned by search provider ' + this.provider.id +
                        ': expected ' + metasNeeded.length + ' but got ' + metas.length);
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -360,14 +360,11 @@ var InputSourceManager = new Lang.Class({
        this._settings.connect('per-window-changed', this._sourcesPerWindowChanged.bind(this));
        this._sourcesPerWindowChanged();
        this._disableIBus = false;
-        this._reloading = false;
    },

    reload() {
-        this._reloading = true;
        this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions);
        this._inputSourcesChanged();
-        this._reloading = false;
    },

    _ibusReadyCallback(im, ready) {
@@ -461,15 +458,7 @@ var InputSourceManager = new Lang.Class({
    },

    activateInputSource(is, interactive) {
-        // The focus changes during holdKeyboard/releaseKeyboard may trick
-        // the client into hiding UI containing the currently focused entry.
-        // So holdKeyboard/releaseKeyboard are not called when
-        // 'set-content-type' signal is received.
-        // E.g. Focusing on a password entry in a popup in Xorg Firefox
-        // will emit 'set-content-type' signal.
-        // https://gitlab.gnome.org/GNOME/gnome-shell/issues/391
-        if (!this._reloading)
-            KeyboardManager.holdKeyboard();
+        KeyboardManager.holdKeyboard();
        this._keyboardManager.apply(is.xkbId);

        // All the "xkb:..." IBus engines simply "echo" back symbols,
@@ -484,10 +473,7 @@ var InputSourceManager = new Lang.Class({
        else
            engine = 'xkb:us::eng';

-        if (!this._reloading)
-            this._ibusManager.setEngine(engine, KeyboardManager.releaseKeyboard);
-        else
-            this._ibusManager.setEngine(engine);
+        this._ibusManager.setEngine(engine, KeyboardManager.releaseKeyboard);
        this._currentInputSourceChanged(is);

        if (interactive)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -419,14 +419,12 @@ var NMConnectionDevice = new Lang.Class({
        this._deactivateItem.actor.visible = this._device.state > NM.DeviceState.DISCONNECTED;

        if (this._activeConnection == null) {
-            let activeConnection = this._device.active_connection;
-            if (activeConnection && activeConnection.connection) {
-                let item = this._connectionItems.get(activeConnection.connection.get_uuid());
-                if (item) {
-                    this._activeConnection = activeConnection;
-                    ensureActiveConnectionProps(this._activeConnection, this._client);
-                    item.setActiveConnection(this._activeConnection);
-                }
+            this._activeConnection = this._device.active_connection;
+
+            if (this._activeConnection) {
+                ensureActiveConnectionProps(this._activeConnection, this._client);
+                let item = this._connectionItems.get(this._activeConnection.connection.get_uuid());
+                item.setActiveConnection(this._activeConnection);
            }
        }

--- a/js/ui/status/remoteAccess.js
+++ b/js/ui/status/remoteAccess.js
@@ -0,0 +1,81 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+
+var RemoteAccessApplet = new Lang.Class({
+    Name: 'RemoteAccessApplet',
+    Extends: PanelMenu.SystemIndicator,
+
+    _init() {
+        this.parent();
+
+        let backend = Meta.get_backend();
+        let controller = backend.get_remote_access_controller();
+
+        if (!controller)
+            return;
+
+        // We can't possibly know about all types of screen sharing on X11, so
+        // showing these controls on X11 might give a false sense of security.
+        // Thus, only enable these controls when using Wayland, where we are
+        // in control of sharing.
+        if (!Meta.is_wayland_compositor())
+            return;
+
+        this._handles = new Set();
+        this._indicator = null;
+        this._menuSection = null;
+
+        controller.connect('new-handle', (controller, handle) => {
+            this._onNewHandle(handle);
+        });
+    },
+
+    _ensureControls() {
+        if (this._indicator)
+            return;
+
+        this._indicator = this._addIndicator();
+        this._indicator.icon_name = 'screen-shared-symbolic';
+        this._indicator.add_style_class_name('remote-access-indicator');
+        this._item =
+            new PopupMenu.PopupSubMenuMenuItem(_("Screen is Being Shared"),
+                                               true);
+        this._item.menu.addAction(_("Turn off"),
+                                  () => {
+                                      for (let handle of this._handles)
+                                            handle.stop();
+                                  });
+        this._item.icon.icon_name = 'screen-shared-symbolic';
+        this.menu.addMenuItem(this._item);
+    },
+
+    _sync() {
+        if (this._handles.size == 0) {
+            this._indicator.visible = false;
+            this._item.actor.visible = false;
+        } else {
+            this._indicator.visible = true;
+            this._item.actor.visible = true;
+        }
+    },
+
+    _onStopped(handle) {
+        this._handles.delete(handle);
+        this._sync();
+    },
+
+    _onNewHandle(handle) {
+        this._handles.add(handle);
+        handle.connect('stopped', this._onStopped.bind(this));
+
+        if (this._handles.size == 1) {
+            this._ensureControls();
+            this._sync();
+        }
+    },
+});
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -58,9 +58,6 @@ var AltSwitcher = new Lang.Class({
            childToShow = this._standard;
        } else if (this._alternate.visible) {
            childToShow = this._alternate;
-        } else {
-            this.actor.hide();
-            return;
        }

        let childShown = this.actor.get_child();
@@ -82,7 +79,7 @@ var AltSwitcher = new Lang.Class({
            global.sync_pointer();
        }

-        this.actor.show();
+        this.actor.visible = (childToShow != null);
    },

    _onDestroy() {
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -311,7 +311,6 @@ var ViewSelector = new Lang.Class({
    },

    hide() {
-        this.reset();
        this._workspacesDisplay.hide();
    },

@@ -460,11 +459,7 @@ var ViewSelector = new Lang.Class({
    },

    reset() {
-        // Don't drop the key focus on Clutter's side if anything but the
-        // overview has pushed a modal (e.g. system modals when activated using
-        // the overview).
-        if (Main.modalCount <= 1)
-            global.stage.set_key_focus(null);
+        global.stage.set_key_focus(null);

        this._entry.text = '';

--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -627,8 +627,8 @@ var AppSwitchAction = new Lang.Class({

        if (this.get_n_current_points() == 3) {
            for (let i = 0; i < this.get_n_current_points(); i++) {
-                let [startX, startY] = this.get_press_coords(i);
-                let [x, y] = this.get_motion_coords(i);
+                [startX, startY] = this.get_press_coords(i);
+                [x, y] = this.get_motion_coords(i);

                if (Math.abs(x - startX) > MOTION_THRESHOLD ||
                    Math.abs(y - startY) > MOTION_THRESHOLD)
@@ -1173,10 +1173,6 @@ 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)
@@ -1252,11 +1248,6 @@ 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;
@@ -1763,14 +1754,6 @@ var WindowManager = new Lang.Class({
            }
        }

-        for (let i = 0; i < switchData.windows.length; i++) {
-            let w = switchData.windows[i];
-
-            w.windowDestroyId = w.window.connect('destroy', () => {
-                switchData.windows.splice(switchData.windows.indexOf(w), 1);
-            });
-        }
-
        switchData.inGroup.set_position(-xDest, -yDest);
        switchData.inGroup.raise_top();

@@ -1801,8 +1784,8 @@ var WindowManager = new Lang.Class({

        for (let i = 0; i < switchData.windows.length; i++) {
                let w = switchData.windows[i];
-                w.window.disconnect(w.windowDestroyId);
-
+                if (w.window.is_destroyed()) // Window gone
+                    continue;
                if (w.window.get_parent() == switchData.outGroup) {
                    w.window.reparent(w.parent);
                    w.window.hide();
--- a/js/ui/windowMenu.js
+++ b/js/ui/windowMenu.js
@@ -128,10 +128,11 @@ var WindowMenu = new Lang.Class({

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

+            let monitorIndex = window.get_monitor();
+
            let dir = Meta.ScreenDirection.UP;
            let upMonitorIndex =
                screen.get_monitor_neighbor_index(monitorIndex, dir);
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -137,10 +137,8 @@ var WindowClone = new Lang.Class({
        this._dragSlot = [0, 0, 0, 0];
        this._stackAbove = null;

-        this._windowClone._sizeChangedId = this.metaWindow.connect('size-changed',
-            this._onMetaWindowSizeChanged.bind(this));
-        this._windowClone._posChangedId = this.metaWindow.connect('position-changed',
-            this._computeBoundingBox.bind(this));
+        this._windowClone._updateId = this.metaWindow.connect('size-changed',
+            this._onRealWindowSizeChanged.bind(this));
        this._windowClone._destroyId =
            this.realWindow.connect('destroy', () => {
                // First destroy the clone and then destroy everything
@@ -208,7 +206,8 @@ var WindowClone = new Lang.Class({

    addAttachedDialog(win) {
        this._doAddAttachedDialog(win, win.get_compositor_private());
-        this._onMetaWindowSizeChanged();
+        this._computeBoundingBox();
+        this.emit('size-changed');
    },

    hasAttachedDialogs() {
@@ -217,14 +216,15 @@ var WindowClone = new Lang.Class({

    _doAddAttachedDialog(metaWin, realWin) {
        let clone = new Clutter.Clone({ source: realWin });
-        clone._sizeChangedId = metaWin.connect('size-changed',
-            this._onMetaWindowSizeChanged.bind(this));
-        clone._posChangedId = metaWin.connect('position-changed',
-            this._onMetaWindowSizeChanged.bind(this));
+        clone._updateId = metaWin.connect('size-changed', () => {
+            this._computeBoundingBox();
+            this.emit('size-changed');
+        });
        clone._destroyId = realWin.connect('destroy', () => {
            clone.destroy();

-            this._onMetaWindowSizeChanged();
+            this._computeBoundingBox();
+            this.emit('size-changed');
        });
        this.actor.add_child(clone);
    },
@@ -321,13 +321,12 @@ var WindowClone = new Lang.Class({
            else
                realWindow = child.source;

-            realWindow.meta_window.disconnect(child._sizeChangedId);
-            realWindow.meta_window.disconnect(child._posChangedId);
+            realWindow.meta_window.disconnect(child._updateId);
            realWindow.disconnect(child._destroyId);
        });
    },

-    _onMetaWindowSizeChanged() {
+    _onRealWindowSizeChanged() {
        this._computeBoundingBox();
        this.emit('size-changed');
    },
@@ -470,6 +469,7 @@ var WindowOverlay = new Lang.Class({
        this._windowAddedId = 0;

        button.hide();
+        title.hide();

        this.title = title;
        this.closeButton = button;
@@ -544,10 +544,12 @@ var WindowOverlay = new Lang.Class({
        let titleX = cloneX + (cloneWidth - title.width) / 2;
        let titleY = cloneY + cloneHeight - (title.height - this.borderSize) / 2;

-        if (animate)
-            this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY));
-        else
+        if (animate) {
+            this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), title.width);
+        } else {
+            title.width = title.width;
            title.set_position(Math.floor(titleX), Math.floor(titleY));
+        }

        let borderX = cloneX - this.borderSize;
        let borderY = cloneY - this.borderSize;
@@ -566,12 +568,10 @@ var WindowOverlay = new Lang.Class({
    _animateOverlayActor(actor, x, y, width, height) {
        let params = { x: x,
                       y: y,
+                       width: width,
                       time: Overview.ANIMATION_TIME,
                       transition: 'easeOutQuad' };

-        if (width !== undefined)
-            params.width = width;
-
        if (height !== undefined)
            params.height = height;

@@ -1506,7 +1506,7 @@ var Workspace = new Lang.Class({
            if (metaWin.is_attached_dialog()) {
                let parent = metaWin.get_transient_for();
                while (parent.is_attached_dialog())
-                    parent = parent.get_transient_for();
+                    parent = metaWin.get_transient_for();

                let idx = this._lookupIndex (parent);
                if (idx < 0) {
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -68,7 +68,7 @@ var WindowClone = new Lang.Class({
        this.realWindow = realWindow;
        this.metaWindow = realWindow.meta_window;

-        this.clone._updateId = this.realWindow.connect('notify::position',
+        this.clone._updateId = this.metaWindow.connect('position-changed',
                                                       this._onPositionChanged.bind(this));
        this.clone._destroyId = this.realWindow.connect('destroy', () => {
            // First destroy the clone and then destroy everything
@@ -153,7 +153,7 @@ var WindowClone = new Lang.Class({
        let clone = new Clutter.Clone({ source: realDialog });
        this._updateDialogPosition(realDialog, clone);

-        clone._updateId = realDialog.connect('notify::position', dialog => {
+        clone._updateId = metaDialog.connect('position-changed', dialog => {
            this._updateDialogPosition(dialog, clone);
        });
        clone._destroyId = realDialog.connect('destroy', () => {
@@ -171,6 +171,7 @@ var WindowClone = new Lang.Class({
    },

    _onPositionChanged() {
+        let rect = this.metaWindow.get_frame_rect();
        this.actor.set_position(this.realWindow.x, this.realWindow.y);
    },

@@ -178,7 +179,7 @@ var WindowClone = new Lang.Class({
        this.actor.get_children().forEach(child => {
            let realWindow = child.source;

-            realWindow.disconnect(child._updateId);
+            realWindow.meta_window.disconnect(child._updateId);
            realWindow.disconnect(child._destroyId);
        });
    },
@@ -416,7 +417,7 @@ var WorkspaceThumbnail = new Lang.Class({
        } else if (metaWin.is_attached_dialog()) {
            let parent = metaWin.get_transient_for();
            while (parent.is_attached_dialog())
-                parent = parent.get_transient_for();
+                parent = metaWin.get_transient_for();

            let idx = this._lookupIndex (parent);
            if (idx < 0) {
@@ -676,11 +677,7 @@ var ThumbnailsBox = new Lang.Class({
        this._settings.connect('changed::dynamic-workspaces',
            this._updateSwitcherVisibility.bind(this));

-        Main.layoutManager.connect('monitors-changed', () => {
-            this._destroyThumbnails();
-            if (Main.overview.visible)
-                this._createThumbnails();
-        });
+        Main.layoutManager.connect('monitors-changed', this._rebuildThumbnails.bind(this));
    },

    _updateSwitcherVisibility() {
@@ -873,6 +870,9 @@ var ThumbnailsBox = new Lang.Class({
            Main.overview.connect('windows-restacked',
                                  this._syncStacking.bind(this));

+        this._workareasChangedId =
+            global.screen.connect('workareas-changed', this._rebuildThumbnails.bind(this));
+
        this._targetScale = 0;
        this._scale = 0;
        this._pendingScaleUpdate = false;
@@ -902,12 +902,24 @@ var ThumbnailsBox = new Lang.Class({
            this._syncStackingId = 0;
        }

+        if (this._workareasChangedId > 0) {
+            global.screen.disconnect(this._workareasChangedId);
+            this._workareasChangedId = 0;
+        }
+
        for (let w = 0; w < this._thumbnails.length; w++)
            this._thumbnails[w].destroy();
        this._thumbnails = [];
        this._porthole = null;
    },

+    _rebuildThumbnails() {
+        this._destroyThumbnails();
+
+        if (Main.overview.visible)
+            this._createThumbnails();
+    },
+
    _workspacesChanged() {
        let validThumbnails =
            this._thumbnails.filter(t => t.state <= ThumbnailState.NORMAL);
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -470,7 +470,6 @@ var WorkspacesDisplay = new Lang.Class({
        this._switchWorkspaceNotifyId = 0;

        this._notifyOpacityId = 0;
-        this._restackedNotifyId = 0;
        this._scrollEventId = 0;
        this._keyPressEventId = 0;

--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.28.4',
+  version: '3.28.3',
  meson_version: '>= 0.42.0',
  license: 'GPLv2+'
 )
--- a/po/cs.po
+++ b/po/cs.po
@@ -1064,7 +1064,7 @@ msgstr "Načítá se…"
 #: js/ui/dateMenu.js:321
 #, javascript-format
 msgid "Feels like %s."
-msgstr "Pocitová teplota %s."
+msgstr "Pocitově jako %s."

 #: js/ui/dateMenu.js:324
 msgid "Go online for weather information"
--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -399,9 +399,6 @@ get_gl_vendor (void)
 gboolean
 shell_util_need_background_refresh (void)
 {
-  if (!clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
-    return FALSE;
-
  if (g_strcmp0 (get_gl_vendor (), "NVIDIA Corporation") == 0)
    return TRUE;

--- a/src/st/st-adjustment.c
+++ b/src/st/st-adjustment.c
@@ -205,8 +205,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT |
-                                                        G_PARAM_EXPLICIT_NOTIFY));
+                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_UPPER,
                                   g_param_spec_double ("upper",
@@ -216,8 +215,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT |
-                                                        G_PARAM_EXPLICIT_NOTIFY));
+                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_VALUE,
                                   g_param_spec_double ("value",
@@ -227,8 +225,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT |
-                                                        G_PARAM_EXPLICIT_NOTIFY));
+                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_STEP_INC,
                                   g_param_spec_double ("step-increment",
@@ -238,8 +235,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT |
-                                                        G_PARAM_EXPLICIT_NOTIFY));
+                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_PAGE_INC,
                                   g_param_spec_double ("page-increment",
@@ -249,8 +245,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT |
-                                                        G_PARAM_EXPLICIT_NOTIFY));
+                                                        G_PARAM_CONSTRUCT));
  g_object_class_install_property (object_class,
                                   PROP_PAGE_SIZE,
                                   g_param_spec_double ("page-size",
@@ -260,8 +255,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                                                        G_MAXDOUBLE,
                                                        0.0,
                                                        ST_PARAM_READWRITE |
-                                                        G_PARAM_CONSTRUCT |
-                                                        G_PARAM_EXPLICIT_NOTIFY));
+                                                        G_PARAM_CONSTRUCT));
  /**
   * StAdjustment::changed:
   * @self: the #StAdjustment
--- a/src/st/st-bin.c
+++ b/src/st/st-bin.c
@@ -177,15 +177,15 @@ st_bin_get_preferred_height (ClutterActor *self,
 }

 static void
-st_bin_destroy (ClutterActor *actor)
+st_bin_dispose (GObject *gobject)
 {
-  StBinPrivate *priv = st_bin_get_instance_private (ST_BIN (actor));
+  StBinPrivate *priv = st_bin_get_instance_private (ST_BIN (gobject));

  if (priv->child)
    clutter_actor_destroy (priv->child);
  g_assert (priv->child == NULL);

-  CLUTTER_ACTOR_CLASS (st_bin_parent_class)->destroy (actor);
+  G_OBJECT_CLASS (st_bin_parent_class)->dispose (gobject);
 }

 static void
@@ -315,11 +315,11 @@ st_bin_class_init (StBinClass *klass)

  gobject_class->set_property = st_bin_set_property;
  gobject_class->get_property = st_bin_get_property;
+  gobject_class->dispose = st_bin_dispose;

  actor_class->get_preferred_width = st_bin_get_preferred_width;
  actor_class->get_preferred_height = st_bin_get_preferred_height;
  actor_class->allocate = st_bin_allocate;
-  actor_class->destroy = st_bin_destroy;

  widget_class->popup_menu = st_bin_popup_menu;
  widget_class->navigate_focus = st_bin_navigate_focus;
--- 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_relayout (CLUTTER_ACTOR (box));
+  clutter_actor_queue_redraw (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, lower, upper;
+  gdouble x, y;
  StBoxLayoutPrivate *priv = self->priv;
  StThemeNode *theme_node = st_widget_get_theme_node (ST_WIDGET (actor));
  ClutterActorBox allocation_box;
@@ -505,42 +505,13 @@ 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;
-
-      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);
+      clutter_paint_volume_set_width (volume, content_box.x2 - content_box.x1);
+      clutter_paint_volume_set_height (volume, content_box.y2 - content_box.y1);
    }
  else if (!CLUTTER_ACTOR_CLASS (st_box_layout_parent_class)->get_paint_volume (actor, volume))
    return FALSE;
--- a/src/st/st-button.c
+++ b/src/st/st-button.c
@@ -248,17 +248,14 @@ st_button_touch_event (ClutterActor      *actor,
  if (event->type == CLUTTER_TOUCH_BEGIN && !priv->press_sequence)
    {
      clutter_input_device_sequence_grab (device, sequence, actor);
-      if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event))
-        st_button_press (button, device, 0, sequence);
+      st_button_press (button, device, 0, sequence);
      return CLUTTER_EVENT_STOP;
    }
  else if (event->type == CLUTTER_TOUCH_END &&
           priv->device == device &&
           priv->press_sequence == sequence)
    {
-      if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event))
-        st_button_release (button, device, mask, 0, sequence);
-
+      st_button_release (button, device, mask, 0, sequence);
      clutter_input_device_sequence_ungrab (device, sequence);
      return CLUTTER_EVENT_STOP;
    }
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -906,13 +906,6 @@ 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)
 {
@@ -930,7 +923,6 @@ 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;
@@ -1295,10 +1287,10 @@ st_entry_get_input_hints (StEntry *entry)
  return clutter_text_get_input_hints (CLUTTER_TEXT (priv->entry));
 }

-static void
-_st_entry_icon_clicked_cb (ClutterClickAction *action,
-                           ClutterActor       *actor,
-                           StEntry            *entry)
+static gboolean
+_st_entry_icon_press_cb (ClutterActor       *actor,
+                         ClutterButtonEvent *event,
+                         StEntry            *entry)
 {
  StEntryPrivate *priv = ST_ENTRY_PRIV (entry);

@@ -1306,6 +1298,8 @@ _st_entry_icon_clicked_cb (ClutterClickAction *action,
    g_signal_emit (entry, entry_signals[PRIMARY_ICON_CLICKED], 0);
  else
    g_signal_emit (entry, entry_signals[SECONDARY_ICON_CLICKED], 0);
+
+  return FALSE;
 }

 static void
@@ -1315,24 +1309,21 @@ _st_entry_set_icon (StEntry       *entry,
 {
  if (*icon)
    {
-      clutter_actor_remove_action_by_name (*icon, "entry-icon-action");
+      g_signal_handlers_disconnect_by_func (*icon,
+                                            _st_entry_icon_press_cb,
+                                            entry);
      clutter_actor_remove_child (CLUTTER_ACTOR (entry), *icon);
      *icon = NULL;
    }

  if (new_icon)
    {
-      ClutterAction *action;
-
      *icon = g_object_ref (new_icon);

      clutter_actor_set_reactive (*icon, TRUE);
      clutter_actor_add_child (CLUTTER_ACTOR (entry), *icon);
-
-      action = clutter_click_action_new ();
-      clutter_actor_add_action_with_name (*icon, "entry-icon-action", action);
-      g_signal_connect (action, "clicked",
-                        G_CALLBACK (_st_entry_icon_clicked_cb), entry);
+      g_signal_connect (*icon, "button-release-event",
+                        G_CALLBACK (_st_entry_icon_press_cb), entry);
    }

  clutter_actor_queue_relayout (CLUTTER_ACTOR (entry));
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@@ -304,13 +304,6 @@ 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)
@@ -800,7 +793,6 @@ 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
@@ -105,6 +105,18 @@ st_texture_cache_class_init (StTextureCacheClass *klass)
                  G_TYPE_NONE, 1, G_TYPE_FILE);
 }

+/* Evicts all cached textures */
+void
+st_texture_cache_clear (StTextureCache *cache)
+{
+  GHashTableIter iter;
+  gpointer key;
+  gpointer value;
+
+  g_hash_table_remove_all (cache->priv->keyed_cache);
+  g_signal_emit (cache, signals[ICON_THEME_CHANGED], 0);
+}
+
 /* Evicts all cached textures for named icons */
 static void
 st_texture_cache_evict_icons (StTextureCache *cache)
@@ -780,13 +792,13 @@ st_texture_cache_load (StTextureCache       *cache,
  if (!texture)
    {
      texture = load (cache, key, data, error);
-      if (texture && policy == ST_TEXTURE_CACHE_POLICY_FOREVER)
+      if (texture)
        g_hash_table_insert (cache->priv->keyed_cache, g_strdup (key), texture);
+      else
+        return NULL;
    }

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

@@ -984,7 +996,7 @@ file_changed_cb (GFileMonitor      *monitor,
  char *key;
  guint file_hash;

-  if (event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
+  if (event_type != G_FILE_MONITOR_EVENT_CHANGED)
    return;

  file_hash = g_file_hash (file);
--- a/src/st/st-texture-cache.h
+++ b/src/st/st-texture-cache.h
@@ -52,6 +52,7 @@ typedef enum {
 } StTextureCachePolicy;

 StTextureCache* st_texture_cache_get_default (void);
+void st_texture_cache_clear (StTextureCache *cache);

 ClutterActor *
 st_texture_cache_load_sliced_image (StTextureCache *cache,
--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@@ -229,9 +229,9 @@ unpremultiply (ClutterColor *color)
 {
  if (color->alpha != 0)
    {
-      color->red = MIN((color->red * 255 + 127) / color->alpha, 255);
-      color->green = MIN((color->green * 255 + 127) / color->alpha, 255);
-      color->blue = MIN((color->blue * 255 + 127) / color->alpha, 255);
+      color->red = (color->red * 255 + 127) / color->alpha;
+      color->green = (color->green * 255 + 127) / color->alpha;
+      color->blue = (color->blue * 255 + 127) / color->alpha;
    }
 }

@@ -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_FOREVER, load_corner, &corner, NULL);
+  texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &corner, NULL);

  if (texture)
    {
@@ -1414,32 +1414,6 @@ st_theme_node_load_background_image (StThemeNode *node)
  return node->background_texture != COGL_INVALID_HANDLE;
 }

-static gboolean
-st_theme_node_invalidate_resources_for_file (StThemeNode *node,
-                                             GFile       *file)
-{
-  StBorderImage *border_image;
-  gboolean changed = FALSE;
-  GFile *theme_file;
-
-  theme_file = st_theme_node_get_background_image (node);
-  if ((theme_file != NULL) && g_file_equal (theme_file, file))
-    {
-      st_theme_node_invalidate_background_image (node);
-      changed = TRUE;
-    }
-
-  border_image = st_theme_node_get_border_image (node);
-  theme_file = border_image ? st_border_image_get_file (border_image) : NULL;
-  if ((theme_file != NULL) && g_file_equal (theme_file, file))
-    {
-      st_theme_node_invalidate_border_image (node);
-      changed = TRUE;
-    }
-
-  return changed;
-}
-
 static void st_theme_node_prerender_shadow (StThemeNodePaintState *state);

 static void
@@ -2777,17 +2751,3 @@ st_theme_node_paint_state_invalidate (StThemeNodePaintState *state)
  state->alloc_width = 0;
  state->alloc_height = 0;
 }
-
-gboolean
-st_theme_node_paint_state_invalidate_for_file (StThemeNodePaintState *state,
-                                               GFile                 *file)
-{
-  if (state->node != NULL &&
-      st_theme_node_invalidate_resources_for_file (state->node, file))
-    {
-      st_theme_node_paint_state_invalidate (state);
-      return TRUE;
-    }
-
-  return FALSE;
-}
--- a/src/st/st-theme-node.h
+++ b/src/st/st-theme-node.h
@@ -287,9 +287,6 @@ void st_theme_node_paint_state_free (StThemeNodePaintState *state);
 void st_theme_node_paint_state_copy (StThemeNodePaintState *state,
                                     StThemeNodePaintState *other);
 void st_theme_node_paint_state_invalidate (StThemeNodePaintState *state);
-gboolean st_theme_node_paint_state_invalidate_for_file (StThemeNodePaintState *state,
-                                                        GFile                 *file);
-
 void st_theme_node_paint_state_set_node (StThemeNodePaintState *state,
                                         StThemeNode           *node);

--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -289,17 +289,44 @@ st_widget_texture_cache_changed (StTextureCache *cache,
 {
  StWidget *actor = ST_WIDGET (user_data);
  StWidgetPrivate *priv = st_widget_get_instance_private (actor);
+  StThemeNode *node = priv->theme_node;
+  StBorderImage *border_image;
  gboolean changed = FALSE;
-  int i;
+  GFile *theme_file;

-  for (i = 0; i < G_N_ELEMENTS (priv->paint_states); i++)
+  if (node == NULL)
+    return;
+
+  theme_file = st_theme_node_get_background_image (node);
+  if ((theme_file != NULL) && g_file_equal (theme_file, file))
    {
-      StThemeNodePaintState *paint_state = &priv->paint_states[i];
-      changed |= st_theme_node_paint_state_invalidate_for_file (paint_state, file);
+      st_theme_node_invalidate_background_image (node);
+      changed = TRUE;
    }

-  if (changed && clutter_actor_is_mapped (CLUTTER_ACTOR (actor)))
-    clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
+  border_image = st_theme_node_get_border_image (node);
+  theme_file = border_image ? st_border_image_get_file (border_image) : NULL;
+  if ((theme_file != NULL) && g_file_equal (theme_file, file))
+    {
+      st_theme_node_invalidate_border_image (node);
+      changed = TRUE;
+    }
+
+  if (changed)
+    {
+      /* If we prerender the background / border, we need to update
+       * the paint state. We should probably implement a method to
+       * the theme node to determine this, but for now, just wipe
+       * the entire paint state.
+       *
+       * Use the existing state instead of a new one because it's
+       * assumed the rest of the state will stay the same.
+       */
+      st_theme_node_paint_state_invalidate (current_paint_state (actor));
+
+      if (clutter_actor_is_mapped (CLUTTER_ACTOR (actor)))
+        clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
+    }
 }

 static void
Author	SHA1	Message	Date
Ray Strode	0507fef4cd	st-texture-cache: purge on resume With the proprietary nvidia driver, textures get garbled on suspend, so the texture cache needs to evict all textures in that situation.	2019-01-15 12:54:32 -05:00
Ray Strode	68c631223c	background: rebuild background, not just animation on resume Previously, we would only refresh the animation on resume (to handle clock skew). But we actually need to rebuild the background, too, on nvidia, so we should just do a full background change.	2019-01-15 12:52:49 -05:00
Ray Strode	97b38c1950	background: refresh after suspend on wayland At the moment we only refresh after suspend on Xorg. We need to do it on wayland, too.	2019-01-15 12:51:16 -05:00
Jonas Ådahl	b098930e6d	remoteAccess: Make indicator orange Make the indicator for active remote access use the warning color, to indicate the severity of allowing remote access. This only makes the indicator icon orange; the icon in the system menu is still white.	2019-01-08 13:00:35 -05:00
Jonas Ådahl	45da60516c	Add remote access indication and control Add an indicator for when there is something access the display server remotely. This could be 1) remote desktop, 2) screen cast or 3) remote control, but all effectively applications using org.freedesktop.portal.ScreenCast or org.gnome.portal.RemoteDesktop as well as gnome-remote-desktop using the corresponding org.gnome.Mutter APIs directly. As it is now, it'll simply show a single icon for when anything is having an active session, and a single action "Turn off" that'll close every active session. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/160	2019-01-08 13:00:35 -05:00
Ray Strode	c4b1ba48f2	gnome-shell-favourite-apps-firefox.patch	2019-01-08 13:00:35 -05:00