Merge branch 'main' into lenemter/fix-scale-factor

Author: lenemter

lib/CloseButton.vala

@@ -79,11 +79,7 @@ public class Gala.CloseButton : Clutter.Actor {
         pixbuf_actor.background_color = { 255, 0, 0, 255 };
     }
 
-#if HAS_MUTTER45
     public override bool button_press_event (Clutter.Event e) {
-#else
-    public override bool button_press_event (Clutter.ButtonEvent e) {
-#endif
         var estimated_duration = (uint) (ANIMATION_DURATION * (scale_x - 0.8) / 0.2);
 
         pixbuf_actor.save_easing_state ();
@@ -97,11 +93,7 @@ public class Gala.CloseButton : Clutter.Actor {
         return Clutter.EVENT_STOP;
     }
 
-#if HAS_MUTTER45
     public override bool button_release_event (Clutter.Event e) {
-#else
-    public override bool button_release_event (Clutter.ButtonEvent e) {
-#endif
         reset_scale ();
 
         if (is_pressed) {
@@ -112,11 +104,7 @@ public class Gala.CloseButton : Clutter.Actor {
         return Clutter.EVENT_STOP;
     }
 
-#if HAS_MUTTER45
     public override bool leave_event (Clutter.Event event) {
-#else
-    public override bool leave_event (Clutter.CrossingEvent event) {
-#endif
         reset_scale ();
         is_pressed = false;
 

lib/Constants.vala

@@ -35,6 +35,16 @@ namespace Gala {
         NUDGE = 360,
     }
 
+    public enum GestureAction {
+        NONE,
+        SWITCH_WORKSPACE,
+        SWITCH_WINDOWS,
+        MULTITASKING_VIEW,
+        DOCK,
+        ZOOM,
+        N_ACTIONS
+    }
+
     /**
      * Used as a key for Object.set_data<bool> on Meta.Windows that should be
      * treated as notifications. Has to be set before the window is mapped.

lib/Plugin.vala

@@ -84,34 +84,20 @@ namespace Gala {
          * It is calculated by the system whenever update_region is called.
          * You can influce it with the custom_region and the track_actor function.
          */
-#if HAS_MUTTER45
         private Mtk.Rectangle[] region;
         public unowned Mtk.Rectangle[] get_region () {
-#else
-        private Meta.Rectangle[] region;
-        public unowned Meta.Rectangle[] get_region () {
-#endif
             return region;
         }
         /**
          * This list will be merged with the region property. See region for
          * more details. Changing this property will cause update_region to be
          * called. Default to null.
          */
-#if HAS_MUTTER45
         private Mtk.Rectangle[]? _custom_region = null;
         protected unowned Mtk.Rectangle[]? get_custom_region () {
-#else
-        private Meta.Rectangle[]? _custom_region = null;
-        protected unowned Meta.Rectangle[]? get_custom_region () {
-#endif
             return _custom_region;
         }
-#if HAS_MUTTER45
         protected void set_custom_region (Mtk.Rectangle[]? custom_region) {
-#else
-        protected void set_custom_region (Meta.Rectangle[]? custom_region) {
-#endif
             _custom_region = custom_region;
             update_region ();
         }
@@ -189,11 +175,7 @@ namespace Gala {
             var has_custom = custom_region != null;
             var len = tracked_actors.length () + (has_custom ? custom_region.length : 0);
 
-#if HAS_MUTTER45
             var regions = new Mtk.Rectangle[len];
-#else
-            var regions = new Meta.Rectangle[len];
-#endif
             var i = 0;
 
             if (has_custom) {

lib/Utils.vala

@@ -305,11 +305,7 @@ namespace Gala {
          */
         public static Clutter.Actor? get_window_actor_snapshot (
             Meta.WindowActor actor,
-#if HAS_MUTTER45
             Mtk.Rectangle inner_rect
-#else
-            Meta.Rectangle inner_rect
-#endif
         ) {
             Clutter.Content content;
 
@@ -344,11 +340,7 @@ namespace Gala {
          */
         [Version (deprecated = true, deprecated_since = "7.0.3", replacement = "Meta.Display.get_monitor_scale")]
         public static int get_ui_scaling_factor () {
-#if HAS_MUTTER44
             return 1;
-#else
-            return Meta.Backend.get_backend ().get_settings ().get_ui_scaling_factor ();
-#endif
         }
 
         /**

lib/WindowManager.vala

@@ -70,6 +70,9 @@ namespace Gala {
      */
     public class ModalProxy : Object {
         public Clutter.Grab? grab { get; set; }
+
+        private GestureAction[] allowed_actions;
+
         /**
          * A function which is called whenever a keybinding is pressed. If you supply a custom
          * one you can filter out those that'd you like to be passed through and block all others.
@@ -94,6 +97,14 @@ namespace Gala {
         public void allow_all_keybindings () {
             _keybinding_filter = null;
         }
+
+        public void allow_actions (GestureAction[] actions) {
+            allowed_actions = actions;
+        }
+
+        public bool filter_action (GestureAction action) {
+            return !(action in allowed_actions);
+        }
     }
 
     public interface WindowManager : Meta.Plugin {
@@ -185,5 +196,11 @@ namespace Gala {
          * @param action_key The gsettings key of action. Available keys are stored in ActionKeys
          */
         public abstract void launch_action (string action_key);
+
+        /**
+         * Checks whether the action should currently be prohibited.
+         * @return true if the action should be prohibited, false otherwise
+         */
+        public abstract bool filter_action (GestureAction action);
     }
 }

meson.build

@@ -103,39 +103,6 @@ libmutter_dep = []
 
 vala_flags = []
 
-mutter42_dep = dependency('libmutter-10', version: ['>= 42', '< 43'], required: false)
-if mutter42_dep.found()
-	libmutter_dep = dependency('libmutter-10', version: '>= 42')
-	mutter_dep = [
-		libmutter_dep,
-		dependency('mutter-cogl-10'), dependency('mutter-cogl-pango-10'),
-		dependency('mutter-clutter-10')
-	]
-	vala_flags = []
-endif
-
-mutter43_dep = dependency('libmutter-11', version: ['>= 43', '< 44'], required: false)
-if mutter43_dep.found()
-	libmutter_dep = dependency('libmutter-11', version: '>= 43')
-	mutter_dep = [
-		libmutter_dep,
-		dependency('mutter-cogl-11'), dependency('mutter-cogl-pango-11'),
-		dependency('mutter-clutter-11')
-	]
-	vala_flags = ['--define', 'HAS_MUTTER43']
-endif
-
-mutter44_dep = dependency('libmutter-12', version: ['>= 44', '< 45'], required: false)
-if mutter44_dep.found()
-	libmutter_dep = dependency('libmutter-12', version: '>= 44')
-	mutter_dep = [
-		libmutter_dep,
-		dependency('mutter-cogl-12'), dependency('mutter-cogl-pango-12'),
-		dependency('mutter-clutter-12')
-	]
-	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44']
-endif
-
 mutter45_dep = dependency('libmutter-13', version: ['>= 45', '< 46'], required: false)
 if mutter45_dep.found()
 	libmutter_dep = dependency('libmutter-13', version: '>= 45')

plugins/pip/Main.vala

@@ -22,11 +22,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
     private Gala.WindowManager? wm = null;
     private SelectionArea? selection_area;
 
-#if HAS_MUTTER45
     private static inline bool meta_rectangle_contains (Mtk.Rectangle rect, int x, int y) {
-#else
-    private static inline bool meta_rectangle_contains (Meta.Rectangle rect, int x, int y) {
-#endif
         return x >= rect.x && x < rect.x + rect.width
             && y >= rect.y && y < rect.y + rect.height;
     }

plugins/pip/PopupWindow.vala

@@ -162,11 +162,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         }
     }
 
-#if HAS_MUTTER45
     public override bool enter_event (Clutter.Event event) {
-#else
-    public override bool enter_event (Clutter.CrossingEvent event) {
-#endif
         var duration = Utils.get_animation_duration (300);
 
         close_button.save_easing_state ();
@@ -182,11 +178,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         return Clutter.EVENT_PROPAGATE;
     }
 
-#if HAS_MUTTER45
     public override bool leave_event (Clutter.Event event) {
-#else
-    public override bool leave_event (Clutter.CrossingEvent event) {
-#endif
         var duration = Utils.get_animation_duration (300);
 
         close_button.save_easing_state ();
@@ -220,11 +212,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         display.set_cursor (Meta.Cursor.DEFAULT);
     }
 
-#if HAS_MUTTER45
     private bool on_resize_button_press (Clutter.Event event) {
-#else
-    private bool on_resize_button_press (Clutter.ButtonEvent event) {
-#endif
         if (resizing || event.get_button () != Clutter.Button.PRIMARY) {
             return Clutter.EVENT_STOP;
         }

plugins/pip/SelectionArea.vala

@@ -44,11 +44,7 @@ public class Gala.Plugins.PIP.SelectionArea : CanvasActor {
         height = screen_height;
     }
 
-#if HAS_MUTTER45
     public override bool key_press_event (Clutter.Event e) {
-#else
-    public override bool key_press_event (Clutter.KeyEvent e) {
-#endif
         if (e.get_key_symbol () == Clutter.Key.Escape) {
             close ();
             closed ();
@@ -58,11 +54,7 @@ public class Gala.Plugins.PIP.SelectionArea : CanvasActor {
         return false;
     }
 
-#if HAS_MUTTER45
     public override bool button_press_event (Clutter.Event e) {
-#else
-    public override bool button_press_event (Clutter.ButtonEvent e) {
-#endif
         if (dragging || e.get_button () != Clutter.Button.PRIMARY) {
             return true;
         }
@@ -76,11 +68,7 @@ public class Gala.Plugins.PIP.SelectionArea : CanvasActor {
         return true;
     }
 
-#if HAS_MUTTER45
     public override bool button_release_event (Clutter.Event e) {
-#else
-    public override bool button_release_event (Clutter.ButtonEvent e) {
-#endif
         if (e.get_button () != Clutter.Button.PRIMARY) {
             return true;
         }
@@ -109,11 +97,7 @@ public class Gala.Plugins.PIP.SelectionArea : CanvasActor {
         return true;
     }
 
-#if HAS_MUTTER45
     public override bool motion_event (Clutter.Event e) {
-#else
-    public override bool motion_event (Clutter.MotionEvent e) {
-#endif
         if (!clicked) {
             return true;
         }

plugins/template/Main.vala

@@ -69,11 +69,7 @@ namespace Gala.Plugins.Template {
             wm.ui_group.add_child (red_box);
         }
 
-#if HAS_MUTTER45
         private bool turn_green (Clutter.Event event) {
-#else
-        private bool turn_green (Clutter.ButtonEvent event) {
-#endif
             red_box.background_color = { 0, 255, 0, 255 };
             return true;
         }