svn merge "^/branches/released" .

Solved mouse motion bug in new version of dix/getevents.c

5 files changed, 705 insertions, 707 deletions

diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c
index 21d2cf75c..d2eb04649 100644
--- a/xorg-server/os/io.c
+++ b/xorg-server/os/io.c
@@ -410,16 +410,29 @@ ReadRequestFromClient(ClientPtr client)
 	else

 	    needed = sizeof(xReq);

     }

-    oci->lenLastReq = needed;

 

     /* If there are bytes to ignore, ignore them now. */

 

     if (oci->ignoreBytes > 0) {

 	assert(needed == oci->ignoreBytes || needed == oci->size);

-	oci->ignoreBytes -= gotnow;

-	needed = gotnow = 0;

+	/*

+	 * The _XSERVTransRead call above may return more or fewer bytes than we

+	 * want to ignore.  Ignore the smaller of the two sizes.

+	 */

+	if (gotnow < needed) {

+	    oci->ignoreBytes -= gotnow;

+	    oci->bufptr += gotnow;

+	    gotnow = 0;

+	} else {

+	    oci->ignoreBytes -= needed;

+	    oci->bufptr += needed;

+	    gotnow -= needed;

+	}

+	needed = 0;

     }

 

+    oci->lenLastReq = needed;

