Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 13:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] wayland: clean up objects when wl_pointer disappears

Browse Source
This commit is contained in:
Quantum 2021-12-06 20:45:52 -05:00 committed by Geoffrey McRae
parent ad40ea4195
commit d96b2ef1fb
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
client/displayservers/Wayland/input.c
View File

@ -290,16 +290,39 @@ static const struct wl_keyboard_listener keyboardListener = {
.modifiers = keyboardModifiersHandler, .modifiers = keyboardModifiersHandler,
}; };
static void waylandCleanUpPointer(void)
{
INTERLOCKED_SECTION(wlWm.confineLock, {
if (wlWm.lockedPointer)
{
zwp_locked_pointer_v1_destroy(wlWm.lockedPointer);
wlWm.lockedPointer = NULL;
}
if (wlWm.confinedPointer)
{
zwp_confined_pointer_v1_destroy(wlWm.confinedPointer);
wlWm.confinedPointer = NULL;
}
});
if (wlWm.relativePointer)
{
zwp_relative_pointer_v1_destroy(wlWm.relativePointer);
wlWm.relativePointer = NULL;
}
wl_pointer_destroy(wlWm.pointer);
wlWm.pointer = NULL;
}
// Seat-handling listeners. // Seat-handling listeners.
static void handlePointerCapability(uint32_t capabilities) static void handlePointerCapability(uint32_t capabilities)
{ {
bool hasPointer = capabilities & WL_SEAT_CAPABILITY_POINTER; bool hasPointer = capabilities & WL_SEAT_CAPABILITY_POINTER;
if (!hasPointer && wlWm.pointer) if (!hasPointer && wlWm.pointer)
{ waylandCleanUpPointer();
wl_pointer_destroy(wlWm.pointer);
wlWm.pointer = NULL;
}
else if (hasPointer && !wlWm.pointer) else if (hasPointer && !wlWm.pointer)
{ {
wlWm.pointer = wl_seat_get_pointer(wlWm.seat); wlWm.pointer = wl_seat_get_pointer(wlWm.seat);
@ -394,7 +417,9 @@ void waylandInputFree(void)
{ {
waylandUngrabPointer(); waylandUngrabPointer();
LG_LOCK_FREE(wlWm.confineLock); LG_LOCK_FREE(wlWm.confineLock);
wl_pointer_destroy(wlWm.pointer);
if (wlWm.pointer)
waylandCleanUpPointer();
wl_keyboard_destroy(wlWm.keyboard); wl_keyboard_destroy(wlWm.keyboard);
wl_seat_destroy(wlWm.seat); wl_seat_destroy(wlWm.seat);