diff options
Diffstat (limited to 'dix/main.c')
| -rw-r--r-- | dix/main.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/dix/main.c b/dix/main.c index a31f33d8a..37add2a62 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.40 2003/02/17 16:55:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.44 2003/11/17 22:20:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -106,15 +106,11 @@ SOFTWARE. #endif extern int InitClientPrivates( -#if NeedFunctionPrototypes ClientPtr /*client*/ -#endif ); extern void Dispatch( -#if NeedFunctionPrototypes void -#endif ); char *ConnectionInfo; @@ -151,11 +147,9 @@ NotImplemented(xEvent *from, xEvent *to) /*ARGSUSED*/ void ReplyNotSwappd( -#if NeedNestedPrototypes ClientPtr pClient , int size , void * pbuf -#endif ) { FatalError("Not implemented"); @@ -319,8 +313,8 @@ main(int argc, char *argv[], char *envp[]) } else ResetWellKnownSockets (); - clients[0] = serverClient; - currentMaxClients = 1; + clients[0] = serverClient; + currentMaxClients = 1; if (!InitClientResources(serverClient)) /* for root resources */ FatalError("couldn't init server resources"); @@ -418,8 +412,11 @@ main(int argc, char *argv[], char *envp[]) for (i = 0; i < screenInfo.numScreens; i++) InitRootWindow(WindowTable[i]); - DefineInitialRootWindow(WindowTable[0]); + DefineInitialRootWindow(WindowTable[0]); SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset); +#ifdef DPMSExtension + SetDPMSTimers(); +#endif #ifdef PANORAMIX if (!noPanoramiXExtension) { @@ -437,6 +434,7 @@ main(int argc, char *argv[], char *envp[]) /* Now free up whatever must be freed */ if (screenIsSaved == SCREEN_SAVER_ON) SaveScreens(SCREEN_SAVER_OFF, ScreenSaverReset); + FreeScreenSaverTimer(); CloseDownExtensions(); #ifdef PANORAMIX @@ -463,7 +461,12 @@ main(int argc, char *argv[], char *envp[]) CloseDownEvents(); xfree(WindowTable); WindowTable = NULL; - FreeFonts (); + FreeFonts(); + +#ifdef DPMSExtension + FreeDPMSTimers(); +#endif + FreeAuditTimer(); xfree(serverClient->devPrivates); serverClient->devPrivates = NULL; @@ -471,7 +474,12 @@ main(int argc, char *argv[], char *envp[]) if (dispatchException & DE_TERMINATE) { CloseWellKnownConnections(); - OsCleanup(); + } + + OsCleanup((dispatchException & DE_TERMINATE) != 0); + + if (dispatchException & DE_TERMINATE) + { ddxGiveUp(); break; } @@ -540,7 +548,7 @@ CreateConnectionBlock() i = padlength[setup.nbytesVendor & 3]; sizesofar += i; while (--i >= 0) - *pBuf++ = 0; + *pBuf++ = 0; for (i=0; i<screenInfo.numPixmapFormats; i++) { @@ -634,24 +642,15 @@ with its screen number, a pointer to its ScreenRec, argc, and argv. */ int -#if NeedFunctionPrototypes AddScreen( Bool (* pfnInit)( -#if NeedNestedPrototypes int /*index*/, ScreenPtr /*pScreen*/, int /*argc*/, char ** /*argv*/ -#endif ), int argc, char **argv) -#else -AddScreen(pfnInit, argc, argv) - Bool (* pfnInit)(); - int argc; - char **argv; -#endif { int i; |