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

seat: simplify keyboard grabs

Browse source
This commit is contained in:
Kirill Primak 2023-01-16 22:34:12 +03:00
parent a7ff2e1751
commit 65b97d6e8a
8 changed files with 70 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/types/wlr_seat.h
View file

@ -5,8 +5,8 @@
#include <wlr/types/wlr_seat.h>
extern const struct wlr_pointer_grab default_pointer_grab;
extern const struct wlr_keyboard_grab default_keyboard_grab;
extern const struct wlr_keyboard_grab_interface default_keyboard_grab_impl;
extern const struct wlr_touch_grab_interface default_touch_grab_impl;
void seat_client_create_pointer(struct wlr_seat_client *seat_client,

1
include/wlr/types/wlr_data_device.h
View file

@ -109,7 +109,6 @@ enum wlr_drag_grab_type {
struct wlr_drag {
enum wlr_drag_grab_type grab_type;
struct wlr_seat_keyboard_grab keyboard_grab;
struct wlr_seat_touch_grab touch_grab;
struct wlr_seat *seat;

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

@ -103,18 +103,14 @@ struct wlr_pointer_grab {
void (*cancel)(void *data);
};
struct wlr_seat_keyboard_grab;
struct wlr_keyboard_grab_interface {
void (*enter)(struct wlr_seat_keyboard_grab *grab,
struct wlr_surface *surface, uint32_t keycodes[],
size_t num_keycodes, struct wlr_keyboard_modifiers *modifiers);
void (*clear_focus)(struct wlr_seat_keyboard_grab *grab);
void (*key)(struct wlr_seat_keyboard_grab *grab, uint32_t time_msec,
uint32_t key, uint32_t state);
void (*modifiers)(struct wlr_seat_keyboard_grab *grab,
struct wlr_keyboard_modifiers *modifiers);
void (*cancel)(struct wlr_seat_keyboard_grab *grab);
struct wlr_keyboard_grab {
void (*enter)(void *data,
struct wlr_surface *surface, uint32_t keycodes[],
size_t num_keycodes, struct wlr_keyboard_modifiers *modifiers);
void (*clear_focus)(void *data);
void (*key)(void *data, uint32_t time_msec, uint32_t key, uint32_t state);
void (*modifiers)(void *data, struct wlr_keyboard_modifiers *modifiers);
void (*cancel)(void *data);
};
struct wlr_seat_touch_grab;
@ -146,16 +142,6 @@ struct wlr_seat_touch_grab {
void *data;
};
/**
* Passed to wlr_seat_keyboard_start_grab() to start a grab of the keyboard.
* The grabber is responsible for handling keyboard events for the seat.
*/
struct wlr_seat_keyboard_grab {
const struct wlr_keyboard_grab_interface *interface;
struct wlr_seat *seat;
void *data;
};
#define WLR_POINTER_BUTTONS_CAP 16
struct wlr_seat_pointer_state {
@ -197,8 +183,8 @@ struct wlr_seat_keyboard_state {
struct wl_listener surface_destroy;
struct wlr_seat_keyboard_grab *grab;
struct wlr_seat_keyboard_grab *default_grab;
const struct wlr_keyboard_grab *grab;
void *grab_data;
struct {
struct wl_signal focus_change; // struct wlr_seat_keyboard_focus_change_event
@ -550,7 +536,7 @@ void wlr_seat_keyboard_notify_clear_focus(struct wlr_seat *wlr_seat);
* handling all keyboard events until the grab ends.
*/
void wlr_seat_keyboard_start_grab(struct wlr_seat *wlr_seat,
struct wlr_seat_keyboard_grab *grab);
const struct wlr_keyboard_grab *grab, void *data);
/**
* End the grab of the keyboard of this seat. This reverts the grab back to the

1
include/wlr/types/wlr_xdg_shell.h
View file

@ -117,7 +117,6 @@ struct wlr_xdg_popup {
// each seat gets a popup grab
struct wlr_xdg_popup_grab {
struct wl_client *client;
struct wlr_seat_keyboard_grab keyboard_grab;
struct wlr_seat_touch_grab touch_grab;
struct wlr_seat *seat;
struct wl_list popups;

20
types/data_device/wlr_drag.c
View file

@ -309,35 +309,34 @@ static const struct wlr_touch_grab_interface
.cancel = drag_handle_touch_cancel,
};
static void drag_handle_keyboard_enter(struct wlr_seat_keyboard_grab *grab,
static void drag_handle_keyboard_enter(void *data,
struct wlr_surface *surface, uint32_t keycodes[], size_t num_keycodes,
struct wlr_keyboard_modifiers *modifiers) {
// nothing has keyboard focus during drags
}
static void drag_handle_keyboard_clear_focus(struct wlr_seat_keyboard_grab *grab) {
static void drag_handle_keyboard_clear_focus(void *data) {
// nothing has keyboard focus during drags
}
static void drag_handle_keyboard_key(struct wlr_seat_keyboard_grab *grab,
static void drag_handle_keyboard_key(void *data,
uint32_t time, uint32_t key, uint32_t state) {
// no keyboard input during drags
}
static void drag_handle_keyboard_modifiers(struct wlr_seat_keyboard_grab *grab,
static void drag_handle_keyboard_modifiers(void *data,
struct wlr_keyboard_modifiers *modifiers) {
//struct wlr_keyboard *keyboard = grab->seat->keyboard_state.keyboard;
// TODO change the dnd action based on what modifier is pressed on the
// keyboard
}
static void drag_handle_keyboard_cancel(struct wlr_seat_keyboard_grab *grab) {
struct wlr_drag *drag = grab->data;
static void drag_handle_keyboard_cancel(void *data) {
struct wlr_drag *drag = data;
drag_destroy(drag);
}
static const struct wlr_keyboard_grab_interface
data_device_keyboard_drag_interface = {
static const struct wlr_keyboard_grab drag_keyboard_grab = {
.enter = drag_handle_keyboard_enter,
.clear_focus = drag_handle_keyboard_clear_focus,
.key = drag_handle_keyboard_key,
@ -438,9 +437,6 @@ struct wlr_drag *wlr_drag_create(struct wlr_seat_client *seat_client,
drag->touch_grab.data = drag;
drag->touch_grab.interface = &data_device_touch_drag_interface;
drag->keyboard_grab.data = drag;
drag->keyboard_grab.interface = &data_device_keyboard_drag_interface;
return drag;
}
@ -476,7 +472,7 @@ void wlr_seat_start_drag(struct wlr_seat *seat, struct wlr_drag *drag,
assert(!drag->started);
drag->started = true;
wlr_seat_keyboard_start_grab(seat, &drag->keyboard_grab);
wlr_seat_keyboard_start_grab(seat, &drag_keyboard_grab, drag);
seat->drag = drag;
seat->drag_serial = serial;

17
types/seat/wlr_seat.c
View file

@ -211,7 +211,6 @@ void wlr_seat_destroy(struct wlr_seat *seat) {
}
wlr_global_destroy_safe(seat->global);
free(seat->keyboard_state.default_grab);
free(seat->touch_state.default_grab);
free(seat->name);
free(seat);
@ -239,27 +238,18 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) {
wl_signal_init(&seat->pointer_state.events.focus_change);
// keyboard state
struct wlr_seat_keyboard_grab *keyboard_grab =
calloc(1, sizeof(struct wlr_seat_keyboard_grab));
if (!keyboard_grab) {
free(seat);
return NULL;
}
keyboard_grab->interface = &default_keyboard_grab_impl;
keyboard_grab->seat = seat;
seat->keyboard_state.default_grab = keyboard_grab;
seat->keyboard_state.grab = keyboard_grab;
seat->keyboard_state.seat = seat;
wl_list_init(&seat->keyboard_state.surface_destroy.link);
seat->keyboard_state.grab = &default_keyboard_grab;
seat->keyboard_state.grab_data = seat;
wl_signal_init(&seat->keyboard_state.events.focus_change);
// touch state
struct wlr_seat_touch_grab *touch_grab =
calloc(1, sizeof(struct wlr_seat_touch_grab));
if (!touch_grab) {
free(keyboard_grab);
free(seat);
return NULL;
}
@ -275,7 +265,6 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) {
SEAT_VERSION, seat, seat_handle_bind);
if (seat->global == NULL) {
free(touch_grab);
free(keyboard_grab);
free(seat);
return NULL;
}

63
types/seat/wlr_seat_keyboard.c
View file

@ -9,31 +9,31 @@
#include "types/wlr_data_device.h"
#include "types/wlr_seat.h"
static void default_keyboard_enter(struct wlr_seat_keyboard_grab *grab,
static void default_keyboard_enter(void *data,
struct wlr_surface *surface, uint32_t keycodes[], size_t num_keycodes,
struct wlr_keyboard_modifiers *modifiers) {
wlr_seat_keyboard_enter(grab->seat, surface, keycodes, num_keycodes, modifiers);
wlr_seat_keyboard_enter(data, surface, keycodes, num_keycodes, modifiers);
}
static void default_keyboard_clear_focus(struct wlr_seat_keyboard_grab *grab) {
wlr_seat_keyboard_clear_focus(grab->seat);
static void default_keyboard_clear_focus(void *data) {
wlr_seat_keyboard_clear_focus(data);
}
static void default_keyboard_key(struct wlr_seat_keyboard_grab *grab,
static void default_keyboard_key(void *data,
uint32_t time, uint32_t key, uint32_t state) {
wlr_seat_keyboard_send_key(grab->seat, time, key, state);
wlr_seat_keyboard_send_key(data, time, key, state);
}
static void default_keyboard_modifiers(struct wlr_seat_keyboard_grab *grab,
static void default_keyboard_modifiers(void *data,
struct wlr_keyboard_modifiers *modifiers) {
wlr_seat_keyboard_send_modifiers(grab->seat, modifiers);
wlr_seat_keyboard_send_modifiers(data, modifiers);
}
static void default_keyboard_cancel(struct wlr_seat_keyboard_grab *grab) {
static void default_keyboard_cancel(void *data) {
// cannot be cancelled
}
const struct wlr_keyboard_grab_interface default_keyboard_grab_impl = {
const struct wlr_keyboard_grab default_keyboard_grab = {
.enter = default_keyboard_enter,
.clear_focus = default_keyboard_clear_focus,
.key = default_keyboard_key,
@ -41,7 +41,6 @@ const struct wlr_keyboard_grab_interface default_keyboard_grab_impl = {
.cancel = default_keyboard_cancel,
};
static void keyboard_release(struct wl_client *client,
struct wl_resource *resource) {
wl_resource_destroy(resource);
@ -63,7 +62,6 @@ static void keyboard_handle_resource_destroy(struct wl_resource *resource) {
seat_client_destroy_keyboard(resource);
}
void wlr_seat_keyboard_send_key(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t key, uint32_t state) {
struct wlr_seat_client *client = wlr_seat->keyboard_state.focused_client;
@ -163,21 +161,24 @@ struct wlr_keyboard *wlr_seat_get_keyboard(struct wlr_seat *seat) {
}
void wlr_seat_keyboard_start_grab(struct wlr_seat *wlr_seat,
struct wlr_seat_keyboard_grab *grab) {
grab->seat = wlr_seat;
const struct wlr_keyboard_grab *grab, void *data) {
wlr_seat->keyboard_state.grab = grab;
wlr_seat->keyboard_state.grab_data = data;
wl_signal_emit_mutable(&wlr_seat->events.keyboard_grab_begin, grab);
wl_signal_emit_mutable(&wlr_seat->events.keyboard_grab_begin, NULL);
}
void wlr_seat_keyboard_end_grab(struct wlr_seat *wlr_seat) {
struct wlr_seat_keyboard_grab *grab = wlr_seat->keyboard_state.grab;
const struct wlr_keyboard_grab *grab = wlr_seat->keyboard_state.grab;
void *grab_data = wlr_seat->keyboard_state.grab_data;
if (grab != wlr_seat->keyboard_state.default_grab) {
wlr_seat->keyboard_state.grab = wlr_seat->keyboard_state.default_grab;
wl_signal_emit_mutable(&wlr_seat->events.keyboard_grab_end, grab);
if (grab->interface->cancel) {
grab->interface->cancel(grab);
if (grab != &default_keyboard_grab) {
wlr_seat->keyboard_state.grab = &default_keyboard_grab;
wlr_seat->keyboard_state.grab_data = wlr_seat;
wl_signal_emit_mutable(&wlr_seat->events.keyboard_grab_end, NULL);
if (grab->cancel) {
grab->cancel(grab_data);
}
}
}
@ -311,8 +312,9 @@ void wlr_seat_keyboard_notify_enter(struct wlr_seat *seat,
// NULL surfaces are prohibited in the grab-compatible API. Use
// wlr_seat_keyboard_notify_clear_focus() instead.
assert(surface);
struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab;
grab->interface->enter(grab, surface, keycodes, num_keycodes, modifiers);
struct wlr_seat_keyboard_state *keyboard_state = &seat->keyboard_state;
keyboard_state->grab->enter(keyboard_state->grab_data,
surface, keycodes, num_keycodes, modifiers);
}
void wlr_seat_keyboard_clear_focus(struct wlr_seat *seat) {
@ -320,29 +322,28 @@ void wlr_seat_keyboard_clear_focus(struct wlr_seat *seat) {
}
void wlr_seat_keyboard_notify_clear_focus(struct wlr_seat *seat) {
struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab;
grab->interface->clear_focus(grab);
struct wlr_seat_keyboard_state *keyboard_state = &seat->keyboard_state;
keyboard_state->grab->clear_focus(keyboard_state->grab_data);
}
bool wlr_seat_keyboard_has_grab(struct wlr_seat *seat) {
return seat->keyboard_state.grab->interface != &default_keyboard_grab_impl;
return seat->keyboard_state.grab != &default_keyboard_grab;
}
void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat,
struct wlr_keyboard_modifiers *modifiers) {
clock_gettime(CLOCK_MONOTONIC, &seat->last_event);
struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab;
grab->interface->modifiers(grab, modifiers);
struct wlr_seat_keyboard_state *keyboard_state = &seat->keyboard_state;
keyboard_state->grab->modifiers(keyboard_state->grab_data, modifiers);
}
void wlr_seat_keyboard_notify_key(struct wlr_seat *seat, uint32_t time,
uint32_t key, uint32_t state) {
clock_gettime(CLOCK_MONOTONIC, &seat->last_event);
struct wlr_seat_keyboard_grab *grab = seat->keyboard_state.grab;
grab->interface->key(grab, time, key, state);
struct wlr_seat_keyboard_state *keyboard_state = &seat->keyboard_state;
keyboard_state->grab->key(keyboard_state->grab_data, time, key, state);
}
static void seat_client_send_keymap(struct wlr_seat_client *client,
struct wlr_keyboard *keyboard) {
if (!keyboard) {

29
types/xdg_shell/wlr_xdg_popup.c
View file

@ -110,31 +110,34 @@ static const struct wlr_pointer_grab xdg_pointer_grab = {
.frame = xdg_pointer_grab_frame,
};
static void xdg_keyboard_grab_enter(struct wlr_seat_keyboard_grab *grab,
static void xdg_keyboard_grab_enter(void *data,
struct wlr_surface *surface, uint32_t keycodes[], size_t num_keycodes,
struct wlr_keyboard_modifiers *modifiers) {
// keyboard focus should remain on the popup
}
static void xdg_keyboard_grab_clear_focus(struct wlr_seat_keyboard_grab *grab) {
static void xdg_keyboard_grab_clear_focus(void *data) {
// keyboard focus should remain on the popup
}
static void xdg_keyboard_grab_key(struct wlr_seat_keyboard_grab *grab, uint32_t time,
static void xdg_keyboard_grab_key(void *data, uint32_t time,
uint32_t key, uint32_t state) {
wlr_seat_keyboard_send_key(grab->seat, time, key, state);
struct wlr_xdg_popup_grab *popup_grab = data;
wlr_seat_keyboard_send_key(popup_grab->seat, time, key, state);
}
static void xdg_keyboard_grab_modifiers(struct wlr_seat_keyboard_grab *grab,
static void xdg_keyboard_grab_modifiers(void *data,
struct wlr_keyboard_modifiers *modifiers) {
wlr_seat_keyboard_send_modifiers(grab->seat, modifiers);
struct wlr_xdg_popup_grab *popup_grab = data;
wlr_seat_keyboard_send_modifiers(popup_grab->seat, modifiers);
}
static void xdg_keyboard_grab_cancel(struct wlr_seat_keyboard_grab *grab) {
wlr_seat_pointer_end_grab(grab->seat);
static void xdg_keyboard_grab_cancel(void *data) {
struct wlr_xdg_popup_grab *popup_grab = data;
wlr_seat_pointer_end_grab(popup_grab->seat);
}
static const struct wlr_keyboard_grab_interface xdg_keyboard_grab_impl = {
static const struct wlr_keyboard_grab xdg_keyboard_grab = {
.enter = xdg_keyboard_grab_enter,
.clear_focus = xdg_keyboard_grab_clear_focus,
.key = xdg_keyboard_grab_key,
@ -224,8 +227,6 @@ static struct wlr_xdg_popup_grab *get_xdg_shell_popup_grab_from_seat(
return NULL;
}
xdg_grab->keyboard_grab.data = xdg_grab;
xdg_grab->keyboard_grab.interface = &xdg_keyboard_grab_impl;
xdg_grab->touch_grab.data = xdg_grab;
xdg_grab->touch_grab.interface = &xdg_touch_grab_impl;
@ -301,9 +302,9 @@ static void xdg_popup_handle_grab(struct wl_client *client,
wlr_seat_pointer_start_grab(seat_client->seat,
&xdg_pointer_grab, popup_grab);
wlr_seat_keyboard_start_grab(seat_client->seat,
&popup_grab->keyboard_grab);
&xdg_keyboard_grab, popup_grab);
wlr_seat_touch_start_grab(seat_client->seat,
&popup_grab->touch_grab);
}
@ -441,7 +442,7 @@ void unmap_xdg_popup(struct wlr_xdg_popup *popup) {
if (grab->seat->pointer_state.grab == &xdg_pointer_grab) {
wlr_seat_pointer_end_grab(grab->seat);
}
if (grab->seat->keyboard_state.grab == &grab->keyboard_grab) {
if (grab->seat->keyboard_state.grab == &xdg_keyboard_grab) {
wlr_seat_keyboard_end_grab(grab->seat);
}
if (grab->seat->touch_state.grab == &grab->touch_grab) {