Fix window drag (#558)

Co-authored-by: lenemter <lenemter@gmail.com>

Author: leolost2605

src/PanelWindow.vala

@@ -22,7 +22,6 @@ public class Wingpanel.PanelWindow : Gtk.Window {
 
     private Widgets.Panel panel;
     private Gtk.EventControllerKey key_controller; // For keeping in memory
-    private Gtk.GestureMultiPress gesture_controller; // For keeping in memory
     private Gtk.Revealer revealer;
     private int monitor_width;
     private int monitor_height;
@@ -80,24 +79,14 @@ public class Wingpanel.PanelWindow : Gtk.Window {
         key_controller = new Gtk.EventControllerKey (this);
         key_controller.key_pressed.connect (on_key_pressed);
 
-        gesture_controller = new Gtk.GestureMultiPress (this) {
-            propagation_phase = CAPTURE
-        };
-
-        gesture_controller.pressed.connect (() => {
-            if (desktop_panel != null) {
-                desktop_panel.focus ();
-            }
-        });
-
         panel.size_allocate.connect (update_panel_dimensions);
     }
 
     private void on_realize () {
         update_panel_dimensions ();
         Services.BackgroundManager.initialize (panel_height);
 
-        if (Utils.is_wayland ()) {
+        if (Gdk.Display.get_default () is Gdk.Wayland.Display) {
             // We have to wrap in Idle otherwise the Meta.Window of the WaylandSurface in Gala is still null
             Idle.add_once (init_wl);
         } else {
@@ -141,6 +130,8 @@ public class Wingpanel.PanelWindow : Gtk.Window {
 
             this.expanded = true;
             this.set_size_request (monitor_width, monitor_height);
+
+            desktop_panel.focus ();
         } else if (!expand) {
             Services.BackgroundManager.get_default ().restore_window ();
 

src/Services/BackgroundManager.vala

@@ -33,7 +33,7 @@ namespace Wingpanel.Services {
         public abstract void initialize (int panel_height) throws GLib.Error;
         public abstract void remember_focused_window () throws GLib.Error;
         public abstract void restore_focused_window () throws GLib.Error;
-        public abstract bool begin_grab_focused_window (int x, int y, int button, uint time, uint state) throws GLib.Error;
+        public abstract bool begin_grab_focused_window (int x, int y) throws GLib.Error;
     }
 
     public class BackgroundManager : Object {
@@ -106,9 +106,9 @@ namespace Wingpanel.Services {
             }
         }
 
-        public bool begin_grab_focused_window (int x, int y, int button, uint time, uint state) {
+        public bool begin_grab_focused_window (int x, int y) {
             try {
-                return bus.begin_grab_focused_window (x, y, button, time, state);
+                return bus.begin_grab_focused_window (x, y);
             } catch (Error e) {
                 warning ("Grabbing focused window failed: %s", e.message);
             }

src/Utils.vala

@@ -71,42 +71,25 @@ public class Wingpanel.Widgets.Panel : Gtk.EventBox {
         style_context = get_style_context ();
 
         Services.BackgroundManager.get_default ().background_state_changed.connect (update_background);
-    }
-
-    public override bool button_press_event (Gdk.EventButton event) {
-        if (Utils.is_wayland ()) {
-            return Gdk.EVENT_PROPAGATE;
-        }
 
-        if (event.button != Gdk.BUTTON_PRIMARY) {
+        button_press_event.connect ((event) => {
+            begin_drag (event.x_root, event.y_root);
             return Gdk.EVENT_PROPAGATE;
-        }
+        });
+    }
 
+    private void begin_drag (double x, double y) {
         var window = get_window ();
         if (window == null) {
-            return Gdk.EVENT_PROPAGATE;
-        }
-
-        // Grabbing with touchscreen on X does not work unfortunately
-        if (event.device.get_source () == Gdk.InputSource.TOUCHSCREEN) {
-            return Gdk.EVENT_PROPAGATE;
+            return;
         }
 
-        uint32 time = event.time;
-
         window.get_display ().get_default_seat ().ungrab ();
 
-        Gdk.ModifierType state;
-        event.get_state (out state);
-
         popover_manager.close ();
 
-        var scale_factor = this.get_scale_factor ();
-        var x = (int)event.x_root * scale_factor;
-        var y = (int)event.y_root * scale_factor;
-
         var background_manager = Services.BackgroundManager.get_default ();
-        return background_manager.begin_grab_focused_window (x, y, (int)event.button, time, state);
+        background_manager.begin_grab_focused_window ((int) x, (int) y);
     }
 
     public void cycle (bool forward) {

src/Widgets/Panel.vala

@@ -2,7 +2,6 @@ wingpanel_files = files(
     'PanelWindow.vala',
     'SessionManager.vala',
     'Application.vala',
-    'Utils.vala',
     'Services/BackgroundManager.vala',
     'Services/IndicatorSorter.vala',
     'Services/PopoverManager.vala',

src/meson.build

@@ -33,8 +33,8 @@ public class WingpanelInterface.DBusServer : Object {
         focus_manager = new FocusManager ();
     }
 
-    public bool begin_grab_focused_window (int x, int y, int button, uint time, uint state) throws GLib.Error {
-        return focus_manager.begin_grab_focused_window (x, y, button, time, state);
+    public bool begin_grab_focused_window (int x, int y) throws GLib.Error {
+        return focus_manager.begin_grab_focused_window (x, y);
     }
 
     public void remember_focused_window () throws GLib.Error {

wingpanel-interface/DBusServer.vala

@@ -89,7 +89,7 @@ public class WingpanelInterface.FocusManager : Object {
         }
     }
 
-    public bool begin_grab_focused_window (int x, int y, int button, uint time, uint state) {
+    public bool begin_grab_focused_window (int x, int y) {
         unowned var display = Main.display;
         unowned var window = display.get_focus_window ();
         if (window == null || !get_can_grab_window (window, x, y)) {
@@ -114,15 +114,34 @@ public class WingpanelInterface.FocusManager : Object {
         }
 
         if (window != null) {
+            unowned var wm = Main.wm;
+            unowned var stage = wm.stage;
 
-#if HAS_MUTTER46
-            Graphene.Point pos_hint = {x, y};
-            window.begin_grab_op (Meta.GrabOp.MOVING, null, null, time, pos_hint);
-#elif HAS_MUTTER44
-            window.begin_grab_op (Meta.GrabOp.MOVING, null, null, time);
-#else
-            display.begin_grab_op (window, Meta.GrabOp.MOVING, false, true, button, state, time, x, y);
-#endif
+            var proxy = wm.push_modal (stage);
+
+            ulong handler = 0;
+            handler = stage.captured_event.connect ((event) => {
+                if (event.get_type () == LEAVE) {
+                    /* We get leave emitted when beginning a grab op, so we have
+                    to filter it in order to avoid disconnecting and popping twice */
+                    return Clutter.EVENT_PROPAGATE;
+                }
+
+                if (event.get_type () == MOTION || event.get_type () == TOUCH_UPDATE) {
+                    window.begin_grab_op (
+                        Meta.GrabOp.MOVING,
+                        event.get_device (),
+                        event.get_event_sequence (),
+                        event.get_time (),
+                        { x, y }
+                    );
+                }
+
+                wm.pop_modal (proxy);
+                stage.disconnect (handler);
+
+                return Clutter.EVENT_PROPAGATE;
+            });
             return true;
         }