mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-17 21:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2698 from ianyfan/hide-cursor

Browse source 
Only show cursor if pointer configured
This commit is contained in:
emersion 2018-09-29 14:32:05 +02:00 committed by GitHub
parent 351e722b6e a10fef9ae8
commit a53171669a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/input/cursor.c
View file

@ -1006,8 +1006,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
if (seat_is_input_allowed(seat, surface)) { if (seat_is_input_allowed(seat, surface)) {
wlr_seat_touch_notify_down(wlr_seat, surface, event->time_msec, wlr_seat_touch_notify_down(wlr_seat, surface, event->time_msec,
event->touch_id, sx, sy); event->touch_id, sx, sy);
cursor->image_client = NULL; cursor_set_image(cursor, NULL, NULL);
wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0);
} }
} }
@ -1175,11 +1174,13 @@ static void handle_request_set_cursor(struct wl_listener *listener,
void cursor_set_image(struct sway_cursor *cursor, const char *image, void cursor_set_image(struct sway_cursor *cursor, const char *image,
struct wl_client *client) { struct wl_client *client) {
if (!cursor->image || strcmp(cursor->image, image) != 0) { if (!image) {
wlr_cursor_set_image(cursor->cursor, NULL, 0, 0, 0, 0, 0, 0);
} else if (!cursor->image || strcmp(cursor->image, image) != 0) {
wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image, wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager, image,
cursor->cursor); cursor->cursor);
cursor->image = image;
} }
cursor->image = image;
cursor->image_client = client; cursor->image_client = client;
} }

12
sway/input/seat.c
View file

@ -368,11 +368,20 @@ static void seat_update_capabilities(struct sway_seat *seat) {
caps |= WL_SEAT_CAPABILITY_TOUCH; caps |= WL_SEAT_CAPABILITY_TOUCH;
break; break;
case WLR_INPUT_DEVICE_TABLET_TOOL: case WLR_INPUT_DEVICE_TABLET_TOOL:
caps |= WL_SEAT_CAPABILITY_POINTER;
break;
case WLR_INPUT_DEVICE_TABLET_PAD: case WLR_INPUT_DEVICE_TABLET_PAD:
break; break;
} }
} }
wlr_seat_set_capabilities(seat->wlr_seat, caps); 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, 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); output->name, (double)output->scale);
} }
wlr_xcursor_manager_set_cursor_image(seat->cursor->xcursor_manager, cursor_set_image(seat->cursor, "left_ptr", NULL);
"left_ptr", seat->cursor->cursor);
wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x, wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
seat->cursor->cursor->y); seat->cursor->cursor->y);
} }