Merge branch 'main' into lenemter/pip-mask-window

Author: zeebok

.github/workflows/gettext.yml

@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Install Dependencies
       run: |
         apt update
@@ -47,7 +47,7 @@ jobs:
       image: fedora:latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Dependencies
         run: |
           dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-devel libcanberra-devel clutter-devel libgee-devel glib2-devel gnome-desktop3-devel granite-devel granite-7-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite-devel meson valac valadoc
@@ -70,7 +70,7 @@ jobs:
           zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/15.6/X11:Pantheon.repo
           zypper --gpg-auto-import-keys refresh
           zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 libcanberra-devel clutter-devel libgee-devel glib2-devel libgnome-desktop-3-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build
         env:
           DESTDIR: out
@@ -85,7 +85,7 @@ jobs:
       image: valalang/lint
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Lint
       run: |
         io.elementary.vala-lint -d daemon

.github/workflows/release.yml

@@ -10,8 +10,8 @@ jobs:
      runs-on: ubuntu-22.04
      if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
      steps:
-     - uses: actions/checkout@v4
-     - uses: elementary/actions/release@master
+     - uses: actions/checkout@v5
+     - uses: elementary/actions/release@main
        env:
          GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
          GIT_USER_NAME: "elementaryBot"

daemon-gtk3/BackgroundMenu.vala

