diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-08-16 12:46:21 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:12:24 +0200 |
| commit | 24f392c4a7f7f1a838f67eb7ea8fd947fe233f30 (patch) | |
| tree | 9457ae3efed7b3bb67658f7c8cb40115a1d0a0ad | |
| parent | 798a053b4aa567892466306c1be3d6697a2acfe4 (diff) | |
| download | nx-libs-24f392c4a7f7f1a838f67eb7ea8fd947fe233f30.tar.gz nx-libs-24f392c4a7f7f1a838f67eb7ea8fd947fe233f30.tar.bz2 nx-libs-24f392c4a7f7f1a838f67eb7ea8fd947fe233f30.zip | |
nxagent: rename nxagentWMStart to nxagentReadyAtom
This better reflects its purpose: Tell listeners we are ready.
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Splash.c | 6 |
2 files changed, 5 insertions, 5 deletions
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 /* diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c index 28c5599af..c3f6f101e 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -72,7 +72,7 @@ static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height * From Screen.c. */ -extern Atom nxagentWMStart; +extern Atom nxagentReadyAtom; /* * From Clipboard.c. @@ -106,7 +106,7 @@ void nxagentShowSplashWindow(Window parentWindow) } #endif - XSetSelectionOwner(nxagentDisplay, nxagentWMStart, None, CurrentTime); + XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, None, CurrentTime); nxagentWMPassed = False; @@ -401,7 +401,7 @@ void nxagentRemoveSplashWindow(void) if (!nxagentWMPassed) { - XSetSelectionOwner(nxagentDisplay, nxagentWMStart, + XSetSelectionOwner(nxagentDisplay, nxagentReadyAtom, nxagentDefaultWindows[0], CurrentTime); nxagentWMPassed = True; |