tablet: move setting the pressure offset into a helper function
authorPeter Hutterer <peter.hutterer@who-t.net>
Tue, 13 Jun 2023 00:56:10 +0000 (10:56 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Fri, 23 Jun 2023 05:21:51 +0000 (05:21 +0000)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
src/evdev-tablet.c

index c8d7ebb5f5317a7583d95d38d96a3e13ab0d8b7c..3d1938e5b36d1fec9c57e2996626495b6bf33b57 100644 (file)
@@ -1313,6 +1313,21 @@ sanitize_tablet_axes(struct tablet_dispatch *tablet,
        sanitize_mouse_lens_rotation(tablet);
 }
 
+static void
+set_pressure_offset(struct libinput_tablet_tool *tool, int offset)
+{
+       tool->pressure.offset = offset;
+       tool->pressure.has_offset = true;
+
+       /* Adjust the tresholds accordingly - we use the same gap (4% in
+        * device coordinates) between upper and lower as before which isn't
+        * technically correct (our range shrunk) but it's easy to calculate.
+        */
+       int gap = tool->pressure.threshold.upper - tool->pressure.threshold.lower;
+       tool->pressure.threshold.lower = offset;
+       tool->pressure.threshold.upper = offset + gap;
+}
+
 static void
 detect_pressure_offset(struct tablet_dispatch *tablet,
                       struct evdev_device *device,
@@ -1372,17 +1387,9 @@ detect_pressure_offset(struct tablet_dispatch *tablet,
                 tablet_tool_type_to_string(tool->type),
                 tool->serial,
                 HTTP_DOC_LINK);
-set_offset:
-       tool->pressure.offset = offset;
-       tool->pressure.has_offset = true;
 
-       /* Adjust the tresholds accordingly - we use the same gap (4% in
-        * device coordinates) between upper and lower as before which isn't
-        * technically correct (our range shrunk) but it's easy to calculate.
-        */
-       int gap = tool->pressure.threshold.upper - tool->pressure.threshold.lower;
-       tool->pressure.threshold.lower = offset;
-       tool->pressure.threshold.upper = offset + gap;
+set_offset:
+       set_pressure_offset(tool, offset);
 }
 
 static void