mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2771 from RyanDwyer/swaylock-seat-capabilities

Browse source 
swaylock: Support keyboard and pointer disconnects and reconnects
This commit is contained in:
Drew DeVault 2018-10-06 01:51:35 +02:00 • committed by GitHub
commit 5d21c33f13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/swaylock/swaylock.h
View file

@ -58,6 +58,8 @@ 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;

2
swaylock/main.c
View file

@ -277,7 +277,7 @@ static void handle_global(void *data, struct wl_registry *registry,
&wl_shm_interface, 1); &wl_shm_interface, 1);
} 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, 1); registry, name, &wl_seat_interface, 3);
wl_seat_add_listener(seat, &seat_listener, state); wl_seat_add_listener(seat, &seat_listener, state);
} 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(

16
swaylock/seat.c
View file

@ -145,13 +145,21 @@ 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_state *state = data;
if (state->pointer) {
wl_pointer_release(state->pointer);
state->pointer = NULL;
}
if (state->keyboard) {
wl_keyboard_release(state->keyboard);
state->keyboard = NULL;
}
if ((caps & WL_SEAT_CAPABILITY_POINTER)) { if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
struct wl_pointer *pointer = wl_seat_get_pointer(wl_seat); state->pointer = wl_seat_get_pointer(wl_seat);
wl_pointer_add_listener(pointer, &pointer_listener, NULL); wl_pointer_add_listener(state->pointer, &pointer_listener, NULL);
} }
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) { if ((caps & WL_SEAT_CAPABILITY_KEYBOARD)) {
struct wl_keyboard *keyboard = wl_seat_get_keyboard(wl_seat); state->keyboard = wl_seat_get_keyboard(wl_seat);
wl_keyboard_add_listener(keyboard, &keyboard_listener, state); wl_keyboard_add_listener(state->keyboard, &keyboard_listener, state);
} }
} }