chase: tablet_pad to tablet

https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4585

diff --git a/src/seat.c b/src/seat.c
index 0e7f87f41bebc514584e7a84e99e1be4cf419aef..7987b5a32f38ac10c7253f87dfa2447307bff699 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -40,7 +40,7 @@ device_type_from_wlr_device(struct wlr_input_device *wlr_input_device)
 {
        switch (wlr_input_device->type) {
        case WLR_INPUT_DEVICE_TOUCH:
-       case WLR_INPUT_DEVICE_TABLET_TOOL:
+       case WLR_INPUT_DEVICE_TABLET:
                return LAB_LIBINPUT_DEVICE_TOUCH;
        default:
                break;
@@ -397,7 +397,7 @@ seat_update_capabilities(struct seat *seat)
                        caps |= WL_SEAT_CAPABILITY_KEYBOARD;
                        break;
                case WLR_INPUT_DEVICE_POINTER:
-               case WLR_INPUT_DEVICE_TABLET_TOOL:
+               case WLR_INPUT_DEVICE_TABLET:
                        caps |= WL_SEAT_CAPABILITY_POINTER;
                        break;
                case WLR_INPUT_DEVICE_TOUCH:
@@ -438,7 +438,7 @@ new_input_notify(struct wl_listener *listener, void *data)
        case WLR_INPUT_DEVICE_TOUCH:
                input = new_touch(seat, device);
                break;
-       case WLR_INPUT_DEVICE_TABLET_TOOL:
+       case WLR_INPUT_DEVICE_TABLET:
                input = new_tablet(seat, device);
                break;
        case WLR_INPUT_DEVICE_TABLET_PAD:
@@ -609,7 +609,7 @@ seat_reconfigure(struct server *server)
                        configure_libinput(input->wlr_input_device);
                        map_touch_to_output(seat, input->wlr_input_device);
                        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);
                        break;
                default:
@@ -759,7 +759,7 @@ seat_output_layout_changed(struct seat *seat)
                case WLR_INPUT_DEVICE_TOUCH:
                        map_touch_to_output(seat, input->wlr_input_device);
                        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);
                        break;
                default:

diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index f2a1724b980341f4df90a22d8341a8d5d1aef387..db4faf0afc1c2f4f7335ce8933bbc1778d628e81 100644 (file)
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 488a23c16908a83041cf28e134a6f149d831598d
+revision = b821be5749061b0b73d777cb2fc74204cbf78278
 
 [provide]
 dependency_names = wlroots