diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-03-08 16:45:03 -0500 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-03-17 13:44:18 -0400 |
| commit | a92e5f8d4634a5d24c2fbab4a7fe0256558a96e6 (patch) | |
| tree | a07b6ace0b7d1caabe69eb47e908d9df0baf4653 /include/wlr | |
| parent | 2001441a370f673e8a46a1c172c5fc48df106750 (diff) | |
types/wlr_input_device: move output_name field to wlr_pointer and wlr_touch
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_input_device.h | 1 | ||||
| -rw-r--r-- | include/wlr/types/wlr_pointer.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_touch.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index 0ca64341..730912f7 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -31,7 +31,6 @@ struct wlr_input_device { char *name; // Or 0 if not applicable to this device double width_mm, height_mm; - char *output_name; /* wlr_input_device.type determines which of these is valid */ union { diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h index a5850718..dc7611b8 100644 --- a/include/wlr/types/wlr_pointer.h +++ b/include/wlr/types/wlr_pointer.h @@ -21,6 +21,8 @@ struct wlr_pointer { const struct wlr_pointer_impl *impl; + char *output_name; + struct { struct wl_signal motion; // struct wlr_event_pointer_motion struct wl_signal motion_absolute; // struct wlr_event_pointer_motion_absolute diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h index b2c097e8..ed2f0033 100644 --- a/include/wlr/types/wlr_touch.h +++ b/include/wlr/types/wlr_touch.h @@ -20,6 +20,8 @@ struct wlr_touch { const struct wlr_touch_impl *impl; + char *output_name; + struct { struct wl_signal down; // struct wlr_event_touch_down struct wl_signal up; // struct wlr_event_touch_up |