mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pointer-constraints: use proper wayland-scanner functions

Browse source
This commit is contained in:
emersion 2018-09-27 10:53:11 +02:00
parent 792b1f5cbf
commit d98181dab8
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/wlr/types/wlr_pointer_constraints_v1.h
View file

@ -85,6 +85,9 @@ struct wlr_pointer_constraint_v1 *
void wlr_pointer_constraint_v1_send_activated( void wlr_pointer_constraint_v1_send_activated(
struct wlr_pointer_constraint_v1 *constraint); struct wlr_pointer_constraint_v1 *constraint);
/**
* Deactivate the constraint. May destroy the constraint.
*/
void wlr_pointer_constraint_v1_send_deactivated( void wlr_pointer_constraint_v1_send_deactivated(
struct wlr_pointer_constraint_v1 *constraint); struct wlr_pointer_constraint_v1 *constraint);

23
types/wlr_pointer_constraints_v1.c
View file

@ -346,22 +346,27 @@ struct wlr_pointer_constraint_v1 *
return NULL; return NULL;
} }
// Thankfully zwp_confined_pointer_v1_send_{un,}confined work
// on both locked and confined pointer constraints.
void wlr_pointer_constraint_v1_send_activated( void wlr_pointer_constraint_v1_send_activated(
struct wlr_pointer_constraint_v1 *constraint) { struct wlr_pointer_constraint_v1 *constraint) {
wlr_log(WLR_DEBUG, "constrained %p", constraint); wlr_log(WLR_DEBUG, "constrained %p", constraint);
zwp_confined_pointer_v1_send_confined(constraint->resource); if (constraint->type == WLR_POINTER_CONSTRAINT_V1_LOCKED) {
zwp_locked_pointer_v1_send_locked(constraint->resource);
} else {
zwp_confined_pointer_v1_send_confined(constraint->resource);
}
} }
void wlr_pointer_constraint_v1_send_deactivated( void wlr_pointer_constraint_v1_send_deactivated(
struct wlr_pointer_constraint_v1 *constraint) { struct wlr_pointer_constraint_v1 *constraint) {
if (wl_resource_get_user_data(constraint->resource)) { wlr_log(WLR_DEBUG, "unconstrained %p", constraint);
wlr_log(WLR_DEBUG, "unconstrained %p", constraint); if (constraint->type == WLR_POINTER_CONSTRAINT_V1_LOCKED) {
zwp_locked_pointer_v1_send_unlocked(constraint->resource);
} else {
zwp_confined_pointer_v1_send_unconfined(constraint->resource); zwp_confined_pointer_v1_send_unconfined(constraint->resource);
if (constraint->lifetime == }
ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT) {
pointer_constraint_destroy(constraint); if (constraint->lifetime ==
} ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT) {
pointer_constraint_destroy(constraint);
} }
} }