mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-08 10:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cursor: generalize seat->pressed

Browse source 
This commit moduralize seat_{set,reset}_pressed() into
cursor_context_save() so that we can also have seat->hovered later.
This commit is contained in:
tokyo4j 2025-11-21 01:25:19 +09:00 • committed by Hiroaki Yamamoto
parent 4fcb873f6f
commit acb3da7903
8 changed files with 97 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/input/cursor.c
View file

@ -437,8 +437,72 @@ cursor_update_image(struct seat *seat)
cursor_names[cursor]);
}
static void
clear_cursor_context(struct cursor_context_saved *saved_ctx)
{
if (saved_ctx->node_destroy.notify) {
wl_list_remove(&saved_ctx->node_destroy.link);
}
if (saved_ctx->surface_destroy.notify) {
wl_list_remove(&saved_ctx->surface_destroy.link);
}
if (saved_ctx->view_destroy.notify) {
wl_list_remove(&saved_ctx->view_destroy.link);
}
*saved_ctx = (struct cursor_context_saved) {0};
}
static void
handle_ctx_node_destroy(struct wl_listener *listener, void *data)
{
struct cursor_context_saved *saved_ctx =
wl_container_of(listener, saved_ctx, node_destroy);
clear_cursor_context(saved_ctx);
}
static void
handle_ctx_surface_destroy(struct wl_listener *listener, void *data)
{
struct cursor_context_saved *saved_ctx =
wl_container_of(listener, saved_ctx, surface_destroy);
clear_cursor_context(saved_ctx);
}
static void
handle_ctx_view_destroy(struct wl_listener *listener, void *data)
{
struct cursor_context_saved *saved_ctx =
wl_container_of(listener, saved_ctx, view_destroy);
clear_cursor_context(saved_ctx);
}
void
cursor_context_save(struct cursor_context_saved *saved_ctx,
const struct cursor_context *ctx)
{
assert(saved_ctx);
clear_cursor_context(saved_ctx);
if (!ctx) {
return;
}
saved_ctx->ctx = *ctx;
if (ctx->node) {
saved_ctx->node_destroy.notify = handle_ctx_node_destroy;
wl_signal_add(&ctx->node->events.destroy, &saved_ctx->node_destroy);
}
if (ctx->surface) {
saved_ctx->surface_destroy.notify = handle_ctx_surface_destroy;
wl_signal_add(&ctx->surface->events.destroy, &saved_ctx->surface_destroy);
}
if (ctx->view) {
saved_ctx->view_destroy.notify = handle_ctx_view_destroy;
wl_signal_add(&ctx->view->events.destroy, &saved_ctx->view_destroy);
}
}
static bool
update_pressed_surface(struct seat *seat, struct cursor_context *ctx)
update_pressed_surface(struct seat *seat, const struct cursor_context *ctx)
{
/*
* In most cases, we don't want to leave one surface and enter
@ -454,10 +518,10 @@ update_pressed_surface(struct seat *seat, struct cursor_context *ctx)
if (!wlr_seat_pointer_has_grab(seat->seat)) {
return false;
}
if (seat->pressed.surface && ctx->surface != seat->pressed.surface) {
if (seat->pressed.ctx.surface && ctx->surface != seat->pressed.ctx.surface) {
struct wlr_surface *toplevel = get_toplevel(ctx->surface);
if (toplevel && toplevel == get_toplevel(seat->pressed.surface)) {
seat_set_pressed(seat, ctx);
if (toplevel && toplevel == get_toplevel(seat->pressed.ctx.surface)) {
cursor_context_save(&seat->pressed, ctx);
return true;
}
}
@ -487,7 +551,7 @@ cursor_update_common(struct server *server, struct cursor_context *ctx,
}
/* TODO: verify drag_icon logic */
if (seat->pressed.surface && ctx->surface != seat->pressed.surface
if (seat->pressed.ctx.surface && ctx->surface != seat->pressed.ctx.surface
&& !update_pressed_surface(seat, ctx)
&& !seat->drag.active) {
if (cursor_has_moved) {
@ -499,7 +563,7 @@ cursor_update_common(struct server *server, struct cursor_context *ctx,
* if the cursor moves outside of the surface.
*/
int lx, ly;
wlr_scene_node_coords(seat->pressed.node, &lx, &ly);
wlr_scene_node_coords(seat->pressed.ctx.node, &lx, &ly);
*sx = server->seat.cursor->x - lx;
*sy = server->seat.cursor->y - ly;
return true;
@ -597,8 +661,8 @@ cursor_process_motion(struct server *server, uint32_t time, double *sx, double *
* moving/resizing the wrong view
*/
mousebind->pressed_in_context = false;
actions_run(seat->pressed.view, server,
&mousebind->actions, &seat->pressed);
actions_run(seat->pressed.ctx.view, server,
&mousebind->actions, &seat->pressed.ctx);
}
}
@ -1073,7 +1137,7 @@ cursor_process_button_press(struct seat *seat, uint32_t button, uint32_t time_ms
if (ctx.view || ctx.surface) {
/* Store cursor context for later action processing */
seat_set_pressed(seat, &ctx);
cursor_context_save(&seat->pressed, &ctx);
}
if (server->input_mode == LAB_INPUT_STATE_MENU) {
@ -1138,12 +1202,12 @@ cursor_process_button_release(struct seat *seat, uint32_t button,
{
struct server *server = seat->server;
struct cursor_context ctx = get_cursor_context(server);
struct wlr_surface *pressed_surface = seat->pressed.surface;
struct wlr_surface *pressed_surface = seat->pressed.ctx.surface;
/* Always notify button release event when it's not bound */
const bool notify = !lab_set_contains(&seat->bound_buttons, button);
seat_reset_pressed(seat);
cursor_context_save(&seat->pressed, NULL);
if (server->input_mode == LAB_INPUT_STATE_MENU) {
/* TODO: take into account overflow of time_msec */