Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-04-26 16:46:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] clipboard/wayland: support keyboard capability hotplug

Browse Source
This commit is contained in:
Tudor Brindus 2021-01-09 13:39:50 -05:00 committed by Geoffrey McRae
parent c73d50f56a
commit fb7ee16f7b
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/clipboards/Wayland/src/wayland.c
View File

@ -201,6 +201,18 @@ static void seat_capabilities_handler(void * data, struct wl_seat * seat,
uint32_t capabilities) uint32_t capabilities)
{ {
this->capabilities = capabilities; this->capabilities = capabilities;
bool has_keyboard = capabilities & WL_SEAT_CAPABILITY_KEYBOARD;
if (!has_keyboard && this->keyboard)
{
wl_keyboard_destroy(this->keyboard);
this->keyboard = NULL;
}
else if (has_keyboard && !this->keyboard)
{
this->keyboard = wl_seat_get_keyboard(this->seat);
wl_keyboard_add_listener(this->keyboard, &keyboard_listener, NULL);
}
} }
static void seat_name_handler(void * data, struct wl_seat * seat, static void seat_name_handler(void * data, struct wl_seat * seat,
@ -375,15 +387,6 @@ static bool wayland_cb_init(
// Wait for the compositor to let us know of capabilities. // Wait for the compositor to let us know of capabilities.
wl_seat_add_listener(this->seat, &seat_listener, NULL); wl_seat_add_listener(this->seat, &seat_listener, NULL);
wl_display_roundtrip(this->display); wl_display_roundtrip(this->display);
if (!(this->capabilities & WL_SEAT_CAPABILITY_KEYBOARD))
{
// TODO: keyboard hotplug support.
DEBUG_ERROR("no keyboard");
return false;
}
this->keyboard = wl_seat_get_keyboard(this->seat);
wl_keyboard_add_listener(this->keyboard, &keyboard_listener, NULL);
return true; return true;
} }
@ -467,6 +470,10 @@ static void wayland_cb_notice(LG_ClipboardRequestFn requestFn, LG_ClipboardData
if (!this->requestFn) if (!this->requestFn)
return; return;
// Won't have a keyboard enter serial if we don't have the keyboard capability.
if (!this->keyboard)
return;
this->requestFn(wayland_cb_reply_fn, NULL); this->requestFn(wayland_cb_reply_fn, NULL);
} }