mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-31 22:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chase: tablet_pad to tablet

Browse source 
https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4585
This commit is contained in:
Consolatis 2024-03-19 00:22:44 +01:00 • committed by Johan Malm
parent 5c6e1ed878
commit d16c6dd63a
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/seat.c
View file

@ -40,7 +40,7 @@ device_type_from_wlr_device(struct wlr_input_device *wlr_input_device)
{ {
switch (wlr_input_device->type) { switch (wlr_input_device->type) {
case WLR_INPUT_DEVICE_TOUCH: case WLR_INPUT_DEVICE_TOUCH:
case WLR_INPUT_DEVICE_TABLET_TOOL: case WLR_INPUT_DEVICE_TABLET:
return LAB_LIBINPUT_DEVICE_TOUCH; return LAB_LIBINPUT_DEVICE_TOUCH;
default: default:
break; break;
@ -397,7 +397,7 @@ seat_update_capabilities(struct seat *seat)
caps |= WL_SEAT_CAPABILITY_KEYBOARD; caps |= WL_SEAT_CAPABILITY_KEYBOARD;
break; break;
case WLR_INPUT_DEVICE_POINTER: case WLR_INPUT_DEVICE_POINTER:
case WLR_INPUT_DEVICE_TABLET_TOOL: case WLR_INPUT_DEVICE_TABLET:
caps |= WL_SEAT_CAPABILITY_POINTER; caps |= WL_SEAT_CAPABILITY_POINTER;
break; break;
case WLR_INPUT_DEVICE_TOUCH: case WLR_INPUT_DEVICE_TOUCH:
@ -438,7 +438,7 @@ new_input_notify(struct wl_listener *listener, void *data)
case WLR_INPUT_DEVICE_TOUCH: case WLR_INPUT_DEVICE_TOUCH:
input = new_touch(seat, device); input = new_touch(seat, device);
break; break;
case WLR_INPUT_DEVICE_TABLET_TOOL: case WLR_INPUT_DEVICE_TABLET:
input = new_tablet(seat, device); input = new_tablet(seat, device);
break; break;
case WLR_INPUT_DEVICE_TABLET_PAD: case WLR_INPUT_DEVICE_TABLET_PAD:
@ -609,7 +609,7 @@ seat_reconfigure(struct server *server)
configure_libinput(input->wlr_input_device); configure_libinput(input->wlr_input_device);
map_touch_to_output(seat, input->wlr_input_device); map_touch_to_output(seat, input->wlr_input_device);
break; break;
case WLR_INPUT_DEVICE_TABLET_TOOL: case WLR_INPUT_DEVICE_TABLET:
map_input_to_output(seat, input->wlr_input_device, rc.tablet.output_name); map_input_to_output(seat, input->wlr_input_device, rc.tablet.output_name);
break; break;
default: default:
@ -759,7 +759,7 @@ seat_output_layout_changed(struct seat *seat)
case WLR_INPUT_DEVICE_TOUCH: case WLR_INPUT_DEVICE_TOUCH:
map_touch_to_output(seat, input->wlr_input_device); map_touch_to_output(seat, input->wlr_input_device);
break; break;
case WLR_INPUT_DEVICE_TABLET_TOOL: case WLR_INPUT_DEVICE_TABLET:
map_input_to_output(seat, input->wlr_input_device, rc.tablet.output_name); map_input_to_output(seat, input->wlr_input_device, rc.tablet.output_name);
break; break;
default: default:

2
subprojects/wlroots.wrap
View file

@ -1,6 +1,6 @@
[wrap-git] [wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = 488a23c16908a83041cf28e134a6f149d831598d revision = b821be5749061b0b73d777cb2fc74204cbf78278
[provide] [provide]
dependency_names = wlroots dependency_names = wlroots