mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2026-05-03 06:46:38 -04:00
feat: apply touch-input patch
This commit is contained in:
parent
26d9a24e18
commit
7b5bf9c510
1 changed files with 158 additions and 0 deletions
158
src/mango.c
158
src/mango.c
|
|
@ -70,6 +70,7 @@
|
||||||
#include <wlr/types/wlr_single_pixel_buffer_v1.h>
|
#include <wlr/types/wlr_single_pixel_buffer_v1.h>
|
||||||
#include <wlr/types/wlr_subcompositor.h>
|
#include <wlr/types/wlr_subcompositor.h>
|
||||||
#include <wlr/types/wlr_switch.h>
|
#include <wlr/types/wlr_switch.h>
|
||||||
|
#include <wlr/types/wlr_touch.h>
|
||||||
#include <wlr/types/wlr_viewporter.h>
|
#include <wlr/types/wlr_viewporter.h>
|
||||||
#include <wlr/types/wlr_virtual_keyboard_v1.h>
|
#include <wlr/types/wlr_virtual_keyboard_v1.h>
|
||||||
#include <wlr/types/wlr_virtual_pointer_v1.h>
|
#include <wlr/types/wlr_virtual_pointer_v1.h>
|
||||||
|
|
@ -410,6 +411,12 @@ typedef struct {
|
||||||
struct wl_listener destroy;
|
struct wl_listener destroy;
|
||||||
} KeyboardGroup;
|
} KeyboardGroup;
|
||||||
|
|
||||||
|
typedef struct TouchGroup {
|
||||||
|
struct wl_list link;
|
||||||
|
struct wlr_touch *touch;
|
||||||
|
Monitor *m;
|
||||||
|
} TouchGroup;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
struct wlr_keyboard_shortcuts_inhibitor_v1 *inhibitor;
|
struct wlr_keyboard_shortcuts_inhibitor_v1 *inhibitor;
|
||||||
struct wl_listener destroy;
|
struct wl_listener destroy;
|
||||||
|
|
@ -556,6 +563,7 @@ static void createpointerconstraint(struct wl_listener *listener, void *data);
|
||||||
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
|
static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
|
||||||
static void commitpopup(struct wl_listener *listener, void *data);
|
static void commitpopup(struct wl_listener *listener, void *data);
|
||||||
static void createpopup(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 cursorframe(struct wl_listener *listener, void *data);
|
||||||
static void cursorwarptohint(void);
|
static void cursorwarptohint(void);
|
||||||
static void destroydecoration(struct wl_listener *listener, void *data);
|
static void destroydecoration(struct wl_listener *listener, void *data);
|
||||||
|
|
@ -633,6 +641,11 @@ static void setsel(struct wl_listener *listener, void *data);
|
||||||
static void setup(void);
|
static void setup(void);
|
||||||
static void startdrag(struct wl_listener *listener, void *data);
|
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 unlocksession(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 unmaplayersurfacenotify(struct wl_listener *listener, void *data);
|
||||||
static void unmapnotify(struct wl_listener *listener, void *data);
|
static void unmapnotify(struct wl_listener *listener, void *data);
|
||||||
|
|
@ -810,6 +823,7 @@ static struct wlr_output_layout *output_layout;
|
||||||
static struct wlr_box sgeom;
|
static struct wlr_box sgeom;
|
||||||
static struct wl_list mons;
|
static struct wl_list mons;
|
||||||
static Monitor *selmon;
|
static Monitor *selmon;
|
||||||
|
static struct wl_list touches;
|
||||||
|
|
||||||
static int enablegaps = 1; /* enables gaps, used by togglegaps */
|
static int enablegaps = 1; /* enables gaps, used by togglegaps */
|
||||||
static int axis_apply_time = 0;
|
static int axis_apply_time = 0;
|
||||||
|
|
@ -883,6 +897,10 @@ static struct wl_listener request_set_sel = {.notify = setsel};
|
||||||
static struct wl_listener request_set_cursor_shape = {.notify = setcursorshape};
|
static struct wl_listener request_set_cursor_shape = {.notify = setcursorshape};
|
||||||
static struct wl_listener request_start_drag = {.notify = requeststartdrag};
|
static struct wl_listener request_start_drag = {.notify = requeststartdrag};
|
||||||
static struct wl_listener start_drag = {.notify = startdrag};
|
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 new_session_lock = {.notify = locksession};
|
static struct wl_listener new_session_lock = {.notify = locksession};
|
||||||
static struct wl_listener drm_lease_request = {.notify = requestdrmlease};
|
static struct wl_listener drm_lease_request = {.notify = requestdrmlease};
|
||||||
static struct wl_listener keyboard_shortcuts_inhibit_new_inhibitor = {
|
static struct wl_listener keyboard_shortcuts_inhibit_new_inhibitor = {
|
||||||
|
|
@ -2024,6 +2042,10 @@ void cleanuplisteners(void) {
|
||||||
wl_list_remove(&request_set_cursor_shape.link);
|
wl_list_remove(&request_set_cursor_shape.link);
|
||||||
wl_list_remove(&request_start_drag.link);
|
wl_list_remove(&request_start_drag.link);
|
||||||
wl_list_remove(&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(&new_session_lock.link);
|
wl_list_remove(&new_session_lock.link);
|
||||||
wl_list_remove(&tearing_new_object.link);
|
wl_list_remove(&tearing_new_object.link);
|
||||||
wl_list_remove(&keyboard_shortcuts_inhibit_new_inhibitor.link);
|
wl_list_remove(&keyboard_shortcuts_inhibit_new_inhibitor.link);
|
||||||
|
|
@ -2962,6 +2984,14 @@ void createpopup(struct wl_listener *listener, void *data) {
|
||||||
LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
|
LISTEN_STATIC(&popup->base->surface->events.commit, commitpopup);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void createtouch(struct wlr_touch *wlr_touch) {
|
||||||
|
TouchGroup *touch = ecalloc(1, sizeof(TouchGroup));
|
||||||
|
|
||||||
|
touch->touch = wlr_touch;
|
||||||
|
wl_list_insert(&touches, &touch->link);
|
||||||
|
wlr_cursor_attach_input_device(cursor, &wlr_touch->base);
|
||||||
|
}
|
||||||
|
|
||||||
void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint) {
|
void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint) {
|
||||||
if (active_constraint == constraint)
|
if (active_constraint == constraint)
|
||||||
return;
|
return;
|
||||||
|
|
@ -3285,6 +3315,9 @@ void inputdevice(struct wl_listener *listener, void *data) {
|
||||||
case WLR_INPUT_DEVICE_SWITCH:
|
case WLR_INPUT_DEVICE_SWITCH:
|
||||||
createswitch(wlr_switch_from_input_device(device));
|
createswitch(wlr_switch_from_input_device(device));
|
||||||
break;
|
break;
|
||||||
|
case WLR_INPUT_DEVICE_TOUCH:
|
||||||
|
createtouch(wlr_touch_from_input_device(device));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
/* TODO handle other input device types */
|
/* TODO handle other input device types */
|
||||||
break;
|
break;
|
||||||
|
|
@ -3298,6 +3331,8 @@ void inputdevice(struct wl_listener *listener, void *data) {
|
||||||
caps = WL_SEAT_CAPABILITY_POINTER;
|
caps = WL_SEAT_CAPABILITY_POINTER;
|
||||||
if (!wl_list_empty(&kb_group->wlr_group->devices))
|
if (!wl_list_empty(&kb_group->wlr_group->devices))
|
||||||
caps |= WL_SEAT_CAPABILITY_KEYBOARD;
|
caps |= WL_SEAT_CAPABILITY_KEYBOARD;
|
||||||
|
if (!wl_list_empty(&touches))
|
||||||
|
caps |= WL_SEAT_CAPABILITY_TOUCH;
|
||||||
wlr_seat_set_capabilities(seat, caps);
|
wlr_seat_set_capabilities(seat, caps);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -5065,6 +5100,13 @@ void setup(void) {
|
||||||
wl_signal_add(&cursor->events.axis, &cursor_axis);
|
wl_signal_add(&cursor->events.axis, &cursor_axis);
|
||||||
wl_signal_add(&cursor->events.frame, &cursor_frame);
|
wl_signal_add(&cursor->events.frame, &cursor_frame);
|
||||||
|
|
||||||
|
wl_list_init(&touches);
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
// 这两句代码会造成obs窗口里的鼠标光标消失,不知道注释有什么影响
|
// 这两句代码会造成obs窗口里的鼠标光标消失,不知道注释有什么影响
|
||||||
cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
|
cursor_shape_mgr = wlr_cursor_shape_manager_v1_create(dpy, 1);
|
||||||
wl_signal_add(&cursor_shape_mgr->events.request_set_shape,
|
wl_signal_add(&cursor_shape_mgr->events.request_set_shape,
|
||||||
|
|
@ -5175,6 +5217,122 @@ void startdrag(struct wl_listener *listener, void *data) {
|
||||||
LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon);
|
LISTEN_STATIC(&drag->icon->events.destroy, destroydragicon);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void touchdown(struct wl_listener *listener, void *data) {
|
||||||
|
struct wlr_touch_down_event *event = data;
|
||||||
|
double lx, ly;
|
||||||
|
double sx, sy;
|
||||||
|
struct wlr_surface *surface;
|
||||||
|
Client *c = NULL;
|
||||||
|
uint32_t serial = 0;
|
||||||
|
Monitor *m;
|
||||||
|
|
||||||
|
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||||
|
|
||||||
|
// 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);
|
||||||
|
|
||||||
|
/* Find the client under the pointer and send the event along. */
|
||||||
|
xytonode(lx, ly, &surface, &c, NULL, &sx, &sy);
|
||||||
|
if (sloppyfocus)
|
||||||
|
focusclient(c, 0);
|
||||||
|
|
||||||
|
if (surface != NULL) {
|
||||||
|
serial = wlr_seat_touch_notify_down(seat, surface, event->time_msec,
|
||||||
|
event->touch_id, sx, sy);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (serial && wlr_seat_touch_num_points(seat) == 1) {
|
||||||
|
/* Emulate a mouse click if the touch event wasn't handled */
|
||||||
|
struct wlr_pointer_button_event *button_event = data;
|
||||||
|
struct wlr_pointer_motion_absolute_event *motion_event = data;
|
||||||
|
double dx, dy;
|
||||||
|
|
||||||
|
wlr_cursor_absolute_to_layout_coords(
|
||||||
|
cursor, &motion_event->pointer->base, motion_event->x,
|
||||||
|
motion_event->y, &lx, &ly);
|
||||||
|
wlr_cursor_warp_closest(cursor, &motion_event->pointer->base, lx, ly);
|
||||||
|
dx = lx - cursor->x;
|
||||||
|
dy = ly - cursor->y;
|
||||||
|
motionnotify(motion_event->time_msec, &motion_event->pointer->base, dx,
|
||||||
|
dy, dx, dy);
|
||||||
|
|
||||||
|
button_event->button = BTN_LEFT;
|
||||||
|
button_event->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;
|
||||||
|
|
||||||
|
if (!wlr_seat_touch_get_point(seat, event->touch_id)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wlr_seat_touch_num_points(seat) == 1) {
|
||||||
|
struct wlr_pointer_button_event *button_event = data;
|
||||||
|
|
||||||
|
button_event->button = BTN_LEFT;
|
||||||
|
button_event->state = WL_POINTER_BUTTON_STATE_RELEASED;
|
||||||
|
buttonpress(listener, button_event);
|
||||||
|
}
|
||||||
|
|
||||||
|
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) {
|
||||||
|
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;
|
||||||
|
double lx, ly;
|
||||||
|
double sx, sy;
|
||||||
|
struct wlr_surface *surface;
|
||||||
|
Client *c = NULL;
|
||||||
|
|
||||||
|
if (!wlr_seat_touch_get_point(seat, event->touch_id)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
wlr_cursor_absolute_to_layout_coords(cursor, &event->touch->base, event->x,
|
||||||
|
event->y, &lx, &ly);
|
||||||
|
xytonode(lx, ly, &surface, &c, NULL, &sx, &sy);
|
||||||
|
|
||||||
|
if (c != NULL && surface != NULL) {
|
||||||
|
if (sloppyfocus)
|
||||||
|
focusclient(c, 0);
|
||||||
|
wlr_seat_touch_point_focus(seat, surface, event->time_msec,
|
||||||
|
event->touch_id, sx, sy);
|
||||||
|
} else {
|
||||||
|
if (sloppyfocus)
|
||||||
|
focusclient(NULL, 0);
|
||||||
|
wlr_seat_touch_point_clear_focus(seat, event->time_msec,
|
||||||
|
event->touch_id);
|
||||||
|
}
|
||||||
|
wlr_seat_touch_notify_motion(seat, event->time_msec, event->touch_id, sx,
|
||||||
|
sy);
|
||||||
|
|
||||||
|
wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
|
||||||
|
}
|
||||||
|
|
||||||
void tag_client(const Arg *arg, Client *target_client) {
|
void tag_client(const Arg *arg, Client *target_client) {
|
||||||
Client *fc = NULL;
|
Client *fc = NULL;
|
||||||
if (target_client && arg->ui & TAGMASK) {
|
if (target_client && arg->ui & TAGMASK) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue