aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2023-06-23 12:28:15 +0200
committerLibravatar Simon Ser <contact@emersion.fr>2023-06-23 12:28:15 +0200
commitffd4f8b60aedd498d909dd3c479f6a0b2897d3cc (patch)
treeeea9463eb63642eb270ca99a1c926f33af2ec959
parentUse wlr_cursor_unset_image() (diff)
downloadsway-default-xcursor.tar.gz
sway-default-xcursor.tar.zst
sway-default-xcursor.zip
Use "default" XCursor instead of "left_ptr"default-xcursor
"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,
236 // Try a node's resize edge 236 // Try a node's resize edge
237 enum wlr_edges edge = find_resize_edge(node->sway_container, NULL, cursor); 237 enum wlr_edges edge = find_resize_edge(node->sway_container, NULL, cursor);
238 if (edge == WLR_EDGE_NONE) { 238 if (edge == WLR_EDGE_NONE) {
239 cursor_set_image(cursor, "left_ptr", NULL); 239 cursor_set_image(cursor, "default", NULL);
240 } else if (container_is_floating(node->sway_container)) { 240 } else if (container_is_floating(node->sway_container)) {
241 cursor_set_image(cursor, wlr_xcursor_get_resize_name(edge), NULL); 241 cursor_set_image(cursor, wlr_xcursor_get_resize_name(edge), NULL);
242 } else { 242 } else {
@@ -247,7 +247,7 @@ void cursor_update_image(struct sway_cursor *cursor,
247 } 247 }
248 } 248 }
249 } else { 249 } else {
250 cursor_set_image(cursor, "left_ptr", NULL); 250 cursor_set_image(cursor, "default", NULL);
251 } 251 }
252} 252}
253 253
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) {
671 } else { 671 } else {
672 wlr_seat_set_capabilities(seat->wlr_seat, caps); 672 wlr_seat_set_capabilities(seat->wlr_seat, caps);
673 if ((previous_caps & WL_SEAT_CAPABILITY_POINTER) == 0) { 673 if ((previous_caps & WL_SEAT_CAPABILITY_POINTER) == 0) {
674 cursor_set_image(seat->cursor, "left_ptr", NULL); 674 cursor_set_image(seat->cursor, "default", NULL);
675 } 675 }
676 } 676 }
677} 677}
@@ -1039,7 +1039,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
1039 1039
1040 wlr_xcursor_manager_load(server.xwayland.xcursor_manager, 1); 1040 wlr_xcursor_manager_load(server.xwayland.xcursor_manager, 1);
1041 struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor( 1041 struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(
1042 server.xwayland.xcursor_manager, "left_ptr", 1); 1042 server.xwayland.xcursor_manager, "default", 1);
1043 if (xcursor != NULL) { 1043 if (xcursor != NULL) {
1044 struct wlr_xcursor_image *image = xcursor->images[0]; 1044 struct wlr_xcursor_image *image = xcursor->images[0];
1045 wlr_xwayland_set_cursor( 1045 wlr_xwayland_set_cursor(
@@ -1082,7 +1082,7 @@ void seat_configure_xcursor(struct sway_seat *seat) {
1082 1082
1083 // Reset the cursor so that we apply it to outputs that just appeared 1083 // Reset the cursor so that we apply it to outputs that just appeared
1084 cursor_set_image(seat->cursor, NULL, NULL); 1084 cursor_set_image(seat->cursor, NULL, NULL);
1085 cursor_set_image(seat->cursor, "left_ptr", NULL); 1085 cursor_set_image(seat->cursor, "default", NULL);
1086 wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x, 1086 wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
1087 seat->cursor->cursor->y); 1087 seat->cursor->cursor->y);
1088} 1088}
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) {
82 pointer->cursor_theme = wl_cursor_theme_load( 82 pointer->cursor_theme = wl_cursor_theme_load(
83 cursor_theme, cursor_size * scale, seat->bar->shm); 83 cursor_theme, cursor_size * scale, seat->bar->shm);
84 struct wl_cursor *cursor; 84 struct wl_cursor *cursor;
85 cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr"); 85 cursor = wl_cursor_theme_get_cursor(pointer->cursor_theme, "default");
86 pointer->cursor_image = cursor->images[0]; 86 pointer->cursor_image = cursor->images[0];
87 wl_surface_set_buffer_scale(pointer->cursor_surface, scale); 87 wl_surface_set_buffer_scale(pointer->cursor_surface, scale);
88 wl_surface_attach(pointer->cursor_surface, 88 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) {
154 pointer->cursor_theme = wl_cursor_theme_load( 154 pointer->cursor_theme = wl_cursor_theme_load(
155 cursor_theme, cursor_size * swaynag->scale, swaynag->shm); 155 cursor_theme, cursor_size * swaynag->scale, swaynag->shm);
156 struct wl_cursor *cursor = 156 struct wl_cursor *cursor =
157 wl_cursor_theme_get_cursor(pointer->cursor_theme, "left_ptr"); 157 wl_cursor_theme_get_cursor(pointer->cursor_theme, "default");
158 pointer->cursor_image = cursor->images[0]; 158 pointer->cursor_image = cursor->images[0];
159 wl_surface_set_buffer_scale(pointer->cursor_surface, 159 wl_surface_set_buffer_scale(pointer->cursor_surface,
160 swaynag->scale); 160 swaynag->scale);