+

     /*

      *  Check to see if client has at least one whole request in the

      *  buffer beyond the request we're returning to the caller.

diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 0d45b7791..f997e3eee 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -1,629 +1,619 @@
-/*
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-Copyright 1994 Quarterdeck Office Systems.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Digital and
-Quarterdeck not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT
-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
-OR PERFORMANCE OF THIS SOFTWARE.
-
-*/
-
-/*
- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/Xos.h>
-#include <stdio.h>
-#include <time.h>
-#include <sys/stat.h>
-#include <stdarg.h>
-#include <stdlib.h>	/* for malloc() */
-#include <errno.h>
-
-#include "input.h"
-#include "site.h"
-#include "opaque.h"
-
-#ifdef WIN32
-#include <process.h>
-#ifndef _MSC_VER
-#define getpid(x) _getpid(x)
-#endif
-#endif
-
-#ifdef _MSC_VER
-#define S_ISREG(m)  (((m)&_S_IFMT) == _S_IFREG)
-#endif
-
-#ifdef XF86BIGFONT
-#include "xf86bigfontsrv.h"
-#endif
-
-#ifdef DDXOSVERRORF
-void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL;
-#endif
-
-static FILE *logFile = NULL;
-static Bool logFlush = FALSE;
-static Bool logSync = FALSE;
-static int logVerbosity = DEFAULT_LOG_VERBOSITY;
-static int logFileVerbosity = DEFAULT_LOG_FILE_VERBOSITY;
-
-/* Buffer to information logged before the log file is opened. */
-static char *saveBuffer = NULL;
-static int bufferSize = 0, bufferUnused = 0, bufferPos = 0;
-static Bool needBuffer = TRUE;
-
-#ifdef __APPLE__
-#include <AvailabilityMacros.h>
-
-static char __crashreporter_info_buff__[4096] = {0};
-static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-// This is actually a toolchain requirement, but I'm not sure the correct check,        
-// but it should be fine to just only include it for Leopard and later.  This line
-// just tells the linker to never strip this symbol (such as for space optimization)
-asm (".desc ___crashreporter_info__, 0x10");
-#endif
-#endif
-
-/* Prefix strings for log messages. */
-#ifndef X_UNKNOWN_STRING
-#define X_UNKNOWN_STRING		"(\?\?)"
-#endif
-#ifndef X_PROBE_STRING
-#define X_PROBE_STRING			"(--)"
-#endif
-#ifndef X_CONFIG_STRING
-#define X_CONFIG_STRING			"(**)"
-#endif
-#ifndef X_DEFAULT_STRING
-#define X_DEFAULT_STRING		"(==)"
-#endif
-#ifndef X_CMDLINE_STRING
-#define X_CMDLINE_STRING		"(++)"
-#endif
-#ifndef X_NOTICE_STRING
-#define X_NOTICE_STRING			"(!!)"
-#endif
-#ifndef X_ERROR_STRING
-#define X_ERROR_STRING			"(EE)"
-#endif
-#ifndef X_WARNING_STRING
-#define X_WARNING_STRING		"(WW)"
-#endif
-#ifndef X_INFO_STRING
-#define X_INFO_STRING			"(II)"
-#endif
-#ifndef X_NOT_IMPLEMENTED_STRING
-#define X_NOT_IMPLEMENTED_STRING	"(NI)"
-#endif
-
-/*
- * LogInit is called to start logging to a file.  It is also called (with
- * NULL arguments) when logging to a file is not wanted.  It must always be
- * called, otherwise log messages will continue to accumulate in a buffer.
- *
- * %s, if present in the fname or backup strings, is expanded to the display
- * string.
- */
-
-const char *
-LogInit(const char *fname, const char *backup)
-{
-    char *logFileName = NULL;
-
-    if (fname && *fname) {
-	/* malloc() can't be used yet. */
-	logFileName = malloc(strlen(fname) + strlen(display) + 1);
-	if (!logFileName)
-	    FatalError("Cannot allocate space for the log file name\n");
-	sprintf(logFileName, fname, display);
-
-	if (backup && *backup) {
-	    struct stat buf;
-
-	    if (!stat(logFileName, &buf) && S_ISREG(buf.st_mode)) {
-		char *suffix;
-		char *oldLog;
-
-		oldLog = malloc(strlen(logFileName) + strlen(backup) +
-				strlen(display) + 1);
-		suffix = malloc(strlen(backup) + strlen(display) + 1);
-		if (!oldLog || !suffix)
-		    FatalError("Cannot allocate space for the log file name\n");
-		sprintf(suffix, backup, display);
-		sprintf(oldLog, "%s%s", logFileName, suffix);
-		free(suffix);
-		if (rename(logFileName, oldLog) == -1) {
-		    FatalError("Cannot move old log file \"%s\" to \"%s\"\n",
-			       logFileName, oldLog);
-		}
-		free(oldLog);
-	    }
-	}
-	if ((logFile = fopen(logFileName, "w")) == NULL)
-	    FatalError("Cannot open log file \"%s\"\n", logFileName);
-	setvbuf(logFile, NULL, _IONBF, 0);
-
-	/* Flush saved log information. */
-	if (saveBuffer && bufferSize > 0) {
-	    fwrite(saveBuffer, bufferPos, 1, logFile);
-	    fflush(logFile);
-#ifndef WIN32
-	    fsync(fileno(logFile));
-#endif
-	}
-    }
-
-    /*
-     * Unconditionally free the buffer, and flag that the buffer is no longer
-     * needed.
-     */
-    if (saveBuffer && bufferSize > 0) {
-	free(saveBuffer);	/* Must be free(), not free() */
-	saveBuffer = NULL;
-	bufferSize = 0;
-    }
-    needBuffer = FALSE;
-
-    return logFileName;
-}
-
-void
-LogClose(void)
-{
-    if (logFile) {
-	fclose(logFile);
-	logFile = NULL;
-    }
-}
-
-Bool
-LogSetParameter(LogParameter param, int value)
-{
-    switch (param) {
-    case XLOG_FLUSH:
-	logFlush = value ? TRUE : FALSE;
-	return TRUE;
-    case XLOG_SYNC:
-	logSync = value ? TRUE : FALSE;
-	return TRUE;
-    case XLOG_VERBOSITY:
-	logVerbosity = value;
-	return TRUE;
-    case XLOG_FILE_VERBOSITY:
-	logFileVerbosity = value;
-	return TRUE;
-    default:
-	return FALSE;
-    }
-}
-
-/* This function does the actual log message writes. */
-
-void
-LogVWrite(int verb, const char *f, va_list args)
-{
-    char tmpBuffer[1024];
-    int len = 0;
-    static Bool newline = TRUE;
-
-    if (newline) {
-	sprintf(tmpBuffer, "[%10.3f] ", GetTimeInMillis() / 1000.0);
-	len = strlen(tmpBuffer);
-	if (logFile)
-	    fwrite(tmpBuffer, len, 1, logFile);
-    }
-
-    /*
-     * Since a va_list can only be processed once, write the string to a
-     * buffer, and then write the buffer out to the appropriate output
-     * stream(s).
-     */
-    if (verb < 0 || logFileVerbosity >= verb || logVerbosity >= verb) {
-	vsnprintf(tmpBuffer, sizeof(tmpBuffer)-1, f, args);
-        tmpBuffer[sizeof(tmpBuffer)-1]=0;
-	len = strlen(tmpBuffer);
-    }
-    newline = (tmpBuffer[len-1] == '\n');
-    if ((verb < 0 || logVerbosity >= verb) && len > 0)
-	fwrite(tmpBuffer, len, 1, stderr);
-    if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {
-	if (logFile) {
-	    fwrite(tmpBuffer, len, 1, logFile);
-	    if (logFlush) {
-		fflush(logFile);
-#ifndef WIN32
-		if (logSync)
-		    fsync(fileno(logFile));
-#endif
-	    }
-	} else if (needBuffer) {
-	    /*
-	     * Note, this code is used before OsInit() has been called, so
-	     * malloc() and friends can't be used.
-	     */
-	    if (len > bufferUnused) {
-		bufferSize += 1024;
-		bufferUnused += 1024;
-		if (saveBuffer)
-		    saveBuffer = realloc(saveBuffer, bufferSize);
-		else
-		    saveBuffer = malloc(bufferSize);
-		if (!saveBuffer)
-		    FatalError("realloc() failed while saving log messages\n");
-	    }
-	    bufferUnused -= len;
-	    memcpy(saveBuffer + bufferPos, tmpBuffer, len);
-	    bufferPos += len;
-	}
-    }
-}
-
-void
-LogWrite(int verb, const char *f, ...)
-{
-    va_list args;
-
-    va_start(args, f);
-    LogVWrite(verb, f, args);
-    va_end(args);
-}
-
-void
-LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)
-{
-    const char *s  = X_UNKNOWN_STRING;
-    char tmpBuf[1024];
-
-    /* Ignore verbosity for X_ERROR */
-    if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {
-	switch (type) {
-	case X_PROBED:
-	    s = X_PROBE_STRING;
-	    break;
-	case X_CONFIG:
-	    s = X_CONFIG_STRING;
-	    break;
-	case X_DEFAULT:
-	    s = X_DEFAULT_STRING;
-	    break;
-	case X_CMDLINE:
-	    s = X_CMDLINE_STRING;
-	    break;
-	case X_NOTICE:
-	    s = X_NOTICE_STRING;
-	    break;
-	case X_ERROR:
-	    s = X_ERROR_STRING;
-	    if (verb > 0)
-		verb = 0;
-	    break;
-	case X_WARNING:
-	    s = X_WARNING_STRING;
-	    break;
-	case X_INFO:
-	    s = X_INFO_STRING;
-	    break;
-	case X_NOT_IMPLEMENTED:
-	    s = X_NOT_IMPLEMENTED_STRING;
-	    break;
-	case X_UNKNOWN:
-	    s = X_UNKNOWN_STRING;
-	    break;
-	case X_NONE:
-	    s = NULL;
-	    break;
-	}
-
-        /* if s is not NULL we need a space before format */
-        snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",
-                                                   s ? " " : "",
-                                                   format);
-        LogVWrite(verb, tmpBuf, args);
-    }
-}
-
-/* Log message with verbosity level specified. */
-void
-LogMessageVerb(MessageType type, int verb, const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    LogVMessageVerb(type, verb, format, ap);
-    va_end(ap);
-}
-
-/* Log a message with the standard verbosity level of 1. */
-void
-LogMessage(MessageType type, const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    LogVMessageVerb(type, 1, format, ap);
-    va_end(ap);
-}
-
-void
-AbortServer(void) _X_NORETURN;
-
-void
-AbortServer(void)
-{
-#ifdef XF86BIGFONT
-    XF86BigfontCleanup();
-#endif
-    CloseWellKnownConnections();
-    OsCleanup(TRUE);
-    CloseDownDevices();
-    AbortDDX();
-    fflush(stderr);
-    if (CoreDump)
-	OsAbort();
-    exit (1);
-}
-
-#define AUDIT_PREFIX "AUDIT: %s: %ld: "
-#ifndef AUDIT_TIMEOUT
-#define AUDIT_TIMEOUT ((CARD32)(120 * 1000)) /* 2 mn */
-#endif
-
-static int nrepeat = 0;
-static int oldlen = -1;
-static OsTimerPtr auditTimer = NULL;
-
-void
-FreeAuditTimer(void)
-{
-    if (auditTimer != NULL) {
-	/* Force output of pending messages */
-	TimerForce(auditTimer);
-	TimerFree(auditTimer);
-	auditTimer = NULL;
-    }
-}
-
-static char *
-AuditPrefix(void)
-{
-    time_t tm;
-    char *autime, *s;
-    char *tmpBuf;
-    int len;
-
-    time(&tm);
-    autime = ctime(&tm);
-    if ((s = strchr(autime, '\n')))
-	*s = '\0';
-    len = strlen(AUDIT_PREFIX) + strlen(autime) + 10 + 1;
-    tmpBuf = malloc(len);
-    if (!tmpBuf)
-	return NULL;
-    snprintf(tmpBuf, len, AUDIT_PREFIX, autime, (unsigned long)getpid());
-    return tmpBuf;
-}
-
-void
-AuditF(const char * f, ...)
-{
-    va_list args;
-
-    va_start(args, f);
-
-    VAuditF(f, args);
-    va_end(args);
-}
-
-static CARD32
-AuditFlush(OsTimerPtr timer, CARD32 now, pointer arg)
-{
-    char *prefix;
-
-    if (nrepeat > 0) {
-	prefix = AuditPrefix();
-	ErrorF("%slast message repeated %d times\n",
-	       prefix != NULL ? prefix : "", nrepeat);
-	nrepeat = 0;
-	if (prefix != NULL)
-	    free(prefix);
-	return AUDIT_TIMEOUT;
-    } else {
-	/* if the timer expires without anything to print, flush the message */
-	oldlen = -1;
-	return 0;
-    }
-}
-
-void
-VAuditF(const char *f, va_list args)
-{
-    char *prefix;
-    char buf[1024];
-    int len;
-    static char oldbuf[1024];
-
-    prefix = AuditPrefix();
-    len = vsnprintf(buf, sizeof(buf), f, args);
-
-    if (len == oldlen && strcmp(buf, oldbuf) == 0) {
-	/* Message already seen */
-	nrepeat++;
-    } else {
-	/* new message */
-	if (auditTimer != NULL)
-	    TimerForce(auditTimer);
-	ErrorF("%s%s", prefix != NULL ? prefix : "", buf);
-	strlcpy(oldbuf, buf, sizeof(oldbuf));
-	oldlen = len;
-	nrepeat = 0;
-	auditTimer = TimerSet(auditTimer, 0, AUDIT_TIMEOUT, AuditFlush, NULL);
-    }
-    if (prefix != NULL)
-	free(prefix);
-}
-
-extern char g_FatalErrorMessage[1024];
-
-void
-FatalError(const char *f, ...)
-{
-    va_list args;
-    static Bool beenhere = FALSE;
-
-    if (beenhere)
-	ErrorF("\nFatalError re-entered, aborting\n");
-    else
-	ErrorF("\nFatal server error:\n");
-
-    va_start(args, f);
-#ifdef __APPLE__
-    (void)vsnprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__), f, args);
-#endif
-#ifdef WIN32
-    vsnprintf(g_FatalErrorMessage, 1024, f, args);
-#endif
-    VErrorF(f, args);
-    va_end(args);
-    ErrorF("\n");
-    if (!beenhere)
-	OsVendorFatalError();
-    if (!beenhere) {
-	beenhere = TRUE;
-	AbortServer();
-    } else
-	OsAbort();
-    /*NOTREACHED*/
-}
-
-void
-VErrorF(const char *f, va_list args)
-{
-#ifdef DDXOSVERRORF
-    if (OsVendorVErrorFProc)
-	OsVendorVErrorFProc(f, args);
-    else
-	LogVWrite(-1, f, args);
-#else
-    LogVWrite(-1, f, args);
-#endif
-}
-
-void
-ErrorF(const char * f, ...)
-{
-    va_list args;
-
-    va_start(args, f);
-    VErrorF(f, args);
-    va_end(args);
-}
-
-/* A perror() workalike. */
-
-void
-Error(char *str)
-{
-    char *err = NULL;
-    int saveErrno = errno;
-
-    if (str) {
-	err = malloc(strlen(strerror(saveErrno)) + strlen(str) + 2 + 1);
-	if (!err)
-	    return;
-	sprintf(err, "%s: ", str);
-	strcat(err, strerror(saveErrno));
-	LogWrite(-1, "%s", err);
-	free(err);
-    } else
-	LogWrite(-1, "%s", strerror(saveErrno));
-}
-
-void
-LogPrintMarkers(void)
-{
-    /* Show what the message marker symbols mean. */
-    LogWrite(0, "Markers: ");
-    LogMessageVerb(X_PROBED, 0, "probed, ");
-    LogMessageVerb(X_CONFIG, 0, "from config file, ");
-    LogMessageVerb(X_DEFAULT, 0, "default setting,\n\t");
-    LogMessageVerb(X_CMDLINE, 0, "from command line, ");
-    LogMessageVerb(X_NOTICE, 0, "notice, ");
-    LogMessageVerb(X_INFO, 0, "informational,\n\t");
-    LogMessageVerb(X_WARNING, 0, "warning, ");
-    LogMessageVerb(X_ERROR, 0, "error, ");
-    LogMessageVerb(X_NOT_IMPLEMENTED, 0, "not implemented, ");
-    LogMessageVerb(X_UNKNOWN, 0, "unknown.\n");
-}
-
+/*

+

+Copyright 1987, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included

+in all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall

+not be used in advertising or otherwise to promote the sale, use or

+other dealings in this Software without prior written authorization

+from The Open Group.

+

+

+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,

+Copyright 1994 Quarterdeck Office Systems.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the names of Digital and

+Quarterdeck not be used in advertising or publicity pertaining to

+distribution of the software without specific, written prior

+permission.

+

+DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND

+FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT

+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE

+OR PERFORMANCE OF THIS SOFTWARE.

+

+*/

+

+/*

+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in

+ * all copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+ * OTHER DEALINGS IN THE SOFTWARE.

+ *

+ * Except as contained in this notice, the name of the copyright holder(s)

+ * and author(s) shall not be used in advertising or otherwise to promote

+ * the sale, use or other dealings in this Software without prior written

+ * authorization from the copyright holder(s) and author(s).

+ */

+

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <X11/Xos.h>

+#include <stdio.h>

+#include <time.h>

+#include <sys/stat.h>

+#include <stdarg.h>

+#include <stdlib.h>	/* for malloc() */

+#include <errno.h>

+

+#include "input.h"

+#include "site.h"

+#include "opaque.h"

+

+#ifdef WIN32

+#include <process.h>

+#ifndef _MSC_VER

+#define getpid(x) _getpid(x)

+#endif

+#endif

+

+#ifdef _MSC_VER

+#define S_ISREG(m)  (((m)&_S_IFMT) == _S_IFREG)

+#endif

+

+#ifdef XF86BIGFONT

+#include "xf86bigfontsrv.h"

+#endif

+

+#ifdef DDXOSVERRORF

+void (*OsVendorVErrorFProc)(const char *, va_list args) = NULL;

+#endif

+

+static FILE *logFile = NULL;

+static Bool logFlush = FALSE;

+static Bool logSync = FALSE;

+static int logVerbosity = DEFAULT_LOG_VERBOSITY;

+static int logFileVerbosity = DEFAULT_LOG_FILE_VERBOSITY;

+

+/* Buffer to information logged before the log file is opened. */

+static char *saveBuffer = NULL;

+static int bufferSize = 0, bufferUnused = 0, bufferPos = 0;

+static Bool needBuffer = TRUE;

+

+#ifdef __APPLE__

+#include <AvailabilityMacros.h>

+

+static char __crashreporter_info_buff__[4096] = {0};

+static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];

+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

+// This is actually a toolchain requirement, but I'm not sure the correct check,        

+// but it should be fine to just only include it for Leopard and later.  This line

+// just tells the linker to never strip this symbol (such as for space optimization)

+asm (".desc ___crashreporter_info__, 0x10");

+#endif

+#endif

+

+/* Prefix strings for log messages. */

+#ifndef X_UNKNOWN_STRING

+#define X_UNKNOWN_STRING		"(\?\?)"

+#endif

+#ifndef X_PROBE_STRING

+#define X_PROBE_STRING			"(--)"

+#endif

+#ifndef X_CONFIG_STRING

+#define X_CONFIG_STRING			"(**)"

+#endif

+#ifndef X_DEFAULT_STRING

+#define X_DEFAULT_STRING		"(==)"

+#endif

+#ifndef X_CMDLINE_STRING

+#define X_CMDLINE_STRING		"(++)"

+#endif

+#ifndef X_NOTICE_STRING

+#define X_NOTICE_STRING			"(!!)"

+#endif

+#ifndef X_ERROR_STRING

+#define X_ERROR_STRING			"(EE)"

+#endif

+#ifndef X_WARNING_STRING

+#define X_WARNING_STRING		"(WW)"

+#endif

+#ifndef X_INFO_STRING

+#define X_INFO_STRING			"(II)"

+#endif

+#ifndef X_NOT_IMPLEMENTED_STRING

+#define X_NOT_IMPLEMENTED_STRING	"(NI)"

+#endif

+

+/*

+ * LogInit is called to start logging to a file.  It is also called (with

+ * NULL arguments) when logging to a file is not wanted.  It must always be

+ * called, otherwise log messages will continue to accumulate in a buffer.

+ *

+ * %s, if present in the fname or backup strings, is expanded to the display

+ * string.

+ */

+

+const char *

+LogInit(const char *fname, const char *backup)

+{

+    char *logFileName = NULL;

+

+    if (fname && *fname) {

+	logFileName = malloc(strlen(fname) + strlen(display) + 1);

+	if (!logFileName)

+	    FatalError("Cannot allocate space for the log file name\n");

+	sprintf(logFileName, fname, display);

+

+	if (backup && *backup) {

+	    struct stat buf;

+

+	    if (!stat(logFileName, &buf) && S_ISREG(buf.st_mode)) {

+		char *suffix;

+		char *oldLog;

+

+		oldLog = malloc(strlen(logFileName) + strlen(backup) +

+				strlen(display) + 1);

+		suffix = malloc(strlen(backup) + strlen(display) + 1);

+		if (!oldLog || !suffix)

+		    FatalError("Cannot allocate space for the log file name\n");

+		sprintf(suffix, backup, display);

+		sprintf(oldLog, "%s%s", logFileName, suffix);

+		free(suffix);

+		if (rename(logFileName, oldLog) == -1) {

+		    FatalError("Cannot move old log file \"%s\" to \"%s\"\n",

+			       logFileName, oldLog);

+		}

+		free(oldLog);

+	    }

+	}

+	if ((logFile = fopen(logFileName, "w")) == NULL)

+	    FatalError("Cannot open log file \"%s\"\n", logFileName);

+	setvbuf(logFile, NULL, _IONBF, 0);

+

+	/* Flush saved log information. */

+	if (saveBuffer && bufferSize > 0) {

+	    fwrite(saveBuffer, bufferPos, 1, logFile);

+	    fflush(logFile);

+#ifndef WIN32

+	    fsync(fileno(logFile));

+#endif

+	}

+    }

+

+    /*

+     * Unconditionally free the buffer, and flag that the buffer is no longer

+     * needed.

+     */

+    if (saveBuffer && bufferSize > 0) {

+	free(saveBuffer);	/* Must be free(), not free() */

+	saveBuffer = NULL;

+	bufferSize = 0;

+    }

+    needBuffer = FALSE;

+

+    return logFileName;

+}

+

+void

+LogClose(void)

+{

+    if (logFile) {

+	fclose(logFile);

+	logFile = NULL;

+    }

+}

+

+Bool

+LogSetParameter(LogParameter param, int value)

