aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2023-06-23 12:28:15 +0200
committerSimon Ser <contact@emersion.fr>2023-06-25 22:38:10 +0200
commit974a8629a8f0f403028332543e4bd31d98f611c1 (patch)
treec2ea62de5a96a6bce7502542013b520331a79c6c
parent7fbd9fbf2825f1c41468ac996aced9ba4b152992 (diff)
Use "default" XCursor instead of "left_ptr"
"left_ptr" is the legacy XCursor name. "default" is the cursor spec name.
-rw-r--r--sway/input/cursor.c4
-rw-r--r--sway/input/seat.c6
-rw-r--r--swaybar/input.c2
-rw-r--r--swaynag/swaynag.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index abc6c554..7a4dd19f 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -236,7 +236,7 @@ void cursor_update_image(struct sway_cursor *cursor,
// Try a node's resize edge
enum wlr_edges edge = find_resize_edge(node->sway_container, NULL, cursor);
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)) {
cursor_set_image(cursor, wlr_xcursor_get_resize_name(edge), NULL);
} else {
@@ -247,7 +247,7 @@ void cursor_update_image(struct sway_cursor *cursor,
}
}
} else {
- cursor_set_image(cursor, "left_ptr", NULL);
+ cursor_set_image(cursor, "default", NULL);
}
}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index fdd21057..82f4eb5f 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -671,7 +671,7 @@ static void seat_update_capabilities(struct sway_seat *seat) {
} else {
wlr_seat_set_capabilities(seat->wlr_seat, caps);
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);
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) {
struct wlr_xcursor_image *image = xcursor->images[0];
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
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,
seat->cursor->cursor->y);
}
diff --git a/swaybar/input.c b/swaybar/input.c
index 8eccf542..f8f0672e 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -82,7 +82,7 @@ void update_cursor(struct swaybar_seat *seat) {
pointer->cursor_theme = wl_cursor_theme_load(
cursor_theme, cursor_size * scale, seat->bar->shm);
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];
wl_surface_set_buffer_scale(pointer->cursor_surface, scale);
wl_surface_attach(pointer->cursor_surface,
diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
index 08e26127..1b114e28 100644
--- a/swaynag/swaynag.c
+++ b/swaynag/swaynag.c
@@ -154,7 +154,7 @@ static void update_cursor(struct swaynag_seat *seat) {
pointer->cursor_theme = wl_cursor_theme_load(
cursor_theme, cursor_size * swaynag->scale, swaynag->shm);
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];
wl_surface_set_buffer_scale(pointer->cursor_surface,
swaynag->scale);