diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-29 08:00:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-29 08:00:20 -0400 |
commit | 24ab66d123ab493feb3c2343cbc9d93625b668d7 (patch) | |
tree | 66a34db1364899eeaca8521b3a35088f5ddd760d | |
parent | Merge pull request #1869 from emersion/xwayland-ignore-fullscreen-unmapped (diff) | |
parent | Update for swaywm/wlroots#923 (diff) | |
download | sway-24ab66d123ab493feb3c2343cbc9d93625b668d7.tar.gz sway-24ab66d123ab493feb3c2343cbc9d93625b668d7.tar.zst sway-24ab66d123ab493feb3c2343cbc9d93625b668d7.zip |
Merge pull request #1867 from emersion/wlroots-923
Update for wlroots#923
-rw-r--r-- | sway/input/cursor.c | 14 |
1 files 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 @@ | |||
1 | #define _XOPEN_SOURCE 700 | 1 | #define _XOPEN_SOURCE 700 |
2 | #include <math.h> | ||
2 | #ifdef __linux__ | 3 | #ifdef __linux__ |
3 | #include <linux/input-event-codes.h> | 4 | #include <linux/input-event-codes.h> |
4 | #elif __FreeBSD__ | 5 | #elif __FreeBSD__ |
@@ -262,18 +263,11 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) { | |||
262 | } | 263 | } |
263 | 264 | ||
264 | static double apply_mapping_from_coord(double low, double high, double value) { | 265 | static double apply_mapping_from_coord(double low, double high, double value) { |
265 | if (value == -1) { | 266 | if (isnan(value)) { |
266 | return value; | 267 | return value; |
267 | } | 268 | } |
268 | 269 | ||
269 | value = (value - low) / (high - low); | 270 | return (value - low) / (high - low); |
270 | if (value < 0) { | ||
271 | return 0; | ||
272 | } else if (value > 1) { | ||
273 | return 1; | ||
274 | } else { | ||
275 | return value; | ||
276 | } | ||
277 | } | 271 | } |
278 | 272 | ||
279 | static void apply_mapping_from_region(struct wlr_input_device *device, | 273 | 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) { | |||
300 | struct wlr_event_tablet_tool_axis *event = data; | 294 | struct wlr_event_tablet_tool_axis *event = data; |
301 | struct sway_input_device *input_device = event->device->data; | 295 | struct sway_input_device *input_device = event->device->data; |
302 | 296 | ||
303 | double x = -1, y = -1; | 297 | double x = NAN, y = NAN; |
304 | if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) { | 298 | if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) { |
305 | x = event->x; | 299 | x = event->x; |
306 | } | 300 | } |