+{

+    switch (param) {

+    case XLOG_FLUSH:

+	logFlush = value ? TRUE : FALSE;

+	return TRUE;

+    case XLOG_SYNC:

+	logSync = value ? TRUE : FALSE;

+	return TRUE;

+    case XLOG_VERBOSITY:

+	logVerbosity = value;

+	return TRUE;

+    case XLOG_FILE_VERBOSITY:

+	logFileVerbosity = value;

+	return TRUE;

+    default:

+	return FALSE;

+    }

+}

+

+/* This function does the actual log message writes. */

+

+void

+LogVWrite(int verb, const char *f, va_list args)

+{

+    char tmpBuffer[1024];

+    int len = 0;

+    static Bool newline = TRUE;

+

+    if (newline) {

+	sprintf(tmpBuffer, "[%10.3f] ", GetTimeInMillis() / 1000.0);

+	len = strlen(tmpBuffer);

+	if (logFile)

+	    fwrite(tmpBuffer, len, 1, logFile);

+    }

+

+    /*

+     * Since a va_list can only be processed once, write the string to a

+     * buffer, and then write the buffer out to the appropriate output

+     * stream(s).

+     */

+    if (verb < 0 || logFileVerbosity >= verb || logVerbosity >= verb) {

+	vsnprintf(tmpBuffer, sizeof(tmpBuffer)-1, f, args);

+        tmpBuffer[sizeof(tmpBuffer)-1]=0;

+	len = strlen(tmpBuffer);

+    }

+    newline = (tmpBuffer[len-1] == '\n');

+    if ((verb < 0 || logVerbosity >= verb) && len > 0)

+	fwrite(tmpBuffer, len, 1, stderr);

+    if ((verb < 0 || logFileVerbosity >= verb) && len > 0) {

+	if (logFile) {

+	    fwrite(tmpBuffer, len, 1, logFile);

+	    if (logFlush) {

+		fflush(logFile);

+#ifndef WIN32

+		if (logSync)

+		    fsync(fileno(logFile));

+#endif

+	    }

+	} else if (needBuffer) {

+	    if (len > bufferUnused) {

+		bufferSize += 1024;

+		bufferUnused += 1024;

+		saveBuffer = realloc(saveBuffer, bufferSize);

+		if (!saveBuffer)

+		    FatalError("realloc() failed while saving log messages\n");

+	    }

+	    bufferUnused -= len;

+	    memcpy(saveBuffer + bufferPos, tmpBuffer, len);

+	    bufferPos += len;

+	}

+    }

+}

+

+void

+LogWrite(int verb, const char *f, ...)

+{

+    va_list args;

+

+    va_start(args, f);

+    LogVWrite(verb, f, args);

+    va_end(args);

+}

+

+void

+LogVMessageVerb(MessageType type, int verb, const char *format, va_list args)

+{

+    const char *s  = X_UNKNOWN_STRING;

+    char tmpBuf[1024];

+

+    /* Ignore verbosity for X_ERROR */

+    if (logVerbosity >= verb || logFileVerbosity >= verb || type == X_ERROR) {

+	switch (type) {

+	case X_PROBED:

+	    s = X_PROBE_STRING;

+	    break;

+	case X_CONFIG:

+	    s = X_CONFIG_STRING;

+	    break;

+	case X_DEFAULT:

+	    s = X_DEFAULT_STRING;

+	    break;

+	case X_CMDLINE:

+	    s = X_CMDLINE_STRING;

+	    break;

+	case X_NOTICE:

+	    s = X_NOTICE_STRING;

+	    break;

+	case X_ERROR:

+	    s = X_ERROR_STRING;

+	    if (verb > 0)

+		verb = 0;

+	    break;

+	case X_WARNING:

+	    s = X_WARNING_STRING;

+	    break;

+	case X_INFO:

+	    s = X_INFO_STRING;

+	    break;

+	case X_NOT_IMPLEMENTED:

+	    s = X_NOT_IMPLEMENTED_STRING;

+	    break;

+	case X_UNKNOWN:

+	    s = X_UNKNOWN_STRING;

+	    break;

+	case X_NONE:

+	    s = NULL;

+	    break;

+	}

+

+        /* if s is not NULL we need a space before format */

+        snprintf(tmpBuf, sizeof(tmpBuf), "%s%s%s", s ? s : "",

+                                                   s ? " " : "",

+                                                   format);

+        LogVWrite(verb, tmpBuf, args);

+    }

+}

+

+/* Log message with verbosity level specified. */

+void

+LogMessageVerb(MessageType type, int verb, const char *format, ...)

+{

+    va_list ap;

+

+    va_start(ap, format);

+    LogVMessageVerb(type, verb, format, ap);

+    va_end(ap);

+}

+

+/* Log a message with the standard verbosity level of 1. */

+void

+LogMessage(MessageType type, const char *format, ...)

+{

+    va_list ap;

+

+    va_start(ap, format);

+    LogVMessageVerb(type, 1, format, ap);

+    va_end(ap);

+}

+

+void

+AbortServer(void) _X_NORETURN;

+

+void

+AbortServer(void)

