mirror of
https://github.com/swaywm/sway.git
synced 2024-11-23 08:21:28 +00:00
Merge pull request #1660 from emersion/client-cursors
Handle set_cursor requests from clients
This commit is contained in:
commit
70d9dc0b9e
|
@ -9,6 +9,7 @@ struct sway_cursor {
|
||||||
struct wlr_xcursor_manager *xcursor_manager;
|
struct wlr_xcursor_manager *xcursor_manager;
|
||||||
|
|
||||||
double x, y;
|
double x, y;
|
||||||
|
struct wl_client *image_client;
|
||||||
|
|
||||||
struct wl_listener motion;
|
struct wl_listener motion;
|
||||||
struct wl_listener motion_absolute;
|
struct wl_listener motion_absolute;
|
||||||
|
|
|
@ -81,6 +81,18 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
|
||||||
struct sway_container *cont =
|
struct sway_container *cont =
|
||||||
container_at_cursor(cursor, &surface, &sx, &sy);
|
container_at_cursor(cursor, &surface, &sx, &sy);
|
||||||
|
|
||||||
|
// reset cursor if switching between clients
|
||||||
|
struct wl_client *client = NULL;
|
||||||
|
if (surface != NULL) {
|
||||||
|
client = wl_resource_get_client(surface->resource);
|
||||||
|
}
|
||||||
|
if (client != cursor->image_client) {
|
||||||
|
wlr_xcursor_manager_set_cursor_image(cursor->xcursor_manager,
|
||||||
|
"left_ptr", cursor->cursor);
|
||||||
|
cursor->image_client = client;
|
||||||
|
}
|
||||||
|
|
||||||
|
// send pointer enter/leave
|
||||||
if (cont != NULL && surface != NULL) {
|
if (cont != NULL && surface != NULL) {
|
||||||
wlr_seat_pointer_notify_enter(seat, surface, sx, sy);
|
wlr_seat_pointer_notify_enter(seat, surface, sx, sy);
|
||||||
wlr_seat_pointer_notify_motion(seat, time, sx, sy);
|
wlr_seat_pointer_notify_motion(seat, time, sx, sy);
|
||||||
|
@ -167,7 +179,24 @@ static void handle_request_set_cursor(struct wl_listener *listener,
|
||||||
struct sway_cursor *cursor =
|
struct sway_cursor *cursor =
|
||||||
wl_container_of(listener, cursor, request_set_cursor);
|
wl_container_of(listener, cursor, request_set_cursor);
|
||||||
struct wlr_seat_pointer_request_set_cursor_event *event = data;
|
struct wlr_seat_pointer_request_set_cursor_event *event = data;
|
||||||
wlr_log(L_DEBUG, "TODO: handle request set cursor event: %p", event);
|
|
||||||
|
struct wl_client *focused_client = NULL;
|
||||||
|
struct wlr_surface *focused_surface =
|
||||||
|
cursor->seat->wlr_seat->pointer_state.focused_surface;
|
||||||
|
if (focused_surface != NULL) {
|
||||||
|
focused_client = wl_resource_get_client(focused_surface->resource);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: check cursor mode
|
||||||
|
if (focused_client == NULL ||
|
||||||
|
event->seat_client->client != focused_client) {
|
||||||
|
wlr_log(L_DEBUG, "denying request to set cursor from unfocused client");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
wlr_cursor_set_surface(cursor->cursor, event->surface, event->hotspot_x,
|
||||||
|
event->hotspot_y);
|
||||||
|
cursor->image_client = focused_client;
|
||||||
}
|
}
|
||||||
|
|
||||||
void sway_cursor_destroy(struct sway_cursor *cursor) {
|
void sway_cursor_destroy(struct sway_cursor *cursor) {
|
||||||
|
|
Loading…
Reference in a new issue