aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-01-01 12:51:18 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-02-07 16:28:28 +0000
commit92ebe00927b4c9113d6921f2c70a3f609b8785a9 (patch)
treed48359c721fb615510faf788cd9d7c0d6b258346
parentMerge branch 'pipe-scrollback-crash' (diff)
render: call wl_cursor_theme_get_cursor() earlier
Before this patch, wl_cursor_theme_get_cursor() was called in the FDM hook, just before we’re about to update the mouse cursor “for real”. This relies on seat->pointer.xcursor still being valid. This is true as long as we’re only using our compiled-in static xcursor names, but not otherwise. Now, we call wl_cursor_theme_get_cursor() in render_xcursor_set(). At this point, we *know* seat->pointer.xcursor is valid. There is a slight chance of added overhead here, if the client application is switching mouse grabbing on/off rapidly. Before, the calls to wl_cursor_theme_get_cursor() would automatically be throttled. However, the main point of delaying the actual pointer update to the FDM hook is to throttle the *Wayland* calls. And this is still happening: wl_cursor_theme_get_cursor() is client-side only.
-rw-r--r--render.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/render.c b/render.c
index 953ec4da..7e8183df 100644
--- a/render.c
+++ b/render.c
@@ -3817,13 +3817,7 @@ render_xcursor_update(struct seat *seat)
return;
}
- seat->pointer.cursor = wl_cursor_theme_get_cursor(
- seat->pointer.theme, seat->pointer.xcursor);
-
- if (seat->pointer.cursor == NULL) {
- LOG_ERR("failed to load xcursor pointer '%s'", seat->pointer.xcursor);
- return;
- }
+ xassert(seat->pointer.cursor != NULL);
const int scale = seat->pointer.scale;
struct wl_cursor_image *image = seat->pointer.cursor->images[0];
@@ -4010,8 +4004,19 @@ render_xcursor_set(struct seat *seat, struct terminal *term, const char *xcursor
if (seat->pointer.xcursor == xcursor)
return true;
+ if (xcursor != XCURSOR_HIDDEN) {
+ seat->pointer.cursor = wl_cursor_theme_get_cursor(
+ seat->pointer.theme, xcursor);
+
+ if (seat->pointer.cursor == NULL) {
+ LOG_ERR("failed to load xcursor pointer '%s'", xcursor);
+ return false;
+ }
+ } else
+ seat->pointer.cursor = NULL;
+
/* FDM hook takes care of actual rendering */
- seat->pointer.xcursor_pending = true;
seat->pointer.xcursor = xcursor;
+ seat->pointer.xcursor_pending = true;
return true;
}