wio: simplify gesture api

Author: ypsvlq

demo/src/main.zig

@@ -91,8 +91,7 @@ fn eventFn(data: ?*anyopaque, event: wio.Event) void {
         .scroll_vertical, .scroll_horizontal => |value| std.log.info("{s} {d}", .{ @tagName(event), value }),
         .touch => |touch| std.log.info("touch {}: ({},{})", .{ touch.id, touch.x, touch.y }),
         .touch_end => |touch| std.log.info("touch {}: {s}", .{ touch.id, if (touch.ignore) "ignore" else "end" }),
-        .gesture_hold => |gesture| std.log.info("{s} ({} fingers)", .{ @tagName(event), gesture.fingers }),
-        .gesture_pan_x, .gesture_pan_y, .gesture_zoom, .gesture_rotate => |gesture| std.log.info("{s} ({} fingers) {}", .{ @tagName(event), gesture.fingers, gesture.value }),
+        .gesture_pan_x, .gesture_pan_y, .gesture_zoom, .gesture_rotate => |value| std.log.info("{s} {}", .{ @tagName(event), value }),
         .drop_position => |pos| std.log.info("drop_position ({},{})", .{ pos.x, pos.y }),
         else => std.log.info("{s}", .{@tagName(event)}),
     }

src/macos.zig

