aboutsummaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Luofan Chen <clfbbn@gmail.com>2024-03-01 11:43:14 +0800
committerLibravatar Simon Ser <contact@emersion.fr>2024-03-01 09:53:43 +0100
commit2058209a130f5051b59d8ebb24196409695deaaf (patch)
tree867fea97c4b4d78a61da441192286c7563faf3fa /sway
parentipc: add `scratchpad_state` property to GET_TREE (diff)
downloadsway-2058209a130f5051b59d8ebb24196409695deaaf.tar.gz
sway-2058209a130f5051b59d8ebb24196409695deaaf.tar.zst
sway-2058209a130f5051b59d8ebb24196409695deaaf.zip
input: Rename WLR_INPUT_DEVICE_TABLET_TOOL to WLR_INPUT_DEVICE_TABLET
wlroots has changed the naming, causing the following build errors when building: error: ‘WLR_INPUT_DEVICE_TABLET_TOOL’ undeclared
Diffstat (limited to 'sway')
-rw-r--r--sway/input/cursor.c4
-rw-r--r--sway/input/input-manager.c2
-rw-r--r--sway/input/seat.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 7d66a89d..3d04826c 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -243,7 +243,7 @@ static enum sway_input_idle_source idle_source_from_device(
243 return IDLE_SOURCE_POINTER; 243 return IDLE_SOURCE_POINTER;
244 case WLR_INPUT_DEVICE_TOUCH: 244 case WLR_INPUT_DEVICE_TOUCH:
245 return IDLE_SOURCE_TOUCH; 245 return IDLE_SOURCE_TOUCH;
246 case WLR_INPUT_DEVICE_TABLET_TOOL: 246 case WLR_INPUT_DEVICE_TABLET:
247 return IDLE_SOURCE_TABLET_TOOL; 247 return IDLE_SOURCE_TABLET_TOOL;
248 case WLR_INPUT_DEVICE_TABLET_PAD: 248 case WLR_INPUT_DEVICE_TABLET_PAD:
249 return IDLE_SOURCE_TABLET_PAD; 249 return IDLE_SOURCE_TABLET_PAD;
@@ -518,7 +518,7 @@ static void apply_mapping_from_region(struct wlr_input_device *device,
518 double x1 = region->x1, x2 = region->x2; 518 double x1 = region->x1, x2 = region->x2;
519 double y1 = region->y1, y2 = region->y2; 519 double y1 = region->y1, y2 = region->y2;
520 520
521 if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) { 521 if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET) {
522 struct wlr_tablet *tablet = wlr_tablet_from_input_device(device); 522 struct wlr_tablet *tablet = wlr_tablet_from_input_device(device);
523 if (tablet->width_mm == 0 || tablet->height_mm == 0) { 523 if (tablet->width_mm == 0 || tablet->height_mm == 0) {
524 return; 524 return;
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 9ee635af..056cc3ea 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -111,7 +111,7 @@ const char *input_device_get_type(struct sway_input_device *device) {
111 return "keyboard"; 111 return "keyboard";
112 case WLR_INPUT_DEVICE_TOUCH: 112 case WLR_INPUT_DEVICE_TOUCH:
113 return "touch"; 113 return "touch";
114 case WLR_INPUT_DEVICE_TABLET_TOOL: 114 case WLR_INPUT_DEVICE_TABLET:
115 return "tablet_tool"; 115 return "tablet_tool";
116 case WLR_INPUT_DEVICE_TABLET_PAD: 116 case WLR_INPUT_DEVICE_TABLET_PAD:
117 return "tablet_pad"; 117 return "tablet_pad";
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 7ae29828..f2486893 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -607,7 +607,7 @@ static void seat_update_capabilities(struct sway_seat *seat) {
607 case WLR_INPUT_DEVICE_TOUCH: 607 case WLR_INPUT_DEVICE_TOUCH:
608 caps |= WL_SEAT_CAPABILITY_TOUCH; 608 caps |= WL_SEAT_CAPABILITY_TOUCH;
609 break; 609 break;
610 case WLR_INPUT_DEVICE_TABLET_TOOL: 610 case WLR_INPUT_DEVICE_TABLET:
611 caps |= WL_SEAT_CAPABILITY_POINTER; 611 caps |= WL_SEAT_CAPABILITY_POINTER;
612 break; 612 break;
613 case WLR_INPUT_DEVICE_SWITCH: 613 case WLR_INPUT_DEVICE_SWITCH:
@@ -665,7 +665,7 @@ static const char *get_builtin_output_name(void) {
665static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) { 665static bool is_touch_or_tablet_tool(struct sway_seat_device *seat_device) {
666 switch (seat_device->input_device->wlr_device->type) { 666 switch (seat_device->input_device->wlr_device->type) {
667 case WLR_INPUT_DEVICE_TOUCH: 667 case WLR_INPUT_DEVICE_TOUCH:
668 case WLR_INPUT_DEVICE_TABLET_TOOL: 668 case WLR_INPUT_DEVICE_TABLET:
669 return true; 669 return true;
670 default: 670 default:
671 return false; 671 return false;
@@ -680,7 +680,7 @@ static void seat_apply_input_mapping(struct sway_seat *seat,
680 switch (sway_device->input_device->wlr_device->type) { 680 switch (sway_device->input_device->wlr_device->type) {
681 case WLR_INPUT_DEVICE_POINTER: 681 case WLR_INPUT_DEVICE_POINTER:
682 case WLR_INPUT_DEVICE_TOUCH: 682 case WLR_INPUT_DEVICE_TOUCH:
683 case WLR_INPUT_DEVICE_TABLET_TOOL: 683 case WLR_INPUT_DEVICE_TABLET:
684 break; 684 break;
685 default: 685 default:
686 return; // these devices don't support mappings 686 return; // these devices don't support mappings
@@ -873,7 +873,7 @@ void seat_configure_device(struct sway_seat *seat,
873 case WLR_INPUT_DEVICE_TOUCH: 873 case WLR_INPUT_DEVICE_TOUCH:
874 seat_configure_touch(seat, seat_device); 874 seat_configure_touch(seat, seat_device);
875 break; 875 break;
876 case WLR_INPUT_DEVICE_TABLET_TOOL: 876 case WLR_INPUT_DEVICE_TABLET:
877 seat_configure_tablet_tool(seat, seat_device); 877 seat_configure_tablet_tool(seat, seat_device);
878 break; 878 break;
879 case WLR_INPUT_DEVICE_TABLET_PAD: 879 case WLR_INPUT_DEVICE_TABLET_PAD:
@@ -912,7 +912,7 @@ void seat_reset_device(struct sway_seat *seat,
912 case WLR_INPUT_DEVICE_TOUCH: 912 case WLR_INPUT_DEVICE_TOUCH:
913 seat_reset_input_config(seat, seat_device); 913 seat_reset_input_config(seat, seat_device);
914 break; 914 break;
915 case WLR_INPUT_DEVICE_TABLET_TOOL: 915 case WLR_INPUT_DEVICE_TABLET:
916 seat_reset_input_config(seat, seat_device); 916 seat_reset_input_config(seat, seat_device);
917 break; 917 break;
918 case WLR_INPUT_DEVICE_TABLET_PAD: 918 case WLR_INPUT_DEVICE_TABLET_PAD: