diff options
Diffstat (limited to 'os/utils.c')
| -rw-r--r-- | os/utils.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/os/utils.c b/os/utils.c index c10fad5ae..654c8bc7e 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1,4 +1,4 @@ -/* $XdotOrg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ +/* $XdotOrg: xc/programs/Xserver/os/utils.c,v 1.1.4.6 2004/02/25 21:47:04 kaleb Exp $ */ /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* @@ -50,7 +50,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.95 2003/10/01 18:36:38 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.97 2004/01/09 00:35:06 dawes Exp $ */ #ifdef __CYGWIN__ #include <stdlib.h> @@ -129,12 +129,12 @@ OR PERFORMANCE OF THIS SOFTWARE. Bool CoreDump; Bool noTestExtensions; -Bool noXineramaExtension = TRUE; +Bool noPanoramiXExtension = TRUE; #ifdef XINERAMA -Bool XineramaVisibilityNotifySent = FALSE; -Bool XineramaMapped = FALSE; -Bool XineramaWindowExposureSent = FALSE; -Bool XineramaOneExposeRequest = FALSE; +Bool PanoramiXVisibilityNotifySent = FALSE; +Bool PanoramiXMapped = FALSE; +Bool PanoramiXWindowExposureSent = FALSE; +Bool PanoramiXOneExposeRequest = FALSE; #endif int auditTrailLevel = 1; @@ -245,6 +245,7 @@ LockServer(void) int lfd, i, haslock, l_pid, t; char *tmppath = NULL; int len; + char port[20]; if (nolock) return; /* @@ -259,13 +260,14 @@ LockServer(void) FatalError("No TMP dir found\n"); #endif + sprintf(port, "%d", atoi(display)); len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) : strlen(LOCK_TMP_PREFIX); - len += strlen(tmppath) + strlen(display) + strlen(LOCK_SUFFIX) + 1; + len += strlen(tmppath) + strlen(port) + strlen(LOCK_SUFFIX) + 1; if (len > sizeof(LockFile)) - FatalError("Display name `%s' is too long\n", display); - (void)sprintf(tmp, "%s" LOCK_TMP_PREFIX "%s" LOCK_SUFFIX, tmppath, display); - (void)sprintf(LockFile, "%s" LOCK_PREFIX "%s" LOCK_SUFFIX, tmppath, display); + FatalError("Display name `%s' is too long\n", port); + (void)sprintf(tmp, "%s" LOCK_TMP_PREFIX "%s" LOCK_SUFFIX, tmppath, port); + (void)sprintf(LockFile, "%s" LOCK_PREFIX "%s" LOCK_SUFFIX, tmppath, port); /* * Create a temporary file containing our PID. Attempt three times @@ -360,7 +362,7 @@ LockServer(void) */ unlink(tmp); FatalError("Server is already active for display %s\n%s %s\n%s\n", - display, "\tIf this server is no longer running, remove", + port, "\tIf this server is no longer running, remove", LockFile, "\tand start again."); } } @@ -585,8 +587,10 @@ ProcessCommandLine(int argc, char *argv[]) defaultKeyboardControl.autoRepeat = TRUE; -#ifdef PART_NET - PartialNetwork = TRUE; +#ifdef NO_PART_NET + PartialNetwork = FALSE; +#else + PartialNetwork = TRUE; #endif for ( i = 1; i < argc; i++ ) @@ -882,10 +886,10 @@ ProcessCommandLine(int argc, char *argv[]) } #ifdef XINERAMA else if ( strcmp( argv[i], "+xinerama") == 0){ - noXineramaExtension = FALSE; + noPanoramiXExtension = FALSE; } else if ( strcmp( argv[i], "-xinerama") == 0){ - noXineramaExtension = TRUE; + noPanoramiXExtension = TRUE; } #endif else if ( strcmp( argv[i], "-x") == 0) |