aboutsummaryrefslogtreecommitdiff
path: root/include/wlr
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-03-28 11:40:35 -0400
committerDrew DeVault <sir@cmpwn.com>2018-03-28 12:05:37 -0400
commitac219cbda6dc3122fcc7f1bfa89b7e8fbb03b8ce (patch)
treea67f7b0fb4f8a2b4abf3b05c944486f154c38dbc /include/wlr
parent324b9d910dc237151fd71c01bef015d0080be191 (diff)
Remove width_mm from tablet events
Diffstat (limited to 'include/wlr')
-rw-r--r--include/wlr/types/wlr_input_device.h2
-rw-r--r--include/wlr/types/wlr_tablet_tool.h12
2 files changed, 8 insertions, 6 deletions
diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h
index 6d8e3631..d65172c1 100644
--- a/include/wlr/types/wlr_input_device.h
+++ b/include/wlr/types/wlr_input_device.h
@@ -29,6 +29,8 @@ struct wlr_input_device {
enum wlr_input_device_type type;
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 59e49ef8..22bf2649 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/include/wlr/types/wlr_tablet_tool.h
@@ -36,8 +36,8 @@ struct wlr_event_tablet_tool_axis {
struct wlr_input_device *device;
uint32_t time_msec;
uint32_t updated_axes;
- double x_mm, y_mm;
- double width_mm, height_mm;
+ // From 0..1
+ double x, y;
double pressure;
double distance;
double tilt_x, tilt_y;
@@ -54,8 +54,8 @@ enum wlr_tablet_tool_proximity_state {
struct wlr_event_tablet_tool_proximity {
struct wlr_input_device *device;
uint32_t time_msec;
- double x_mm, y_mm;
- double width_mm, height_mm;
+ // From 0..1
+ double x, y;
enum wlr_tablet_tool_proximity_state state;
};
@@ -67,8 +67,8 @@ enum wlr_tablet_tool_tip_state {
struct wlr_event_tablet_tool_tip {
struct wlr_input_device *device;
uint32_t time_msec;
- double x_mm, y_mm;
- double width_mm, height_mm;
+ // From 0..1
+ double x, y;
enum wlr_tablet_tool_tip_state state;
};