Move scale_axis to a utility header so we can re-use it better

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1013>

diff --git a/src/evdev.c b/src/evdev.c
index 15e338ac6e42e52107194915866090a7ab78b4e2..3a336a1effb42aae43c177206ec0c8b0fbdd933f 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -383,18 +383,12 @@ evdev_transform_relative(struct evdev_device *device,
        matrix_mult_vec(&rel_matrix, &point->x, &point->y);
 }
 
-static inline double
-scale_axis(const struct input_absinfo *absinfo, double val, double to_range)
-{
-       return (val - absinfo->minimum) * to_range / absinfo_range(absinfo);
-}
-
 double
 evdev_device_transform_x(struct evdev_device *device,
                         double x,
                         uint32_t width)
 {
-       return scale_axis(device->abs.absinfo_x, x, width);
+       return absinfo_scale_axis(device->abs.absinfo_x, x, width);
 }
 
 double
@@ -402,7 +396,7 @@ evdev_device_transform_y(struct evdev_device *device,
                         double y,
                         uint32_t height)
 {
-       return scale_axis(device->abs.absinfo_y, y, height);
+       return absinfo_scale_axis(device->abs.absinfo_y, y, height);
 }
 
 void

diff --git a/src/util-input-event.h b/src/util-input-event.h
index c9b02ab8bebcadff7060d6d71e4827623fad8c59..b7910215bef7272370711b80471994e795e96038 100644 (file)
--- a/src/util-input-event.h
+++ b/src/util-input-event.h
@@ -84,3 +84,9 @@ absinfo_normalize(const struct input_absinfo *abs)
 {
        return absinfo_normalize_value(abs, abs->value);
 }
+
+static inline double
+absinfo_scale_axis(const struct input_absinfo *absinfo, double val, double to_range)
+{
+       return (val - absinfo->minimum) * to_range / absinfo_range(absinfo);
+}