mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-22 01:40:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: support button mapping for tablet capable surfaces

Browse source 
Apply the original mapping to mouse buttons and
map those back to stylus buttons.
This commit is contained in:
Jens Peters 2024-04-21 21:05:12 +02:00 • committed by Consolatis
parent fb57d61f35
commit be72c4bde3
1 changed files with 51 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/input/tablet.c
View file

@ -257,6 +257,28 @@ handle_axis(struct wl_listener *listener, void *data)
} }
} }
static uint32_t
to_stylus_button(uint32_t button)
{
/*
* Use the mapping that is used by XWayland and GTK, even
* if it isn't the order one would expect. This is also
* consistent with the mapping for mouse emulation
*/
switch (button) {
case BTN_LEFT:
return BTN_TOOL_PEN;
case BTN_RIGHT:
return BTN_STYLUS2;
case BTN_MIDDLE:
return BTN_STYLUS;
case BTN_SIDE:
return BTN_STYLUS3;
default:
return 0;
}
}
static void static void
handle_tip(struct wl_listener *listener, void *data) handle_tip(struct wl_listener *listener, void *data)
{ {
@ -267,9 +289,16 @@ handle_tip(struct wl_listener *listener, void *data)
double x, y; double x, y;
struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y); struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y);
uint32_t button = tablet_get_mapped_button(BTN_TOOL_PEN);
if (tool && (surface || wlr_tablet_tool_v2_has_implicit_grab(tool->tool_v2))) { if (tool && (surface || wlr_tablet_tool_v2_has_implicit_grab(tool->tool_v2))) {
idle_manager_notify_activity(tool->seat->seat); idle_manager_notify_activity(tool->seat->seat);
uint32_t stylus_button = to_stylus_button(button);
if (stylus_button != BTN_TOOL_PEN) {
wlr_log(WLR_INFO, "ignoring stylus tool pen mapping for tablet mode");
}
if (ev->state == WLR_TABLET_TOOL_TIP_DOWN) { if (ev->state == WLR_TABLET_TOOL_TIP_DOWN) {
bool notify = cursor_process_button_press(tool->seat, BTN_LEFT, bool notify = cursor_process_button_press(tool->seat, BTN_LEFT,
ev->time_msec); ev->time_msec);
@ -301,7 +330,6 @@ handle_tip(struct wl_listener *listener, void *data)
} }
} }
} else { } else {
uint32_t button = tablet_get_mapped_button(BTN_TOOL_PEN);
if (button) { if (button) {
cursor_emulate_button(tablet->seat, cursor_emulate_button(tablet->seat,
button, button,
@ -323,25 +351,35 @@ handle_button(struct wl_listener *listener, void *data)
double x, y; double x, y;
struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y); struct wlr_surface *surface = tablet_get_coords(tablet, &x, &y);
uint32_t button = tablet_get_mapped_button(ev->button);
if (tool && surface) { if (tool && surface) {
idle_manager_notify_activity(tool->seat->seat); idle_manager_notify_activity(tool->seat->seat);
struct view *view = view_from_wlr_surface(surface); if (button) {
struct mousebind *mousebind; struct view *view = view_from_wlr_surface(surface);
wl_list_for_each(mousebind, &rc.mousebinds, link) { struct mousebind *mousebind;
if (mousebind->mouse_event == MOUSE_ACTION_PRESS wl_list_for_each(mousebind, &rc.mousebinds, link) {
&& mousebind->button == BTN_RIGHT if (mousebind->mouse_event == MOUSE_ACTION_PRESS
&& mousebind->context == LAB_SSD_CLIENT) { && mousebind->button == button
actions_run(view, tool->seat->server, &mousebind->actions, 0); && mousebind->context == LAB_SSD_CLIENT) {
actions_run(view, tool->seat->server,
&mousebind->actions, 0);
}
} }
} }
wlr_tablet_v2_tablet_tool_notify_button(tool->tool_v2, ev->button, uint32_t stylus_button = to_stylus_button(button);
ev->state == WLR_BUTTON_PRESSED if (stylus_button && stylus_button != BTN_TOOL_PEN) {
? ZWP_TABLET_PAD_V2_BUTTON_STATE_PRESSED wlr_tablet_v2_tablet_tool_notify_button(tool->tool_v2,
: ZWP_TABLET_PAD_V2_BUTTON_STATE_RELEASED); stylus_button,
ev->state == WLR_BUTTON_PRESSED
? ZWP_TABLET_PAD_V2_BUTTON_STATE_PRESSED
: ZWP_TABLET_PAD_V2_BUTTON_STATE_RELEASED);
} else {
wlr_log(WLR_INFO, "invalid stylus button mapping for tablet mode");
}
} else { } else {
uint32_t button = tablet_get_mapped_button(ev->button);
if (button) { if (button) {
cursor_emulate_button(tablet->seat, button, ev->state, ev->time_msec); cursor_emulate_button(tablet->seat, button, ev->state, ev->time_msec);
} }