From 96ccc50c5753346e852625fe37418a54386c7804 Mon Sep 17 00:00:00 2001
From: Simon Zeni <simon@bl4ckb0ne.ca>
Date: Tue, 8 Mar 2022 16:54:28 -0500
Subject: types/wlr_input_device: move width_mm and height_mm fields to
wlr_tablet and wlr_touch
---
include/wlr/types/wlr_input_device.h | 2 --
include/wlr/types/wlr_tablet_tool.h | 2 ++
include/wlr/types/wlr_touch.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
(limited to 'include/wlr')
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
--
cgit v1.2.3