From 4453757fc9fa357288423ef3b54af3a1d7f35366 Mon Sep 17 00:00:00 2001 From: Ryan Walklin Date: Wed, 20 Mar 2019 09:41:20 +1100 Subject: s/lid_switch/switch_device Rename lid_switch to switch_device to disambiguate lid and tablet mode switches. --- include/rootston/switch.h | 2 +- include/wlr/interfaces/wlr_switch.h | 6 +++--- include/wlr/types/wlr_input_device.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/rootston/switch.h b/include/rootston/switch.h index 7aaa8c95..32bc3dab 100644 --- a/include/rootston/switch.h +++ b/include/rootston/switch.h @@ -12,7 +12,7 @@ struct roots_switch { struct wl_list link; }; -void roots_switch_handle_toggle(struct roots_switch *lid_switch, +void roots_switch_handle_toggle(struct roots_switch *switch_device, struct wlr_event_switch_toggle *event); #endif diff --git a/include/wlr/interfaces/wlr_switch.h b/include/wlr/interfaces/wlr_switch.h index 0b0454f5..83a1365b 100644 --- a/include/wlr/interfaces/wlr_switch.h +++ b/include/wlr/interfaces/wlr_switch.h @@ -12,11 +12,11 @@ #include struct wlr_switch_impl { - void (*destroy)(struct wlr_switch *lid_switch); + void (*destroy)(struct wlr_switch *switch_device); }; -void wlr_switch_init(struct wlr_switch *lid_switch, +void wlr_switch_init(struct wlr_switch *switch_device, struct wlr_switch_impl *impl); -void wlr_switch_destroy(struct wlr_switch *lid_switch); +void wlr_switch_destroy(struct wlr_switch *switch_device); #endif diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index f948d55b..21462023 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -48,7 +48,7 @@ struct wlr_input_device { void *_device; struct wlr_keyboard *keyboard; struct wlr_pointer *pointer; - struct wlr_switch *lid_switch; + struct wlr_switch *switch_device; struct wlr_touch *touch; struct wlr_tablet *tablet; struct wlr_tablet_pad *tablet_pad; -- cgit v1.2.3