+{

+#ifdef XF86BIGFONT

+    XF86BigfontCleanup();

+#endif

+    CloseWellKnownConnections();

+    OsCleanup(TRUE);

+    CloseDownDevices();

+    AbortDDX();

+    fflush(stderr);

+    if (CoreDump)

+	OsAbort();

+    exit (1);

+}

+

+#define AUDIT_PREFIX "AUDIT: %s: %ld: "

+#ifndef AUDIT_TIMEOUT

+#define AUDIT_TIMEOUT ((CARD32)(120 * 1000)) /* 2 mn */

+#endif

+

+static int nrepeat = 0;

+static int oldlen = -1;

+static OsTimerPtr auditTimer = NULL;

+

+void

+FreeAuditTimer(void)

+{

+    if (auditTimer != NULL) {

+	/* Force output of pending messages */

+	TimerForce(auditTimer);

+	TimerFree(auditTimer);

+	auditTimer = NULL;

+    }

+}

+

+static char *

+AuditPrefix(void)

+{

+    time_t tm;

+    char *autime, *s;

+    char *tmpBuf;

+    int len;

+

+    time(&tm);

+    autime = ctime(&tm);

+    if ((s = strchr(autime, '\n')))

+	*s = '\0';

+    len = strlen(AUDIT_PREFIX) + strlen(autime) + 10 + 1;

+    tmpBuf = malloc(len);

+    if (!tmpBuf)

+	return NULL;

+    snprintf(tmpBuf, len, AUDIT_PREFIX, autime, (unsigned long)getpid());

+    return tmpBuf;

+}

+

+void

+AuditF(const char * f, ...)

+{

+    va_list args;

+

+    va_start(args, f);

+

+    VAuditF(f, args);

+    va_end(args);

+}

+

+static CARD32

+AuditFlush(OsTimerPtr timer, CARD32 now, pointer arg)

+{

+    char *prefix;

+

+    if (nrepeat > 0) {

+	prefix = AuditPrefix();

+	ErrorF("%slast message repeated %d times\n",

+	       prefix != NULL ? prefix : "", nrepeat);

+	nrepeat = 0;

+	free(prefix);

+	return AUDIT_TIMEOUT;

+    } else {

+	/* if the timer expires without anything to print, flush the message */

+	oldlen = -1;

+	return 0;

+    }

+}

+

+void

+VAuditF(const char *f, va_list args)

+{

+    char *prefix;

+    char buf[1024];

+    int len;

+    static char oldbuf[1024];

+

+    prefix = AuditPrefix();

+    len = vsnprintf(buf, sizeof(buf), f, args);

+

+    if (len == oldlen && strcmp(buf, oldbuf) == 0) {

+	/* Message already seen */

+	nrepeat++;

+    } else {

+	/* new message */

+	if (auditTimer != NULL)

+	    TimerForce(auditTimer);

+	ErrorF("%s%s", prefix != NULL ? prefix : "", buf);

+	strlcpy(oldbuf, buf, sizeof(oldbuf));

+	oldlen = len;

+	nrepeat = 0;

+	auditTimer = TimerSet(auditTimer, 0, AUDIT_TIMEOUT, AuditFlush, NULL);

+    }

+    free(prefix);

+}

+

+extern char g_FatalErrorMessage[1024];

+

+void

+FatalError(const char *f, ...)

+{

+    va_list args;

+    static Bool beenhere = FALSE;

+

+    if (beenhere)

+	ErrorF("\nFatalError re-entered, aborting\n");

+    else

+	ErrorF("\nFatal server error:\n");

+

+    va_start(args, f);

+#ifdef __APPLE__

+    (void)vsnprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__), f, args);

+#endif

+#ifdef WIN32

+    vsnprintf(g_FatalErrorMessage, 1024, f, args);

+#endif

+    VErrorF(f, args);

+    va_end(args);

+    ErrorF("\n");

+    if (!beenhere)

+	OsVendorFatalError();

+    if (!beenhere) {

+	beenhere = TRUE;

+	AbortServer();

+    } else

+	OsAbort();

+    /*NOTREACHED*/

+}

+

+void

+VErrorF(const char *f, va_list args)

+{

+#ifdef DDXOSVERRORF

+    if (OsVendorVErrorFProc)

+	OsVendorVErrorFProc(f, args);

+    else

+	LogVWrite(-1, f, args);

+#else

+    LogVWrite(-1, f, args);

+#endif

+}

+

+void

+ErrorF(const char * f, ...)

+{

+    va_list args;

+

+    va_start(args, f);

+    VErrorF(f, args);

+    va_end(args);

+}

+

+/* A perror() workalike. */

+

+void

+Error(char *str)

+{

+    char *err = NULL;

+    int saveErrno = errno;

+

+    if (str) {

+	err = malloc(strlen(strerror(saveErrno)) + strlen(str) + 2 + 1);

+	if (!err)

+	    return;

+	sprintf(err, "%s: ", str);

+	strcat(err, strerror(saveErrno));

+	LogWrite(-1, "%s", err);

+	free(err);

+    } else

+	LogWrite(-1, "%s", strerror(saveErrno));

+}

+

+void

+LogPrintMarkers(void)

