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

[client] x11: cleanup on failure to initialize

Browse Source
This commit is contained in:
Geoffrey McRae 2021-01-27 19:51:41 +11:00
parent 4dfe4b8e2b
commit 740dad943b
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/displayservers/X11/x11.c
View File

@ -148,6 +148,12 @@ static bool x11Init(const LG_DSInitParams params)
CopyFromParent, CWEventMask, CopyFromParent, CWEventMask,
&swa); &swa);
if (!x11.window)
{
DEBUG_ERROR("XCreateWindow failed");
goto fail_display;
}
XStoreName(x11.display, x11.window, params.title); XStoreName(x11.display, x11.window, params.title);
x11.aNetReqFrameExtents = x11.aNetReqFrameExtents =
@ -193,7 +199,7 @@ static bool x11Init(const LG_DSInitParams params)
if (!devinfo) if (!devinfo)
{ {
DEBUG_ERROR("XIQueryDevice failed"); DEBUG_ERROR("XIQueryDevice failed");
return false; goto fail_window;
} }
bool havePointer = false; bool havePointer = false;
@ -233,14 +239,14 @@ static bool x11Init(const LG_DSInitParams params)
{ {
DEBUG_ERROR("Failed to find the master pointing device"); DEBUG_ERROR("Failed to find the master pointing device");
XIFreeDeviceInfo(devinfo); XIFreeDeviceInfo(devinfo);
return false; goto fail_window;
} }
if (!haveKeyboard) if (!haveKeyboard)
{ {
DEBUG_ERROR("Failed to find the master keyboard device"); DEBUG_ERROR("Failed to find the master keyboard device");
XIFreeDeviceInfo(devinfo); XIFreeDeviceInfo(devinfo);
return false; goto fail_window;
} }
XIFreeDeviceInfo(devinfo); XIFreeDeviceInfo(devinfo);
@ -265,7 +271,7 @@ static bool x11Init(const LG_DSInitParams params)
{ {
XFree(mask); XFree(mask);
DEBUG_ERROR("Failed to select the xinput events"); DEBUG_ERROR("Failed to select the xinput events");
return false; goto fail_window;
} }
Atom NETWM_BYPASS_COMPOSITOR = XInternAtom(x11.display, Atom NETWM_BYPASS_COMPOSITOR = XInternAtom(x11.display,
@ -330,6 +336,14 @@ static bool x11Init(const LG_DSInitParams params)
} }
return true; return true;
fail_window:
XDestroyWindow(x11.display, x11.window);
fail_display:
XCloseDisplay(x11.display);
return false;
} }
static void x11Startup(void) static void x11Startup(void)