[client] wayland: allow seatless operation for github CI testing

This commit is contained in:
Geoffrey McRae
2026-07-30 15:22:37 +10:00
parent 5c5a2f15d8
commit a1fc3d20d3
6 changed files with 28 additions and 5 deletions

View File

@@ -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+)");

View File

@@ -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);

View File

@@ -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);

View File

@@ -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);

View File

@@ -116,6 +116,7 @@ typedef struct LG_DSInitParams
bool borderless;
bool maximize;
bool largeCursorDot;
bool allowNoInput;
// if true the renderer requires an OpenGL context
bool opengl;

View File

@@ -1288,6 +1288,7 @@ static int lg_run(void)
.borderless = g_params.borderless,
.maximize = g_params.maximize,
.largeCursorDot = g_params.largeCursorDot,
.allowNoInput = strcmp(g_params.transport, "test") == 0,
.opengl = needsOpenGL,
.jitRender = g_params.jitRender
};