diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-03-08 16:54:28 -0500 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-03-17 13:44:19 -0400 |
| commit | 96ccc50c5753346e852625fe37418a54386c7804 (patch) | |
| tree | bcbdf4f165d054d6e8d61d472898f3e140ea24a4 /include/wlr | |
| parent | a92e5f8d4634a5d24c2fbab4a7fe0256558a96e6 (diff) | |
types/wlr_input_device: move width_mm and height_mm fields to wlr_tablet and wlr_touch
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_input_device.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_tablet_tool.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_touch.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h index 730912f7..8c360aab 100644 --- a/include/wlr/types/wlr_input_device.h +++ b/include/wlr/types/wlr_input_device.h @@ -29,8 +29,6 @@ struct wlr_input_device { enum wlr_input_device_type type; unsigned int vendor, product; char *name; - // Or 0 if not applicable to this device - double width_mm, height_mm; /* wlr_input_device.type determines which of these is valid */ union { diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h index c7d612a3..2819bcc4 100644 --- a/include/wlr/types/wlr_tablet_tool.h +++ b/include/wlr/types/wlr_tablet_tool.h @@ -64,6 +64,8 @@ struct wlr_tablet { const struct wlr_tablet_impl *impl; + double width_mm, height_mm; + struct { struct wl_signal axis; struct wl_signal proximity; diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h index ed2f0033..ac256e08 100644 --- a/include/wlr/types/wlr_touch.h +++ b/include/wlr/types/wlr_touch.h @@ -21,6 +21,7 @@ struct wlr_touch { const struct wlr_touch_impl *impl; char *output_name; + double width_mm, height_mm; struct { struct wl_signal down; // struct wlr_event_touch_down |