Commit e44a93b0 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Splash.c: some reformatting

parent ca531cce
...@@ -65,10 +65,6 @@ static void nxagentPaintLogo(XlibWindow win, XlibGC gc, int scale, int width, in ...@@ -65,10 +65,6 @@ static void nxagentPaintLogo(XlibWindow win, XlibGC gc, int scale, int width, in
void nxagentShowSplashWindow(XlibWindow parentWindow) void nxagentShowSplashWindow(XlibWindow parentWindow)
{ {
XWindowAttributes getAttributes;
XWindowChanges values;
XSetWindowAttributes attributes;
/* /*
* Show splash window only when running as X2Go Agent * Show splash window only when running as X2Go Agent
*/ */
...@@ -94,19 +90,19 @@ void nxagentShowSplashWindow(XlibWindow parentWindow) ...@@ -94,19 +90,19 @@ void nxagentShowSplashWindow(XlibWindow parentWindow)
nxagentWMPassed = False; nxagentWMPassed = False;
XWindowAttributes getAttributes;
/* /*
* This would cause a GetWindowAttributes and a * This would cause a GetWindowAttributes and a GetGeometry
* GetGeometry (asynchronous) reply. We use instead * (asynchronous) reply. We use instead the geometry requested by
* the geometry requested by the user for the agent * the user for the agent window.
* window.
* *
* XGetWindowAttributes(nxagentDisplay, parentWindow, &getAttributes); * XGetWindowAttributes(nxagentDisplay, parentWindow, &getAttributes);
*/ */
/* /*
* During reconnection we draw the splash over * During reconnection we draw the splash over the default window
* the default window and not over the root * and not over the root window because it would be hidden by other
* window because it would be hidden by other
* windows. * windows.
*/ */
...@@ -145,9 +141,9 @@ void nxagentShowSplashWindow(XlibWindow parentWindow) ...@@ -145,9 +141,9 @@ void nxagentShowSplashWindow(XlibWindow parentWindow)
XlibGC gc = XCreateGC(nxagentDisplay, nxagentSplashWindow, 0, NULL); XlibGC gc = XCreateGC(nxagentDisplay, nxagentSplashWindow, 0, NULL);
nxagentPaintLogo(nxagentSplashWindow, gc, 1, getAttributes.width, getAttributes.height); nxagentPaintLogo(nxagentSplashWindow, gc, 1, getAttributes.width, getAttributes.height);
XMapRaised (nxagentDisplay, nxagentSplashWindow); XMapRaised (nxagentDisplay, nxagentSplashWindow);
values.stack_mode = Above; XWindowChanges values = {.stack_mode = Above};
XConfigureWindow(nxagentDisplay, nxagentSplashWindow, CWStackMode, &values); XConfigureWindow(nxagentDisplay, nxagentSplashWindow, CWStackMode, &values);
attributes.override_redirect = True; XSetWindowAttributes attributes = {.override_redirect = True};
XChangeWindowAttributes(nxagentDisplay, nxagentSplashWindow, CWOverrideRedirect, &attributes); XChangeWindowAttributes(nxagentDisplay, nxagentSplashWindow, CWOverrideRedirect, &attributes);
XFreeGC(nxagentDisplay, gc); XFreeGC(nxagentDisplay, gc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment