aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-06-27 14:57:33 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-07-03 12:36:32 +0000
commitee794a121e4603d01fb662ad6d1f3b18b6937d2c (patch)
tree704298b5e68dece52429d14237d6a857764cbbdb /render.c
parentwayland: handle enum value XDG_TOPLEVEL_STATE_SUSPENDED (diff)
refactor: track current xcursor using an enum, instead of a char pointer
Diffstat (limited to 'render.c')
-rw-r--r--render.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/render.c b/render.c
index 4498290e..fedc3467 100644
--- a/render.c
+++ b/render.c
@@ -4254,9 +4254,9 @@ render_xcursor_update(struct seat *seat)
if (!seat->mouse_focus)
return;
- xassert(seat->pointer.xcursor != NULL);
+ xassert(seat->pointer.shape != CURSOR_SHAPE_NONE);
- if (seat->pointer.xcursor == XCURSOR_HIDDEN) {
+ if (seat->pointer.shape == CURSOR_SHAPE_HIDDEN) {
/* Hide cursor */
wl_surface_attach(seat->pointer.surface.surf, NULL, 0, 0);
wl_surface_commit(seat->pointer.surface.surf);
@@ -4434,13 +4434,13 @@ render_refresh_urls(struct terminal *term)
}
bool
-render_xcursor_set(struct seat *seat, struct terminal *term, const char *xcursor)
+render_xcursor_set(struct seat *seat, struct terminal *term, enum cursor_shape shape)
{
if (seat->pointer.theme == NULL)
return false;
if (seat->mouse_focus == NULL) {
- seat->pointer.xcursor = NULL;
+ seat->pointer.shape = CURSOR_SHAPE_NONE;
return true;
}
@@ -4449,18 +4449,24 @@ render_xcursor_set(struct seat *seat, struct terminal *term, const char *xcursor
return true;
}
- if (seat->pointer.xcursor == xcursor)
+ if (seat->pointer.shape == shape)
return true;
- if (xcursor != XCURSOR_HIDDEN) {
+ if (shape != CURSOR_SHAPE_HIDDEN) {
+ const char *const xcursor = cursor_shape_to_string(shape);
+ const char *const fallback =
+ cursor_shape_to_string(CURSOR_SHAPE_TEXT_FALLBACK);
+
seat->pointer.cursor = wl_cursor_theme_get_cursor(
seat->pointer.theme, xcursor);
if (seat->pointer.cursor == NULL) {
seat->pointer.cursor = wl_cursor_theme_get_cursor(
- seat->pointer.theme, XCURSOR_TEXT_FALLBACK );
+ seat->pointer.theme, fallback);
+
if (seat->pointer.cursor == NULL) {
- LOG_ERR("failed to load xcursor pointer '%s', and fallback '%s'", xcursor, XCURSOR_TEXT_FALLBACK);
+ LOG_ERR("failed to load xcursor pointer "
+ "'%s', and fallback '%s'", xcursor, fallback);
return false;
}
}
@@ -4468,7 +4474,7 @@ render_xcursor_set(struct seat *seat, struct terminal *term, const char *xcursor
seat->pointer.cursor = NULL;
/* FDM hook takes care of actual rendering */
- seat->pointer.xcursor = xcursor;
+ seat->pointer.shape = shape;
seat->pointer.xcursor_pending = true;
return true;
}