@@ -925,11 +925,11 @@ export fn wioScroll(self: *Window, x: f32, y: f32) void {
 }
 
 export fn wioGestureZoom(self: *Window, value: f32) void {
-    internal.eventFn(self.event_fn_data, .{ .gesture_zoom = .{ .fingers = 2, .value = value + 1 } });
+    internal.eventFn(self.event_fn_data, .{ .gesture_zoom = value + 1 });
 }
 
 export fn wioGestureRotate(self: *Window, value: f32) void {
-    internal.eventFn(self.event_fn_data, .{ .gesture_rotate = .{ .fingers = 2, .value = -value } });
+    internal.eventFn(self.event_fn_data, .{ .gesture_rotate = -value });
 }
 
 export fn wioDupeClipboardText(allocator: *const std.mem.Allocator, bytes: [*:0]const u8, len: *usize) ?[*]u8 {

src/unix/wayland.zig

@@ -101,9 +101,7 @@ var activation: ?*h.xdg_activation_v1 = null;
 var text_input: ?*h.zwp_text_input_v3 = null;
 var cursor_shape_device: ?*h.wp_cursor_shape_device_v1 = null;
 var relative_pointer: ?*h.zwp_relative_pointer_v1 = null;
-var swipe_gesture: ?*h.zwp_pointer_gesture_swipe_v1 = null;
-var pinch_gesture: ?*h.zwp_pointer_gesture_pinch_v1 = null;
-var hold_gesture: ?*h.zwp_pointer_gesture_hold_v1 = null;
+var gesture_pinch: ?*h.zwp_pointer_gesture_pinch_v1 = null;
 var data_device: ?*h.wl_data_device = null;
 var data_offer: ?*h.wl_data_offer = null;
 var data_source: ?*h.wl_data_source = null;
@@ -132,7 +130,6 @@ var preedit_active = false;
 var commit_string: std.ArrayList(u8) = .empty;
 var touch_ids: std.StaticBitSet(256) = .empty;
 var touch_info: std.AutoHashMapUnmanaged(i32, struct { public_id: u8, window: *Window }) = .empty;
-var gesture_fingers: u8 = undefined;
 var clipboard_text: []const u8 = "";
 
 var pending_drag_has_uri: bool = false;
@@ -257,9 +254,7 @@ fn destroyProxies() void {
     if (data_source) |_| h.wl_data_source_destroy(data_source);
     if (data_offer) |_| h.wl_data_offer_destroy(data_offer);
     if (data_device) |_| h.wl_data_device_destroy(data_device);
-    if (hold_gesture) |_| h.zwp_pointer_gesture_hold_v1_destroy(hold_gesture);
-    if (pinch_gesture) |_| h.zwp_pointer_gesture_pinch_v1_destroy(pinch_gesture);
-    if (swipe_gesture) |_| h.zwp_pointer_gesture_swipe_v1_destroy(swipe_gesture);
+    if (gesture_pinch) |_| h.zwp_pointer_gesture_pinch_v1_destroy(gesture_pinch);
     if (relative_pointer) |_| h.zwp_relative_pointer_v1_destroy(relative_pointer);
     if (cursor_shape_device) |_| h.wp_cursor_shape_device_v1_destroy(cursor_shape_device);
     if (text_input) |_| h.zwp_text_input_v3_destroy(text_input);
@@ -881,17 +876,9 @@ fn seatCapabilities(_: ?*anyopaque, _: ?*h.wl_seat, capabilities: h.wl_seat_capa
         touch_ids = .empty;
         touch_info.clearRetainingCapacity();
     }
-    if (hold_gesture) |_| {
-        h.zwp_pointer_gesture_hold_v1_destroy(hold_gesture);
-        hold_gesture = null;
-    }
-    if (pinch_gesture) |_| {
-        h.zwp_pointer_gesture_pinch_v1_destroy(pinch_gesture);
-        pinch_gesture = null;
-    }
-    if (swipe_gesture) |_| {
-        h.zwp_pointer_gesture_swipe_v1_destroy(swipe_gesture);
-        swipe_gesture = null;
+    if (gesture_pinch) |_| {
+        h.zwp_pointer_gesture_pinch_v1_destroy(gesture_pinch);
+        gesture_pinch = null;
     }
     if (relative_pointer) |_| {
         h.zwp_relative_pointer_v1_destroy(relative_pointer);
@@ -925,12 +912,8 @@ fn seatCapabilities(_: ?*anyopaque, _: ?*h.wl_seat, capabilities: h.wl_seat_capa
             _ = h.zwp_relative_pointer_v1_add_listener(relative_pointer, &relative_pointer_listener, null);
         }
         if (pointer_gestures) |_| {
-            swipe_gesture = h.zwp_pointer_gestures_v1_get_swipe_gesture(pointer_gestures, pointer);
-            _ = h.zwp_pointer_gesture_swipe_v1_add_listener(swipe_gesture, &swipe_gesture_listener, null);
-            pinch_gesture = h.zwp_pointer_gestures_v1_get_pinch_gesture(pointer_gestures, pointer);
-            _ = h.zwp_pointer_gesture_pinch_v1_add_listener(pinch_gesture, &pinch_gesture_listener, null);
-            hold_gesture = h.zwp_pointer_gestures_v1_get_hold_gesture(pointer_gestures, pointer);
-            _ = h.zwp_pointer_gesture_hold_v1_add_listener(hold_gesture, &hold_gesture_listener, null);
+            gesture_pinch = h.zwp_pointer_gestures_v1_get_pinch_gesture(pointer_gestures, pointer);
+            _ = h.zwp_pointer_gesture_pinch_v1_add_listener(gesture_pinch, &gesture_pinch_listener, null);
         }
     }
     if (capabilities & h.WL_SEAT_CAPABILITY_TOUCH != 0) {
@@ -1085,90 +1068,38 @@ fn relativePointerMotion(_: ?*anyopaque, _: ?*h.zwp_relative_pointer_v1, _: u32,
     }
 }
 
-const swipe_gesture_listener: h.zwp_pointer_gesture_swipe_v1_listener = .{
-    .begin = swipeBegin,
-    .update = swipeUpdate,
-    .end = swipeEnd,
+const gesture_pinch_listener: h.zwp_pointer_gesture_pinch_v1_listener = .{
+    .begin = gesturePinchBegin,
+    .update = gesturePinchUpdate,
+    .end = gesturePinchEnd,
 };
 
-fn swipeBegin(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_swipe_v1, _: u32, _: u32, surface: ?*h.wl_surface, fingers: u32) callconv(.c) void {
-    if (getWindow(surface)) |window| {
-        gesture_focus = window;
-        gesture_fingers = @truncate(fingers);
-    }
-}
-
-fn swipeUpdate(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_swipe_v1, _: u32, dx: h.wl_fixed_t, dy: h.wl_fixed_t) callconv(.c) void {
-    if (gesture_focus) |window| {
-        if (dx != 0) {
-            internal.eventFn(window.event_fn_data, .{ .gesture_pan_x = .{ .fingers = gesture_fingers, .value = fixedToFloat(dx) } });
-        }
-        if (dy != 0) {
-            internal.eventFn(window.event_fn_data, .{ .gesture_pan_y = .{ .fingers = gesture_fingers, .value = fixedToFloat(dy) } });
-        }
-    }
-}
-
-fn swipeEnd(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_swipe_v1, _: u32, _: u32, cancelled: i32) callconv(.c) void {
-    if (gesture_focus) |window| {
-        if (cancelled == 1) {
-            internal.eventFn(window.event_fn_data, .gesture_ignore);
+fn gesturePinchBegin(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_pinch_v1, _: u32, _: u32, surface: ?*h.wl_surface, fingers: u32) callconv(.c) void {
+    if (fingers == 2) {
+        if (getWindow(surface)) |window| {
+            gesture_focus = window;
         }
     }
 }
 
-const pinch_gesture_listener: h.zwp_pointer_gesture_pinch_v1_listener = .{
-    .begin = pinchBegin,
-    .update = pinchUpdate,
-    .end = pinchEnd,
-};
-
-fn pinchBegin(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_pinch_v1, _: u32, _: u32, surface: ?*h.wl_surface, fingers: u32) callconv(.c) void {
-    if (getWindow(surface)) |window| {
-        gesture_focus = window;
-        gesture_fingers = @truncate(fingers);
-    }
-}
-
-fn pinchUpdate(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_pinch_v1, _: u32, dx: h.wl_fixed_t, dy: h.wl_fixed_t, scale: h.wl_fixed_t, rotation: h.wl_fixed_t) callconv(.c) void {
+fn gesturePinchUpdate(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_pinch_v1, _: u32, dx: h.wl_fixed_t, dy: h.wl_fixed_t, scale: h.wl_fixed_t, rotation: h.wl_fixed_t) callconv(.c) void {
     if (gesture_focus) |window| {
         if (dx != 0) {
-            internal.eventFn(window.event_fn_data, .{ .gesture_pan_x = .{ .fingers = gesture_fingers, .value = fixedToFloat(dx) } });
+            internal.eventFn(window.event_fn_data, .{ .gesture_pan_x = fixedToFloat(dx) });
         }
         if (dy != 0) {
-            internal.eventFn(window.event_fn_data, .{ .gesture_pan_y = .{ .fingers = gesture_fingers, .value = fixedToFloat(dy) } });
+            internal.eventFn(window.event_fn_data, .{ .gesture_pan_y = fixedToFloat(dy) });
         }
         if (scale != 0) {
-            internal.eventFn(window.event_fn_data, .{ .gesture_zoom = .{ .fingers = gesture_fingers, .value = fixedToFloat(scale) } });
+            internal.eventFn(window.event_fn_data, .{ .gesture_zoom = fixedToFloat(scale) });
         }
         if (rotation != 0) {
-            internal.eventFn(window.event_fn_data, .{ .gesture_rotate = .{ .fingers = gesture_fingers, .value = fixedToFloat(rotation) } });
-        }
-    }
-}
-
-fn pinchEnd(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_pinch_v1, _: u32, _: u32, cancelled: i32) callconv(.c) void {
-    if (gesture_focus) |window| {
-        if (cancelled == 1) {
-            internal.eventFn(window.event_fn_data, .gesture_ignore);
+            internal.eventFn(window.event_fn_data, .{ .gesture_rotate = fixedToFloat(rotation) });
         }
     }
 }
 
-const hold_gesture_listener: h.zwp_pointer_gesture_hold_v1_listener = .{
-    .begin = holdBegin,
-    .end = holdEnd,
-};
-
-fn holdBegin(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_hold_v1, _: u32, _: u32, surface: ?*h.wl_surface, fingers: u32) callconv(.c) void {
-    if (getWindow(surface)) |window| {
-        gesture_focus = window;
-        gesture_fingers = @truncate(fingers);
-        internal.eventFn(window.event_fn_data, .{ .gesture_hold = .{ .fingers = gesture_fingers, .value = 0 } });
-    }
-}
-
-fn holdEnd(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_hold_v1, _: u32, _: u32, cancelled: i32) callconv(.c) void {
+fn gesturePinchEnd(_: ?*anyopaque, _: ?*h.zwp_pointer_gesture_pinch_v1, _: u32, _: u32, cancelled: i32) callconv(.c) void {
     if (gesture_focus) |window| {
         if (cancelled == 1) {
             internal.eventFn(window.event_fn_data, .gesture_ignore);

src/wasm/Wio.js

@@ -181,11 +181,11 @@ class Wio {
                 event.preventDefault();
                 window.drop_files = [];
                 window.drop_text = null;
-                wioEvent(data, 31);
+                wioEvent(data, 30);
             });
             canvas.addEventListener("dragover", (event) => {
                 event.preventDefault();
-                wioEvent(data, 32, event.offsetX, event.offsetY);
+                wioEvent(data, 31, event.offsetX, event.offsetY);
             });
             canvas.addEventListener("drop", (event) => {
                 event.preventDefault();
@@ -194,7 +194,7 @@ class Wio {
                 }
                 const text = event.dataTransfer.getData("text/plain");
                 window.drop_text = text.length > 0 ? text : null;
-                wioEvent(data, 33);
+                wioEvent(data, 32);
             });
 
             this.windows.push(window);

src/wio.zig

@@ -613,11 +613,10 @@ pub const Event = union(enum) {
     /// not affect the program.
     touch_end: TouchEnd,
 
-    gesture_hold: Gesture,
-    gesture_pan_x: Gesture,
-    gesture_pan_y: Gesture,
-    gesture_zoom: Gesture,
-    gesture_rotate: Gesture,
+    gesture_pan_x: f32,
+    gesture_pan_y: f32,
+    gesture_zoom: f32,
+    gesture_rotate: f32,
     gesture_ignore: void,
 
     drop_begin: void,
@@ -634,11 +633,6 @@ pub const Event = union(enum) {
         id: u8,
         ignore: bool,
     };
-
-    pub const Gesture = struct {
-        fingers: u8,
-        value: f32,
-    };
 };
 
 pub const EventType = @typeInfo(Event).@"union".tag_type.?;