From 860d2384b434cd1576d9029f20db62b583895cf4 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 27 Apr 2018 17:30:45 +0100 Subject: Update for swaywm/wlroots#923 --- sway/input/cursor.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 944ad8eb..64b95e7d 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c @@ -1,4 +1,5 @@ #define _XOPEN_SOURCE 700 +#include #ifdef __linux__ #include #elif __FreeBSD__ @@ -262,18 +263,11 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) { } static double apply_mapping_from_coord(double low, double high, double value) { - if (value == -1) { + if (isnan(value)) { return value; } - value = (value - low) / (high - low); - if (value < 0) { - return 0; - } else if (value > 1) { - return 1; - } else { - return value; - } + return (value - low) / (high - low); } static void apply_mapping_from_region(struct wlr_input_device *device, @@ -300,7 +294,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) { struct wlr_event_tablet_tool_axis *event = data; struct sway_input_device *input_device = event->device->data; - double x = -1, y = -1; + double x = NAN, y = NAN; if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) { x = event->x; } -- cgit v1.2.3