nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 16:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

pointer-constraints-v1: use wlr_surface_synced

Browse Source
This commit is contained in:
Simon Ser 2023-12-08 13:58:44 +01:00
parent a6122c3ec5
commit 90e12fb978
2 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/wlr/types/wlr_pointer_constraints_v1.h
View File

@ -12,6 +12,7 @@
#include <stdint.h> #include <stdint.h>
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <pixman.h> #include <pixman.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_seat.h>
#include "pointer-constraints-unstable-v1-protocol.h" #include "pointer-constraints-unstable-v1-protocol.h"
@ -50,10 +51,6 @@ struct wlr_pointer_constraint_v1 {
struct wlr_pointer_constraint_v1_state current, pending; struct wlr_pointer_constraint_v1_state current, pending;
struct wl_listener surface_commit;
struct wl_listener surface_destroy;
struct wl_listener seat_destroy;
struct wl_list link; // wlr_pointer_constraints_v1.constraints struct wl_list link; // wlr_pointer_constraints_v1.constraints
struct { struct {
@ -66,6 +63,14 @@ struct wlr_pointer_constraint_v1 {
} events; } events;
void *data; void *data;
// private state
struct wl_listener surface_commit;
struct wl_listener surface_destroy;
struct wl_listener seat_destroy;
struct wlr_surface_synced synced;
}; };
struct wlr_pointer_constraints_v1 { struct wlr_pointer_constraints_v1 {

56
types/wlr_pointer_constraints_v1.c
View File

@ -48,6 +48,7 @@ static void pointer_constraint_destroy(struct wlr_pointer_constraint_v1 *constra
wl_signal_emit_mutable(&constraint->events.destroy, constraint); wl_signal_emit_mutable(&constraint->events.destroy, constraint);
wl_resource_set_user_data(constraint->resource, NULL); wl_resource_set_user_data(constraint->resource, NULL);
wlr_surface_synced_finish(&constraint->synced);
wl_list_remove(&constraint->link); wl_list_remove(&constraint->link);
wl_list_remove(&constraint->surface_commit.link); wl_list_remove(&constraint->surface_commit.link);
wl_list_remove(&constraint->surface_destroy.link); wl_list_remove(&constraint->surface_destroy.link);
@ -105,20 +106,6 @@ static void pointer_constraint_set_cursor_position_hint(struct wl_client *client
static void pointer_constraint_commit( static void pointer_constraint_commit(
struct wlr_pointer_constraint_v1 *constraint) { struct wlr_pointer_constraint_v1 *constraint) {
if (constraint->pending.committed &
WLR_POINTER_CONSTRAINT_V1_STATE_REGION) {
pixman_region32_copy(&constraint->current.region,
&constraint->pending.region);
}
if (constraint->pending.committed &
WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) {
constraint->current.cursor_hint = constraint->pending.cursor_hint;
}
constraint->current.committed = constraint->pending.committed;
bool updated_region = !!constraint->pending.committed;
constraint->pending.committed = 0;
pixman_region32_clear(&constraint->region); pixman_region32_clear(&constraint->region);
if (pixman_region32_not_empty(&constraint->current.region)) { if (pixman_region32_not_empty(&constraint->current.region)) {
pixman_region32_intersect(&constraint->region, pixman_region32_intersect(&constraint->region,
@ -128,7 +115,7 @@ static void pointer_constraint_commit(
&constraint->surface->input_region); &constraint->surface->input_region);
} }
if (updated_region) { if (constraint->current.committed & WLR_POINTER_CONSTRAINT_V1_STATE_REGION) {
wl_signal_emit_mutable(&constraint->events.set_region, NULL); wl_signal_emit_mutable(&constraint->events.set_region, NULL);
} }
} }
@ -165,6 +152,37 @@ static const struct zwp_locked_pointer_v1_interface locked_pointer_impl = {
.set_cursor_position_hint = pointer_constraint_set_cursor_position_hint, .set_cursor_position_hint = pointer_constraint_set_cursor_position_hint,
}; };
static void surface_synced_init_state(void *_state) {
struct wlr_pointer_constraint_v1_state *state = _state;
pixman_region32_init(&state->region);
}
static void surface_synced_finish_state(void *_state) {
struct wlr_pointer_constraint_v1_state *state = _state;
pixman_region32_fini(&state->region);
}
static void surface_synced_move_state(void *_dst, void *_src) {
struct wlr_pointer_constraint_v1_state *dst = _dst, *src = _src;
if (src->committed & WLR_POINTER_CONSTRAINT_V1_STATE_REGION) {
pixman_region32_copy(&dst->region, &src->region);
}
if (src->committed & WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) {
dst->cursor_hint = src->cursor_hint;
}
dst->committed = src->committed;
src->committed = 0;
}
static const struct wlr_surface_synced_impl surface_synced_impl = {
.state_size = sizeof(struct wlr_pointer_constraint_v1_state),
.init_state = surface_synced_init_state,
.finish_state = surface_synced_finish_state,
.move_state = surface_synced_move_state,
};
static void pointer_constraint_create(struct wl_client *client, static void pointer_constraint_create(struct wl_client *client,
struct wl_resource *pointer_constraints_resource, uint32_t id, struct wl_resource *pointer_constraints_resource, uint32_t id,
struct wl_resource *surface_resource, struct wl_resource *surface_resource,
@ -207,6 +225,14 @@ static void pointer_constraint_create(struct wl_client *client,
return; return;
} }
if (!wlr_surface_synced_init(&constraint->synced, surface,
&surface_synced_impl, &constraint->pending, &constraint->current)) {
free(constraint);
wl_resource_destroy(resource);
wl_client_post_no_memory(client);
return;
}
constraint->resource = resource; constraint->resource = resource;
constraint->surface = surface; constraint->surface = surface;
constraint->seat = seat; constraint->seat = seat;