mirror of
https://github.com/gnif/LookingGlass.git
synced 2026-08-02 13:22:02 +00:00
[client] wayland: allow seatless operation for github CI testing
This commit is contained in:
@@ -342,6 +342,12 @@ bool waylandCBInit(void)
|
||||
{
|
||||
memset(&wlCb, 0, sizeof(wlCb));
|
||||
|
||||
if (!wlWm.seat)
|
||||
{
|
||||
DEBUG_WARN("Clipboard unavailable without wl_seat");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!wlWm.dataDeviceManager)
|
||||
{
|
||||
DEBUG_ERROR("Missing wl_data_device_manager interface (version 3+)");
|
||||
|
||||
@@ -405,10 +405,17 @@ static const struct wl_seat_listener seatListener = {
|
||||
.name = seatNameHandler,
|
||||
};
|
||||
|
||||
bool waylandInputInit(void)
|
||||
bool waylandInputInit(bool allowNoInput)
|
||||
{
|
||||
if (!wlWm.seat)
|
||||
{
|
||||
if (allowNoInput)
|
||||
{
|
||||
DEBUG_WARN("Compositor missing wl_seat, input will be disabled");
|
||||
wlWm.warpSupport = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
DEBUG_ERROR("Compositor missing wl_seat, will not proceed");
|
||||
return false;
|
||||
}
|
||||
@@ -444,6 +451,9 @@ bool waylandInputInit(void)
|
||||
|
||||
void waylandInputFree(void)
|
||||
{
|
||||
if (!wlWm.seat)
|
||||
return;
|
||||
|
||||
waylandUngrabPointer();
|
||||
|
||||
if (wlWm.pointer)
|
||||
@@ -468,7 +478,8 @@ void waylandInputFree(void)
|
||||
|
||||
void waylandGrabPointer(void)
|
||||
{
|
||||
if (!wlWm.relativePointerManager || !wlWm.pointerConstraints)
|
||||
if (!wlWm.pointer ||
|
||||
!wlWm.relativePointerManager || !wlWm.pointerConstraints)
|
||||
return;
|
||||
|
||||
if (!wlWm.warpSupport && !wlWm.relativePointer)
|
||||
@@ -493,6 +504,9 @@ void waylandGrabPointer(void)
|
||||
|
||||
inline static void internalUngrabPointer(bool lock)
|
||||
{
|
||||
if (!wlWm.pointer)
|
||||
return;
|
||||
|
||||
if (lock)
|
||||
LG_LOCK(wlWm.surfaceLock);
|
||||
|
||||
@@ -578,7 +592,8 @@ void waylandUncapturePointer(void)
|
||||
|
||||
void waylandGrabKeyboard(void)
|
||||
{
|
||||
if (wlWm.keyboardInhibitManager && !wlWm.keyboardInhibitor)
|
||||
if (wlWm.seat &&
|
||||
wlWm.keyboardInhibitManager && !wlWm.keyboardInhibitor)
|
||||
{
|
||||
wlWm.keyboardInhibitor = zwp_keyboard_shortcuts_inhibit_manager_v1_inhibit_shortcuts(
|
||||
wlWm.keyboardInhibitManager, wlWm.surface, wlWm.seat);
|
||||
|
||||
@@ -166,7 +166,7 @@ static bool waylandInit(const LG_DSInitParams params)
|
||||
if (!waylandCursorInit())
|
||||
return false;
|
||||
|
||||
if (!waylandInputInit())
|
||||
if (!waylandInputInit(params.allowNoInput))
|
||||
return false;
|
||||
|
||||
wlWm.desktop->setSize(params.w, params.h);
|
||||
|
||||
@@ -367,7 +367,7 @@ void waylandInhibitIdle(void);
|
||||
void waylandUninhibitIdle(void);
|
||||
|
||||
// input module
|
||||
bool waylandInputInit(void);
|
||||
bool waylandInputInit(bool allowNoInput);
|
||||
void waylandInputFree(void);
|
||||
void waylandGrabKeyboard(void);
|
||||
void waylandGrabPointer(void);
|
||||
|
||||
Reference in New Issue
Block a user