sway

commit 0345148ea667dbad29ad7b70072708f4733afc0c
parent 1e79088a7245028fc0845d684cb5e2763f4f2816
Author: Simon Zeni <simon@bl4ckb0ne.ca>
Date:   Tue,  8 Mar 2022 17:03:38 -0500

sway/input/cursor: take device mm size from wlr_tablet

Diffstat:
M
sway/input/cursor.c
 | 
13
+++++++------

1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
@@ -591,14 +591,15 @@ static void apply_mapping_from_region(struct wlr_input_device *device,
 	double x1 = region->x1, x2 = region->x2;
 	double y1 = region->y1, y2 = region->y2;
 
-	if (region->mm) {
-		if (device->width_mm == 0 || device->height_mm == 0) {
+	if (region->mm && device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
+		struct wlr_tablet *tablet = device->tablet;
+		if (tablet->width_mm == 0 || tablet->height_mm == 0) {
 			return;
 		}
-		x1 /= device->width_mm;
-		x2 /= device->width_mm;
-		y1 /= device->height_mm;
-		y2 /= device->height_mm;
+		x1 /= tablet->width_mm;
+		x2 /= tablet->width_mm;
+		y1 /= tablet->height_mm;
+		y2 /= tablet->height_mm;
 	}
 
 	*x = apply_mapping_from_coord(x1, x2, *x);