mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-02-05 04:06:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

seat/pointer: add wl_pointer.warp event support

Browse source 
Add support for the wl_pointer.warp event from Wayland protocol version 11.
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/340

This allows the compositor to notify clients when the pointer position has
changed due to surface movement or compositor action, rather than input device
motion. This is useful for tracking cursor position across surface boundaries
and dynamic repositioning.
This commit is contained in:
Lu YaNing 2026-01-13 20:43:36 +08:00
parent 1f0fb95e3b
commit f175c2f592
5 changed files with 54 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
backend/wayland/pointer.c
View file

@ -211,6 +211,22 @@ static void pointer_handle_axis_relative_direction(void *data,
pointer->axis_relative_direction = direction;
}
static void pointer_handle_warp(void *data, struct wl_pointer *wl_pointer,
wl_fixed_t sx, wl_fixed_t sy) {
struct wlr_wl_seat *seat = data;
struct wlr_wl_pointer *pointer = seat->active_pointer;
if (pointer == NULL) {
return;
}
struct wlr_pointer_warp_event event = {
.pointer = &pointer->wlr_pointer,
.sx = wl_fixed_to_double(sx),
.sy = wl_fixed_to_double(sy),
};
wl_signal_emit_mutable(&pointer->wlr_pointer.events.warp, &event);
}
static const struct wl_pointer_listener pointer_listener = {
.enter = pointer_handle_enter,
.leave = pointer_handle_leave,
@ -223,6 +239,7 @@ static const struct wl_pointer_listener pointer_listener = {
.axis_discrete = pointer_handle_axis_discrete,
.axis_value120 = pointer_handle_axis_value120,
.axis_relative_direction = pointer_handle_axis_relative_direction,
.warp = pointer_handle_warp,
};
static void gesture_swipe_begin(void *data,

6
include/wlr/types/wlr_pointer.h
View file

@ -34,6 +34,7 @@ struct wlr_pointer {
struct wl_signal button; // struct wlr_pointer_button_event
struct wl_signal axis; // struct wlr_pointer_axis_event
struct wl_signal frame;
struct wl_signal warp; // struct wlr_pointer_warp_event
struct wl_signal swipe_begin; // struct wlr_pointer_swipe_begin_event
struct wl_signal swipe_update; // struct wlr_pointer_swipe_update_event
@ -82,7 +83,10 @@ struct wlr_pointer_axis_event {
double delta;
int32_t delta_discrete;
};
struct wlr_pointer_warp_event {
struct wlr_pointer *pointer;
double sx, sy;
};
struct wlr_pointer_swipe_begin_event {
struct wlr_pointer *pointer;
uint32_t time_msec;

9
include/wlr/types/wlr_seat.h
View file

@ -432,6 +432,15 @@ void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time_msec,
*/
void wlr_seat_pointer_send_frame(struct wlr_seat *wlr_seat);
/**
* Send a warp event to the surface with pointer focus. This notifies the client
* that the pointer location has changed due to surface movement or compositor
* action, rather than input device motion. Coordinates are surface-local.
* This function does not respect pointer grabs.
*/
void wlr_seat_pointer_send_warp(struct wlr_seat *wlr_seat,
double sx, double sy);
/**
* Notify the seat of a pointer enter event to the given surface and request it
* to be the focused surface for the pointer. Pass surface-local coordinates

2
types/seat/wlr_seat.c
View file

@ -11,7 +11,7 @@
#include "types/wlr_seat.h"
#include "util/global.h"
#define SEAT_VERSION 9
#define SEAT_VERSION 11
static void seat_handle_get_pointer(struct wl_client *client,
struct wl_resource *seat_resource, uint32_t id) {

22
types/seat/wlr_seat_pointer.c
View file

@ -410,6 +410,28 @@ void wlr_seat_pointer_send_frame(struct wlr_seat *wlr_seat) {
}
}
void wlr_seat_pointer_send_warp(struct wlr_seat *wlr_seat,
double sx, double sy) {
struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
if (client == NULL) {
return;
}
struct wl_resource *resource;
wl_resource_for_each(resource, &client->pointers) {
if (wlr_seat_client_from_pointer_resource(resource) == NULL) {
continue;
}
uint32_t version = wl_resource_get_version(resource);
if (version >= 11) { // WL_POINTER_WARP_SINCE_VERSION
wl_pointer_send_warp(resource,
wl_fixed_from_double(sx),
wl_fixed_from_double(sy));
}
}
}
void wlr_seat_pointer_start_grab(struct wlr_seat *wlr_seat,
struct wlr_seat_pointer_grab *grab) {
assert(wlr_seat);