dwl-patches/patches/gestures/gestures.patch
A Frederick Christensen 9c5d5d85f3
dwl-patches overhaul
Eliminated wiki.
Individual patches have a README.md explanation in their own subdirectory.
Simplified submission of new patches and maintenance of existing patches.
Instructions page (README.md autodisplayed) is now at https://codeberg.org/dwl/dwl-patches/
2024-05-09 23:12:04 -05:00

171 lines
5.3 KiB
Diff

From 6b9c8f96a2f1ed3c36d260df1e1dcba24cb98550 Mon Sep 17 00:00:00 2001
From: wochap <gean.marroquin@gmail.com>
Date: Thu, 11 Apr 2024 14:46:48 -0500
Subject: [PATCH] add swipe gestures to trigger functions
like libinput-gestures, it supports the following gestures: SWIPE_UP, SWIPE_DOWN, SWIPE_LEFT and SWIPE_RIGHTsupport multiple fingers count in gestures[]support mods in gestures[]
---
config.def.h | 9 +++++++
dwl.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/config.def.h b/config.def.h
index 8847e58..53a8437 100644
--- a/config.def.h
+++ b/config.def.h
@@ -14,6 +14,8 @@ static const float urgentcolor[] = COLOR(0xff0000ff);
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
+static const unsigned int swipe_min_threshold = 0;
+
/* tagging - TAGCOUNT must be no greater than 31 */
#define TAGCOUNT (9)
@@ -169,3 +171,10 @@ static const Button buttons[] = {
{ MODKEY, BTN_MIDDLE, togglefloating, {0} },
{ MODKEY, BTN_RIGHT, moveresize, {.ui = CurResize} },
};
+
+static const Gesture gestures[] = {
+ // { MODKEY, SWIPE_LEFT, 4, shiftview, { .i = 1 } },
+ // { MODKEY, SWIPE_RIGHT, 4, shiftview, { .i = -1 } },
+ { MODKEY, SWIPE_UP, 3, focusstack, {.i = 1} },
+ { MODKEY, SWIPE_DOWN, 3, focusstack, {.i = -1} },
+};
diff --git a/dwl.c b/dwl.c
index e96ea09..7e8a684 100644
--- a/dwl.c
+++ b/dwl.c
@@ -87,6 +87,7 @@ enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock,
enum { NetWMWindowTypeDialog, NetWMWindowTypeSplash, NetWMWindowTypeToolbar,
NetWMWindowTypeUtility, NetLast }; /* EWMH atoms */
#endif
+enum { SWIPE_LEFT, SWIPE_RIGHT, SWIPE_DOWN, SWIPE_UP };
typedef union {
int i;
@@ -102,6 +103,14 @@ typedef struct {
const Arg arg;
} Button;
+typedef struct {
+ unsigned int mod;
+ unsigned int motion;
+ unsigned int fingers_count;
+ void (*func)(const Arg *);
+ const Arg arg;
+} Gesture;
+
typedef struct Monitor Monitor;
typedef struct {
/* Must keep these three elements in this order */
@@ -249,6 +258,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list,
static void arrangelayers(Monitor *m);
static void axisnotify(struct wl_listener *listener, void *data);
static void buttonpress(struct wl_listener *listener, void *data);
+static int ongesture(struct wlr_pointer_swipe_end_event *event);
static void swipe_begin(struct wl_listener *listener, void *data);
static void swipe_update(struct wl_listener *listener, void *data);
static void swipe_end(struct wl_listener *listener, void *data);
@@ -413,6 +423,10 @@ static struct wlr_box sgeom;
static struct wl_list mons;
static Monitor *selmon;
+static uint32_t swipe_fingers = 0;
+static double swipe_dx = 0;
+static double swipe_dy = 0;
+
#ifdef XWAYLAND
static void activatex11(struct wl_listener *listener, void *data);
static void associatex11(struct wl_listener *listener, void *data);
@@ -432,6 +446,8 @@ static xcb_atom_t netatom[NetLast];
/* attempt to encapsulate suck into one file */
#include "client.h"
+static const unsigned int abzsquare = swipe_min_threshold * swipe_min_threshold;
+
/* function implementations */
void
applybounds(Client *c, struct wlr_box *bbox)
@@ -641,6 +657,11 @@ swipe_begin(struct wl_listener *listener, void *data)
{
struct wlr_pointer_swipe_begin_event *event = data;
+ swipe_fingers = event->fingers;
+ // Reset swipe distance at the beginning of a swipe
+ swipe_dx = 0;
+ swipe_dy = 0;
+
// Forward swipe begin event to client
wlr_pointer_gestures_v1_send_swipe_begin(
pointer_gestures,
@@ -655,6 +676,11 @@ swipe_update(struct wl_listener *listener, void *data)
{
struct wlr_pointer_swipe_update_event *event = data;
+ swipe_fingers = event->fingers;
+ // Accumulate swipe distance
+ swipe_dx += event->dx;
+ swipe_dy += event->dy;
+
// Forward swipe update event to client
wlr_pointer_gestures_v1_send_swipe_update(
pointer_gestures,
@@ -665,11 +691,53 @@ swipe_update(struct wl_listener *listener, void *data)
);
}
+int
+ongesture(struct wlr_pointer_swipe_end_event *event)
+{
+ struct wlr_keyboard *keyboard;
+ uint32_t mods;
+ const Gesture *g;
+ unsigned int motion;
+ unsigned int adx = ROUND(fabs(swipe_dx));
+ unsigned int ady = ROUND(fabs(swipe_dy));
+ int handled = 0;
+
+ if (event->cancelled) {
+ return handled;
+ }
+
+ // Require absolute distance movement beyond a small thresh-hold
+ if (adx * adx + ady * ady < abzsquare) {
+ return handled;
+ }
+
+ if (adx > ady) {
+ motion = swipe_dx < 0 ? SWIPE_LEFT : SWIPE_RIGHT;
+ } else {
+ motion = swipe_dy < 0 ? SWIPE_UP : SWIPE_DOWN;
+ }
+
+ keyboard = wlr_seat_get_keyboard(seat);
+ mods = keyboard ? wlr_keyboard_get_modifiers(keyboard) : 0;
+ for (g = gestures; g < END(gestures); g++) {
+ if (CLEANMASK(mods) == CLEANMASK(g->mod) &&
+ swipe_fingers == g->fingers_count &&
+ motion == g->motion && g->func) {
+ g->func(&g->arg);
+ handled = 1;
+ }
+ }
+ return handled;
+}
+
void
swipe_end(struct wl_listener *listener, void *data)
{
struct wlr_pointer_swipe_end_event *event = data;
+ // TODO: should we stop here if the event has been handled?
+ ongesture(event);
+
// Forward swipe end event to client
wlr_pointer_gestures_v1_send_swipe_end(
pointer_gestures,
--
2.43.2