pass the same info to all three mousemap callbacks

runtime/share/mezzaluna/master.lua

@@ -279,8 +279,10 @@ local master = function()
   end
 
   mez.input.add_mousemap("alt", "BTN_LEFT", {
-    press = function()
+    press = function(_, drag)
+      if drag.view ~= nil then
         mez.input.set_cursor_type("pointer")
+      end
     end,
     drag = function(pos, drag)
       if drag.view ~= nil then
@@ -295,8 +297,10 @@ local master = function()
   -- This is so impractical
   -- I love it
   mez.input.add_mousemap("alt|shift", "BTN_LEFT", {
-    press = function()
+    press = function(_, drag)
+      if drag.view ~= nil then
         mez.input.set_cursor_type("cross")
+      end
       move_all_drag = {}
       for _, id in ipairs(mez.view.get_all_ids()) do
         move_all_drag[id] = mez.view.get_position(id)
@@ -314,8 +318,11 @@ local master = function()
   })
 
   mez.input.add_mousemap("alt", "BTN_RIGHT", {
-    press = function()
+    press = function(_, drag)
+      if drag.view ~= nil then
         mez.input.set_cursor_type("cross")
+        mez.view.set_resizing(drag.view.id, true)
+      end
     end,
     drag = function(pos, drag)
       if drag.view ~= nil then
@@ -327,7 +334,10 @@ local master = function()
         mez.view.set_size(drag.view.id, width, height)
       end
     end,
-    release = function()
+    release = function(_, drag)
+      if drag.view ~= nil then
+        mez.view.set_resizing(drag.view.id, false)
+      end
       mez.input.set_cursor_type("default")
     end
   })

src/Cursor.zig

@@ -188,88 +188,84 @@ fn handleMotionAbsolute(
 }
 
 fn handleButton(listener: *wl.Listener(*wlr.Pointer.event.Button), event: *wlr.Pointer.event.Button) void {
-    const cursor: *Cursor = @fieldParentPtr("button", listener);
+    const self: *Cursor = @fieldParentPtr("button", listener);
 
-    switch (event.state) {
+    if (event.state == .pressed) {
-        .pressed => {
+        self.mode = .drag;
-            cursor.mode = .drag;
-
-            cursor.drag = .{
-                .event_code = event.button,
-                .start = .{
-                    .x = @as(c_int, @intFromFloat(cursor.wlr_cursor.x)),
-                    .y = @as(c_int, @intFromFloat(cursor.wlr_cursor.y)),
-                },
-                .view = null,
-            };
 
         // Keep track of where the drag started
-            if (server.seat.focused_surface) |fs| {
+        self.drag = .{
-                if (fs == .view) {
+            .event_code = event.button,
-                    cursor.drag.?.view = .{
+            .start = .{
+                .x = @as(c_int, @intFromFloat(self.wlr_cursor.x)),
+                .y = @as(c_int, @intFromFloat(self.wlr_cursor.y)),
+            },
+            .view = view: {
+                const surfaceAtResult = server.seat.focused_output.?.surfaceAt(self.wlr_cursor.x, self.wlr_cursor.y);
+                if (surfaceAtResult) |result| {
+                    const fs = result.scene_node_data.*;
+                    if (fs == .view) break :view .{
                         .view = fs.view,
                         .dims = .{
                             .width = fs.view.xdg_toplevel.base.geometry.width,
                             .height = fs.view.xdg_toplevel.base.geometry.height,
                         },
                         .offset = .{
-                            .x = cursor.drag.?.start.x - fs.view.scene_tree.node.x,
+                            .x = self.drag.?.start.x - fs.view.scene_tree.node.x,
-                            .y = cursor.drag.?.start.y - fs.view.scene_tree.node.y,
+                            .y = self.drag.?.start.y - fs.view.scene_tree.node.y,
                         },
                     };
                 }
-            }
+                break :view null;
-        },
-        .released => {
-            cursor.mode = .normal;
-
-            // How do we do this on the lua side
-            // if(cursor.drag.view) |view| {
-            //   _ = view.xdg_toplevel.setResizing(false);
-            // }
-
-            cursor.drag.?.view = null;
-        },
-        else => {
-            std.log.err("Invalid/Unimplemented pointer button event type", .{});
             },
+        };
     }
 
+    // run this as late as possible that way we can use the current drag info
+    // in the release callback
+    defer if (event.state == .released) {
+        self.mode = .normal;
+        self.drag.?.view = null; // the drag is over, don't keep any information
+    };
+
+    // by default we pass the mouse clicks through to the client
     var passthrough = true;
-    const modifiers = server.seat.keyboard_group.wlr_group.keyboard.getModifiers();
 
     // Proceed if mousemap for current mouse and modifier state's exist
+    const modifiers = server.seat.keyboard_group.wlr_group.keyboard.getModifiers();
     if (server.mousemaps.get(Mousemap.hash(modifiers, @bitCast(event.button)))) |map| {
+        const args = .{
+            .{
+                .x = @as(c_int, @intFromFloat(self.wlr_cursor.x)),
+                .y = @as(c_int, @intFromFloat(self.wlr_cursor.y)),
+            },
+            .{
+                .start = self.drag.?.start,
+                .view = if (self.drag.?.view != null) .{
+                    .id = self.drag.?.view.?.view.id,
+                    .dims = self.drag.?.view.?.dims,
+                    .offset = self.drag.?.view.?.offset,
+                } else null,
+            }
+        };
         switch (event.state) {
             .pressed => {
-                // Only make callback if a callback function exists
+                // Only call callback if a callback function exists
                 if (map.options.lua_press_ref_idx > 0) {
-                    passthrough = map.callback(.press, .{
+                    passthrough = map.callback(.press, args);
-                        .{
-                            .x = @as(c_int, @intFromFloat(cursor.wlr_cursor.x)),
-                            .y = @as(c_int, @intFromFloat(cursor.wlr_cursor.y)),
-                        },
-                    });
                 }
             },
             .released => {
-                if (map.options.lua_press_ref_idx > 0) {
+                // Only call callback if a callback function exists
-                    passthrough = map.callback(.release, .{
+                if (map.options.lua_release_ref_idx > 0) {
-                        .{
+                    passthrough = map.callback(.release, args);
-                            .x = @as(c_int, @intFromFloat(cursor.wlr_cursor.x)),
-                            .y = @as(c_int, @intFromFloat(cursor.wlr_cursor.y)),
-                        },
-                    });
                 }
             },
-            else => {
+            _ => undefined,
-                unreachable;
-            },
         }
     }
 
     // If no keymap exists for button event, forward it to a surface
-    // TODO: Allow for transparent mousemaps that pass mouse button events anyways
     if (passthrough) {
         _ = server.seat.wlr_seat.pointerNotifyButton(event.time_msec, event.button, event.state);
     }