From 13d7fa2f03452ef5b1f34cdf7847476052532178 Mon Sep 17 00:00:00 2001 From: Simon Zeni Date: Wed, 9 Mar 2022 15:08:20 -0500 Subject: [PATCH] types/wlr_switch: uniformize events name --- backend/libinput/switch.c | 3 +-- include/wlr/types/wlr_switch.h | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/backend/libinput/switch.c b/backend/libinput/switch.c index 586ec0c80..2e89ed59a 100644 --- a/backend/libinput/switch.c +++ b/backend/libinput/switch.c @@ -29,8 +29,7 @@ void handle_switch_toggle(struct libinput_event *event, struct wlr_switch *wlr_switch) { struct libinput_event_switch *sevent = libinput_event_get_switch_event (event); - struct wlr_event_switch_toggle wlr_event = { 0 }; - wlr_event.device = &wlr_switch->base; + struct wlr_switch_toggle_event wlr_event = { 0 }; switch (libinput_event_switch_get_switch(sevent)) { case LIBINPUT_SWITCH_LID: wlr_event.switch_type = WLR_SWITCH_TYPE_LID; diff --git a/include/wlr/types/wlr_switch.h b/include/wlr/types/wlr_switch.h index 8e7230327..e26c9a3f0 100644 --- a/include/wlr/types/wlr_switch.h +++ b/include/wlr/types/wlr_switch.h @@ -28,17 +28,16 @@ struct wlr_switch { }; enum wlr_switch_type { - WLR_SWITCH_TYPE_LID = 1, + WLR_SWITCH_TYPE_LID, WLR_SWITCH_TYPE_TABLET_MODE, }; enum wlr_switch_state { WLR_SWITCH_STATE_OFF = 0, - WLR_SWITCH_STATE_ON + WLR_SWITCH_STATE_ON, }; -struct wlr_event_switch_toggle { - struct wlr_input_device *device; +struct wlr_switch_toggle_event { uint32_t time_msec; enum wlr_switch_type switch_type; enum wlr_switch_state switch_state;