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

[client] wayland: lock confine-related code to avoid race

Browse Source 
This should fix the occasional Wayland protocol errors that arise when
the UI thread and the cursor thread race.

Example of error that is fixed:

    zwp_pointer_constraints_v1@11: error 1: a pointer constraint with a wl_pointer of the same wl_seat is already on this surface
This commit is contained in:
Quantum 2021-06-06 01:28:22 -04:00 committed by Geoffrey McRae
parent f07e4839b1
commit 4b99bba200
2 changed files with 87 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,12 +301,15 @@ bool waylandInputInit(void)
&relativePointerListener, NULL); &relativePointerListener, NULL);
} }
LG_LOCK_INIT(wlWm.confineLock);
return true; return true;
} }
void waylandInputFree(void) void waylandInputFree(void)
{ {
waylandUngrabPointer(); waylandUngrabPointer();
LG_LOCK_FREE(wlWm.confineLock);
wl_pointer_destroy(wlWm.pointer); wl_pointer_destroy(wlWm.pointer);
wl_keyboard_destroy(wlWm.keyboard); wl_keyboard_destroy(wlWm.keyboard);
wl_seat_destroy(wlWm.seat); wl_seat_destroy(wlWm.seat);
@ -326,21 +329,27 @@ void waylandGrabPointer(void)
&relativePointerListener, NULL); &relativePointerListener, NULL);
} }
if (!wlWm.confinedPointer) INTERLOCKED_SECTION(wlWm.confineLock,
{ {
wlWm.confinedPointer = zwp_pointer_constraints_v1_confine_pointer( if (!wlWm.confinedPointer)
wlWm.pointerConstraints, wlWm.surface, wlWm.pointer, NULL, {
ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT); wlWm.confinedPointer = zwp_pointer_constraints_v1_confine_pointer(
} wlWm.pointerConstraints, wlWm.surface, wlWm.pointer, NULL,
ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
}
});
} }
void waylandUngrabPointer(void) void waylandUngrabPointer(void)
{ {
if (wlWm.confinedPointer) INTERLOCKED_SECTION(wlWm.confineLock,
{ {
zwp_confined_pointer_v1_destroy(wlWm.confinedPointer); if (wlWm.confinedPointer)
wlWm.confinedPointer = NULL; {
} zwp_confined_pointer_v1_destroy(wlWm.confinedPointer);
wlWm.confinedPointer = NULL;
}
});
if (!wlWm.warpSupport) if (!wlWm.warpSupport)
{ {
@ -366,41 +375,48 @@ void waylandCapturePointer(void)
return; return;
} }
if (wlWm.confinedPointer) INTERLOCKED_SECTION(wlWm.confineLock,
{ {
zwp_confined_pointer_v1_destroy(wlWm.confinedPointer); if (wlWm.confinedPointer)
wlWm.confinedPointer = NULL; {
} zwp_confined_pointer_v1_destroy(wlWm.confinedPointer);
wlWm.confinedPointer = NULL;
}
wlWm.lockedPointer = zwp_pointer_constraints_v1_lock_pointer( wlWm.lockedPointer = zwp_pointer_constraints_v1_lock_pointer(
wlWm.pointerConstraints, wlWm.surface, wlWm.pointer, NULL, wlWm.pointerConstraints, wlWm.surface, wlWm.pointer, NULL,
ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT); ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
});
} }
void waylandUncapturePointer(void) void waylandUncapturePointer(void)
{ {
if (wlWm.lockedPointer) INTERLOCKED_SECTION(wlWm.confineLock,
{ {
zwp_locked_pointer_v1_destroy(wlWm.lockedPointer); if (wlWm.lockedPointer)
wlWm.lockedPointer = NULL; {
} zwp_locked_pointer_v1_destroy(wlWm.lockedPointer);
wlWm.lockedPointer = NULL;
}
/* we need to ungrab the pointer on the following conditions when exiting capture mode: /* we need to ungrab the pointer on the following conditions when exiting capture mode:
* - if warp is not supported, exit via window edge detection will never work * - if warp is not supported, exit via window edge detection will never work
* as the cursor can not be warped out of the window when we release it. * as the cursor can not be warped out of the window when we release it.
* - if the format is invalid as we do not know where the guest cursor is, * - if the format is invalid as we do not know where the guest cursor is,
* which also breaks edge detection. * which also breaks edge detection.
* - if the user has opted to use captureInputOnly mode. * - if the user has opted to use captureInputOnly mode.
*/ */
if (!wlWm.warpSupport || !app_isFormatValid() || app_isCaptureOnlyMode()) if (!wlWm.warpSupport || !app_isFormatValid() || app_isCaptureOnlyMode())
{ {
waylandUngrabPointer(); waylandUngrabPointer();
return; }
} else
{
wlWm.confinedPointer = zwp_pointer_constraints_v1_confine_pointer( wlWm.confinedPointer = zwp_pointer_constraints_v1_confine_pointer(
wlWm.pointerConstraints, wlWm.surface, wlWm.pointer, NULL, wlWm.pointerConstraints, wlWm.surface, wlWm.pointer, NULL,
ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT); ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
}
});
} }
void waylandGrabKeyboard(void) void waylandGrabKeyboard(void)
@ -423,35 +439,44 @@ void waylandUngrabKeyboard(void)
void waylandWarpPointer(int x, int y, bool exiting) void waylandWarpPointer(int x, int y, bool exiting)
{ {
if (!wlWm.pointerInSurface || wlWm.lockedPointer) if (!wlWm.pointerInSurface)
return; return;
if (x < 0) x = 0; INTERLOCKED_SECTION(wlWm.confineLock,
else if (x >= wlWm.width) x = wlWm.width - 1;
if (y < 0) y = 0;
else if (y >= wlWm.height) y = wlWm.height - 1;
struct wl_region * region = wl_compositor_create_region(wlWm.compositor);
wl_region_add(region, x, y, 1, 1);
if (wlWm.confinedPointer)
{ {
zwp_confined_pointer_v1_set_region(wlWm.confinedPointer, region); if (!wlWm.lockedPointer)
wl_surface_commit(wlWm.surface); {
zwp_confined_pointer_v1_set_region(wlWm.confinedPointer, NULL); LG_UNLOCK(wlWm.confineLock);
} return;
else }
{
struct zwp_confined_pointer_v1 * confine;
confine = zwp_pointer_constraints_v1_confine_pointer(
wlWm.pointerConstraints, wlWm.surface, wlWm.pointer, region,
ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
wl_surface_commit(wlWm.surface);
zwp_confined_pointer_v1_destroy(confine);
}
wl_surface_commit(wlWm.surface); if (x < 0) x = 0;
wl_region_destroy(region); else if (x >= wlWm.width) x = wlWm.width - 1;
if (y < 0) y = 0;
else if (y >= wlWm.height) y = wlWm.height - 1;
struct wl_region * region = wl_compositor_create_region(wlWm.compositor);
wl_region_add(region, x, y, 1, 1);
if (wlWm.confinedPointer)
{
zwp_confined_pointer_v1_set_region(wlWm.confinedPointer, region);
wl_surface_commit(wlWm.surface);
zwp_confined_pointer_v1_set_region(wlWm.confinedPointer, NULL);
}
else
{
struct zwp_confined_pointer_v1 * confine;
confine = zwp_pointer_constraints_v1_confine_pointer(
wlWm.pointerConstraints, wlWm.surface, wlWm.pointer, region,
ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
wl_surface_commit(wlWm.surface);
zwp_confined_pointer_v1_destroy(confine);
}
wl_surface_commit(wlWm.surface);
wl_region_destroy(region);
});
} }
void waylandRealignPointer(void) void waylandRealignPointer(void)

1
client/displayservers/Wayland/wayland.h
View File

@ -141,6 +141,7 @@ struct WaylandDSState
struct zwp_locked_pointer_v1 * lockedPointer; struct zwp_locked_pointer_v1 * lockedPointer;
bool showPointer; bool showPointer;
uint32_t pointerEnterSerial; uint32_t pointerEnterSerial;
LG_Lock confineLock;
struct zwp_idle_inhibit_manager_v1 * idleInhibitManager; struct zwp_idle_inhibit_manager_v1 * idleInhibitManager;
struct zwp_idle_inhibitor_v1 * idleInhibitor; struct zwp_idle_inhibitor_v1 * idleInhibitor;