From be508a447be199b24a3bb856adb64a6fbd016e9e Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 15 Aug 2019 22:04:07 +0200 Subject: Splash.c: nxagentRemoveSplashWindow: drop unused parameter --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 5cdb50f90..2355e5b61 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -3122,7 +3122,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr { if (!nxagentWMPassed) { - nxagentRemoveSplashWindow(NULL); + nxagentRemoveSplashWindow(); } NXShadowExportChanges(&numRects, &ptBox); -- cgit v1.2.3 From 798a053b4aa567892466306c1be3d6697a2acfe4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 16 Aug 2019 12:38:53 +0200 Subject: Splash.c: move some variables to Splash.c They belong there... --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 2355e5b61..e27d37056 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -147,8 +147,6 @@ Window nxagentScreenSaverWindows[MAXSCREENS]; #ifdef NXAGENT_ONSTART Atom nxagentWMStart; -Window nxagentSplashWindow = None; -Pixmap nxagentPixmapLogo; #endif ScreenPtr nxagentDefaultScreen = NULL; -- cgit v1.2.3 From 24f392c4a7f7f1a838f67eb7ea8fd947fe233f30 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 16 Aug 2019 12:46:21 +0200 Subject: nxagent: rename nxagentWMStart to nxagentReadyAtom This better reflects its purpose: Tell listeners we are ready. --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index e27d37056..b089ef303 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -146,7 +146,7 @@ Window nxagentInputWindows[MAXSCREENS]; Window nxagentScreenSaverWindows[MAXSCREENS]; #ifdef NXAGENT_ONSTART -Atom nxagentWMStart; +Atom nxagentReadyAtom; #endif ScreenPtr nxagentDefaultScreen = NULL; @@ -932,7 +932,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen, nxagentQueryAtoms(pScreen); #ifdef NXAGENT_ONSTART - nxagentWMStart = nxagentAtoms[3]; /* WM_NX_READY */ + nxagentReadyAtom = nxagentAtoms[3]; /* WM_NX_READY */ #endif /* -- cgit v1.2.3 From ab80152370da820cb42f22a500c1342bbb3ca3c8 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 16 Aug 2019 13:02:01 +0200 Subject: nxagent: move nxagentWMPassed to Splash.c It is only relevant there. --- nx-X11/programs/Xserver/hw/nxagent/Screen.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index b089ef303..93110f782 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -3118,10 +3118,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr if (result == 1) { - if (!nxagentWMPassed) - { - nxagentRemoveSplashWindow(); - } + nxagentRemoveSplashWindow(); NXShadowExportChanges(&numRects, &ptBox); pBox = (BoxRec *)ptBox; -- cgit v1.2.3