diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-29 08:00:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-29 08:00:26 -0400 |
| commit | 795d4071db1ae504e8f5748005513d89ec7064ea (patch) | |
| tree | 1fed977b6aaf73dba2b487662d63c22711292409 /rootston | |
| parent | 4d7877420d49f4ab1999211e96f5d3ffdede0551 (diff) | |
| parent | 6e7c0b57f6b601a8c6883f71d00719dbd208c79d (diff) | |
| download | wlroots-795d4071db1ae504e8f5748005513d89ec7064ea.tar.xz | |
Merge pull request #923 from emersion/cursor-unspecified-axes
cursor: use NAN for unspecified axes, refactor absolute warping code
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/cursor.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/rootston/cursor.c b/rootston/cursor.c index 21e32a09..61a34db9 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -320,11 +320,9 @@ void roots_cursor_handle_touch_down(struct roots_cursor *cursor, struct wlr_event_touch_down *event) { struct roots_desktop *desktop = cursor->seat->input->server->desktop; double lx, ly; - bool result = wlr_cursor_absolute_to_layout_coords(cursor->cursor, - event->device, event->x, event->y, &lx, &ly); - if (!result) { - return; - } + wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device, + event->x, event->y, &lx, &ly); + double sx, sy; struct wlr_surface *surface = desktop_surface_at( desktop, lx, ly, &sx, &sy, NULL); @@ -371,11 +369,8 @@ void roots_cursor_handle_touch_motion(struct roots_cursor *cursor, } double lx, ly; - bool result = wlr_cursor_absolute_to_layout_coords(cursor->cursor, - event->device, event->x, event->y, &lx, &ly); - if (!result) { - return; - } + wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device, + event->x, event->y, &lx, &ly); double sx, sy; struct wlr_surface *surface = desktop_surface_at( |