diff options
| author | emersion <contact@emersion.fr> | 2018-09-29 14:32:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-29 14:32:05 +0200 |
| commit | a53171669a709886b0cd887bdefbe9a6ca84b39c (patch) | |
| tree | 3699e9e71aa85b07068b425d1b28ba8b7672f8fb /sway/input/seat.c | |
| parent | 351e722b6e10f27625da7ae457240a3caf6c809d (diff) | |
| parent | a10fef9ae8ca66ad98fb837f163f5c3bbe19d0b9 (diff) | |
| download | sway-a53171669a709886b0cd887bdefbe9a6ca84b39c.tar.xz | |
Merge pull request #2698 from ianyfan/hide-cursor
Only show cursor if pointer configured
Diffstat (limited to 'sway/input/seat.c')
| -rw-r--r-- | sway/input/seat.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index a9c564e7..4817eae7 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -368,11 +368,20 @@ static void seat_update_capabilities(struct sway_seat *seat) { caps |= WL_SEAT_CAPABILITY_TOUCH; break; case WLR_INPUT_DEVICE_TABLET_TOOL: + caps |= WL_SEAT_CAPABILITY_POINTER; + break; case WLR_INPUT_DEVICE_TABLET_PAD: break; } } wlr_seat_set_capabilities(seat->wlr_seat, caps); + + // Hide cursor if seat doesn't have pointer capability + if ((caps & WL_SEAT_CAPABILITY_POINTER) == 0) { + cursor_set_image(seat->cursor, NULL, NULL); + } else { + cursor_set_image(seat->cursor, "left_ptr", NULL); + } } static void seat_apply_input_config(struct sway_seat *seat, @@ -552,8 +561,7 @@ void seat_configure_xcursor(struct sway_seat *seat) { output->name, (double)output->scale); } - wlr_xcursor_manager_set_cursor_image(seat->cursor->xcursor_manager, - "left_ptr", seat->cursor->cursor); + cursor_set_image(seat->cursor, "left_ptr", NULL); wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x, seat->cursor->cursor->y); } |