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

Use "default" XCursor instead of "left_ptr"

Browse source 
"left_ptr" is the legacy XCursor name. "default" is the cursor
spec name.
This commit is contained in:
Simon Ser 2023-06-23 12:28:15 +02:00
parent 7fbd9fbf28
commit 974a8629a8
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/input/cursor.c
View file

@ -236,7 +236,7 @@ void cursor_update_image(struct sway_cursor *cursor,
// Try a node's resize edge // Try a node's resize edge
enum wlr_edges edge = find_resize_edge(node->sway_container, NULL, cursor); enum wlr_edges edge = find_resize_edge(node->sway_container, NULL, cursor);
if (edge == WLR_EDGE_NONE) { if (edge == WLR_EDGE_NONE) {
cursor_set_image(cursor, "left_ptr", NULL); cursor_set_image(cursor, "default", NULL);
} else if (container_is_floating(node->sway_container)) { } else if (container_is_floating(node->sway_container)) {
cursor_set_image(cursor, wlr_xcursor_get_resize_name(edge), NULL); cursor_set_image(cursor, wlr_xcursor_get_resize_name(edge), NULL);
} else { } else {
@ -247,7 +247,7 @@ void cursor_update_image(struct sway_cursor *cursor,
} }
} }
} else { } else {
cursor_set_image(cursor, "left_ptr", NULL); cursor_set_image(cursor, "default", NULL);
} }
} }

6
sway/input/seat.c
View file

@ -671,7 +671,7 @@ static void seat_update_capabilities(struct sway_seat *seat) {
} else { } else {
wlr_seat_set_capabilities(seat->wlr_seat, caps); wlr_seat_set_capabilities(seat->wlr_seat, caps);
if ((previous_caps & WL_SEAT_CAPABILITY_POINTER) == 0) { if ((previous_caps & WL_SEAT_CAPABILITY_POINTER) == 0) {
cursor_set_image(seat->cursor, "left_ptr", NULL); cursor_set_image(seat->cursor, "default", NULL);
} }
} }
} }
@ -1039,7 +1039,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
wlr_xcursor_manager_load(server.xwayland.xcursor_manager, 1); wlr_xcursor_manager_load(server.xwayland.xcursor_manager, 1);
struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor( struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(
server.xwayland.xcursor_manager, "left_ptr", 1); server.xwayland.xcursor_manager, "default", 1);
if (xcursor != NULL) { if (xcursor != NULL) {
struct wlr_xcursor_image *image = xcursor->images[0]; struct wlr_xcursor_image *image = xcursor->images[0];
wlr_xwayland_set_cursor( wlr_xwayland_set_cursor(
@ -1082,7 +1082,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
// Reset the cursor so that we apply it to outputs that just appeared // Reset the cursor so that we apply it to outputs that just appeared
cursor_set_image(seat->cursor, NULL, NULL); cursor_set_image(seat->cursor, NULL, NULL);
cursor_set_image(seat->cursor, "left_ptr", NULL); cursor_set_image(seat->cursor, "default", NULL);
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);
} }

2
swaybar/input.c
View file

@ -82,7 +82,7 @@ void update_cursor(struct swaybar_seat *seat) {
pointer->cursor_theme = wl_cursor_theme_load( pointer->cursor_theme = wl_cursor_theme_load(
cursor_theme, cursor_size * scale, seat->bar->shm); cursor_theme, cursor_size * scale, seat->bar->shm);
struct wl_cursor *cursor; struct wl_cursor *cursor;
cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr"); cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "default");
pointer->cursor_image = cursor->images[0]; pointer->cursor_image = cursor->images[0];
wl_surface_set_buffer_scale(pointer->cursor_surface, scale); wl_surface_set_buffer_scale(pointer->cursor_surface, scale);
wl_surface_attach(pointer->cursor_surface, wl_surface_attach(pointer->cursor_surface,

2
swaynag/swaynag.c
View file

@ -154,7 +154,7 @@ static void update_cursor(struct swaynag_seat *seat) {
pointer->cursor_theme = wl_cursor_theme_load( pointer->cursor_theme = wl_cursor_theme_load(
cursor_theme, cursor_size * swaynag->scale, swaynag->shm); cursor_theme, cursor_size * swaynag->scale, swaynag->shm);
struct wl_cursor *cursor = struct wl_cursor *cursor =
wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr"); wl_cursor_theme_get_cursor(pointer->cursor_theme, "default");
pointer->cursor_image = cursor->images[0]; pointer->cursor_image = cursor->images[0];
wl_surface_set_buffer_scale(pointer->cursor_surface, wl_surface_set_buffer_scale(pointer->cursor_surface,
swaynag->scale); swaynag->scale);