mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-05-03 06:46:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: touch gestures are working now! Once again big thanks to Sqooky and Werapi for their implementation made this a lot easier!

Browse source
This commit is contained in:
ernestoCruz05 2026-04-06 12:10:25 +01:00
parent 82808ff219
commit 29629d0ec7
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/mango.c
View file

@ -503,6 +503,7 @@ typedef struct TouchGroup {
uint32_t pending_swipe; uint32_t pending_swipe;
uint32_t touch_points_pending_swipe; uint32_t touch_points_pending_swipe;
Monitor *m; Monitor *m;
double pinch_dist;
} TouchGroup; } TouchGroup;
typedef struct { typedef struct {
@ -6927,6 +6928,17 @@ void touchdown(struct wl_listener *listener, void *data) {
gesture_touch_down(tg, t, lx, ly); gesture_touch_down(tg, t, lx, ly);
wl_list_insert(&tg->touch_points, &t->link); wl_list_insert(&tg->touch_points, &t->link);
if (wl_list_length(&tg->touch_points) == 2) {
TouchPoint *tp_pd;
wl_list_for_each(tp_pd, &tg->touch_points, link) {
if (tp_pd->touch_id != t->touch_id) {
tg->pinch_dist = sqrt(pow(lx - tp_pd->start_x, 2) +
pow(ly - tp_pd->start_y, 2));
break;
}
}
}
xytonode(lx, ly, &surface, &c, NULL, &sx, &sy); xytonode(lx, ly, &surface, &c, NULL, &sx, &sy);
t->start_surface_x = sx; t->start_surface_x = sx;
t->start_surface_y = sy; t->start_surface_y = sy;
@ -7063,12 +7075,10 @@ void touchmotion(struct wl_listener *listener, void *data) {
} }
} }
if (other) { if (other) {
double prev_dist = sqrt(pow(t->prev_x - other->prev_x, 2) + double cur_dist = sqrt(pow(lx - other->end_x, 2) +
pow(t->prev_y - other->prev_y, 2)); pow(ly - other->end_y, 2));
double new_dist = if (tg->pinch_dist > 1.0 && cur_dist > 1.0) {
sqrt(pow(lx - other->end_x, 2) + pow(ly - other->end_y, 2)); float factor = (float)(cur_dist / tg->pinch_dist);
if (prev_dist > 1.0) {
float factor = (float)(new_dist / prev_dist);
float old_zoom = zoom; float old_zoom = zoom;
selmon->pertag->canvas_zoom[tag] = selmon->pertag->canvas_zoom[tag] =
CLAMP_FLOAT(zoom * factor, 0.1f, 1.0f); CLAMP_FLOAT(zoom * factor, 0.1f, 1.0f);
@ -7083,6 +7093,7 @@ void touchmotion(struct wl_listener *listener, void *data) {
cy - (selmon->w.height / new_zoom) / 2.0f; cy - (selmon->w.height / new_zoom) / 2.0f;
canvas_reposition(selmon); canvas_reposition(selmon);
} }
tg->pinch_dist = cur_dist;
} }
} }
} }