diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-03-09 15:08:20 -0500 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2022-03-17 18:16:14 +0000 |
| commit | 13d7fa2f03452ef5b1f34cdf7847476052532178 (patch) | |
| tree | 838d8e8d62d472d8785d398b15e6d40db94dce9c | |
| parent | 9a17200446952f67b10b7801a272b6abdd1ae8b3 (diff) | |
types/wlr_switch: uniformize events name
| -rw-r--r-- | backend/libinput/switch.c | 3 | ||||
| -rw-r--r-- | 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 586ec0c8..2e89ed59 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 8e723032..e26c9a3f 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; |