mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 09:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1867 from emersion/wlroots-923

Browse source 
Update for wlroots#923
This commit is contained in:
Drew DeVault 2018-04-29 08:00:20 -04:00 committed by GitHub
parent 950c451f30 860d2384b4
commit 24ab66d123
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sway/input/cursor.c
View file

@ -1,4 +1,5 @@
#define _XOPEN_SOURCE 700 #define _XOPEN_SOURCE 700
#include <math.h>
#ifdef __linux__ #ifdef __linux__
#include <linux/input-event-codes.h> #include <linux/input-event-codes.h>
#elif __FreeBSD__ #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) { static double apply_mapping_from_coord(double low, double high, double value) {
if (value == -1) { if (isnan(value)) {
return value; return value;
} }
value = (value - low) / (high - low); return (value - low) / (high - low);
if (value < 0) {
return 0;
} else if (value > 1) {
return 1;
} else {
return value;
}
} }
static void apply_mapping_from_region(struct wlr_input_device *device, 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 wlr_event_tablet_tool_axis *event = data;
struct sway_input_device *input_device = event->device->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)) { if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) {
x = event->x; x = event->x;
} }