aboutsummaryrefslogtreecommitdiff
path: root/wayland.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-01-04 21:01:19 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-01-04 21:58:32 +0000
commit5ec447697c7548fc7930031077e821fd1e26b2f9 (patch)
treec03edfcda2c61eda425644803bc6dbf22bec086f /wayland.c
parentinput: scroll: call term_mouse_up() once, after all term_mouse_down() (diff)
render: throttle xcursor updates
With a bad behaving client (e.g. 'less' with mouse support enabled), we can end up with a *lot* of xcursor updates (so much, that we flooded the wayland socket before we implemented a blocking wayl_flush()). Since there's little point in updating the cursor more than once per frame interval, use frame callbacks to throttle the updates. This works more or lesslike normal terminal refreshes: render_xcursor_set() stores the last terminal (window) that had (and updated) the cursor. The renderer's FDM hook checks if we have such a pending terminal set, and if so, tries to refresh the cursor. This is done by first checking if we're already waiting for a callback from a previous cursor update, and if so we do nothing; the callback will update the cursor for the next frame. If we're *not* already waiting for a callback, we update the cursor immediately.
Diffstat (limited to 'wayland.c')
-rw-r--r--wayland.c57
1 files changed, 6 insertions, 51 deletions
diff --git a/wayland.c b/wayland.c
index 6e4bb638..b8edd505 100644
--- a/wayland.c
+++ b/wayland.c
@@ -32,7 +32,7 @@
#define max(x, y) ((x) > (y) ? (x) : (y))
static bool wayl_reload_cursor_theme(
- struct wayland *wayl, const struct terminal *term);
+ struct wayland *wayl, struct terminal *term);
static void
shm_format(void *data, struct wl_shm *wl_shm, uint32_t format)
@@ -769,6 +769,9 @@ wayl_destroy(struct wayland *wayl)
tll_remove(wayl->monitors, it);
}
+ if (wayl->pointer.xcursor_callback != NULL)
+ wl_callback_destroy(wayl->pointer.xcursor_callback);
+
if (wayl->xdg_output_manager != NULL)
zxdg_output_manager_v1_destroy(wayl->xdg_output_manager);
if (wayl->shell != NULL)
@@ -940,56 +943,8 @@ wayl_win_destroy(struct wl_window *win)
free(win);
}
-bool
-wayl_cursor_set(struct wayland *wayl, const struct terminal *term)
-{
- if (wayl->pointer.theme == NULL)
- return false;
-
- if (wayl->mouse_focus == NULL) {
- wayl->pointer.xcursor = NULL;
- return true;
- }
-
- if (wayl->mouse_focus != term) {
- /* This terminal doesn't have mouse focus */
- return true;
- }
-
- if (wayl->pointer.xcursor == term->xcursor)
- return true;
-
- wayl->pointer.cursor = wl_cursor_theme_get_cursor(wayl->pointer.theme, term->xcursor);
- if (wayl->pointer.cursor == NULL) {
- LOG_ERR("%s: failed to load xcursor pointer '%s'",
- wayl->pointer.theme_name, term->xcursor);
- return false;
- }
-
- wayl->pointer.xcursor = term->xcursor;
-
- const int scale = term->scale;
- struct wl_cursor_image *image = wayl->pointer.cursor->images[0];
-
- wl_surface_attach(
- wayl->pointer.surface, wl_cursor_image_get_buffer(image), 0, 0);
-
- wl_pointer_set_cursor(
- wayl->pointer.pointer, wayl->pointer.serial,
- wayl->pointer.surface,
- image->hotspot_x / scale, image->hotspot_y / scale);
-
- wl_surface_damage_buffer(
- wayl->pointer.surface, 0, 0, INT32_MAX, INT32_MAX);
-
- wl_surface_set_buffer_scale(wayl->pointer.surface, scale);
- wl_surface_commit(wayl->pointer.surface);
- wayl_flush(wayl);
- return true;
-}
-
static bool
-wayl_reload_cursor_theme(struct wayland *wayl, const struct terminal *term)
+wayl_reload_cursor_theme(struct wayland *wayl, struct terminal *term)
{
if (wayl->pointer.size == 0)
return true;
@@ -1011,7 +966,7 @@ wayl_reload_cursor_theme(struct wayland *wayl, const struct terminal *term)
return false;
}
- return wayl_cursor_set(wayl, term);
+ return render_xcursor_set(term);
}
struct terminal *