Allow to push modal without grabbing

Author: leolost2605

lib/WindowManager.vala

@@ -137,13 +137,20 @@ namespace Gala {
         public abstract Meta.BackgroundGroup background_group { get; protected set; }
 
         /**
-         * Enters the modal mode, which means that all events are directed to the stage instead
-         * of the windows. This is the only way to receive keyboard events besides shortcut listeners.
+         * Enters the modal mode, which will block keybindings and gestures. See {@link ModalProxy} for
+         * how to allow certain gestures and keybindings.
+         * If {@link grab} is true all events will be redirected to the given {@link Clutter.Actor}.
+         * If {@link grab} is false other actors and shell windows may still receive events.
+         * Normal windows will never receive keyboard focus though they will still receive pointer events
+         * if {@link grab} is false and their {@link Meta.WindowActor} is visible.
+         *
+         * @param actor The actor to grab events for
+         * @param grab Whether to grab all events onto the actor
          *
          * @return a {@link ModalProxy} which is needed to end the modal mode again and provides some
          *         some basic control on the behavior of the window manager while it is in modal mode.
          */
-        public abstract ModalProxy push_modal (Clutter.Actor actor);
+        public abstract ModalProxy push_modal (Clutter.Actor actor, bool grab);
 
         /**
          * May exit the modal mode again, unless another component has called {@link push_modal}

plugins/pip/SelectionArea.vala

@@ -126,7 +126,7 @@ public class Gala.Plugins.PIP.SelectionArea : CanvasActor {
         wm.get_display ().set_cursor (Meta.Cursor.CROSSHAIR);
         grab_key_focus ();
 
-        modal_proxy = wm.push_modal (this);
+        modal_proxy = wm.push_modal (this, true);
     }
 
     private void get_selection_rectangle (out int x, out int y, out int width, out int height) {

src/InternalUtils.vala

@@ -352,5 +352,40 @@ namespace Gala {
             Clutter.get_default_backend ().get_default_seat ().bell_notify ();
 #endif
         }
+
+        /**
+         * Returns the most recently used "normal" window (as gotten via {@link get_window_is_normal}) in the given workspace.
+         * If there is a not normal but more recent window (e.g. a menu/tooltip) any_window will be set to that window otherwise
+         * it will be set to the same window that is returned.
+         */
+        public static Meta.Window? get_mru_window (Meta.Workspace workspace, out Meta.Window? any_window = null) {
+            any_window = null;
+
+            var list = workspace.list_windows ();
+
+            if (list.is_empty ()) {
+                return null;
+            }
+
+            list.sort ((a, b) => {
+                return (int) b.get_user_time () - (int) a.get_user_time ();
+            });
+
+            foreach (var window in list) {
+                if (!ShellClientsManager.get_instance ().is_positioned_window (window)) {
+                    if (any_window == null) {
+                        any_window = window;
+                    }
+
+                    if (!get_window_is_normal (window)) {
+                        continue;
+                    }
+
+                    return window;
+                }
+            }
+
+            return null;
+        }
     }
 }

src/ShellClients/HideTracker.vala

@@ -138,7 +138,12 @@ public class Gala.HideTracker : Object {
         focus_overlap = false;
         focus_maximized_overlap = false;
 
-        foreach (var window in display.get_workspace_manager ().get_active_workspace ().list_windows ()) {
+        var active_workspace = display.get_workspace_manager ().get_active_workspace ();
+
+        Meta.Window? normal_mru_window, any_mru_window;
+        normal_mru_window = InternalUtils.get_mru_window (active_workspace, out any_mru_window);
+
+        foreach (var window in active_workspace.list_windows ()) {
             if (window == panel.window) {
                 continue;
             }
@@ -158,7 +163,7 @@ public class Gala.HideTracker : Object {
 
             overlap = true;
 
-            if (window != display.focus_window) {
+            if (window != normal_mru_window && window != any_mru_window) {
                 continue;
             }
 

src/Widgets/MultitaskingView/MultitaskingView.vala

@@ -261,11 +261,13 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
         if (action == SWITCH_WORKSPACE) {
             WorkspaceManager.get_default ().freeze_remove ();
 
+            var mru_window = InternalUtils.get_mru_window (display.get_workspace_manager ().get_active_workspace ());
+
             if (workspaces_gesture_controller.action_info != null
                 && (bool) workspaces_gesture_controller.action_info
-                && display.focus_window != null
+                && mru_window != null
             ) {
-                var moving = display.focus_window;
+                var moving = mru_window;
 
                 StaticWindowContainer.get_instance (display).notify_window_moving (moving);
 

src/Widgets/PixelPicker.vala

@@ -66,6 +66,6 @@ public class Gala.PixelPicker : Clutter.Actor {
         wm.get_display ().set_cursor (Meta.Cursor.CROSSHAIR);
         grab_key_focus ();
 
-        modal_proxy = wm.push_modal (this);
+        modal_proxy = wm.push_modal (this, true);
     }
 }

src/Widgets/SelectionArea.vala

@@ -111,7 +111,7 @@ public class Gala.SelectionArea : CanvasActor {
         wm.get_display ().set_cursor (Meta.Cursor.CROSSHAIR);
         grab_key_focus ();
 
-        modal_proxy = wm.push_modal (this);
+        modal_proxy = wm.push_modal (this, true);
     }
 
     public Graphene.Rect get_selection_rectangle () {

src/Widgets/SessionLocker.vala

@@ -328,7 +328,7 @@ public class Gala.SessionLocker : Clutter.Actor {
         wm.get_display ().get_cursor_tracker ().set_pointer_visible (false);
         visible = true;
         grab_key_focus ();
-        modal_proxy = wm.push_modal (this);
+        modal_proxy = wm.push_modal (this, true);
 
         if (Meta.Prefs.get_gnome_animations () && animate) {
             animate_and_lock (animation_time);

src/Widgets/WindowOverview.vala

@@ -112,7 +112,7 @@ public class Gala.WindowOverview : ActorTarget, RootTarget, ActivatableComponent
 
         grab_key_focus ();
 
-        modal_proxy = wm.push_modal (this);
+        modal_proxy = wm.push_modal (this, true);
         modal_proxy.set_keybinding_filter (keybinding_filter);
         modal_proxy.allow_actions ({ ZOOM });
 

src/Widgets/WindowSwitcher/WindowSwitcher.vala

@@ -445,7 +445,7 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
     }
 
     private void push_modal () {
-        modal_proxy = wm.push_modal (this);
+        modal_proxy = wm.push_modal (this, true);
         modal_proxy.allow_actions ({ SWITCH_WINDOWS });
         modal_proxy.set_keybinding_filter ((binding) => {
             var action = Meta.Prefs.get_keybinding_action (binding.get_name ());