alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2961 from RyanDwyer/swaylock-multiseat

Browse source 
Add multiseat support to swaylock
This commit is contained in:
emersion 2018-10-24 14:33:33 +02:00 committed by GitHub
parent bdb176863c 17bb39cd49
commit f2082a3d4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/swaylock/seat.h
View file

@ -10,6 +10,12 @@ struct swaylock_xkb {
struct xkb_keymap *keymap; struct xkb_keymap *keymap;
}; };
struct swaylock_seat {
struct swaylock_state *state;
struct wl_pointer *pointer;
struct wl_keyboard *keyboard;
};
extern const struct wl_seat_listener seat_listener; extern const struct wl_seat_listener seat_listener;
#endif #endif

2
include/swaylock/swaylock.h
View file

@ -62,8 +62,6 @@ struct swaylock_state {
struct wl_compositor *compositor; struct wl_compositor *compositor;
struct zwlr_layer_shell_v1 *layer_shell; struct zwlr_layer_shell_v1 *layer_shell;
struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager; struct zwlr_input_inhibit_manager_v1 *input_inhibit_manager;
struct wl_pointer *pointer;
struct wl_keyboard *keyboard;
struct wl_shm *shm; struct wl_shm *shm;
struct wl_list surfaces; struct wl_list surfaces;
struct wl_list images; struct wl_list images;

5
swaylock/main.c
View file

@ -279,7 +279,10 @@ static void handle_global(void *data, struct wl_registry *registry,
} else if (strcmp(interface, wl_seat_interface.name) == 0) { } else if (strcmp(interface, wl_seat_interface.name) == 0) {
struct wl_seat *seat = wl_registry_bind( struct wl_seat *seat = wl_registry_bind(
registry, name, &wl_seat_interface, 3); registry, name, &wl_seat_interface, 3);
wl_seat_add_listener(seat, &seat_listener, state); struct swaylock_seat *swaylock_seat =
calloc(1, sizeof(struct swaylock_seat));
swaylock_seat->state = state;
wl_seat_add_listener(seat, &seat_listener, swaylock_seat);
} else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
state->layer_shell = wl_registry_bind( state->layer_shell = wl_registry_bind(
registry, name, &zwlr_layer_shell_v1_interface, 1); registry, name, &zwlr_layer_shell_v1_interface, 1);

22
swaylock/seat.c
View file

@ -144,22 +144,22 @@ static const struct wl_pointer_listener pointer_listener = {
static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
enum wl_seat_capability caps) { enum wl_seat_capability caps) {
struct swaylock_state *state = data; struct swaylock_seat *seat = data;
if (state->pointer) { if (seat->pointer) {
wl_pointer_release(state->pointer); wl_pointer_release(seat->pointer);
state->pointer = NULL; seat->pointer = NULL;
} }
if (state->keyboard) { if (seat->keyboard) {
wl_keyboard_release(state->keyboard); wl_keyboard_release(seat->keyboard);
state->keyboard = NULL; seat->keyboard = NULL;
} }
if ((caps & WL_SEAT_CAPABILITY_POINTER)) { if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
state->pointer = wl_seat_get_pointer(wl_seat); seat->pointer = wl_seat_get_pointer(wl_seat);
wl_pointer_add_listener(state->pointer, &pointer_listener, NULL); wl_pointer_add_listener(seat->pointer, &pointer_listener, NULL);
} }
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
state->keyboard = wl_seat_get_keyboard(wl_seat); seat->keyboard = wl_seat_get_keyboard(wl_seat);
wl_keyboard_add_listener(state->keyboard, &keyboard_listener, state); wl_keyboard_add_listener(seat->keyboard, &keyboard_listener, seat->state);
} }
} }