Merge branch 'main' into lenemter/search-apps-by-pid-more-cleverly

Author: lenemter

daemon/DBus.vala

@@ -5,7 +5,7 @@
 
 public enum Gala.ActionType {
     NONE = 0,
-    SHOW_WORKSPACE_VIEW,
+    SHOW_MULTITASKING_VIEW,
     MAXIMIZE_CURRENT,
     HIDE_CURRENT,
     OPEN_LAUNCHER,
@@ -164,6 +164,15 @@ public class Gala.Daemon.DBus : GLib.Object {
     }
 
     private void show_menu (Gtk.Popover menu, int display_width, int display_height, int x, int y) {
+        if (!DisplayConfig.is_logical_layout ()) {
+            var scale_factor = window.scale_factor;
+
+            display_width /= scale_factor;
+            display_height /= scale_factor;
+            x /= scale_factor;
+            y /= scale_factor;
+        }
+
         window.default_width = display_width;
         window.default_height = display_height;
         window.present ();

daemon/DisplayConfig.vala

@@ -0,0 +1,94 @@
+/*
+ * Copyright 2024-2025 elementary, Inc. (https://elementary.io)
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+[DBus (name = "org.gnome.Mutter.DisplayConfig")]
+public interface Gala.Daemon.DisplayConfig : Object {
+    private static bool? _is_logical_layout = null;
+    private static DisplayConfig? proxy = null;
+
+    public static bool is_logical_layout () {
+        if (_is_logical_layout == null) {
+            init ();
+        }
+
+        return _is_logical_layout;
+    }
+
+    private static void init () {
+        try {
+            proxy = Bus.get_proxy_sync (BusType.SESSION, "org.gnome.Mutter.DisplayConfig", "/org/gnome/Mutter/DisplayConfig");
+            proxy.monitors_changed.connect (update);
+        } catch (Error e) {
+            critical (e.message);
+            _is_logical_layout = true;
+            return;
+        }
+
+        update ();
+    }
+
+    private static void update () {
+        uint current_serial;
+        MutterReadMonitor[] mutter_monitors;
+        MutterReadLogicalMonitor[] mutter_logical_monitors;
+        GLib.HashTable<string, GLib.Variant> properties;
+        try {
+            proxy.get_current_state (out current_serial, out mutter_monitors, out mutter_logical_monitors, out properties);
+        } catch (Error e) {
+            critical (e.message);
+            _is_logical_layout = true;
+            return;
+        }
+
+        uint layout_mode = 1; // Absence of "layout-mode" means logical (= 1) according to the documentation.
+        var layout_mode_variant = properties.lookup ("layout-mode");
+        if (layout_mode_variant != null) {
+            layout_mode = layout_mode_variant.get_uint32 ();
+        }
+
+        _is_logical_layout = layout_mode == 1;
+    }
+
+    public signal void monitors_changed ();
+    public abstract void get_current_state (out uint serial, out MutterReadMonitor[] monitors, out MutterReadLogicalMonitor[] logical_monitors, out GLib.HashTable<string, GLib.Variant> properties) throws Error;
+}
+
+public struct MutterReadMonitorInfo {
+    public string connector;
+    public string vendor;
+    public string product;
+    public string serial;
+    public uint hash {
+        get {
+            return (connector + vendor + product + serial).hash ();
+        }
+    }
+}
+
+public struct MutterReadMonitorMode {
+    public string id;
+    public int width;
+    public int height;
+    public double frequency;
+    public double preferred_scale;
+    public double[] supported_scales;
+    public GLib.HashTable<string, GLib.Variant> properties;
+}
+
+public struct MutterReadMonitor {
+    public MutterReadMonitorInfo monitor;
+    public MutterReadMonitorMode[] modes;
+    public GLib.HashTable<string, GLib.Variant> properties;
+}
+
+public struct MutterReadLogicalMonitor {
+    public int x;
+    public int y;
+    public double scale;
+    public uint transform;
+    public bool primary;
+    public MutterReadMonitorInfo[] monitors;
+    public GLib.HashTable<string, GLib.Variant> properties;
+}

daemon/meson.build

@@ -1,5 +1,6 @@
 gala_daemon_sources = files(
     'Main.vala',
+    'DisplayConfig.vala',
     'DBus.vala',
     'MonitorLabel.vala',
     'Window.vala',

data/gala.gschema.xml

@@ -14,6 +14,12 @@
     <value nick="switch-to-workspace-last" value="10" />
   </enum>
 
+  <enum id="SuperScrollAction">
+    <value nick="none" value="0" />
+    <value nick="switch-workspace" value="1" />
+    <value nick="zoom" value="2" />
+  </enum>
+
   <schema path="/io/elementary/desktop/screensaver/" id="io.elementary.desktop.screensaver">
     <key type="b" name="lock-on-suspend">
       <default>true</default>
@@ -96,6 +102,11 @@
       <summary>Whether hotcorners should be enabled when fullscreen window is opened</summary>
       <description></description>
     </key>
+    <key enum="SuperScrollAction" name="super-scroll-action">
+      <default>"none"</default>
+      <summary>What action should be performed on Super + Scroll</summary>
+      <description></description>
+    </key>
   </schema>
 
   <schema path="/io/elementary/desktop/wm/keybindings/" id="io.elementary.desktop.wm.keybindings">
@@ -194,7 +205,7 @@
     <key type="b" name="enable-animations">
       <default>true</default>
       <summary>Enable Animations</summary>
-      <description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.</description>
+      <description>DEPRECATED: This key is deprecated and ignored.</description>
     </key>
   </schema>
 

data/gala.metainfo.xml.in

@@ -27,6 +27,60 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
+    <release version="8.2.0" date="2025-03-25" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+          <ul>
+          <li>Updated translations</li>
+          <li>Window state is now saved on sleep and shutdown</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/gala/issues/137">Send a persistent notification after taking a screenshot</issue>
+        <issue url="https://github.com/elementary/gala/issues/321">Use org.gnome.desktop.interface enable-animations</issue>
+        <issue url="https://github.com/elementary/gala/issues/544">Multitasking View. Wingpanel shows for brief moment if a fullscreen wokspace is selected after coming from a wokspace that shows the wingpanel.</issue>
+        <issue url="https://github.com/elementary/gala/issues/898">Super+Number. When workspace doesn't exist, switch to last workspace instead.</issue>
+        <issue url="https://github.com/elementary/gala/issues/1202">Touchpad desktop switching gesture is sometimes unresponsive</issue>
+        <issue url="https://github.com/elementary/gala/issues/1661">Better post-screenshot animation</issue>
+        <issue url="https://github.com/elementary/gala/issues/2114">Wrong context menu placement</issue>
+        <issue url="https://github.com/elementary/gala/issues/2199">Swiping in the multitasking view can close applications</issue>
+        <issue url="https://github.com/elementary/gala/issues/2260">Ghost of window on another workspace appears when cancelling workspace swipe</issue>
+        <issue url="https://github.com/elementary/gala/issues/2267">Dock crash may crash Gala</issue>
+        <issue url="https://github.com/elementary/gala/issues/2279">Can't reveal dock when animations are disabled</issue>
+      </issues>
+    </release>
+
+    <release version="8.1.0" date="2025-01-11" urgency="medium">
+      <description>
+        <p>Improvements:</p>
+        <ul>
+          <li>Updated translations</li>
+          <li>Fixed rare crash when a dock window was killed</li>
+          <li>Added interactive screenshot shortcut</li>
+          <li>Fixed crash when using tiling shortcuts</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/gala/issues/397">Prevent PIP overlapping wingpanel?</issue>
+        <issue url="https://github.com/elementary/gala/issues/551">Return to original workspace if a fullscreen window is closed and there is no more windows open</issue>
+        <issue url="https://github.com/elementary/gala/issues/815">Zoom with Super + Scroll</issue>
+        <issue url="https://github.com/elementary/gala/issues/857">Toggling the active window's maximization state during multitasking view messes up the window preview size</issue>
+        <issue url="https://github.com/elementary/gala/issues/1178">Workspace Switching with Keyboard (meta) + Mouse scroll</issue>
+        <issue url="https://github.com/elementary/gala/issues/1967">Some apps ignore HiDPI mode</issue>
+        <issue url="https://github.com/elementary/gala/issues/1986">Does not return to the first virtual desktop after exiting fullscreen mode.</issue>
+        <issue url="https://github.com/elementary/gala/issues/2088">Invisible window clones</issue>
+        <issue url="https://github.com/elementary/gala/issues/2102">Notifications sometimes result in segfault</issue>
+        <issue url="https://github.com/elementary/gala/issues/2113">gnome-session-x11-services-ready.target isn't started on Wayland session</issue>
+        <issue url="https://github.com/elementary/gala/issues/2131">Unthemed cursor style and glitchy menus on some applications</issue>
+        <issue url="https://github.com/elementary/gala/issues/2154">Windows do not display correctly after moving between workspaces</issue>
+        <issue url="https://github.com/elementary/gala/issues/2159">Crash when moving windows between workspaces and using gestures to switch</issue>
+        <issue url="https://github.com/elementary/gala/issues/2169">Text UI based Scaling: Tiny Titlebars in XWayland Apps</issue>
+        <issue url="https://github.com/elementary/gala/issues/2170">Don’t show app icons in app window spread</issue>
+        <issue url="https://github.com/elementary/gala/issues/2171">PiP dragging doesn't start until after mouse is released</issue>
+        <issue url="https://github.com/elementary/gala/issues/2175">Gala crashes when receiving a notification while switching workspaces</issue>
+      </issues>
+    </release>
+
     <release version="8.0.4" date="2024-12-02" urgency="medium">
       <description>
         <p>Improvements:</p>

lib/AnimationsSettings.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/CloseButton.vala

@@ -35,6 +35,17 @@ namespace Gala {
         NUDGE = 360,
     }
 
+    public enum GestureAction {
+        NONE,
+        SWITCH_WORKSPACE,
+        SWITCH_WINDOWS,
+        MULTITASKING_VIEW,
+        DOCK,
+        ZOOM,
+        CLOSE_WINDOW,
+        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/Constants.vala

@@ -74,7 +74,7 @@ namespace Gala {
          *
          * @param button The button which was pressed
          */
-        public signal void actor_clicked (uint32 button);
+        public signal void actor_clicked (uint32 button, Clutter.InputDeviceType device_type);
 
         /**
          * The type of the action
@@ -290,7 +290,10 @@ namespace Gala {
 
                     // release has happened within bounds of actor
                     if (clicked && x < ex && x + actor.width > ex && y < ey && y + actor.height > ey) {
-                        actor_clicked (event.get_type () == BUTTON_RELEASE ? event.get_button () : Clutter.Button.PRIMARY);
+                        actor_clicked (
+                            event.get_type () == BUTTON_RELEASE ? event.get_button () : Clutter.Button.PRIMARY,
+                            event.get_source_device ().get_device_type ()
+                        );
                     }
 
                     if (clicked) {

lib/DragDropAction.vala

@@ -9,20 +9,33 @@ public class Gala.Drawing.Canvas : GLib.Object, Clutter.Content {
     private int height = -1;
     private float scale_factor = 1.0f;
 
+    private Cogl.Context? cogl_context;
+
     private Cogl.Texture? texture = null;
     private Cogl.Bitmap? bitmap = null;
 
     private bool dirty = false;
 
     public signal void draw (Cairo.Context cr, int width, int height);
 
-    private void emit_draw () requires (width > 0 && height > 0) {
+    public override void attached (Clutter.Actor actor) {
+#if HAS_MUTTER47
+        cogl_context = actor.context.get_backend ().get_cogl_context ();
+#else
+        cogl_context = Clutter.get_default_backend ().get_cogl_context ();
+#endif
+    }
+
+    public override void detached (Clutter.Actor actor) {
+        cogl_context = null;
+    }
+
+    private void emit_draw () requires (width > 0 && height > 0 && cogl_context != null) {
         dirty = true;
         int real_width = (int) Math.ceilf (width * scale_factor);
         int real_height = (int) Math.ceilf (height * scale_factor);
         if (bitmap == null) {
-            unowned Cogl.Context ctx = Clutter.get_default_backend ().get_cogl_context ();
-            bitmap = new Cogl.Bitmap.with_size (ctx, real_width, real_height, Cogl.PixelFormat.CAIRO_ARGB32_COMPAT);
+            bitmap = new Cogl.Bitmap.with_size (cogl_context, real_width, real_height, Cogl.PixelFormat.CAIRO_ARGB32_COMPAT);
         }
 
         unowned Cogl.Buffer? buffer = bitmap.get_buffer ();