mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-30 00:15:58 +01:00
rootston: request set cursor
This commit is contained in:
parent
992f931ae9
commit
428bf18ec7
4 changed files with 48 additions and 11 deletions
|
@ -53,6 +53,11 @@ struct roots_cursor {
|
|||
|
||||
struct wl_listener tool_axis;
|
||||
struct wl_listener tool_tip;
|
||||
|
||||
struct wl_listener pointer_grab_begin;
|
||||
struct wl_listener pointer_grab_end;
|
||||
|
||||
struct wl_listener request_set_cursor;
|
||||
};
|
||||
|
||||
struct roots_cursor *roots_cursor_create(struct roots_seat *seat);
|
||||
|
@ -86,4 +91,7 @@ void roots_cursor_handle_tool_axis(struct roots_cursor *cursor,
|
|||
void roots_cursor_handle_tool_tip(struct roots_cursor *cursor,
|
||||
struct wlr_event_tablet_tool_tip *event);
|
||||
|
||||
void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
|
||||
struct wlr_seat_pointer_request_set_cursor_event *event);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -17,11 +17,6 @@ struct roots_input {
|
|||
struct wl_listener input_remove;
|
||||
|
||||
struct wl_list seats;
|
||||
|
||||
struct wl_listener pointer_grab_begin;
|
||||
struct wl_listener pointer_grab_end;
|
||||
|
||||
struct wl_listener request_set_cursor;
|
||||
};
|
||||
|
||||
struct roots_input *input_create(struct roots_server *server,
|
||||
|
|
|
@ -281,3 +281,24 @@ void roots_cursor_handle_tool_tip(struct roots_cursor *cursor,
|
|||
roots_cursor_press_button(cursor, event->device,
|
||||
event->time_msec, BTN_LEFT, event->state);
|
||||
}
|
||||
|
||||
void roots_cursor_handle_request_set_cursor(struct roots_cursor *cursor,
|
||||
struct wlr_seat_pointer_request_set_cursor_event *event) {
|
||||
struct wlr_surface *focused_surface =
|
||||
event->seat_client->seat->pointer_state.focused_surface;
|
||||
bool has_focused = focused_surface != NULL && focused_surface->resource != NULL;
|
||||
struct wl_client *focused_client = NULL;
|
||||
if (has_focused) {
|
||||
focused_client = wl_resource_get_client(focused_surface->resource);
|
||||
}
|
||||
if (event->seat_client->client != focused_client ||
|
||||
cursor->mode != ROOTS_CURSOR_PASSTHROUGH) {
|
||||
wlr_log(L_DEBUG, "Denying request to set cursor from unfocused client");
|
||||
return;
|
||||
}
|
||||
|
||||
wlr_log(L_DEBUG, "Setting client cursor");
|
||||
wlr_cursor_set_surface(cursor->cursor, event->surface, event->hotspot_x,
|
||||
event->hotspot_y);
|
||||
cursor->cursor_client = event->seat_client->client;
|
||||
}
|
||||
|
|
|
@ -89,6 +89,14 @@ static void handle_tool_tip(struct wl_listener *listener, void *data) {
|
|||
roots_cursor_handle_tool_tip(cursor, event);
|
||||
}
|
||||
|
||||
static void handle_request_set_cursor(struct wl_listener *listener,
|
||||
void *data) {
|
||||
struct roots_cursor *cursor =
|
||||
wl_container_of(listener, cursor, request_set_cursor);
|
||||
struct wlr_seat_pointer_request_set_cursor_event *event = data;
|
||||
roots_cursor_handle_request_set_cursor(cursor, event);
|
||||
}
|
||||
|
||||
static void seat_reset_device_mappings(struct roots_seat *seat, struct wlr_input_device *device) {
|
||||
struct wlr_cursor *cursor = seat->cursor->cursor;
|
||||
struct roots_config *config = seat->input->config;
|
||||
|
@ -224,6 +232,10 @@ static void roots_seat_init_cursor(struct roots_seat *seat) {
|
|||
|
||||
wl_signal_add(&wlr_cursor->events.tablet_tool_tip, &seat->cursor->tool_tip);
|
||||
seat->cursor->tool_tip.notify = handle_tool_tip;
|
||||
|
||||
wl_signal_add(&seat->seat->events.request_set_cursor,
|
||||
&seat->cursor->request_set_cursor);
|
||||
seat->cursor->request_set_cursor.notify = handle_request_set_cursor;
|
||||
}
|
||||
|
||||
struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {
|
||||
|
@ -240,12 +252,6 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {
|
|||
|
||||
seat->input = input;
|
||||
|
||||
roots_seat_init_cursor(seat);
|
||||
if (!seat->cursor) {
|
||||
free(seat);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
seat->seat = wlr_seat_create(input->server->wl_display, name);
|
||||
if (!seat->seat) {
|
||||
free(seat);
|
||||
|
@ -253,6 +259,13 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name) {
|
|||
return NULL;
|
||||
}
|
||||
|
||||
roots_seat_init_cursor(seat);
|
||||
if (!seat->cursor) {
|
||||
wlr_seat_destroy(seat->seat);
|
||||
free(seat);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
wlr_seat_set_capabilities(seat->seat,
|
||||
WL_SEAT_CAPABILITY_KEYBOARD |
|
||||
WL_SEAT_CAPABILITY_POINTER |
|
||||
|
|
Loading…
Reference in a new issue