mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2026-05-09 23:50:21 -04:00
Merge e1e824d51b into cfc7773dfa
This commit is contained in:
Weronika
GitHub
commit
9363c07a13
1 changed files with 292 additions and 2 deletions
294
src/mango.c
294
src/mango.c
|
|
@ -72,6 +72,7 @@
|
|||
#include <wlr/types/wlr_single_pixel_buffer_v1.h>
|
||||
#include <wlr/types/wlr_subcompositor.h>
|
||||
#include <wlr/types/wlr_switch.h>
|
||||
#include <wlr/types/wlr_touch.h>
|
||||
#include <wlr/types/wlr_viewporter.h>
|
||||
#include <wlr/types/wlr_virtual_keyboard_v1.h>
|
||||
#include <wlr/types/wlr_virtual_pointer_v1.h>
|
||||
|
|
@ -455,6 +456,18 @@ typedef struct {
|
|||
struct wl_listener destroy;
|
||||
} KeyboardGroup;
|
||||
|
||||
typedef struct {
|
||||
struct wl_list link;
|
||||
int32_t touch_id;
|
||||
double start_x, start_y, start_surface_x, start_surface_y;
|
||||
} TouchPoint;
|
||||
|
||||
typedef struct TouchGroup {
|
||||
struct wl_list link;
|
||||
struct wlr_touch *touch;
|
||||
struct wl_list touch_points;
|
||||
} TouchGroup;
|
||||
|
||||
typedef struct {
|
||||
struct wlr_keyboard_shortcuts_inhibitor_v1 *inhibitor;
|
||||
struct wl_listener destroy;
|
||||
|
|
@ -610,6 +623,7 @@ static void createpointerconstraint(struct wl_listener *listener, void *data);
|
|||
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
|
||||
static void commitpopup(struct wl_listener *listener, void *data);
|
||||
static void createpopup(struct wl_listener *listener, void *data);
|
||||
static void createtouch(struct wlr_touch *touch);
|
||||
static void cursorframe(struct wl_listener *listener, void *data);
|
||||
static void cursorwarptohint(void);
|
||||
static void destroydecoration(struct wl_listener *listener, void *data);
|
||||
|
|
@ -685,6 +699,12 @@ static void setsel(struct wl_listener *listener, void *data);
|
|||
static void setup(void);
|
||||
static void startdrag(struct wl_listener *listener, void *data);
|
||||
|
||||
static void touchdown(struct wl_listener *listener, void *data);
|
||||
static void touchup(struct wl_listener *listener, void *data);
|
||||
static void touchframe(struct wl_listener *listener, void *data);
|
||||
static void touchmotion(struct wl_listener *listener, void *data);
|
||||
static void touchcancel(struct wl_listener *listener, void *data);
|
||||
|
||||
static void unlocksession(struct wl_listener *listener, void *data);
|
||||
static void unmaplayersurfacenotify(struct wl_listener *listener, void *data);
|
||||
static void unmapnotify(struct wl_listener *listener, void *data);
|
||||
|
|
@ -887,6 +907,10 @@ static struct wlr_output_layout *output_layout;
|
|||
static struct wlr_box sgeom;
|
||||
static struct wl_list mons;
|
||||
static Monitor *selmon;
|
||||
static struct wl_list touch_groups;
|
||||
|
||||
static bool emulating_pointer_from_touch = false;
|
||||
static int32_t emulated_pointer_touch_id;
|
||||
|
||||
static int32_t enablegaps = 1; /* enables gaps, used by togglegaps */
|
||||
static int32_t axis_apply_time = 0;
|
||||
|
|
@ -985,6 +1009,11 @@ static struct wl_listener request_set_sel = {.notify = setsel};
|
|||
static struct wl_listener request_set_cursor_shape = {.notify = setcursorshape};
|
||||
static struct wl_listener request_start_drag = {.notify = requeststartdrag};
|
||||
static struct wl_listener start_drag = {.notify = startdrag};
|
||||
static struct wl_listener touch_down = {.notify = touchdown};
|
||||
static struct wl_listener touch_frame = {.notify = touchframe};
|
||||
static struct wl_listener touch_motion = {.notify = touchmotion};
|
||||
static struct wl_listener touch_up = {.notify = touchup};
|
||||
static struct wl_listener touch_cancel = {.notify = touchcancel};
|
||||
static struct wl_listener new_session_lock = {.notify = locksession};
|
||||
static struct wl_listener drm_lease_request = {.notify = requestdrmlease};
|
||||
static struct wl_listener keyboard_shortcuts_inhibit_new_inhibitor = {
|
||||
|
|
@ -2229,7 +2258,11 @@ buttonpress(struct wl_listener *listener, void *data) {
|
|||
struct wlr_surface *old_pointer_focus_surface =
|
||||
seat->pointer_state.focused_surface;
|
||||
|
||||
handlecursoractivity();
|
||||
if (!event->pointer ||
|
||||
event->pointer->base.type != WLR_INPUT_DEVICE_TOUCH) {
|
||||
handlecursoractivity();
|
||||
}
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
|
||||
if (check_trackpad_disabled(event->pointer)) {
|
||||
|
|
@ -2428,6 +2461,11 @@ void cleanuplisteners(void) {
|
|||
wl_list_remove(&request_set_cursor_shape.link);
|
||||
wl_list_remove(&request_start_drag.link);
|
||||
wl_list_remove(&start_drag.link);
|
||||
wl_list_remove(&touch_down.link);
|
||||
wl_list_remove(&touch_frame.link);
|
||||
wl_list_remove(&touch_motion.link);
|
||||
wl_list_remove(&touch_up.link);
|
||||
wl_list_remove(&touch_cancel.link);
|
||||
wl_list_remove(&new_session_lock.link);
|
||||
wl_list_remove(&tearing_new_object.link);
|
||||
wl_list_remove(&keyboard_shortcuts_inhibit_new_inhibitor.link);
|
||||
|
|
@ -3507,6 +3545,16 @@ void createpointerconstraint(struct wl_listener *listener, void *data) {
|
|||
&pointer_constraint->destroy, destroypointerconstraint);
|
||||
}
|
||||
|
||||
void createtouch(struct wlr_touch *wlr_touch) {
|
||||
TouchGroup *touch = ecalloc(1, sizeof(TouchGroup));
|
||||
|
||||
touch->touch = wlr_touch;
|
||||
wl_list_init(&touch->touch_points);
|
||||
wl_list_insert(&touch_groups, &touch->link);
|
||||
wlr_touch->data = touch;
|
||||
wlr_cursor_attach_input_device(cursor, &wlr_touch->base);
|
||||
}
|
||||
|
||||
void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint) {
|
||||
if (active_constraint == constraint)
|
||||
return;
|
||||
|
|
@ -3873,6 +3921,9 @@ void inputdevice(struct wl_listener *listener, void *data) {
|
|||
case WLR_INPUT_DEVICE_SWITCH:
|
||||
createswitch(wlr_switch_from_input_device(device));
|
||||
break;
|
||||
case WLR_INPUT_DEVICE_TOUCH:
|
||||
createtouch(wlr_touch_from_input_device(device));
|
||||
break;
|
||||
default:
|
||||
/* TODO handle other input device types */
|
||||
break;
|
||||
|
|
@ -3886,6 +3937,8 @@ void inputdevice(struct wl_listener *listener, void *data) {
|
|||
caps = WL_SEAT_CAPABILITY_POINTER;
|
||||
if (!wl_list_empty(&kb_group->wlr_group->devices))
|
||||
caps |= WL_SEAT_CAPABILITY_KEYBOARD;
|
||||
if (!wl_list_empty(&touch_groups))
|
||||
caps |= WL_SEAT_CAPABILITY_TOUCH;
|
||||
wlr_seat_set_capabilities(seat, caps);
|
||||
}
|
||||
|
||||
|
|
@ -4589,7 +4642,9 @@ void motionnotify(uint32_t time, struct wlr_input_device *device, double dx,
|
|||
}
|
||||
|
||||
wlr_cursor_move(cursor, device, dx, dy);
|
||||
handlecursoractivity();
|
||||
if (!device || device->type != WLR_INPUT_DEVICE_TOUCH) {
|
||||
handlecursoractivity();
|
||||
}
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
|
||||
/* Update selmon (even while dragging a window) */
|
||||
|
|
@ -5934,6 +5989,14 @@ void setup(void) {
|
|||
wl_signal_add(&cursor->events.axis, &cursor_axis);
|
||||
wl_signal_add(&cursor->events.frame, &cursor_frame);
|
||||
|
||||
wl_list_init(&touch_groups);
|
||||
|
||||
wl_signal_add(&cursor->events.touch_down, &touch_down);
|
||||
wl_signal_add(&cursor->events.touch_frame, &touch_frame);
|
||||
wl_signal_add(&cursor->events.touch_motion, &touch_motion);
|
||||
wl_signal_add(&cursor->events.touch_up, &touch_up);
|
||||
wl_signal_add(&cursor->events.touch_cancel, &touch_cancel);
|
||||
|
||||
// 这两句代码会造成obs窗口里的鼠标光标消失,不知道注释有什么影响
|
||||
cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
|
||||
wl_signal_add(&cursor_shape_mgr->events.request_set_shape,
|
||||
|
|
@ -6048,6 +6111,233 @@ void startdrag(struct wl_listener *listener, void *data) {
|
|||
LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon);
|
||||
}
|
||||
|
||||
void touchdown(struct wl_listener *listener, void *data) {
|
||||
struct wlr_touch_down_event *event = data;
|
||||
TouchGroup *tg = event->touch->data;
|
||||
TouchPoint *t = ecalloc(1, sizeof(TouchPoint));
|
||||
double lx, ly;
|
||||
double sx, sy;
|
||||
double dx, dy;
|
||||
struct wlr_surface *surface;
|
||||
Client *c = NULL;
|
||||
Monitor *m;
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
|
||||
if (!cursor_hidden) {
|
||||
hidecursor(NULL);
|
||||
}
|
||||
|
||||
// Map the input to the appropriate output, to ensure that rotation is
|
||||
// handled.
|
||||
wl_list_for_each(m, &mons, link) {
|
||||
if (m == NULL || m->wlr_output == NULL) {
|
||||
continue;
|
||||
}
|
||||
if (event->touch->output_name != NULL &&
|
||||
0 != strcmp(event->touch->output_name, m->wlr_output->name)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
wlr_cursor_map_input_to_output(cursor, &event->touch->base,
|
||||
m->wlr_output);
|
||||
}
|
||||
wlr_cursor_absolute_to_layout_coords(cursor, &event->touch->base, event->x,
|
||||
event->y, &lx, &ly);
|
||||
|
||||
t->touch_id = event->touch_id;
|
||||
t->start_x = lx;
|
||||
t->start_y = ly;
|
||||
|
||||
/* Find the client under the pointer and send the event along. */
|
||||
xytonode(lx, ly, &surface, &c, NULL, &sx, &sy);
|
||||
t->start_surface_x = sx;
|
||||
t->start_surface_y = sy;
|
||||
wl_list_insert(&tg->touch_points, &t->link);
|
||||
|
||||
if (surface != NULL && wlr_surface_accepts_touch(surface, seat)) {
|
||||
if (c)
|
||||
focusclient(c, 0);
|
||||
|
||||
wlr_seat_touch_notify_down(seat, surface, event->time_msec,
|
||||
event->touch_id, sx, sy);
|
||||
emulating_pointer_from_touch = false;
|
||||
return;
|
||||
}
|
||||
|
||||
/* Emulate a mouse click if the touch event wasn't handled */
|
||||
if (!emulating_pointer_from_touch) {
|
||||
emulating_pointer_from_touch = true;
|
||||
emulated_pointer_touch_id = event->touch_id;
|
||||
|
||||
wlr_cursor_warp_closest(cursor, &event->touch->base, lx, ly);
|
||||
dx = lx - cursor->x;
|
||||
dy = ly - cursor->y;
|
||||
motionnotify(event->time_msec, &event->touch->base, dx, dy, dx, dy);
|
||||
|
||||
struct wlr_pointer_button_event button_event = {
|
||||
.pointer = (struct wlr_pointer *)event->touch,
|
||||
.time_msec = event->time_msec,
|
||||
.button = BTN_LEFT,
|
||||
.state = WL_POINTER_BUTTON_STATE_PRESSED};
|
||||
buttonpress(listener, &button_event);
|
||||
}
|
||||
}
|
||||
|
||||
void touchup(struct wl_listener *listener, void *data) {
|
||||
struct wlr_touch_up_event *event = data;
|
||||
TouchGroup *tg = event->touch->data;
|
||||
TouchPoint *t = NULL;
|
||||
TouchPoint *t_iter;
|
||||
|
||||
wl_list_for_each(t_iter, &tg->touch_points, link) {
|
||||
if (t_iter->touch_id == event->touch_id) {
|
||||
t = t_iter;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!t) // invalid or cancelled
|
||||
return;
|
||||
wl_list_remove(&t->link);
|
||||
free(t);
|
||||
|
||||
if (emulating_pointer_from_touch) {
|
||||
if (emulated_pointer_touch_id == event->touch_id) {
|
||||
struct wlr_pointer_button_event button_event = {
|
||||
.pointer = (struct wlr_pointer *)event->touch,
|
||||
.time_msec = event->time_msec,
|
||||
.button = BTN_LEFT,
|
||||
.state = WL_POINTER_BUTTON_STATE_RELEASED};
|
||||
buttonpress(listener, &button_event);
|
||||
|
||||
emulating_pointer_from_touch = false;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!wlr_seat_touch_get_point(seat, event->touch_id)) {
|
||||
return;
|
||||
}
|
||||
|
||||
wlr_seat_touch_notify_up(seat, event->time_msec, event->touch_id);
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
}
|
||||
|
||||
void touchframe(struct wl_listener *listener, void *data) {
|
||||
if (emulating_pointer_from_touch) {
|
||||
wlr_seat_pointer_notify_frame(seat);
|
||||
} else {
|
||||
wlr_seat_touch_notify_frame(seat);
|
||||
}
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
}
|
||||
|
||||
void touchmotion(struct wl_listener *listener, void *data) {
|
||||
struct wlr_touch_motion_event *event = data;
|
||||
TouchGroup *tg = event->touch->data;
|
||||
TouchPoint *t = NULL;
|
||||
TouchPoint *t_iter;
|
||||
double lx, ly;
|
||||
double sx, sy;
|
||||
double dx, dy;
|
||||
struct wlr_surface *surface;
|
||||
Client *c = NULL;
|
||||
struct wlr_touch_point *p = NULL;
|
||||
|
||||
wl_list_for_each(t_iter, &tg->touch_points, link) {
|
||||
if (t_iter->touch_id == event->touch_id) {
|
||||
t = t_iter;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!t) // invalid or cancelled
|
||||
return;
|
||||
|
||||
wlr_cursor_absolute_to_layout_coords(cursor, &event->touch->base, event->x,
|
||||
event->y, &lx, &ly);
|
||||
|
||||
if (emulating_pointer_from_touch) {
|
||||
if (emulated_pointer_touch_id == event->touch_id) {
|
||||
dx = lx - cursor->x;
|
||||
dy = ly - cursor->y;
|
||||
motionnotify(event->time_msec, &event->touch->base, dx, dy, dx, dy);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
p = wlr_seat_touch_get_point(seat, event->touch_id);
|
||||
|
||||
if (!p) {
|
||||
return;
|
||||
}
|
||||
|
||||
sx = t->start_surface_x + (lx - t->start_x);
|
||||
sy = t->start_surface_y + (ly - t->start_y);
|
||||
|
||||
surface = p->surface;
|
||||
if (surface && surface->data) {
|
||||
toplevel_from_wlr_surface(surface, &c, NULL);
|
||||
if (c)
|
||||
focusclient(c, 0);
|
||||
}
|
||||
wlr_seat_touch_notify_motion(seat, event->time_msec, event->touch_id, sx,
|
||||
sy);
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
}
|
||||
|
||||
void touchcancel(struct wl_listener *listener, void *data) {
|
||||
struct wlr_touch_cancel_event *event = data;
|
||||
TouchGroup *tg = event->touch->data;
|
||||
TouchPoint *t = NULL;
|
||||
TouchPoint *t_iter;
|
||||
struct wlr_touch_point *p = NULL;
|
||||
struct wl_client *client = NULL;
|
||||
struct wlr_seat_client *seat_client = NULL;
|
||||
|
||||
wl_list_for_each(t_iter, &tg->touch_points, link) {
|
||||
if (t_iter->touch_id == event->touch_id) {
|
||||
t = t_iter;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!t)
|
||||
return;
|
||||
|
||||
wl_list_remove(&t->link);
|
||||
free(t);
|
||||
|
||||
if (emulating_pointer_from_touch) {
|
||||
if (emulated_pointer_touch_id == event->touch_id) {
|
||||
struct wlr_pointer_button_event button_event = {
|
||||
.pointer = (struct wlr_pointer *)event->touch,
|
||||
.time_msec = event->time_msec,
|
||||
.button = BTN_LEFT,
|
||||
.state = WL_POINTER_BUTTON_STATE_RELEASED};
|
||||
buttonpress(listener, &button_event);
|
||||
|
||||
emulating_pointer_from_touch = false;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
p = wlr_seat_touch_get_point(seat, event->touch_id);
|
||||
|
||||
if (!p) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (p->surface) {
|
||||
client = wl_resource_get_client(p->surface->resource);
|
||||
seat_client = wlr_seat_client_for_wl_client(seat, client);
|
||||
if (seat_client != NULL) {
|
||||
wlr_seat_touch_notify_cancel(seat, seat_client);
|
||||
}
|
||||
}
|
||||
|
||||
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||
}
|
||||
|
||||
void tag_client(const Arg *arg, Client *target_client) {
|
||||
Client *fc = NULL;
|
||||
if (target_client && arg->ui & TAGMASK) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue