aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2023-02-01 15:00:42 +0100
committerSimon Ser <contact@emersion.fr>2023-02-01 15:00:42 +0100
commit3668c9d86c866ec25048eb136701681c49bea62a (patch)
tree6b630bb069cdc62cdad8c1a6ea4846925a7760b5
parent4097eb20f33a19560ade52bfca8ca99161e9598c (diff)
examples, tinywl: use "default" cursor instead of "left_ptr"
"left_ptr" is the X11 name, "default" is the cursor spec name.
-rw-r--r--examples/layer-shell.c4
-rw-r--r--examples/multi-pointer.c4
-rw-r--r--examples/pointer.c6
-rw-r--r--include/wlr/xcursor.h2
-rw-r--r--tinywl/tinywl.c2
5 files changed, 9 insertions, 9 deletions
diff --git a/examples/layer-shell.c b/examples/layer-shell.c
index f2e0aaa7..5f86be8d 100644
--- a/examples/layer-shell.c
+++ b/examples/layer-shell.c
@@ -615,14 +615,14 @@ int main(int argc, char **argv) {
struct wl_cursor *cursor =
wl_cursor_theme_get_cursor(cursor_theme, "crosshair");
if (cursor == NULL) {
- cursor = wl_cursor_theme_get_cursor(cursor_theme, "left_ptr");
+ cursor = wl_cursor_theme_get_cursor(cursor_theme, "default");
}
assert(cursor);
cursor_image = cursor->images[0];
cursor = wl_cursor_theme_get_cursor(cursor_theme, "tcross");
if (cursor == NULL) {
- cursor = wl_cursor_theme_get_cursor(cursor_theme, "left_ptr");
+ cursor = wl_cursor_theme_get_cursor(cursor_theme, "default");
}
assert(cursor);
popup_cursor_image = cursor->images[0];
diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c
index 920ee0fc..ba742e19 100644
--- a/examples/multi-pointer.c
+++ b/examples/multi-pointer.c
@@ -298,9 +298,9 @@ int main(int argc, char *argv[]) {
wlr_log(WLR_ERROR, "Failed to load cursor theme");
return 1;
}
- state.xcursor = wlr_xcursor_theme_get_cursor(theme, "left_ptr");
+ state.xcursor = wlr_xcursor_theme_get_cursor(theme, "default");
if (!state.xcursor) {
- wlr_log(WLR_ERROR, "Failed to load left_ptr cursor");
+ wlr_log(WLR_ERROR, "Failed to load default cursor");
return 1;
}
diff --git a/examples/pointer.c b/examples/pointer.c
index db85b13a..cf096fd5 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -266,7 +266,7 @@ static void new_output_notify(struct wl_listener *listener, void *data) {
wlr_output_layout_add_auto(sample->layout, sample_output->output);
wlr_xcursor_manager_load(sample->xcursor_manager, output->scale);
- wlr_xcursor_manager_set_cursor_image(sample->xcursor_manager, "left_ptr",
+ wlr_xcursor_manager_set_cursor_image(sample->xcursor_manager, "default",
sample->cursor);
struct wlr_output_mode *mode = wlr_output_preferred_mode(output);
@@ -388,11 +388,11 @@ int main(int argc, char *argv[]) {
state.xcursor_manager = wlr_xcursor_manager_create("default", 24);
if (!state.xcursor_manager) {
- wlr_log(WLR_ERROR, "Failed to load left_ptr cursor");
+ wlr_log(WLR_ERROR, "Failed to load default cursor");
return 1;
}
- wlr_xcursor_manager_set_cursor_image(state.xcursor_manager, "left_ptr",
+ wlr_xcursor_manager_set_cursor_image(state.xcursor_manager, "default",
state.cursor);
clock_gettime(CLOCK_MONOTONIC, &state.last_frame);
diff --git a/include/wlr/xcursor.h b/include/wlr/xcursor.h
index d21025cc..bb75119b 100644
--- a/include/wlr/xcursor.h
+++ b/include/wlr/xcursor.h
@@ -105,7 +105,7 @@ struct wlr_xcursor_theme *wlr_xcursor_theme_load(const char *name, int size);
void wlr_xcursor_theme_destroy(struct wlr_xcursor_theme *theme);
/**
- * Obtain a cursor for the specified name (e.g. "left_ptr").
+ * Obtain a cursor for the specified name (e.g. "default").
*
* If the cursor could not be found, NULL is returned.
*/
diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
index af57284b..d3ff2d09 100644
--- a/tinywl/tinywl.c
+++ b/tinywl/tinywl.c
@@ -450,7 +450,7 @@ static void process_cursor_motion(struct tinywl_server *server, uint32_t time) {
* default. This is what makes the cursor image appear when you move it
* around the screen, not over any views. */
wlr_xcursor_manager_set_cursor_image(
- server->cursor_mgr, "left_ptr", server->cursor);
+ server->cursor_mgr, "default", server->cursor);
}
if (surface) {
/*