mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2778 from emersion/swaybar-seat-pointer

Browse source 
swaybar: fix binding to wl_pointer multiple times
This commit is contained in:
Drew DeVault 2018-10-06 20:10:09 +02:00 committed by GitHub
parent f1d8ba69a6 d50f54fa42
commit 8393266eb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
swaybar/bar.c
View file

@ -283,6 +283,10 @@ 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 swaybar *bar = data; struct swaybar *bar = data;
if (bar->pointer.pointer != NULL) {
wl_pointer_release(bar->pointer.pointer);
bar->pointer.pointer = NULL;
}
if ((caps & WL_SEAT_CAPABILITY_POINTER)) { if ((caps & WL_SEAT_CAPABILITY_POINTER)) {
bar->pointer.pointer = wl_seat_get_pointer(wl_seat); bar->pointer.pointer = wl_seat_get_pointer(wl_seat);
wl_pointer_add_listener(bar->pointer.pointer, &pointer_listener, bar); wl_pointer_add_listener(bar->pointer.pointer, &pointer_listener, bar);
@ -429,7 +433,7 @@ static void handle_global(void *data, struct wl_registry *registry,
&wl_compositor_interface, 3); &wl_compositor_interface, 3);
} else if (strcmp(interface, wl_seat_interface.name) == 0) { } else if (strcmp(interface, wl_seat_interface.name) == 0) {
bar->seat = wl_registry_bind(registry, name, bar->seat = wl_registry_bind(registry, name,
&wl_seat_interface, 1); &wl_seat_interface, 3);
wl_seat_add_listener(bar->seat, &seat_listener, bar); wl_seat_add_listener(bar->seat, &seat_listener, bar);
} else if (strcmp(interface, wl_shm_interface.name) == 0) { } else if (strcmp(interface, wl_shm_interface.name) == 0) {
bar->shm = wl_registry_bind(registry, name, bar->shm = wl_registry_bind(registry, name,