+{

+    /* Show what the message marker symbols mean. */

+    LogWrite(0, "Markers: ");

+    LogMessageVerb(X_PROBED, 0, "probed, ");

+    LogMessageVerb(X_CONFIG, 0, "from config file, ");

+    LogMessageVerb(X_DEFAULT, 0, "default setting,\n\t");

+    LogMessageVerb(X_CMDLINE, 0, "from command line, ");

+    LogMessageVerb(X_NOTICE, 0, "notice, ");

+    LogMessageVerb(X_INFO, 0, "informational,\n\t");

+    LogMessageVerb(X_WARNING, 0, "warning, ");

+    LogMessageVerb(X_ERROR, 0, "error, ");

+    LogMessageVerb(X_NOT_IMPLEMENTED, 0, "not implemented, ");

+    LogMessageVerb(X_UNKNOWN, 0, "unknown.\n");

+}

+

diff --git a/xorg-server/os/strlcat.c b/xorg-server/os/strlcat.c
index 91ceabb1c..e374e2908 100644
--- a/xorg-server/os/strlcat.c
+++ b/xorg-server/os/strlcat.c
@@ -1,59 +1,59 @@
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
- * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <sys/types.h>
-#include <string.h>
-#include "os.h"
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat(char *dst, const char *src, size_t siz)
-{
-	register char *d = dst;
-	register const char *s = src;
-	register size_t n = siz;
-	size_t dlen;
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
+/*

+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>

+ *

+ * Permission to use, copy, modify, and distribute this software for any

+ * purpose with or without fee is hereby granted, provided that the above

+ * copyright notice and this permission notice appear in all copies.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL

+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES

+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE

+ * FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION

+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN

+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+ */

+

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include <sys/types.h>

+#include <string.h>

+#include "os.h"

+

+/*

+ * Appends src to string dst of size siz (unlike strncat, siz is the

+ * full size of dst, not space left).  At most siz-1 characters

+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).

+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).

+ * If retval >= siz, truncation occurred.

+ */

+size_t

+strlcat(char *dst, const char *src, size_t siz)

+{

+	register char *d = dst;

+	register const char *s = src;

+	register size_t n = siz;

+	size_t dlen;

+

+	/* Find the end of dst and adjust bytes left but don't go past end */

+	while (n-- != 0 && *d != '\0')

+		d++;

+	dlen = d - dst;

+	n = siz - dlen;

+

+	if (n == 0)

+		return(dlen + strlen(s));

+	while (*s != '\0') {

+		if (n != 1) {

+			*d++ = *s;

+			n--;

+		}

+		s++;

+	}

+	*d = '\0';

+

+	return(dlen + (s - src));	/* count does not include NUL */

+}

diff --git a/xorg-server/os/strlcpy.c b/xorg-server/os/strlcpy.c
index 647adb5e9..006cd7dc2 100644
--- a/xorg-server/os/strlcpy.c
+++ b/xorg-server/os/strlcpy.c
@@ -14,8 +14,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */

 

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

 #endif

 

 #include <sys/types.h>

diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index 11d2ac8fa..9737ced88 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -514,12 +514,9 @@ void UseMsg(void)
     ErrorF("-ls int                limit stack space to N Kb\n");

 #endif

     ErrorF("-nolock                disable the locking mechanism\n");

-#ifndef NOLOGOHACK

-    ErrorF("-logo                  enable logo in screen saver\n");

-    ErrorF("nologo                 disable logo in screen saver\n");

-#endif

     ErrorF("-nolisten string       don't listen on protocol\n");

     ErrorF("-noreset               don't reset after last client exists\n");

+    ErrorF("-background [none]     create root window with no background\n");

     ErrorF("-reset                 reset after last client exists\n");

     ErrorF("-p #                   screen-saver pattern duration (minutes)\n");

     ErrorF("-pn                    accept failure to listen on all ports\n");

@@ -773,16 +770,6 @@ ProcessCommandLine(int argc, char *argv[])
 #endif

 	    nolock = TRUE;

 	}

-#ifndef NOLOGOHACK

-	else if ( strcmp( argv[i], "-logo") == 0)

-	{

-	    logoScreenSaver = 1;

-	}

-	else if ( strcmp( argv[i], "nologo") == 0)

-	{

-	    logoScreenSaver = 0;

-	}

-#endif

 	else if ( strcmp( argv[i], "-nolisten") == 0)

 	{

             if(++i < argc) {

@@ -860,6 +847,14 @@ ProcessCommandLine(int argc, char *argv[])
 	    defaultBackingStore = WhenMapped;

         else if ( strcmp( argv[i], "-wr") == 0)

             whiteRoot = TRUE;

+        else if ( strcmp( argv[i], "-background") == 0) {

+            if(++i < argc) {

+                if (!strcmp ( argv[i], "none"))

+                    bgNoneRoot = TRUE;

+                else

+                    UseMsg();

+            }

+        }

         else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {

              if(++i < argc) {

                  long reqSizeArg = atol(argv[i]);