@@ -4,8 +4,8 @@
  */
 
 public class Gala.Daemon.BackgroundMenu : Gtk.Menu {
-    public const string ACTION_GROUP_PREFIX = "background-menu";
-    public const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
+    private const string ACTION_GROUP_PREFIX = "background-menu";
+    private const string ACTION_PREFIX = ACTION_GROUP_PREFIX + ".";
 
     construct {
         var change_wallpaper = new Gtk.MenuItem.with_label (_("Change Wallpaper…")) {

daemon/MonitorLabel.vala

@@ -4,7 +4,6 @@
  */
 
  public class Gala.Daemon.MonitorLabel : Gtk.Window {
-    private const int SPACING = 12;
     private const string COLORED_STYLE_CSS = """
     .%s {
         background-color: alpha(%s, 0.8);

data/[email protected]

@@ -22,7 +22,7 @@ Type=notify
 ExecStart=@bindir@/gala
 
 # unset some environment variables that were set by the compositor and won't work now that the compositor is gone
-ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY'
+ExecStopPost=-/bin/sh -c 'test "$SERVICE_RESULT" != "exec-condition" && systemctl --user unset-environment GNOME_SETUP_DISPLAY WAYLAND_DISPLAY DISPLAY XAUTHORITY && rm -f "$XDG_RUNTIME_DIR/wayland-0" "$XDG_RUNTIME_DIR/wayland-0.lock"'
 
 # On wayland we cannot restart
 Restart=no

lib/DragDropAction.vala

@@ -55,6 +55,15 @@ namespace Gala {
          */
         public signal void destination_crossed (Clutter.Actor destination, bool hovered);
 
+        /**
+         * Emitted on the source when we are hovering over a destination.
+         *
+         * @param destination The destination actor that we are hovering over
+         * @param x           The x coordinate relative to the destination actor
+         * @param y           The y coordinate relative to the destination actor
+         */
+        public signal void destination_motion (Clutter.Actor destination, float x, float y);
+
         /**
          * The source has been clicked, but the movement was not larger than
          * the drag threshold. Useful if the source is also activatable.
@@ -341,7 +350,7 @@ namespace Gala {
                         last_y = y;
 
                         var stage = actor.get_stage ();
-                        var actor = stage.get_actor_at_pos (Clutter.PickMode.REACTIVE, (int) x, (int) y);
+                        var actor = stage.get_actor_at_pos (NONE, (int) x, (int) y);
                         DragDropAction action = null;
                         // if we're allowed to bubble and this actor is not a destination, check its parents
                         if (actor != null && (action = get_drag_drop_action (actor)) == null && allow_bubbling) {
@@ -352,8 +361,12 @@ namespace Gala {
                         }
 
                         // didn't change, no need to do anything
-                        if (actor == hovered)
+                        if (actor == hovered) {
+                            if (hovered != null) {
+                                destination_motion (hovered, x - hovered.x, y - hovered.y);
+                            }
                             return Clutter.EVENT_STOP;
+                        }
 
                         if (action == null) {
                             // apparently we left ours if we had one before
@@ -436,12 +449,12 @@ namespace Gala {
         }
 
         private void finish () {
+            drag_end (hovered);
+
             // make sure they reset the style or whatever they changed when hovered
             emit_crossed (hovered, false);
 
             cleanup ();
-
-            drag_end (hovered);
         }
 
         private void cleanup () {

lib/Gestures/Gesture.vala

@@ -39,9 +39,8 @@ namespace Gala {
         SWITCH_WORKSPACE,
         SWITCH_WINDOWS,
         MULTITASKING_VIEW,
-        DOCK,
         ZOOM,
-        CLOSE_WINDOW,
+        CUSTOM,
         N_ACTIONS
     }
 

lib/Gestures/GestureBackend.vala

@@ -7,9 +7,9 @@
 
 private interface Gala.GestureBackend : Object {
     public signal bool on_gesture_detected (Gesture gesture, uint32 timestamp);
-    public signal void on_begin (double delta, uint64 time);
-    public signal void on_update (double delta, uint64 time);
-    public signal void on_end (double delta, uint64 time);
+    public signal void on_begin (double percentage, uint64 time);
+    public signal void on_update (double percentage, uint64 time);
+    public signal void on_end (double percentage, uint64 time);
 
     public virtual void prepare_gesture_handling () { }
 

lib/Gestures/GestureController.vala

@@ -19,8 +19,17 @@
  * it will be a hard boundary, if they are fractional it will slow the gesture progress when over the
  * limit simulating a kind of spring that pushes against it.
  * Note that the progress snaps to full integer values after a gesture ends.
+ * Events are always shared between all GestureControllers in the same group (except for the group NONE).
+ * This means that two gestures that can be done in one motion (e.g. horizontal and vertical swipe)
+ * can be done simultaneously if each of two GestureControllers in the same group handle one of
+ * the gestures.
  */
 public class Gala.GestureController : Object {
+    public enum Group {
+        NONE,
+        MULTITASKING_VIEW,
+    }
+
     /**
      * When a gesture ends with a velocity greater than this constant, the action is not cancelled,
      * even if the animation threshold has not been reached.
@@ -34,6 +43,7 @@ public class Gala.GestureController : Object {
 
     public GestureAction action { get; construct; }
     public WindowManager wm { get; construct; }
+    public Group group { get; construct; }
 
     private unowned RootTarget? _target;
     public RootTarget target {
@@ -50,6 +60,7 @@ public class Gala.GestureController : Object {
     public double distance { get; construct set; }
     public double overshoot_lower_clamp { get; construct set; default = 0d; }
     public double overshoot_upper_clamp { get; construct set; default = 1d; }
+    public bool follow_natural_scroll { get; set; default = false; }
 
     /**
      * When disabled gesture progress will stay where the gesture ended and not snap to full integers values.
@@ -77,7 +88,8 @@ public class Gala.GestureController : Object {
 
     public bool recognizing { get; private set; }
 
-    private ToucheggBackend? touchpad_backend;
+    private ToucheggBackend? touchegg_backend;
+    private TouchpadBackend? touchpad_backend;
     private ScrollBackend? scroll_backend;
 
     private GestureBackend? recognizing_backend;
@@ -90,8 +102,8 @@ public class Gala.GestureController : Object {
 
     private SpringTimeline? timeline;
 
-    public GestureController (GestureAction action, WindowManager wm) {
-        Object (action: action, wm: wm);
+    public GestureController (GestureAction action, WindowManager wm, Group group = NONE) {
+        Object (action: action, wm: wm, group: group);
     }
 
     /**
@@ -107,12 +119,20 @@ public class Gala.GestureController : Object {
         unref ();
     }
 
-    public void enable_touchpad () {
-        touchpad_backend = ToucheggBackend.get_default ();
-        touchpad_backend.on_gesture_detected.connect (gesture_detected);
-        touchpad_backend.on_begin.connect (gesture_begin);
-        touchpad_backend.on_update.connect (gesture_update);
-        touchpad_backend.on_end.connect (gesture_end);
+    public void enable_touchpad (Clutter.Actor actor) {
+        if (Meta.Util.is_wayland_compositor ()) {
+            touchpad_backend = new TouchpadBackend (actor, group);
+            touchpad_backend.on_gesture_detected.connect (gesture_detected);
+            touchpad_backend.on_begin.connect (gesture_begin);
+            touchpad_backend.on_update.connect (gesture_update);
+            touchpad_backend.on_end.connect (gesture_end);
+        }
+
+        touchegg_backend = ToucheggBackend.get_default (); // Will automatically filter events on wayland
+        touchegg_backend.on_gesture_detected.connect (gesture_detected);
+        touchegg_backend.on_begin.connect (gesture_begin);
+        touchegg_backend.on_update.connect (gesture_update);
+        touchegg_backend.on_end.connect (gesture_end);
     }
 
     public void enable_scroll (Clutter.Actor actor, Clutter.Orientation orientation) {
@@ -147,6 +167,12 @@ public class Gala.GestureController : Object {
                 direction_multiplier = -1;
             }
 
+            if (follow_natural_scroll &&
+                !GestureSettings.is_natural_scroll_enabled (gesture.performed_on_device_type)
+            ) {
+                direction_multiplier *= -1;
+            }
+
             if (snap && !Meta.Prefs.get_gnome_animations ()) {
                 recognizing = false;
                 prepare ();