This patch should be applied to an un-modified XFree86 version 4.5.0 source tree. It is patch 4 of 4 patches that will will convert the source tree to XFree86 version 4.6.0. To apply this patch, run the following from the directory containing your 'xc' directory: patch -p0 -E < XFree86-4.5.0-4.6.0.diff1 patch -p0 -E < XFree86-4.5.0-4.6.0.diff2 patch -p0 -E < XFree86-4.5.0-4.6.0.diff3 patch -p0 -E < XFree86-4.5.0-4.6.0.diff4 sh XFree86-4.5.0-4.6.0-cleanup.sh gzip -d < XFree86-4.5.0-4.6.0-diff0.tgz | tar vxf - ------------------------------------------------------------------------------- Index: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c diff -u xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c:1.14 xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c:1.15 --- xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c:1.14 Tue Sep 23 01:21:46 2003 +++ xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c Fri Oct 14 11:17:09 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.14 2003/09/23 05:21:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v 1.15 2005/10/14 15:17:09 tsi Exp $ */ /* * Display the Subsystem Vendor Id and Subsystem Id in order to identify * the cards installed in this computer @@ -51,7 +51,7 @@ /* XXX This is including a lot of stuff that modules should not include! */ -#include "X.h" +#include #include "os.h" #include "xf86.h" #include "xf86Priv.h" Index: xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile diff -u xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile:1.4 xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile:1.5 --- xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile:1.4 Mon May 31 20:17:06 2004 +++ xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile Fri Oct 14 11:17:09 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile,v 1.4 2004/06/01 00:17:06 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/module/Imakefile,v 1.5 2005/10/14 15:17:09 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -52,8 +52,7 @@ MODPATHDEFINES = -DDEFAULT_MODULE_PATH=\"$(MODULEDIR)\" INCLUDES = -I.. -I$(XF86SRC)/common -I$(XF86OSSRC) -I$(XF86OSSRC)/bus \ -I$(SERVERSRC)/include -I$(SERVERSRC)/os \ - -I$(XINCLUDESRC) -I$(SERVERSRC)/Xext -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xi \ + -I$(SERVERSRC)/Xext -I$(SERVERSRC)/Xi \ -I$(FONTLIBSRC)/include -I$(XF86PARSERSRC) \ -I$(XF86SRC)/loader $(VGAINCLUDES) -I$(XF86SRC)/rac Index: xc/programs/Xserver/hw/xfree86/shadowfb/Imakefile diff -u xc/programs/Xserver/hw/xfree86/shadowfb/Imakefile:1.6 xc/programs/Xserver/hw/xfree86/shadowfb/Imakefile:1.7 --- xc/programs/Xserver/hw/xfree86/shadowfb/Imakefile:1.6 Mon May 31 20:17:06 2004 +++ xc/programs/Xserver/hw/xfree86/shadowfb/Imakefile Fri Oct 14 11:17:09 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/Imakefile,v 1.6 2004/06/01 00:17:06 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/Imakefile,v 1.7 2005/10/14 15:17:09 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -57,12 +57,10 @@ SRCS = shadow.c $(XFMODSRC) - OBJS = shadow.o $(XFMODOBJ) -INCLUDES = -I. -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XF86OSSRC) -I$(XF86COMSRC) -I$(XINCLUDESRC) -I$(FONTINCSRC) \ - -I../../../render -I$(EXTINCSRC) +INCLUDES = -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ + -I$(XF86OSSRC) -I$(XF86COMSRC) -I../../../render ModuleObjectRule() Index: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c diff -u xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c:1.21 xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c:1.22 --- xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c:1.21 Mon Nov 10 13:22:38 2003 +++ xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c Fri Oct 14 11:17:09 2005 @@ -6,20 +6,20 @@ Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.21 2003/11/10 18:22:38 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.22 2005/10/14 15:17:09 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "pixmapstr.h" #include "input.h" -#include "font.h" +#include #include "mi.h" #include "scrnintstr.h" #include "windowstr.h" #include "gcstruct.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "xf86.h" #include "xf86str.h" #include "shadowfb.h" Index: xc/programs/Xserver/hw/xfree86/testmod/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xfree86/testmod/Imakefile:1.1 --- /dev/null Tue May 9 21:57:38 2006 +++ xc/programs/Xserver/hw/xfree86/testmod/Imakefile Wed Mar 1 22:00:39 2006 @@ -0,0 +1,26 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/testmod/Imakefile,v 1.1 2006/03/02 03:00:39 dawes Exp $ + +#define IHaveModules +#include + +SRCS1 = testmod1.c +OBJS1 = testmod1.o + +SRCS2 = test2mod1.c +OBJS2 = test2mod1.o + +SRCS = $(SRCS1) $(SRCS2) + + INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ + -I$(SERVERSRC)/include -I$(XINCLUDESRC) + +ModuleObjectRule() + +ObjectModuleTarget(testmod,$(OBJS1),.) +ObjectModuleTarget(test2mod,$(OBJS2),.) + +InstallObjectModule(testmod,$(MODULEDIR),.) +InstallObjectModule(test2mod,$(MODULEDIR),.) + +DependTarget() + Index: xc/programs/Xserver/hw/xfree86/testmod/test2mod1.c diff -u /dev/null xc/programs/Xserver/hw/xfree86/testmod/test2mod1.c:1.2 --- /dev/null Tue May 9 21:57:38 2006 +++ xc/programs/Xserver/hw/xfree86/testmod/test2mod1.c Thu Mar 16 11:50:35 2006 @@ -0,0 +1,116 @@ +/* $XFree86: xc/programs/Xserver/hw/xfree86/testmod/test2mod1.c,v 1.2 2006/03/16 16:50:35 dawes Exp $ */ +/* + * Copyright 2003-2006 by David H. Dawes. + * Copyright 2003-2006 by X-Oz Technologies. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by X-Oz Technologies + * (http://www.x-oz.com/)." Alternately, this acknowledgment may + * appear in the software itself, if and wherever such third-party + * acknowledgments normally appear. + * + * 4. Except as contained in this notice, the name of X-Oz + * Technologies shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from X-Oz Technologies. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL X-OZ TECHNOLOGIES OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include "xf86Module.h" +#include "xf86.h" + +static XF86ModuleVersionInfo VersRec = { + "test2mod", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XF86_VERSION_CURRENT, + 0, 1, 1, + ABI_CLASS_ANSIC, + ABI_ANSIC_VERSION, + MOD_CLASS_NONE, + {0, 0, 0, 0} +}; + +static MODULESETUPPROTO(test2modSetup); +static MODULETEARDOWNPROTO(test2modTearDown); + +XF86ModuleData test2modModuleData = + { &VersRec, test2modSetup, test2modTearDown }; + +static pointer +test2modSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) +{ + static Bool setupDone = FALSE; + + ErrorF("test2modSetup: This module (%p) has %salready been loaded\n", + module, setupDone ? "" : "NOT "); + setupDone = TRUE; + xf86LoaderModRefSymbols(module, "testmodFunction1", NULL); + + return (pointer)1; +} + +static void +test2modTearDown(pointer data) +{ + ErrorF("test2modTearDown: called with data %p\n", data); +} + +extern int testmodFunction1(int value); +extern int testmodFunction2(int value); + +int test2modFunction1(int value); +int test2modFunction2(int value); + +#if 1 +char *test2modExportedSymbols[] = { + "test2modFunction1", + NULL +}; +#endif + +int +test2modFunction1(int value) +{ + ErrorF("test2modFunction1: called with value %d\n", value); + return testmodFunction1(value); +} + +int +test2modFunction2(int value) +{ + ErrorF("test2modFunction2: called with value %d\n", value); + return testmodFunction2(value); +} + + Index: xc/programs/Xserver/hw/xfree86/testmod/testmod1.c diff -u /dev/null xc/programs/Xserver/hw/xfree86/testmod/testmod1.c:1.2 --- /dev/null Tue May 9 21:57:38 2006 +++ xc/programs/Xserver/hw/xfree86/testmod/testmod1.c Thu Mar 16 11:50:35 2006 @@ -0,0 +1,144 @@ +/* $XFree86: xc/programs/Xserver/hw/xfree86/testmod/testmod1.c,v 1.2 2006/03/16 16:50:35 dawes Exp $ */ +/* + * Copyright 2003-2006 by David H. Dawes. + * Copyright 2003-2006 by X-Oz Technologies. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by X-Oz Technologies + * (http://www.x-oz.com/)." Alternately, this acknowledgment may + * appear in the software itself, if and wherever such third-party + * acknowledgments normally appear. + * + * 4. Except as contained in this notice, the name of X-Oz + * Technologies shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from X-Oz Technologies. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL X-OZ TECHNOLOGIES OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include "xf86Module.h" +#include "xf86.h" + +static XF86ModuleVersionInfo VersRec = { + "testmod", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XF86_VERSION_CURRENT, + 0, 1, 0, + ABI_CLASS_ANSIC, + ABI_ANSIC_VERSION, + MOD_CLASS_NONE, + {0, 0, 0, 0} +}; + +static MODULESETUPPROTO(testmodSetup); +static MODULETEARDOWNPROTO(testmodTearDown); + +XF86ModuleData testmodModuleData = { &VersRec, testmodSetup, testmodTearDown }; + +static pointer +testmodSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) +{ + static Bool setupDone = FALSE; + + ErrorF("testmodSetup: This module (%p) has %salready been loaded\n", + module, setupDone ? "" : "NOT "); + setupDone = TRUE; + xf86LoaderModRefSymbols(module, "test2modFunction1", "test2modFunction2", NULL); + + return (pointer)1; +} + +static void +testmodTearDown(pointer data) +{ + ErrorF("testmodTearDown: called with data %p\n", data); +} + +int testmodFunction1(int value); +int testmodFunction2(int value); +int testmodFunction3(int value); + +#if 1 +const char *testmodExportedSymbols[] = { + "testmodFunction1", + "testmodFunction3", + NULL +}; +#endif + +int +testmodFunction1(int value) +{ + ErrorF("testmodFunction1: called with value %d\n", value); + return value; +} + +int +testmodFunction2(int value) +{ + ErrorF("testmodFunction2: called with value %d\n", value); + return value; +} + +extern void bdfError(char *, ...); + +static int +testmodFunction4(void) +{ + ErrorF("testmodFunction4\n"); + bdfError("testmodfunc4 says \"g'day\"\n"); + return 1; +} + +int +testmodFunction3(int value) +{ + ErrorF("testmodFunction3: called with value %d\n", value); + ErrorF("testmodFunction3: bdfError is %p\n", (void *)bdfError); + if ((void *)bdfError) { + bdfError("testmodfunc3 says \"g'day\"\n"); + } else { + ErrorF("testmodFunction3: bdfError isn't defined\n"); + } + testmodFunction4(); +#if 1 + if (value == 2) { + strlcat(NULL, "abc", 100); + sprintf(NULL, "hello"); + } +#endif + return value; +} + + Index: xc/programs/Xserver/hw/xfree86/vbe/Imakefile diff -u xc/programs/Xserver/hw/xfree86/vbe/Imakefile:1.5 xc/programs/Xserver/hw/xfree86/vbe/Imakefile:1.6 --- xc/programs/Xserver/hw/xfree86/vbe/Imakefile:1.5 Thu Aug 5 16:11:38 2004 +++ xc/programs/Xserver/hw/xfree86/vbe/Imakefile Fri Oct 14 11:17:10 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vbe/Imakefile,v 1.5 2004/08/05 20:11:38 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vbe/Imakefile,v 1.6 2005/10/14 15:17:10 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -58,12 +58,8 @@ SRCS = vbe.c vbeModes.c $(MODSRC) OBJS = vbe.o vbeModes.o $(MODOBJ) -INCLUDES = -I. -I$(XF86COMSRC) -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(XF86SRC)/int10 -I$(XF86SRC)/ddc \ - -I$(XF86SRC)/i2c - -DEFINES = +INCLUDES = -I$(XF86COMSRC) -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ + -I$(XF86SRC)/int10 -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c ModuleObjectRule() Index: xc/programs/Xserver/hw/xfree86/vbe/vbe.c diff -u xc/programs/Xserver/hw/xfree86/vbe/vbe.c:1.6 xc/programs/Xserver/hw/xfree86/vbe/vbe.c:1.19 --- xc/programs/Xserver/hw/xfree86/vbe/vbe.c:1.6 Fri Feb 25 22:18:38 2005 +++ xc/programs/Xserver/hw/xfree86/vbe/vbe.c Thu Mar 16 11:50:35 2006 @@ -1,17 +1,17 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.6 2005/02/26 03:18:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.19 2006/03/16 16:50:35 dawes Exp $ */ /* * XFree86 vbe module * Copyright 2000 Egbert Eich * - * The mode query/save/set/restore functions from the vesa driver + * The mode query/save/set/restore functions from the vesa driver * have been moved here. * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) - * Authors: Paulo César Pereira de Andrade + * Authors: Paulo César Pereira de Andrade */ /* - * Copyright (c) 2002-2005 by The XFree86 Project, Inc. + * Copyright (c) 2002-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -57,26 +57,16 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "xf86.h" -#include "xf86_ansic.h" #include "vbe.h" -#include "Xarch.h" +#include #define DPMS_SERVER -#include "extensions/dpms.h" +#include -#define VERSION(x) VBE_VERSION_MAJOR(x),VBE_VERSION_MINOR(x) +#define VERSION(x) VBE_VERSION_MAJOR(x), VBE_VERSION_MINOR(x) -#if X_BYTE_ORDER == X_LITTLE_ENDIAN -#define B_O16(x) (x) -#define B_O32(x) (x) -#else -#define B_O16(x) ((((x) & 0xff) << 8) | (((x) & 0xff) >> 8)) -#define B_O32(x) ((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) \ - | (((x) & 0xff0000) >> 8) | (((x) & 0xff000000) >> 24)) -#endif #define L_ADD(x) (B_O32(x) & 0xffff) + ((B_O32(x) >> 12) & 0xffff00) -#define FARP(p) (((unsigned)(p & 0xffff0000) >> 12) | (p & 0xffff)) +#define FARP(p) ((((unsigned)p & 0xffff0000) >> 12) + (p & 0xffff)) #define R16(v) ((v) & 0xffff) static unsigned char * vbeReadEDID(vbeInfoPtr pVbe); @@ -88,6 +78,16 @@ NULL }; +const char *vbe_int10Symbols[] = { + "xf86ExecX86int10", + "xf86FreeInt10", + "xf86InitInt10", + "xf86Int10AllocPages", + "xf86Int10FreePages", + "xf86int10Addr", + NULL +}; + static const char vbeVersionString[] = "VBE2"; vbeInfoPtr @@ -106,83 +106,96 @@ Bool init_int10 = FALSE; vbeInfoPtr vip = NULL; int screen = pScrn->scrnIndex; + unsigned long TotalMem; + ModuleDescPtr pMod, pInt10Mod = NULL; if (!pInt) { - if (!xf86LoadSubModule(pScrn, "int10")) + if (!(pInt10Mod = xf86LoadSubModule(pScrn, "int10"))) goto error; - xf86DrvMsg(screen,X_INFO,"initializing int10\n"); + xf86LoaderModReqSymLists(pInt10Mod, vbe_int10Symbols, NULL); + xf86DrvMsg(screen, X_INFO, "initializing int10\n"); pInt = xf86InitInt10(entityIndex); if (!pInt) goto error; init_int10 = TRUE; + } else { + if ((pMod = xf86GetSubModuleByName(pScrn->module, "int10"))) + xf86LoaderModReqSymLists(pMod, vbe_int10Symbols, NULL); } - - page = xf86Int10AllocPages(pInt,1,&RealOff); + + page = xf86Int10AllocPages(pInt, 1, &RealOff); if (!page) goto error; - vbe = (vbeControllerInfoPtr) page; - memcpy(vbe->VbeSignature,vbeVersionString,4); + vbe = (vbeControllerInfoPtr) page; + (void) memset(vbe, 0, 512); + (void) memcpy(vbe->VbeSignature, vbeVersionString, 4); pInt->ax = 0x4F00; pInt->es = SEG_ADDR(RealOff); pInt->di = SEG_OFF(RealOff); pInt->num = 0x10; - + xf86ExecX86int10(pInt); if ((pInt->ax & 0xff) != 0x4f) { - xf86DrvMsgVerb(screen,X_INFO,3,"VESA BIOS not detected\n"); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA BIOS not detected\n"); goto error; } - + switch (pInt->ax & 0xff00) { case 0: - xf86DrvMsg(screen,X_INFO,"VESA BIOS detected\n"); + xf86DrvMsg(screen, X_INFO, "VESA BIOS detected\n"); break; case 0x100: - xf86DrvMsg(screen,X_INFO,"VESA BIOS function failed\n"); + xf86DrvMsg(screen, X_INFO, "VESA BIOS function failed\n"); goto error; case 0x200: - xf86DrvMsg(screen,X_INFO,"VESA BIOS not supported\n"); + xf86DrvMsg(screen, X_INFO, "VESA BIOS not supported\n"); goto error; case 0x300: - xf86DrvMsg(screen,X_INFO,"VESA BIOS not supported in current mode\n"); + xf86DrvMsg(screen, X_INFO, "VESA BIOS not supported in current mode\n"); goto error; default: - xf86DrvMsg(screen,X_INFO,"Invalid\n"); + xf86DrvMsg(screen, X_INFO, "Invalid\n"); goto error; } - + xf86DrvMsgVerb(screen, X_INFO, 4, - "VbeVersion is %d, OemStringPtr is 0x%08lx,\n" + "VbeVersion is %ld, OemStringPtr is 0x%08lx,\n" "\tOemVendorNamePtr is 0x%08lx, OemProductNamePtr is 0x%08lx,\n" "\tOemProductRevPtr is 0x%08lx\n", - vbe->VbeVersion, (unsigned long)vbe->OemStringPtr, - (unsigned long)vbe->OemVendorNamePtr, - (unsigned long)vbe->OemProductNamePtr, - (unsigned long)vbe->OemProductRevPtr); + (unsigned long)B_O16(vbe->VbeVersion), + (unsigned long)B_O32(vbe->OemStringPtr), + (unsigned long)B_O32(vbe->OemVendorNamePtr), + (unsigned long)B_O32(vbe->OemProductNamePtr), + (unsigned long)B_O32(vbe->OemProductRevPtr)); - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE Version %i.%i\n", + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE Version %i.%i\n", VERSION(vbe->VbeVersion)); - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE Total Mem: %i kB\n", - vbe->TotalMem * 64); - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM: %s\n", - (CARD8*)xf86int10Addr(pInt,L_ADD(vbe->OemStringPtr))); - + + TotalMem = B_O16(vbe->TotalMem); + /* Some BIOS'es are off by one */ + TotalMem += TotalMem & 1U; + + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE Total Mem: %li kB\n", + TotalMem * 64); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM: %s\n", + (CARD8*)xf86int10Addr(pInt, L_ADD(vbe->OemStringPtr))); + if (B_O16(vbe->VbeVersion) >= 0x200) { - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM Software Rev: %i.%i\n", + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM Software Rev: %i.%i\n", VERSION(vbe->OemSoftwareRev)); if (vbe->OemVendorNamePtr) - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM Vendor: %s\n", - (CARD8*)xf86int10Addr(pInt,L_ADD(vbe->OemVendorNamePtr))); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM Vendor: %s\n", + (CARD8*)xf86int10Addr(pInt, L_ADD(vbe->OemVendorNamePtr))); if (vbe->OemProductNamePtr) - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM Product: %s\n", - (CARD8*)xf86int10Addr(pInt,L_ADD(vbe->OemProductNamePtr))); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM Product: %s\n", + (CARD8*)xf86int10Addr(pInt, L_ADD(vbe->OemProductNamePtr))); if (vbe->OemProductRevPtr) - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE OEM Product Rev: %s\n", - (CARD8*)xf86int10Addr(pInt,L_ADD(vbe->OemProductRevPtr))); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE OEM Product Rev: %s\n", + (CARD8*)xf86int10Addr(pInt, L_ADD(vbe->OemProductRevPtr))); } - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE Capabilities: " + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE Capabilities: " "0x%02x%02x%02x%02x\n", vbe->Capabilities[3], vbe->Capabilities[2], vbe->Capabilities[1], vbe->Capabilities[0]); @@ -194,14 +207,19 @@ vip->real_mode_base = RealOff; vip->num_pages = 1; vip->init_int10 = init_int10; + vip->pInt10Mod = pInt10Mod; + vip->pDDCMod = NULL; return vip; error: if (page) xf86Int10FreePages(pInt, page, 1); - if (init_int10) + if (init_int10) { xf86FreeInt10(pInt); + if (pInt10Mod) + xf86UnloadSubModule(pInt10Mod); + } return NULL; } @@ -211,10 +229,15 @@ if (!pVbe) return; - xf86Int10FreePages(pVbe->pInt10,pVbe->memory,pVbe->num_pages); + xf86Int10FreePages(pVbe->pInt10, pVbe->memory, pVbe->num_pages); /* If we have initalized int10 we ought to free it, too */ - if (pVbe->init_int10) + if (pVbe->init_int10) { xf86FreeInt10(pVbe->pInt10); + if (pVbe->pInt10Mod) + xf86UnloadSubModule(pVbe->pInt10Mod); + } + if (pVbe->pDDCMod) + xf86UnloadSubModule(pVbe->pDDCMod); xfree(pVbe); return; } @@ -224,7 +247,7 @@ { char *ddc_level; int screen = pVbe->pInt10->scrnIndex; - + if (!pVbe || (pVbe->ddc == DDC_NONE)) return FALSE; if (pVbe->ddc != DDC_UNCHECKED) @@ -240,50 +263,53 @@ xf86ExecX86int10(pVbe->pInt10); if ((pVbe->pInt10->ax & 0xff) != 0x4f) { - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC not supported\n"); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC not supported\n"); pVbe->ddc = DDC_NONE; return FALSE; } switch ((pVbe->pInt10->ax >> 8) & 0xff) { case 0: - xf86DrvMsg(screen,X_INFO,"VESA VBE DDC supported\n"); + xf86DrvMsg(screen, X_INFO, "VESA VBE DDC supported\n"); switch (pVbe->pInt10->bx & 0x3) { case 0: - ddc_level = " none"; + ddc_level = " none"; pVbe->ddc = DDC_NONE; break; case 1: - ddc_level = " 1"; + ddc_level = " 1"; pVbe->ddc = DDC_1; break; case 2: - ddc_level = " 2"; + ddc_level = " 2"; pVbe->ddc = DDC_2; break; case 3: - ddc_level = " 1 + 2"; + ddc_level = " 1 + 2"; pVbe->ddc = DDC_1_2; break; default: - ddc_level = ""; + ddc_level = ""; pVbe->ddc = DDC_NONE; break; } - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC Level%s\n",ddc_level); - if (pVbe->pInt10->bx & 0x4) { - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC Screen blanked" - "for data transfer\n"); - pVbe->ddc_blank = TRUE; - } else - pVbe->ddc_blank = FALSE; - - xf86DrvMsgVerb(screen,X_INFO,3, - "VESA VBE DDC transfer in appr. %x sec.\n", - (pVbe->pInt10->bx >> 8) & 0xff); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC Level%s\n", ddc_level); + if (pVbe->ddc == DDC_NONE) + return FALSE; + if (pVbe->pInt10->bx & 0x4) { + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC Screen blanked" + "for data transfer\n"); + pVbe->ddc_blank = TRUE; + } else { + pVbe->ddc_blank = FALSE; + } + + xf86DrvMsgVerb(screen, X_INFO, 3, + "VESA VBE DDC transfer in approximately %x second(s)\n", + (pVbe->pInt10->bx >> 8) & 0xff); } - - return TRUE; + + return TRUE; } typedef enum { @@ -314,23 +340,23 @@ if (!page) return NULL; options = xnfalloc(sizeof(VBEOptions)); - (void)memcpy(options, VBEOptions, sizeof(VBEOptions)); + (void) memcpy(options, VBEOptions, sizeof(VBEOptions)); xf86ProcessOptions(screen, xf86Screens[screen]->options, options); xf86GetOptValBool(options, VBEOPT_NOVBE, &novbe); xf86GetOptValBool(options, VBEOPT_NODDC, &noddc); edidOption = xf86GetOptValString(options, VBEOPT_EDID_DATA); xfree(options); if (novbe || noddc) return NULL; - + if (edidOption) tmp = xf86DoEDID_Option(screen, edidOption); if (tmp) return tmp; - + if (!vbeProbeDDC(pVbe)) goto error; - memset(page,0,sizeof(vbeInfoPtr)); - strcpy(page,vbeVersionString); + (void) memset(page, 0, sizeof(vbeInfoPtr)); + (void) memcpy(page, vbeVersionString, 4); pVbe->pInt10->ax = 0x4F15; pVbe->pInt10->bx = 0x01; @@ -343,71 +369,61 @@ xf86ExecX86int10(pVbe->pInt10); if ((pVbe->pInt10->ax & 0xff) != 0x4f) { - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC invalid\n"); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC invalid\n"); goto error; } switch (pVbe->pInt10->ax & 0xff00) { case 0x0: - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC read successfully\n"); - tmp = (unsigned char *)xnfalloc(128); - memcpy(tmp,page,128); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC read successfully\n"); + tmp = (unsigned char *)xnfalloc(128); + (void) memcpy(tmp, page, 128); break; case 0x100: - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC read failed\n"); + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC read failed\n"); break; default: - xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE DDC unkown failure %i\n", + xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC unknown failure %i\n", pVbe->pInt10->ax & 0xff00); break; } - + error: return tmp; } xf86MonPtr -vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule) +vbeDoEDID(vbeInfoPtr pVbe, ModuleDescPtr pDDCModule) { xf86MonPtr pMonitor; - pointer pModule; + ModuleDescPtr pModule; unsigned char *DDC_data = NULL; - + if (!pVbe) return NULL; if (pVbe->version < 0x200) return NULL; if (!(pModule = pDDCModule)) { - pModule = + pVbe->pDDCMod = pModule = xf86LoadSubModule(xf86Screens[pVbe->pInt10->scrnIndex], "ddc"); if (!pModule) return NULL; - xf86LoaderReqSymLists(vbe_ddcSymbols, NULL); } - + xf86LoaderModReqSymLists(pModule, vbe_ddcSymbols, NULL); + DDC_data = vbeReadEDID(pVbe); - if (!DDC_data) + if (!DDC_data) return NULL; - + pMonitor = xf86InterpretEDID(pVbe->pInt10->scrnIndex, DDC_data); - if (!pDDCModule) - xf86UnloadSubModule(pModule); return pMonitor; } - VbeInfoBlock * VBEGetVBEInfo(vbeInfoPtr pVbe) { - VbeInfoBlock *block = NULL; - int i, pStr, pModes; - char *str; - CARD16 major, *modes; - - bzero(pVbe->memory, sizeof(VbeInfoBlock)); - /* Input: AH := 4Fh Super VGA support @@ -419,10 +435,13 @@ (All other registers are preserved) */ - ((char*)pVbe->memory)[0] = 'V'; - ((char*)pVbe->memory)[1] = 'B'; - ((char*)pVbe->memory)[2] = 'E'; - ((char*)pVbe->memory)[3] = '2'; + VbeInfoBlock *block = NULL; + int i, pStr, pModes; + char *str, *pBlock = pVbe->memory; + CARD16 *modes; + + (void) memset(pBlock, 0, 512); + (void) memcpy(pBlock, vbeVersionString, 4); pVbe->pInt10->num = 0x10; pVbe->pInt10->ax = 0x4f00; @@ -431,60 +450,73 @@ xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (NULL); + return NULL; - block = xcalloc(sizeof(VbeInfoBlock), 1); - block->VESASignature[0] = ((char*)pVbe->memory)[0]; - block->VESASignature[1] = ((char*)pVbe->memory)[1]; - block->VESASignature[2] = ((char*)pVbe->memory)[2]; - block->VESASignature[3] = ((char*)pVbe->memory)[3]; + block = xnfcalloc(sizeof(VbeInfoBlock), 1); + block->VESASignature[0] = pBlock[0]; + block->VESASignature[1] = pBlock[1]; + block->VESASignature[2] = pBlock[2]; + block->VESASignature[3] = pBlock[3]; - block->VESAVersion = *(CARD16*)(((char*)pVbe->memory) + 4); - major = (unsigned)block->VESAVersion >> 8; + block->VESAVersion = B_O16(pBlock[4]); - pStr = *(CARD32*)(((char*)pVbe->memory) + 6); + pStr = B_O32(pBlock[6]); str = xf86int10Addr(pVbe->pInt10, FARP(pStr)); block->OEMStringPtr = strdup(str); - block->Capabilities[0] = ((char*)pVbe->memory)[10]; - block->Capabilities[1] = ((char*)pVbe->memory)[11]; - block->Capabilities[2] = ((char*)pVbe->memory)[12]; - block->Capabilities[3] = ((char*)pVbe->memory)[13]; + block->Capabilities[0] = pBlock[10]; + block->Capabilities[1] = pBlock[11]; + block->Capabilities[2] = pBlock[12]; + block->Capabilities[3] = pBlock[13]; - pModes = *(CARD32*)(((char*)pVbe->memory) + 14); + /* + * XXX This doesn't check if the mode list overflows. + */ + pModes = B_O32(pBlock[14]); modes = xf86int10Addr(pVbe->pInt10, FARP(pModes)); - i = 0; - while (modes[i] != 0xffff) - i++; - block->VideoModePtr = xalloc(sizeof(CARD16) * i + 1); - memcpy(block->VideoModePtr, modes, sizeof(CARD16) * i); + for (i = 0; modes[i] != 0xffff; i++); + block->VideoModePtr = xnfalloc(sizeof(CARD16) * i + 1); + for (i = 0; modes[i] != 0xffff; i++) + block->VideoModePtr[i] = B_O16(modes[i]); block->VideoModePtr[i] = 0xffff; - block->TotalMemory = *(CARD16*)(((char*)pVbe->memory) + 18); + block->TotalMemory = B_O16(pBlock[18]); + block->TotalMemory += block->TotalMemory & 1U; + + if (block->VESAVersion < 0x0200) { + (void) memcpy(&block->Reserved, pBlock + 20, 236); + } else { + block->OemSoftwareRev = B_O16(pBlock[20]); + + /* + * XXX Consider using strndup for these three. + */ - if (major < 2) - memcpy(&block->OemSoftwareRev, ((char*)pVbe->memory) + 20, 236); - else { - block->OemSoftwareRev = *(CARD16*)(((char*)pVbe->memory) + 20); - pStr = *(CARD32*)(((char*)pVbe->memory) + 22); + pStr = B_O32(pBlock[22]); str = xf86int10Addr(pVbe->pInt10, FARP(pStr)); block->OemVendorNamePtr = strdup(str); - pStr = *(CARD32*)(((char*)pVbe->memory) + 26); + + pStr = B_O32(pBlock[26]); str = xf86int10Addr(pVbe->pInt10, FARP(pStr)); block->OemProductNamePtr = strdup(str); - pStr = *(CARD32*)(((char*)pVbe->memory) + 30); + + pStr = B_O32(pBlock[30]); str = xf86int10Addr(pVbe->pInt10, FARP(pStr)); block->OemProductRevPtr = strdup(str); - memcpy(&block->Reserved, ((char*)pVbe->memory) + 34, 222); - memcpy(&block->OemData, ((char*)pVbe->memory) + 256, 256); + + (void) memcpy(&block->Reserved, pBlock + 34, 222); + (void) memcpy(&block->OemData, pBlock + 256, 256); } - return (block); + return block; } void VBEFreeVBEInfo(VbeInfoBlock *block) { + if (!block) + return; + xfree(block->OEMStringPtr); xfree(block->VideoModePtr); if (((unsigned)block->VESAVersion >> 8) >= 2) { @@ -517,19 +549,49 @@ Output: AX = Status (All other registers are preserved) */ - pVbe->pInt10->num = 0x10; - pVbe->pInt10->ax = 0x4f02; - pVbe->pInt10->bx = mode; + + xf86Int10InfoPtr pInt10 = pVbe->pInt10; + + pInt10->num = 0x10; + pInt10->ax = 0x4f02; + pInt10->bx = mode & ~(1 << 11); if (block) { - pVbe->pInt10->bx |= 1 << 11; - memcpy(pVbe->memory, block, sizeof(VbeCRTCInfoBlock)); - pVbe->pInt10->es = SEG_ADDR(pVbe->real_mode_base); - pVbe->pInt10->di = SEG_OFF(pVbe->real_mode_base); + CARD8 *pBlock = pVbe->memory; + + pInt10->bx |= 1 << 11; + pInt10->es = SEG_ADDR(pVbe->real_mode_base); + pInt10->di = SEG_OFF(pVbe->real_mode_base); + + /* + * Move most fields byte by byte to avoid endianness and alignment + * issues. + */ + pBlock[0] = block->HorizontalTotal; + pBlock[1] = block->HorizontalTotal >> 8; + pBlock[2] = block->HorizontalSyncStart; + pBlock[3] = block->HorizontalSyncStart >> 8; + pBlock[4] = block->HorizontalSyncEnd; + pBlock[5] = block->HorizontalSyncEnd >> 8; + pBlock[6] = block->VerticalTotal; + pBlock[7] = block->VerticalTotal >> 8; + pBlock[8] = block->VerticalSyncStart; + pBlock[9] = block->VerticalSyncStart >> 8; + pBlock[10] = block->VerticalSyncEnd; + pBlock[11] = block->VerticalSyncEnd >> 8; + pBlock[12] = block->Flags; + pBlock[13] = block->PixelClock; + pBlock[14] = block->PixelClock >> 8; + pBlock[15] = block->PixelClock >> 16; + pBlock[16] = block->PixelClock >> 24; + pBlock[17] = block->RefreshRate; + pBlock[18] = block->RefreshRate >> 8; + + (void) memcpy(pBlock + 19, block->Reserved, 40); } - xf86ExecX86int10(pVbe->pInt10); + xf86ExecX86int10(pInt10); - return (R16(pVbe->pInt10->ax) == 0x4f); + return (R16(pInt10->ax) == 0x4f); } Bool @@ -545,39 +607,40 @@ BX := Current video mode (All other registers are preserved) */ + pVbe->pInt10->num = 0x10; pVbe->pInt10->ax = 0x4f03; xf86ExecX86int10(pVbe->pInt10); - if (R16(pVbe->pInt10->ax) == 0x4f) { - *mode = R16(pVbe->pInt10->bx); - - return (TRUE); - } + if (R16(pVbe->pInt10->ax) != 0x4f) + return FALSE; - return (FALSE); + *mode = R16(pVbe->pInt10->bx); + return TRUE; } VbeModeInfoBlock * VBEGetModeInfo(vbeInfoPtr pVbe, int mode) { - VbeModeInfoBlock *block = NULL; - - bzero(pVbe->memory, sizeof(VbeModeInfoBlock)); - /* Input: AH := 4Fh Super VGA support AL := 01h Return Super VGA mode information - CX := Super VGA video mode - (mode number must be one of those returned by Function 0) + CX := Super VGA video mode + (mode number must be one returned by Function 0) ES:DI := Pointer to buffer Output: AX := status (All other registers are preserved) */ + + VbeModeInfoBlock *block; + char *pBlock = pVbe->memory; + + (void) memset(pBlock, 0, 256); + pVbe->pInt10->num = 0x10; pVbe->pInt10->ax = 0x4f01; pVbe->pInt10->cx = mode; @@ -585,73 +648,80 @@ pVbe->pInt10->di = SEG_OFF(pVbe->real_mode_base); xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (NULL); + return NULL; - block = xcalloc(sizeof(VbeModeInfoBlock), 1); + block = xnfcalloc(sizeof(VbeModeInfoBlock), 1); - block->ModeAttributes = *(CARD16*)pVbe->memory; - block->WinAAttributes = ((char*)pVbe->memory)[2]; - block->WinBAttributes = ((char*)pVbe->memory)[3]; - block->WinGranularity = *(CARD16*)(((char*)pVbe->memory) + 4); - block->WinSize = *(CARD16*)(((char*)pVbe->memory) + 6); - block->WinASegment = *(CARD16*)(((char*)pVbe->memory) + 8); - block->WinBSegment = *(CARD16*)(((char*)pVbe->memory) + 10); - block->WinFuncPtr = *(CARD32*)(((char*)pVbe->memory) + 12); - block->BytesPerScanline = *(CARD16*)(((char*)pVbe->memory) + 16); + block->ModeAttributes = B_O16(pBlock[0]); + block->WinAAttributes = pBlock[2]; + block->WinBAttributes = pBlock[3]; + block->WinGranularity = B_O16(pBlock[4]); + block->WinSize = B_O16(pBlock[6]); + block->WinASegment = B_O16(pBlock[8]); + block->WinBSegment = B_O16(pBlock[10]); + block->WinFuncPtr = B_O32(pBlock[12]); + block->BytesPerScanline = B_O16(pBlock[16]); + + if (pVbe->version < 0x0102) { + (void) memcpy(&block->Reserved2, pBlock + 18, 238); + return block; + } /* mandatory information for VBE 1.2 and above */ - block->XResolution = *(CARD16*)(((char*)pVbe->memory) + 18); - block->YResolution = *(CARD16*)(((char*)pVbe->memory) + 20); - block->XCharSize = ((char*)pVbe->memory)[22]; - block->YCharSize = ((char*)pVbe->memory)[23]; - block->NumberOfPlanes = ((char*)pVbe->memory)[24]; - block->BitsPerPixel = ((char*)pVbe->memory)[25]; - block->NumberOfBanks = ((char*)pVbe->memory)[26]; - block->MemoryModel = ((char*)pVbe->memory)[27]; - block->BankSize = ((char*)pVbe->memory)[28]; - block->NumberOfImages = ((char*)pVbe->memory)[29]; - block->Reserved = ((char*)pVbe->memory)[30]; + block->XResolution = B_O16(pBlock[18]); + block->YResolution = B_O16(pBlock[20]); + block->XCharSize = pBlock[22]; + block->YCharSize = pBlock[23]; + block->NumberOfPlanes = pBlock[24]; + block->BitsPerPixel = pBlock[25]; + block->NumberOfBanks = pBlock[26]; + block->MemoryModel = pBlock[27]; + block->BankSize = pBlock[28]; + block->NumberOfImages = pBlock[29]; + block->Reserved = pBlock[30]; /* Direct color fields (required for direct/6 and YUV/7 memory models) */ - block->RedMaskSize = ((char*)pVbe->memory)[31]; - block->RedFieldPosition = ((char*)pVbe->memory)[32]; - block->GreenMaskSize = ((char*)pVbe->memory)[33]; - block->GreenFieldPosition = ((char*)pVbe->memory)[34]; - block->BlueMaskSize = ((char*)pVbe->memory)[35]; - block->BlueFieldPosition = ((char*)pVbe->memory)[36]; - block->RsvdMaskSize = ((char*)pVbe->memory)[37]; - block->RsvdFieldPosition = ((char*)pVbe->memory)[38]; - block->DirectColorModeInfo = ((char*)pVbe->memory)[39]; + block->RedMaskSize = pBlock[31]; + block->RedFieldPosition = pBlock[32]; + block->GreenMaskSize = pBlock[33]; + block->GreenFieldPosition = pBlock[34]; + block->BlueMaskSize = pBlock[35]; + block->BlueFieldPosition = pBlock[36]; + block->RsvdMaskSize = pBlock[37]; + block->RsvdFieldPosition = pBlock[38]; + block->DirectColorModeInfo = pBlock[39]; + + if (pVbe->version < 0x0200) { + (void) memcpy(&block->Reserved2, pBlock + 40, 216); + return block; + } /* Mandatory information for VBE 2.0 and above */ - if (pVbe->version >= 0x200) { - block->PhysBasePtr = *(CARD32*)(((char*)pVbe->memory) + 40); - block->Reserved32 = *(CARD32*)(((char*)pVbe->memory) + 44); - block->Reserved16 = *(CARD16*)(((char*)pVbe->memory) + 48); - - /* Mandatory information for VBE 3.0 and above */ - if (pVbe->version >= 0x300) { - block->LinBytesPerScanLine = *(CARD16*)(((char*)pVbe->memory) + 50); - block->BnkNumberOfImagePages = ((char*)pVbe->memory)[52]; - block->LinNumberOfImagePages = ((char*)pVbe->memory)[53]; - block->LinRedMaskSize = ((char*)pVbe->memory)[54]; - block->LinRedFieldPosition = ((char*)pVbe->memory)[55]; - block->LinGreenMaskSize = ((char*)pVbe->memory)[56]; - block->LinGreenFieldPosition = ((char*)pVbe->memory)[57]; - block->LinBlueMaskSize = ((char*)pVbe->memory)[58]; - block->LinBlueFieldPosition = ((char*)pVbe->memory)[59]; - block->LinRsvdMaskSize = ((char*)pVbe->memory)[60]; - block->LinRsvdFieldPosition = ((char*)pVbe->memory)[61]; - block->MaxPixelClock = *(CARD32*)(((char*)pVbe->memory) + 62); - memcpy(&block->Reserved2, ((char*)pVbe->memory) + 66, 188); - } - else - memcpy(&block->LinBytesPerScanLine, ((char*)pVbe->memory) + 50, 206); + block->PhysBasePtr = B_O32((pBlock[40])); + block->Reserved32 = B_O32(pBlock[44]); + block->Reserved16 = B_O16(pBlock[48]); + + if (pVbe->version < 0x0300) { + (void) memcpy(&block->Reserved2, pBlock + 50, 206); + return block; } - else - memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216); - return (block); + /* Mandatory information for VBE 3.0 and above */ + block->LinBytesPerScanLine = B_O16(pBlock[50]); + block->BnkNumberOfImagePages = pBlock[52]; + block->LinNumberOfImagePages = pBlock[53]; + block->LinRedMaskSize = pBlock[54]; + block->LinRedFieldPosition = pBlock[55]; + block->LinGreenMaskSize = pBlock[56]; + block->LinGreenFieldPosition = pBlock[57]; + block->LinBlueMaskSize = pBlock[58]; + block->LinBlueFieldPosition = pBlock[59]; + block->LinRsvdMaskSize = pBlock[60]; + block->LinRsvdFieldPosition = pBlock[61]; + block->MaxPixelClock = B_O32(pBlock[62]); + (void) memcpy(&block->Reserved2, pBlock + 66, 190); + + return block; } void @@ -661,7 +731,7 @@ } Bool -VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, +VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, pointer *memory, int *size, int *real_mode_pages) { /* @@ -680,7 +750,6 @@ BX = Number of 64-byte blocks to hold the state buffer (All other registers are preserved) - Input: AH := 4Fh Super VGA support AL := 04h Save/restore Super VGA video state @@ -692,7 +761,6 @@ AX := Status (All other registers are preserved) - Input: AH := 4Fh Super VGA support AL := 04h Save/restore Super VGA video state @@ -705,58 +773,65 @@ (All other registers are preserved) */ - if ((pVbe->version & 0xff00) > 0x100) { - int screen = pVbe->pInt10->scrnIndex; - if (function == MODE_QUERY || - (function == MODE_SAVE && !*memory)) { - /* Query amount of memory to save state */ - - pVbe->pInt10->num = 0x10; - pVbe->pInt10->ax = 0x4f04; - pVbe->pInt10->dx = 0; - pVbe->pInt10->cx = 0x000f; - xf86ExecX86int10(pVbe->pInt10); - if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); - - if (function == MODE_SAVE) { - int npages = (R16(pVbe->pInt10->bx) * 64) / 4096 + 1; - if ((*memory = xf86Int10AllocPages(pVbe->pInt10, npages, - real_mode_pages)) == NULL) { - xf86DrvMsg(screen, X_ERROR, - "Cannot allocate memory to save SVGA state.\n"); - return (FALSE); - } + xf86Int10InfoPtr pInt10; + + /* Earlier VBE versions won't give us an error indication */ + if (pVbe->version < 0x0200) + return TRUE; + + pInt10 = pVbe->pInt10; + + if ((function == MODE_QUERY) || ((function == MODE_SAVE) && !*memory)) { + /* Query amount of memory to save state */ + + pInt10->num = 0x10; + pInt10->ax = 0x4f04; + pInt10->dx = 0; + pInt10->cx = 0x000f; + xf86ExecX86int10(pInt10); + if (R16(pInt10->ax) != 0x4f) + return FALSE; + + if (function == MODE_SAVE) { + int npages = (R16(pInt10->bx) * 64) / 4096 + 1; + + *memory = xf86Int10AllocPages(pInt10, npages, real_mode_pages); + if (!*memory) { + xf86DrvMsg(pInt10->scrnIndex, X_ERROR, + "Cannot allocate memory to save SVGA state.\n"); + return FALSE; } - *size = pVbe->pInt10->bx * 64; } - /* Save/Restore Super VGA state */ - if (function != MODE_QUERY) { - - if (!*memory) return FALSE; - pVbe->pInt10->num = 0x10; - pVbe->pInt10->ax = 0x4f04; - switch (function) { - case MODE_SAVE: - pVbe->pInt10->dx = 1; - break; - case MODE_RESTORE: - pVbe->pInt10->dx = 2; - break; - case MODE_QUERY: - return FALSE; - } - pVbe->pInt10->cx = 0x000f; - - pVbe->pInt10->es = SEG_ADDR(*real_mode_pages); - pVbe->pInt10->bx = SEG_OFF(*real_mode_pages); - xf86ExecX86int10(pVbe->pInt10); - return (R16(pVbe->pInt10->ax) == 0x4f); + *size = pInt10->bx * 64; - } + if (function == MODE_QUERY) + return TRUE; } - return TRUE; + + /* Save/Restore Super VGA state */ + if (!*memory) + return FALSE; + + pInt10->num = 0x10; + pInt10->ax = 0x4f04; + pInt10->cx = 0x000f; + pInt10->es = SEG_ADDR(*real_mode_pages); + pInt10->bx = SEG_OFF(*real_mode_pages); + + switch (function) { + case MODE_SAVE: + pInt10->dx = 1; + break; + case MODE_RESTORE: + pInt10->dx = 2; + break; + default: + return FALSE; + } + + xf86ExecX86int10(pInt10); + return (R16(pInt10->ax) == 0x4f); } Bool @@ -766,28 +841,30 @@ Input: AH := 4Fh Super VGA support AL := 05h + BH := 00h Set memory window + := 01h Get memory window + BL := 00h Window A + := 01h Window B + DX := Window number to set Output: + AX := Status + DX := Window number retrieved */ + pVbe->pInt10->num = 0x10; pVbe->pInt10->ax = 0x4f05; pVbe->pInt10->bx = window; pVbe->pInt10->dx = iBank; xf86ExecX86int10(pVbe->pInt10); - if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); - - return (TRUE); + return (R16(pVbe->pInt10->ax) == 0x4f); } Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, int width, int *pixels, int *bytes, int *max) { - if (command < SCANWID_SET || command > SCANWID_GET_MAX) - return (FALSE); - /* Input: AX := 4F06h VBE Set/Get Logical Scan Line Length @@ -807,6 +884,9 @@ DX := Maximum Number of Scan Lines */ + if (command < SCANWID_SET || command > SCANWID_GET_MAX) + return FALSE; + pVbe->pInt10->num = 0x10; pVbe->pInt10->ax = 0x4f06; pVbe->pInt10->bx = command; @@ -815,7 +895,7 @@ xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); + return FALSE; if (command == SCANWID_GET || command == SCANWID_GET_MAX) { if (pixels) @@ -826,7 +906,7 @@ *max = R16(pVbe->pInt10->dx); } - return (TRUE); + return TRUE; } Bool @@ -839,10 +919,7 @@ pVbe->pInt10->dx = y; xf86ExecX86int10(pVbe->pInt10); - if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); - - return (TRUE); + return (R16(pVbe->pInt10->ax) == 0x4f); } Bool @@ -854,12 +931,12 @@ xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); + return FALSE; *x = pVbe->pInt10->cx; *y = pVbe->pInt10->dx; - return (TRUE); + return TRUE; } int @@ -882,12 +959,12 @@ pVbe->pInt10->ax = 0x4f08; if (!bits) pVbe->pInt10->bx = 0x01; - else + else pVbe->pInt10->bx = (bits & 0x00ff) << 8; xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (0); + return 0; return (bits != 0 ? bits : (pVbe->pInt10->bx >> 8) & 0x00ff); } @@ -898,7 +975,6 @@ { /* Input: - (16-bit) AX := 4F09h VBE Load/Unload Palette Data BL := 00h Set Palette Data := 01h Get Palette Data @@ -911,16 +987,6 @@ Output: AX := VBE Return Status - - - Input: - (32-bit) - BL := 00h Set Palette Data - := 80h Set Palette Data during Vertical Retrace - CX := Number of palette registers to update (to a maximum of 256) - DX := First of the palette registers to update (start) - ES:EDI := Table of palette values (see below for format) - DS := Selector for memory mapped registers */ pVbe->pInt10->num = 0x10; @@ -934,26 +1000,24 @@ pVbe->pInt10->es = SEG_ADDR(pVbe->real_mode_base); pVbe->pInt10->di = SEG_OFF(pVbe->real_mode_base); if (set) - memcpy(pVbe->memory, data, num * sizeof(CARD32)); + (void) memcpy(pVbe->memory, data, num * sizeof(CARD32)); xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (NULL); + return NULL; if (set) - return (data); + return data; - data = xalloc(num * sizeof(CARD32)); - memcpy(data, pVbe->memory, num * sizeof(CARD32)); + data = xnfalloc(num * sizeof(CARD32)); + (void) memcpy(data, pVbe->memory, num * sizeof(CARD32)); - return (data); + return data; } VBEpmi * VBEGetVBEpmi(vbeInfoPtr pVbe) { - VBEpmi *pmi; - /* Input: AH := 4Fh Super VGA support @@ -964,10 +1028,13 @@ AX := Status ES := Real Mode Segment of Table DI := Offset of Table - CX := Lenght of Table including protected mode code in bytes (for copying purposes) + CX := Length of Table including protected mode code in bytes + (for copying purposes) (All other registers are preserved) */ + VBEpmi *pmi; + pVbe->pInt10->num = 0x10; pVbe->pInt10->ax = 0x4f0a; pVbe->pInt10->bx = 0; @@ -975,100 +1042,14 @@ xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (NULL); + return NULL; - pmi = xalloc(sizeof(VBEpmi)); + pmi = xnfalloc(sizeof(VBEpmi)); pmi->seg_tbl = R16(pVbe->pInt10->es); pmi->tbl_off = R16(pVbe->pInt10->di); pmi->tbl_len = R16(pVbe->pInt10->cx); - return (pmi); -} - -#if 0 -vbeModeInfoPtr -VBEBuildVbeModeList(vbeInfoPtr pVbe, VbeInfoBlock *vbe) -{ - vbeModeInfoPtr ModeList = NULL; - - int i = 0; - while (vbe->VideoModePtr[i] != 0xffff) { - vbeModeInfoPtr m; - VbeModeInfoBlock *mode; - int id = vbe->VideoModePtr[i++]; - int bpp; - - if ((mode = VBEGetModeInfo(pVbe, id)) == NULL) - continue; - - bpp = mode->BitsPerPixel; - - m = xnfcalloc(sizeof(vbeModeInfoRec),1); - m->width = mode->XResolution; - m->height = mode->YResolution; - m->bpp = bpp; - m->n = id; - m->next = ModeList; - - xf86DrvMsgVerb(pVbe->pInt10->scrnIndex, X_PROBED, 3, - "BIOS reported VESA mode 0x%x: x:%i y:%i bpp:%i\n", - m->n, m->width, m->height, m->bpp); - - ModeList = m; - - VBEFreeModeInfo(mode); - } - return ModeList; -} - -unsigned short -VBECalcVbeModeIndex(vbeModeInfoPtr m, DisplayModePtr mode, int bpp) -{ - while (m) { - if (bpp == m->bpp - && mode->HDisplay == m->width - && mode->VDisplay == m->height) - return m->n; - m = m->next; - } - return 0; -} -#endif - -void -VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr, - vbeSaveRestoreFunction function) -{ - Bool SaveSucc = FALSE; - - if (VBE_VERSION_MAJOR(pVbe->version) > 1 - && (function == MODE_SAVE || vbe_sr->pstate)) { - if (function == MODE_RESTORE) - memcpy(vbe_sr->state, vbe_sr->pstate, vbe_sr->stateSize); - ErrorF("VBESaveRestore\n"); - if ((VBESaveRestore(pVbe,function, - (pointer)&vbe_sr->state, - &vbe_sr->stateSize,&vbe_sr->statePage))) { - if (function == MODE_SAVE) { - SaveSucc = TRUE; - vbe_sr->stateMode = -1; /* invalidate */ - /* don't rely on the memory not being touched */ - if (vbe_sr->pstate == NULL) - vbe_sr->pstate = xalloc(vbe_sr->stateSize); - memcpy(vbe_sr->pstate, vbe_sr->state, vbe_sr->stateSize); - } - ErrorF("VBESaveRestore done with success\n"); - return; - } - ErrorF("VBESaveRestore done\n"); - } - - if (function == MODE_SAVE && !SaveSucc) - (void)VBEGetVBEMode(pVbe, &vbe_sr->stateMode); - - if (function == MODE_RESTORE && vbe_sr->stateMode != -1) - VBESetVBEMode(pVbe, vbe_sr->stateMode, NULL); - + return pmi; } int @@ -1079,8 +1060,8 @@ AX := 4F0Bh VBE Get Pixel Clock BL := 01h Get Pixel Clock ECX := pixel clock in units of Hz - DX := mode number - + DX := mode number + Output: AX := VBE Return Status ECX := Closest pixel clock @@ -1094,9 +1075,9 @@ xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (0); + return 0; - return (pVbe->pInt10->cx); + return pVbe->pInt10->cx; } Bool @@ -1107,7 +1088,7 @@ AX := 4F10h DPMS BL := 01h Set Display Power State BH := requested power state - + Output: AX := VBE Return Status */ Index: xc/programs/Xserver/hw/xfree86/vbe/vbe.h diff -u xc/programs/Xserver/hw/xfree86/vbe/vbe.h:1.6 xc/programs/Xserver/hw/xfree86/vbe/vbe.h:1.12 --- xc/programs/Xserver/hw/xfree86/vbe/vbe.h:1.6 Sat Apr 3 17:26:25 2004 +++ xc/programs/Xserver/hw/xfree86/vbe/vbe.h Thu Mar 16 11:50:35 2006 @@ -1,28 +1,40 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.6 2004/04/03 22:26:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.12 2006/03/16 16:50:35 dawes Exp $ */ /* * XFree86 vbe module * Copyright 2000 Egbert Eich * - * The mode query/save/set/restore functions from the vesa driver + * The mode query/save/set/restore functions from the vesa driver * have been moved here. * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) - * Authors: Paulo César Pereira de Andrade + * Authors: Paulo César Pereira de Andrade */ #ifndef _VBE_H #define _VBE_H +#include "xf86.h" +#include "xf86_ansic.h" +#include "compiler.h" #include "xf86int10.h" #include "xf86DDC.h" +/* Endianness-neutral unaligned access definitions */ +#define B8P(x) ((CARD8 *)(&(x))) +#define B_O08(x) ((CARD32)(B8P(x)[0])) +#define B_O16(x) ((CARD32)(B8P(x)[0]) | \ + ((CARD32)(B8P(x)[1]) << 8)) +#define B_O32(x) ((CARD32)(B8P(x)[0]) | \ + ((CARD32)(B8P(x)[1]) << 8) | \ + ((CARD32)(B8P(x)[2]) << 16) | \ + ((CARD32)(B8P(x)[3]) << 24)) + typedef enum { DDC_UNCHECKED, DDC_NONE, DDC_1, DDC_2, DDC_1_2 -} -ddc_lvl; +} ddc_lvl; typedef struct { xf86Int10InfoPtr pInt10; @@ -33,15 +45,17 @@ Bool init_int10; ddc_lvl ddc; Bool ddc_blank; + ModuleDescPtr pInt10Mod; + ModuleDescPtr pDDCMod; } vbeInfoRec, *vbeInfoPtr; -#define VBE_VERSION_MAJOR(x) *((CARD8*)(&x) + 1) -#define VBE_VERSION_MINOR(x) (CARD8)(x) +#define VBE_VERSION_MAJOR(x) (B8P(x)[1]) +#define VBE_VERSION_MINOR(x) (B8P(x)[0]) vbeInfoPtr VBEInit(xf86Int10InfoPtr pInt, int entityIndex); vbeInfoPtr VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags); void vbeFree(vbeInfoPtr pVbe); -xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule); +xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, ModuleDescPtr pDDCModule); #pragma pack(1) @@ -60,15 +74,60 @@ CARD8 OemData[256]; } vbeControllerInfoRec, *vbeControllerInfoPtr; -#if defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) || \ - defined(__SUNPRO_C) +#if defined(__GNUC__) || \ + defined(__SCO__) || \ + defined(__USLC__) || \ + defined(__SUNPRO_C) #pragma pack() /* All GCC versions recognise this syntax */ #else #pragma pack(0) #endif -#ifndef __GNUC__ -#define __attribute__(a) +/* + * The three Vbe.*InfoBlock structures below were originally defined as packed + * in line with their VBE counterparts. Strictly speaking, this is unnecessary + * given their contents must be massaged for endianness, alignment, etc. before + * being used to interact directly with the BIOS. + * + * It is also undesirable because their layout then varies by compiler and, in + * VbeInfoBlock's case, platform pointer size. Thus the layout of these + * structures has been changed to remove any lingering expectation that they + * match their VBE counterparts. + * + * The following definitions are meant to deal with the incompatibility between + * modules that arose when these structures were changed. + */ + +#undef xf86LoadVBEModule + +#if defined(XFree86LOADER) + + static __inline__ ModuleDescPtr + xf86LoadVBEModule(ScrnInfoPtr pScreenInfo) + { + /* + * The Vbe*.InfoBlock structures were reworked starting with vbe module + * version number 2.0.0, video driver ABI version 0.9. + */ + static XF86ModReqInfo vbeModuleVersionRequirements = + { + 2, 0, 0, /* major, minor, patchlevel */ + ABI_CLASS_VIDEODRV, /* abiclass */ + SET_ABI_VERSION(0, 9), /* abiversion */ + MOD_CLASS_NONE /* moduleclass */ + }; + + return xf86LoadSubModuleWithRequirements(pScreenInfo, "vbe", + &vbeModuleVersionRequirements); +} + +# define xf86LoadVBEModule(_pScreenInfo) \ + xf86LoadVBEModule(_pScreenInfo) +#else + +# define xf86LoadVBEModule(_pScreenInfo) \ + xf86LoadSubModule(_pScreenInfo, "vbe") + #endif typedef struct _VbeInfoBlock VbeInfoBlock; @@ -81,24 +140,24 @@ struct _VbeInfoBlock { /* VESA 1.2 fields */ - CARD8 VESASignature[4]; /* VESA */ - CARD16 VESAVersion; /* Higher byte major, lower byte minor */ - /*CARD32*/char *OEMStringPtr; /* Pointer to OEM string */ - CARD8 Capabilities[4]; /* Capabilities of the video environment */ - - /*CARD32*/CARD16 *VideoModePtr; /* pointer to supported Super VGA modes */ - - CARD16 TotalMemory; /* Number of 64kb memory blocks on board */ - /* if not VESA 2, 236 scratch bytes follow (256 bytes total size) */ + CARD8 VESASignature[4]; /* VESA */ + CARD16 VESAVersion; /* Higher byte major, lower byte minor */ + CARD8 Capabilities[4]; /* Capabilities of the video environment */ + CARD16 TotalMemory; /* Number of 64kb memory blocks on board */ + char *OEMStringPtr; /* Pointer to OEM string */ + CARD16 *VideoModePtr; /* pointer to supported Super VGA modes */ /* VESA 2 fields */ - CARD16 OemSoftwareRev; /* VBE implementation Software revision */ - /*CARD32*/char *OemVendorNamePtr; /* Pointer to Vendor Name String */ - /*CARD32*/char *OemProductNamePtr; /* Pointer to Product Name String */ - /*CARD32*/char *OemProductRevPtr; /* Pointer to Product Revision String */ - CARD8 Reserved[222]; /* Reserved for VBE implementation */ - CARD8 OemData[256]; /* Data Area for OEM Strings */ -} __attribute__((packed)); + char *OemVendorNamePtr; /* Pointer to Vendor Name String */ + char *OemProductNamePtr; /* Pointer to Product Name String */ + char *OemProductRevPtr; /* Pointer to Product Revision String */ + CARD16 OemSoftwareRev; /* VBE implementation Software revision */ + + /* Allow enough space for VESA 1's reserved field */ + CARD8 Reserved[236]; /* Reserved for VBE implementation */ + /* This only exists for VESA 2 */ + CARD8 OemData[256]; /* Data Area for OEM Strings */ +}; /* Return Super VGA Information */ VbeInfoBlock *VBEGetVBEInfo(vbeInfoPtr pVbe); @@ -116,12 +175,12 @@ CARD16 WinSize; /* window size */ CARD16 WinASegment; /* window A start segment */ CARD16 WinBSegment; /* window B start segment */ - CARD32 WinFuncPtr; /* real mode pointer to window function */ + CARD32 WinFuncPtr; /* far pointer to window function */ CARD16 BytesPerScanline; /* bytes per scanline */ /* Mandatory information for VBE 1.2 and above */ - CARD16 XResolution; /* horizontal resolution in pixels or characters */ - CARD16 YResolution; /* vertical resolution in pixels or characters */ + CARD16 XResolution; /* horizontal pixels or characters */ + CARD16 YResolution; /* vertical pixels or characters */ CARD8 XCharSize; /* character cell width in pixels */ CARD8 YCharSize; /* character cell height in pixels */ CARD8 NumberOfPlanes; /* number of memory planes */ @@ -133,36 +192,41 @@ CARD8 Reserved; /* 1 */ /* reserved for page function */ /* Direct color fields (required for direct/6 and YUV/7 memory models) */ - CARD8 RedMaskSize; /* size of direct color red mask in bits */ - CARD8 RedFieldPosition; /* bit position of lsb of red mask */ - CARD8 GreenMaskSize; /* size of direct color green mask in bits */ - CARD8 GreenFieldPosition; /* bit position of lsb of green mask */ - CARD8 BlueMaskSize; /* size of direct color blue mask in bits */ - CARD8 BlueFieldPosition; /* bit position of lsb of blue mask */ - CARD8 RsvdMaskSize; /* size of direct color reserved mask in bits */ - CARD8 RsvdFieldPosition; /* bit position of lsb of reserved mask */ + CARD8 RedMaskSize; /* bit size of red mask */ + CARD8 RedFieldPosition; /* bit position of red mask lsb */ + CARD8 GreenMaskSize; /* bit size of green mask */ + CARD8 GreenFieldPosition; /* bit position of green mask lsb */ + CARD8 BlueMaskSize; /* bit size of blue mask */ + CARD8 BlueFieldPosition; /* bit position of blue mask lsb */ + CARD8 RsvdMaskSize; /* bit size of reserved mask */ + CARD8 RsvdFieldPosition; /* bit position of reserved mask lsb */ CARD8 DirectColorModeInfo; /* direct color mode attributes */ /* Mandatory information for VBE 2.0 and above */ - CARD32 PhysBasePtr; /* physical address for flat memory frame buffer */ + CARD32 PhysBasePtr; /* physical address of linear + framebuffer */ CARD32 Reserved32; /* 0 */ /* Reserved - always set to 0 */ CARD16 Reserved16; /* 0 */ /* Reserved - always set to 0 */ /* Mandatory information for VBE 3.0 and above */ - CARD16 LinBytesPerScanLine; /* bytes per scan line for linear modes */ + CARD16 LinBytesPerScanLine; /* bytes per scanline */ CARD8 BnkNumberOfImagePages; /* number of images for banked modes */ CARD8 LinNumberOfImagePages; /* number of images for linear modes */ - CARD8 LinRedMaskSize; /* size of direct color red mask (linear modes) */ - CARD8 LinRedFieldPosition; /* bit position of lsb of red mask (linear modes) */ - CARD8 LinGreenMaskSize; /* size of direct color green mask (linear modes) */ - CARD8 LinGreenFieldPosition; /* bit position of lsb of green mask (linear modes) */ - CARD8 LinBlueMaskSize; /* size of direct color blue mask (linear modes) */ - CARD8 LinBlueFieldPosition; /* bit position of lsb of blue mask (linear modes) */ - CARD8 LinRsvdMaskSize; /* size of direct color reserved mask (linear modes) */ - CARD8 LinRsvdFieldPosition; /* bit position of lsb of reserved mask (linear modes) */ - CARD32 MaxPixelClock; /* maximum pixel clock (in Hz) for graphics mode */ - CARD8 Reserved2[189]; /* remainder of VbeModeInfoBlock */ -} __attribute__((packed)); + CARD8 LinRedMaskSize; /* size of direct color red mask */ + CARD8 LinRedFieldPosition; /* bit position of red mask lsb */ + CARD8 LinGreenMaskSize; /* size of direct color green mask */ + CARD8 LinGreenFieldPosition; /* bit position of green mask lsb */ + CARD8 LinBlueMaskSize; /* size of direct color blue mask */ + CARD8 LinBlueFieldPosition; /* bit position of blue mask lsb */ + CARD8 LinRsvdMaskSize; /* size of direct color reserved mask */ + CARD8 LinRsvdFieldPosition; /* bit position of reserved mask lsb */ + + CARD16 pad; /* two-byte fluff */ + CARD32 MaxPixelClock; /* maximum pixel clock (in Hz) for + graphics mode */ + /* Allow enough space for VESA 1.1's reserved field */ + CARD8 Reserved2[238]; /* remainder of VbeModeInfoBlock */ +}; /* Return VBE Mode Information */ VbeModeInfoBlock *VBEGetModeInfo(vbeInfoPtr pVbe, int mode); @@ -178,18 +242,17 @@ #define CRTC_NVSYNC (1<<3) struct _VbeCRTCInfoBlock { - CARD16 HorizontalTotal; /* Horizontal total in pixels */ - CARD16 HorizontalSyncStart; /* Horizontal sync start in pixels */ - CARD16 HorizontalSyncEnd; /* Horizontal sync end in pixels */ - CARD16 VerticalTotal; /* Vertical total in lines */ - CARD16 VerticalSyncStart; /* Vertical sync start in lines */ - CARD16 VerticalSyncEnd; /* Vertical sync end in lines */ - CARD8 Flags; /* Flags (Interlaced, Double Scan etc) */ - CARD32 PixelClock; /* Pixel clock in units of Hz */ - CARD16 RefreshRate; /* Refresh rate in units of 0.01 Hz */ - CARD8 Reserved[40]; /* remainder of ModeInfoBlock */ -} __attribute__((packed)); -/* VbeCRTCInfoBlock is in the VESA 3.0 specs */ + CARD16 HorizontalTotal; /* Horizontal total in pixels */ + CARD16 HorizontalSyncStart; /* Horizontal sync start in pixels */ + CARD16 HorizontalSyncEnd; /* Horizontal sync end in pixels */ + CARD16 VerticalTotal; /* Vertical total in lines */ + CARD16 VerticalSyncStart; /* Vertical sync start in lines */ + CARD16 VerticalSyncEnd; /* Vertical sync end in lines */ + CARD32 PixelClock; /* Pixel clock in units of Hz */ + CARD16 RefreshRate; /* Refresh rate in units of 0.01 Hz */ + CARD8 Flags; /* Flags (Interlaced, Double Scan etc) */ + CARD8 Reserved[40]; /* remainder of ModeInfoBlock */ +}; Bool VBESetVBEMode(vbeInfoPtr pVbe, int mode, VbeCRTCInfoBlock *crtc); @@ -220,7 +283,7 @@ } vbeSaveRestoreFunction; Bool -VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction, +VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction, pointer *memory, int *size, int *real_mode_pages); /* @@ -253,7 +316,7 @@ #define VBEGetMaxLogicalScanline(pVbe, pixels, bytes, max) \ VBESetGetLogicalScanlineLength(pVbe, SCANWID_GET_MAX, 0, \ pixels, bytes, max) -Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, +Bool VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, int width, int *pixels, int *bytes, int *max); @@ -301,32 +364,6 @@ /* high level helper functions */ -typedef struct _vbeModeInfoRec { - int width; - int height; - int bpp; - int n; - struct _vbeModeInfoRec *next; -} vbeModeInfoRec, *vbeModeInfoPtr; - -vbeModeInfoPtr VBEBuildVbeModeList(vbeInfoPtr pVbe, - VbeInfoBlock *vbe); - -unsigned short VBECalcVbeModeIndex(vbeModeInfoPtr m, - DisplayModePtr mode, int bpp); - -typedef struct { - CARD8 *state; - CARD8 *pstate; - int statePage; - int stateSize; - int stateMode; -} vbeSaveRestoreRec, *vbeSaveRestorePtr; - -void -VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr, - vbeSaveRestoreFunction function); - int VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int Clock); Bool VBEDPMSSet(vbeInfoPtr pVbe, int mode); Index: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c diff -u xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c:1.7 xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c:1.9 --- xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c:1.7 Sat Feb 26 13:31:48 2005 +++ xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c Sun Aug 28 16:04:52 2005 @@ -1,6 +1,6 @@ #define DEBUG_VERB 2 -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.7 2005/02/26 18:31:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.9 2005/08/28 20:04:52 tsi Exp $ */ /* * Copyright © 2002 David Dawes @@ -78,9 +78,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "xf86.h" -#include "xf86_ansic.h" -#include "vbe.h" #include "vbeModes.h" static int @@ -219,99 +216,97 @@ if (sizeMatch && !modeOK) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using built-in mode \"%dx%d\" (%s)\n", - mode->XResolution, mode->YResolution, - xf86ModeStatusToString(status)); + mode->XResolution, mode->YResolution, + xf86ModeStatusToString(status)); } } - xf86ErrorFVerb(DEBUG_VERB, - "%sMode: %x (%dx%d)\n", prefix, id, - mode->XResolution, mode->YResolution); - xf86ErrorFVerb(DEBUG_VERB, - " ModeAttributes: 0x%x\n", mode->ModeAttributes); - xf86ErrorFVerb(DEBUG_VERB, - " WinAAttributes: 0x%x\n", mode->WinAAttributes); - xf86ErrorFVerb(DEBUG_VERB, - " WinBAttributes: 0x%x\n", mode->WinBAttributes); - xf86ErrorFVerb(DEBUG_VERB, - " WinGranularity: %d\n", mode->WinGranularity); - xf86ErrorFVerb(DEBUG_VERB, - " WinSize: %d\n", mode->WinSize); - xf86ErrorFVerb(DEBUG_VERB, - " WinASegment: 0x%x\n", mode->WinASegment); - xf86ErrorFVerb(DEBUG_VERB, - " WinBSegment: 0x%x\n", mode->WinBSegment); - xf86ErrorFVerb(DEBUG_VERB, - " WinFuncPtr: 0x%lx\n", (unsigned long)mode->WinFuncPtr); - xf86ErrorFVerb(DEBUG_VERB, - " BytesPerScanline: %d\n", mode->BytesPerScanline); - xf86ErrorFVerb(DEBUG_VERB, - " XResolution: %d\n", mode->XResolution); - xf86ErrorFVerb(DEBUG_VERB, - " YResolution: %d\n", mode->YResolution); - xf86ErrorFVerb(DEBUG_VERB, - " XCharSize: %d\n", mode->XCharSize); - xf86ErrorFVerb(DEBUG_VERB, - " YCharSize: %d\n", mode->YCharSize); - xf86ErrorFVerb(DEBUG_VERB, - " NumberOfPlanes: %d\n", mode->NumberOfPlanes); - xf86ErrorFVerb(DEBUG_VERB, - " BitsPerPixel: %d\n", mode->BitsPerPixel); - xf86ErrorFVerb(DEBUG_VERB, - " NumberOfBanks: %d\n", mode->NumberOfBanks); - xf86ErrorFVerb(DEBUG_VERB, - " MemoryModel: %d\n", mode->MemoryModel); - xf86ErrorFVerb(DEBUG_VERB, - " BankSize: %d\n", mode->BankSize); - xf86ErrorFVerb(DEBUG_VERB, - " NumberOfImages: %d\n", mode->NumberOfImages); - xf86ErrorFVerb(DEBUG_VERB, - " RedMaskSize: %d\n", mode->RedMaskSize); - xf86ErrorFVerb(DEBUG_VERB, - " RedFieldPosition: %d\n", mode->RedFieldPosition); - xf86ErrorFVerb(DEBUG_VERB, - " GreenMaskSize: %d\n", mode->GreenMaskSize); - xf86ErrorFVerb(DEBUG_VERB, - " GreenFieldPosition: %d\n", mode->GreenFieldPosition); - xf86ErrorFVerb(DEBUG_VERB, - " BlueMaskSize: %d\n", mode->BlueMaskSize); - xf86ErrorFVerb(DEBUG_VERB, - " BlueFieldPosition: %d\n", mode->BlueFieldPosition); - xf86ErrorFVerb(DEBUG_VERB, - " RsvdMaskSize: %d\n", mode->RsvdMaskSize); - xf86ErrorFVerb(DEBUG_VERB, - " RsvdFieldPosition: %d\n", mode->RsvdFieldPosition); - xf86ErrorFVerb(DEBUG_VERB, - " DirectColorModeInfo: %d\n", mode->DirectColorModeInfo); + xf86ErrorFVerb(DEBUG_VERB, "%sMode: %x (%dx%d)\n", + prefix, id, mode->XResolution, mode->YResolution); + xf86ErrorFVerb(DEBUG_VERB, " ModeAttributes: 0x%x\n", + mode->ModeAttributes); + xf86ErrorFVerb(DEBUG_VERB, " WinAAttributes: 0x%x\n", + mode->WinAAttributes); + xf86ErrorFVerb(DEBUG_VERB, " WinBAttributes: 0x%x\n", + mode->WinBAttributes); + xf86ErrorFVerb(DEBUG_VERB, " WinGranularity: %d\n", + mode->WinGranularity); + xf86ErrorFVerb(DEBUG_VERB, " WinSize: %d\n", + mode->WinSize); + xf86ErrorFVerb(DEBUG_VERB, " WinASegment: 0x%x\n", + mode->WinASegment); + xf86ErrorFVerb(DEBUG_VERB, " WinBSegment: 0x%x\n", + mode->WinBSegment); + xf86ErrorFVerb(DEBUG_VERB, " WinFuncPtr: 0x%lx\n", + (unsigned long)mode->WinFuncPtr); + xf86ErrorFVerb(DEBUG_VERB, " BytesPerScanline: %d\n", + mode->BytesPerScanline); + xf86ErrorFVerb(DEBUG_VERB, " XResolution: %d\n", + mode->XResolution); + xf86ErrorFVerb(DEBUG_VERB, " YResolution: %d\n", + mode->YResolution); + xf86ErrorFVerb(DEBUG_VERB, " XCharSize: %d\n", + mode->XCharSize); + xf86ErrorFVerb(DEBUG_VERB, " YCharSize: %d\n", + mode->YCharSize); + xf86ErrorFVerb(DEBUG_VERB, " NumberOfPlanes: %d\n", + mode->NumberOfPlanes); + xf86ErrorFVerb(DEBUG_VERB, " BitsPerPixel: %d\n", + mode->BitsPerPixel); + xf86ErrorFVerb(DEBUG_VERB, " NumberOfBanks: %d\n", + mode->NumberOfBanks); + xf86ErrorFVerb(DEBUG_VERB, " MemoryModel: %d\n", + mode->MemoryModel); + xf86ErrorFVerb(DEBUG_VERB, " BankSize: %d\n", + mode->BankSize); + xf86ErrorFVerb(DEBUG_VERB, " NumberOfImages: %d\n", + mode->NumberOfImages); + xf86ErrorFVerb(DEBUG_VERB, " RedMaskSize: %d\n", + mode->RedMaskSize); + xf86ErrorFVerb(DEBUG_VERB, " RedFieldPosition: %d\n", + mode->RedFieldPosition); + xf86ErrorFVerb(DEBUG_VERB, " GreenMaskSize: %d\n", + mode->GreenMaskSize); + xf86ErrorFVerb(DEBUG_VERB, " GreenFieldPosition: %d\n", + mode->GreenFieldPosition); + xf86ErrorFVerb(DEBUG_VERB, " BlueMaskSize: %d\n", + mode->BlueMaskSize); + xf86ErrorFVerb(DEBUG_VERB, " BlueFieldPosition: %d\n", + mode->BlueFieldPosition); + xf86ErrorFVerb(DEBUG_VERB, " RsvdMaskSize: %d\n", + mode->RsvdMaskSize); + xf86ErrorFVerb(DEBUG_VERB, " RsvdFieldPosition: %d\n", + mode->RsvdFieldPosition); + xf86ErrorFVerb(DEBUG_VERB, " DirectColorModeInfo: %d\n", + mode->DirectColorModeInfo); if (major >= 2) { - xf86ErrorFVerb(DEBUG_VERB, - " PhysBasePtr: 0x%lx\n", - (unsigned long)mode->PhysBasePtr); + xf86ErrorFVerb(DEBUG_VERB, " PhysBasePtr: 0x%lx\n", + (unsigned long)mode->PhysBasePtr); if (major >= 3) { - xf86ErrorFVerb(DEBUG_VERB, - " LinBytesPerScanLine: %d\n", mode->LinBytesPerScanLine); - xf86ErrorFVerb(DEBUG_VERB, - " BnkNumberOfImagePages: %d\n", mode->BnkNumberOfImagePages); - xf86ErrorFVerb(DEBUG_VERB, - " LinNumberOfImagePages: %d\n", mode->LinNumberOfImagePages); - xf86ErrorFVerb(DEBUG_VERB, - " LinRedMaskSize: %d\n", mode->LinRedMaskSize); - xf86ErrorFVerb(DEBUG_VERB, - " LinRedFieldPosition: %d\n", mode->LinRedFieldPosition); - xf86ErrorFVerb(DEBUG_VERB, - " LinGreenMaskSize: %d\n", mode->LinGreenMaskSize); - xf86ErrorFVerb(DEBUG_VERB, - " LinGreenFieldPosition: %d\n", mode->LinGreenFieldPosition); - xf86ErrorFVerb(DEBUG_VERB, - " LinBlueMaskSize: %d\n", mode->LinBlueMaskSize); - xf86ErrorFVerb(DEBUG_VERB, - " LinBlueFieldPosition: %d\n", mode->LinBlueFieldPosition); - xf86ErrorFVerb(DEBUG_VERB, - " LinRsvdMaskSize: %d\n", mode->LinRsvdMaskSize); - xf86ErrorFVerb(DEBUG_VERB, - " LinRsvdFieldPosition: %d\n", mode->LinRsvdFieldPosition); - xf86ErrorFVerb(DEBUG_VERB, - " MaxPixelClock: %ld\n", (unsigned long)mode->MaxPixelClock); + xf86ErrorFVerb(DEBUG_VERB, " LinBytesPerScanLine: %d\n", + mode->LinBytesPerScanLine); + xf86ErrorFVerb(DEBUG_VERB, " BnkNumberOfImagePages: %d\n", + mode->BnkNumberOfImagePages); + xf86ErrorFVerb(DEBUG_VERB, " LinNumberOfImagePages: %d\n", + mode->LinNumberOfImagePages); + xf86ErrorFVerb(DEBUG_VERB, " LinRedMaskSize: %d\n", + mode->LinRedMaskSize); + xf86ErrorFVerb(DEBUG_VERB, " LinRedFieldPosition: %d\n", + mode->LinRedFieldPosition); + xf86ErrorFVerb(DEBUG_VERB, " LinGreenMaskSize: %d\n", + mode->LinGreenMaskSize); + xf86ErrorFVerb(DEBUG_VERB, " LinGreenFieldPosition: %d\n", + mode->LinGreenFieldPosition); + xf86ErrorFVerb(DEBUG_VERB, " LinBlueMaskSize: %d\n", + mode->LinBlueMaskSize); + xf86ErrorFVerb(DEBUG_VERB, " LinBlueFieldPosition: %d\n", + mode->LinBlueFieldPosition); + xf86ErrorFVerb(DEBUG_VERB, " LinRsvdMaskSize: %d\n", + mode->LinRsvdMaskSize); + xf86ErrorFVerb(DEBUG_VERB, " LinRsvdFieldPosition: %d\n", + mode->LinRsvdFieldPosition); + xf86ErrorFVerb(DEBUG_VERB, " MaxPixelClock: %ld\n", + (unsigned long)mode->MaxPixelClock); } } @@ -497,14 +492,14 @@ clock = VBEGetPixelClock(pVbe, data->mode, data->block->PixelClock); #ifdef DEBUG ErrorF("Setting clock %.2fMHz, closest is %.2fMHz\n", - (double)data->block->PixelClock / 1000000.0, + (double)data->block->PixelClock / 1000000.0, (double)clock / 1000000.0); #endif if (clock) data->block->PixelClock = clock; data->mode |= (1 << 11); data->block->RefreshRate = ((double)(data->block->PixelClock) / - (double)(best->HTotal * best->VTotal)) * 100; + (double)(best->HTotal * best->VTotal)) * 100; } pMode = pMode->next; } while (pMode != pScrn->modes); @@ -531,4 +526,3 @@ { xf86PrintModes(scrp); } - Index: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h diff -u xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h:1.1 xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h:1.2 --- xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h:1.1 Mon Feb 17 12:06:46 2003 +++ xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h Sun Aug 28 16:04:52 2005 @@ -26,11 +26,13 @@ * * Authors: David Dawes * - * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h,v 1.1 2003/02/17 17:06:46 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.h,v 1.2 2005/08/28 20:04:52 tsi Exp $ */ #ifndef _VBE_MODES_H +#include "vbe.h" + /* * This is intended to be stored in the DisplayModeRec's private area. * It includes all the information necessary to VBE information. Index: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c diff -u xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c:1.1 xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c:1.4 --- xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c:1.1 Mon Feb 17 12:06:46 2003 +++ xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c Thu Mar 16 11:50:35 2006 @@ -1,44 +1,38 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,v 1.1 2003/02/17 17:06:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe_module.c,v 1.4 2006/03/16 16:50:35 dawes Exp $ */ + +#ifdef XFree86LOADER -#include "xf86.h" -#include "xf86str.h" #include "vbe.h" extern const char *vbe_ddcSymbols[]; +extern const char *vbe_int10Symbols[]; -#ifdef XFree86LOADER - -static MODULESETUPPROTO(vbeSetup); - -static XF86ModuleVersionInfo vbeVersRec = +/* + * Vbe.*InfoBlock structures were reworked starting with video driver ABI + * version number 0.9. + */ +static XF86ModReqInfo ParentModuleRequirements = { - "vbe", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XF86_VERSION_CURRENT, - 1, 1, 0, - ABI_CLASS_VIDEODRV, /* needs the video driver ABI */ - ABI_VIDEODRV_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} + MAJOR_UNSPEC, /* majorversion */ + MINOR_UNSPEC, /* minorversion */ + PATCH_UNSPEC, /* patchlevel */ + ABI_CLASS_VIDEODRV, /* abiclass */ + SET_ABI_VERSION(0, 9), /* abiversion */ + MOD_CLASS_NONE /* moduleclass */ }; -XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL }; - static pointer -vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin) +vbeSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { - static Bool setupDone = FALSE; - - if (!setupDone) { - setupDone = TRUE; - LoaderRefSymLists(vbe_ddcSymbols,NULL); - /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - } + /* + * Tell the loader about symbols from other modules that this module + * might refer to. + */ + LoaderModRefSymLists(module, vbe_ddcSymbols, vbe_int10Symbols, NULL); + + /* Cause parent module version to be checked */ + xf86SetParentModuleRequirements(module, &ParentModuleRequirements); + /* * The return value must be non-NULL on success even though there * is no TearDownProc. @@ -46,5 +40,25 @@ return (pointer)1; } -#endif +static XF86ModuleVersionInfo vbeVersRec = +{ + "vbe", /* modname */ + MODULEVENDORSTRING, /* vendor */ + MODINFOSTRING1, /* _modinfo1_ */ + MODINFOSTRING2, /* _modinfo2_ */ + XF86_VERSION_CURRENT, /* xf86version */ + 2, 0, 0, /* majorversion, minorversion, patchlevel */ + ABI_CLASS_VIDEODRV, /* needs the video driver ABI */ + ABI_VIDEODRV_VERSION, /* abiversion (current) */ + MOD_CLASS_NONE, /* moduleclass */ + {0,0,0,0} /* checksum */ +}; + +XF86ModuleData vbeModuleData = +{ + &vbeVersRec, /* vers */ + vbeSetup, /* setup */ + NULL /* teardown */ +}; +#endif /* XFree86LOADER */ Index: xc/programs/Xserver/hw/xfree86/vgahw/Imakefile diff -u xc/programs/Xserver/hw/xfree86/vgahw/Imakefile:1.13 xc/programs/Xserver/hw/xfree86/vgahw/Imakefile:1.14 --- xc/programs/Xserver/hw/xfree86/vgahw/Imakefile:1.13 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/hw/xfree86/vgahw/Imakefile Fri Oct 14 11:17:10 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/Imakefile,v 1.13 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/Imakefile,v 1.14 2005/10/14 15:17:10 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -58,16 +58,13 @@ OBJS = vgaHW.o /*vgaCmap.o*/ $(MODOBJ) - INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \ + INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \ -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c + -I$(SERVERSRC)/include -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c LINTLIBS = ../../../dix/llib-ldix.ln ../../../os/llib-los.ln \ ../../mfb/llib-lmfb.ln ../../mi/llib-lmi.ln - DEFINES = - ModuleObjectRule() LibraryModuleTarget(vgahw,$(OBJS),.) Index: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c diff -u xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c:1.7 xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c:1.9 --- xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c:1.7 Thu Feb 15 13:31:22 2001 +++ xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c Mon Jan 9 10:00:27 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.7 2001/02/15 18:31:22 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.9 2006/01/09 15:00:27 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * @@ -21,11 +21,9 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: vgaCmap.c /main/15 1996/10/28 05:13:44 kaleb $ */ - -#include "X.h" -#include "Xproto.h" +#include +#include #include "windowstr.h" #include "compiler.h" #include "mipointer.h" @@ -36,7 +34,7 @@ #include "xf86_ansic.h" #define _XF86DGA_SERVER_ -#include "extensions/xf86dgastr.h" +#include #include "dgaproc.h" Index: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c diff -u xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c:1.61 xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c:1.63 --- xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c:1.61 Tue Oct 26 18:26:38 2004 +++ xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c Fri Oct 14 11:17:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v 1.61 2004/10/26 22:26:38 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v 1.63 2005/10/14 15:17:10 tsi Exp $ */ /* * Loosely based on code bearing the following copyright: @@ -55,7 +55,7 @@ #define _NEED_SYSI86 -#include "X.h" +#include #include "misc.h" #include "xf86.h" @@ -757,13 +757,14 @@ void vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) { + +#if defined(SAVE_TEXT) || defined(SAVE_FONT1) || defined(SAVE_FONT2) + vgaHWPtr hwp = VGAHWPTR(scrninfp); int savedIOBase; unsigned char miscOut, attr10, gr1, gr3, gr4, gr5, gr6, gr8, seq2, seq4; Bool doMap = FALSE; -#if defined(SAVE_TEXT) || defined(SAVE_FONT1) || defined(SAVE_FONT2) - /* If nothing to do, return now */ if (!hwp->FontInfo1 && !hwp->FontInfo2 && !hwp->TextInfo) return; @@ -809,15 +810,11 @@ #endif hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ + hwp->writeGr(hwp, 0x01, 0x00); /* all planes come from CPU */ + hwp->writeGr(hwp, 0x03, 0x00); /* don't rotate, write unmodified */ hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ - - if (scrninfp->depth == 4) { - /* GJA */ - hwp->writeGr(hwp, 0x03, 0x00); /* don't rotate, write unmodified */ - hwp->writeGr(hwp, 0x08, 0xFF); /* write all bits in a byte */ - hwp->writeGr(hwp, 0x01, 0x00); /* all planes come from CPU */ - } + hwp->writeGr(hwp, 0x08, 0xFF); /* write all bits in a byte */ #ifdef SAVE_FONT1 if (hwp->FontInfo1) { @@ -943,13 +940,14 @@ void vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save) { + +#if defined(SAVE_TEXT) || defined(SAVE_FONT1) || defined(SAVE_FONT2) + vgaHWPtr hwp = VGAHWPTR(scrninfp); int savedIOBase; - unsigned char miscOut, attr10, gr4, gr5, gr6, seq2, seq4; + unsigned char miscOut, attr10, gr1, gr3, gr4, gr5, gr6, gr8, seq2, seq4; Bool doMap = FALSE; -#if defined(SAVE_TEXT) || defined(SAVE_FONT1) || defined(SAVE_FONT2) - if (hwp->Base == NULL) { doMap = TRUE; if (!vgaHWMapMem(scrninfp)) { @@ -966,9 +964,12 @@ /* save the registers that are needed here */ miscOut = hwp->readMiscOut(hwp); + gr1 = hwp->readGr(hwp, 0x01); + gr3 = hwp->readGr(hwp, 0x03); gr4 = hwp->readGr(hwp, 0x04); gr5 = hwp->readGr(hwp, 0x05); gr6 = hwp->readGr(hwp, 0x06); + gr8 = hwp->readGr(hwp, 0x08); seq2 = hwp->readSeq(hwp, 0x02); seq4 = hwp->readSeq(hwp, 0x04); @@ -995,8 +996,11 @@ #endif hwp->writeSeq(hwp, 0x04, 0x06); /* enable plane graphics */ + hwp->writeGr(hwp, 0x01, 0x00); /* all planes come from CPU */ + hwp->writeGr(hwp, 0x03, 0x00); /* don't rotate, write unmodified */ hwp->writeGr(hwp, 0x05, 0x00); /* write mode 0, read mode 0 */ hwp->writeGr(hwp, 0x06, 0x05); /* set graphics */ + hwp->writeGr(hwp, 0x08, 0xFF); /* write all bits in a byte */ #ifdef SAVE_FONT1 if (hwp->FontInfo1 || (hwp->FontInfo1 = xalloc(FONT_AMOUNT))) { @@ -1028,9 +1032,12 @@ hwp->writeAttr(hwp, 0x10, attr10); hwp->writeSeq(hwp, 0x02, seq2); hwp->writeSeq(hwp, 0x04, seq4); + hwp->writeGr(hwp, 0x01, gr1); + hwp->writeGr(hwp, 0x03, gr3); hwp->writeGr(hwp, 0x04, gr4); hwp->writeGr(hwp, 0x05, gr5); hwp->writeGr(hwp, 0x06, gr6); + hwp->writeGr(hwp, 0x08, gr8); hwp->writeMiscOut(hwp, miscOut); hwp->IOBase = savedIOBase; Index: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h diff -u xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h:1.33 xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h:1.34 --- xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h:1.33 Tue Oct 26 18:26:38 2004 +++ xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h Fri Oct 14 11:17:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h,v 1.33 2004/10/26 22:26:38 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h,v 1.34 2005/10/14 15:17:10 tsi Exp $ */ /* * Loosely based on code bearing the following copyright: @@ -58,7 +58,7 @@ #ifndef _VGAHW_H #define _VGAHW_H -#include "X.h" +#include #include "misc.h" #include "input.h" #include "scrnintstr.h" @@ -71,7 +71,7 @@ #include "globals.h" #define DPMS_SERVER -#include "extensions/dpms.h" +#include extern int vgaHWGetIndex(void); Index: xc/programs/Xserver/hw/xfree86/xaa/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xaa/Imakefile:3.44 xc/programs/Xserver/hw/xfree86/xaa/Imakefile:3.45 --- xc/programs/Xserver/hw/xfree86/xaa/Imakefile:3.44 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/hw/xfree86/xaa/Imakefile Fri Oct 14 11:17:10 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xaa/Imakefile,v 3.44 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xaa/Imakefile,v 3.45 2005/10/14 15:17:10 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -84,10 +84,9 @@ DONES = lsb_first/DONE msb_first/DONE lsb_fixed/DONE msb_fixed/DONE -INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(EXTINCSRC) \ +INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ - -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render + -I$(SERVERSRC)/include -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render ModuleObjectRule() @@ -104,11 +103,9 @@ DependTarget() - ForceSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) - InstallDriverSDKLibraryModule(xaa,$(DRIVERSDKMODULEDIR),.) InstallDriverSDKNonExecFile(xaa.h,$(DRIVERSDKINCLUDEDIR)) Index: xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP diff -u xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP:1.8 xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP:1.9 --- xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP:1.8 Mon Dec 17 15:00:46 2001 +++ xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP Fri Oct 14 11:17:10 2005 @@ -1,12 +1,11 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP,v 1.8 2001/12/17 20:00:46 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xaa/Imakefile.EXP,v 1.9 2005/10/14 15:17:10 tsi Exp $ #define IHaveModules #include INCLUDES = -I.. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ - -I$(SERVERSRC)/render -I$(EXTINCSRC) + -I$(SERVERSRC)/include -I$(SERVERSRC)/render DEFINES = EXPDEFINES Index: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c:1.4 xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c:1.5 --- xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c:1.4 Mon Nov 10 13:22:39 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c Fri Oct 14 11:17:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.4 2003/11/10 18:22:39 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.5 2005/10/14 15:17:10 tsi Exp $ */ /* This is a lighter version of cfbBitBlt. We calculate the boxes @@ -12,7 +12,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "mi.h" #include "pixmapstr.h" #include "gcstruct.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c:1.8 xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c:1.9 --- xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c:1.8 Mon Feb 17 11:08:29 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c Fri Oct 14 11:17:10 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.8 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.9 2005/10/14 15:17:10 tsi Exp $ */ -#include "Xmd.h" +#include CARD32 XAAReverseBitOrder(CARD32 v); CARD32 Index: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c:1.13 xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c:1.14 --- xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c:1.13 Mon Feb 19 17:19:49 2001 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c Fri Oct 14 11:17:10 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.13 2001/02/19 22:19:49 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.14 2005/10/14 15:17:10 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c:1.14 xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c:1.15 --- xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c:1.14 Mon Nov 10 13:22:40 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c Fri Oct 14 11:17:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.14 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.15 2005/10/14 15:17:10 tsi Exp $ */ /* A CopyPlane function that handles bitmap->screen copies and @@ -16,7 +16,7 @@ #include "xf86_OSproc.h" #include "servermd.h" -#include "X.h" +#include #include "scrnintstr.h" #include "mi.h" #include "pixmapstr.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c:1.4 xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c:1.5 --- xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c:1.4 Mon Nov 10 13:22:40 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c Fri Oct 14 11:17:10 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.4 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.5 2005/10/14 15:17:10 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c:1.5 xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c:1.6 --- xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c:1.5 Wed Sep 18 14:14:59 2002 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c Fri Oct 14 11:17:10 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.5 2002/09/18 18:14:59 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.6 2005/10/14 15:17:10 tsi Exp $ */ -#include "X.h" +#include #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c:1.5 xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c:1.6 --- xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c:1.5 Sat May 29 23:03:31 1999 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c Fri Oct 14 11:17:10 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.5 1999/05/30 03:03:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.6 2005/10/14 15:17:10 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c:1.4 xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c:1.5 --- xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c:1.4 Sat May 29 23:03:31 1999 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c Fri Oct 14 11:17:10 2005 @@ -21,7 +21,7 @@ * * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.4 1999/05/30 03:03:31 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.5 2005/10/14 15:17:10 tsi Exp $ */ /* * Filled solid arcs, based on cfbfillarc.c. @@ -39,7 +39,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.16 xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.17 --- xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c:1.16 Sat Mar 22 22:41:44 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c Fri Oct 14 11:17:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.16 2003/03/23 03:41:44 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.17 2005/10/14 15:17:10 tsi Exp $ */ /* * Copyright 1996 The XFree86 Project @@ -36,7 +36,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c:1.16 xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c:1.17 --- xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c:1.16 Mon Nov 10 13:22:40 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c Fri Oct 14 11:17:11 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.16 2003/11/10 18:22:40 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.17 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c:1.19 xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c:1.20 --- xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c:1.19 Mon Feb 19 17:19:50 2001 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c Fri Oct 14 11:17:11 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.19 2001/02/19 22:19:50 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.20 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c:1.15 xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c:1.16 --- xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c:1.15 Mon Sep 25 19:56:14 2000 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c Fri Oct 14 11:17:11 2005 @@ -1,13 +1,13 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.15 2000/09/25 23:56:14 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.16 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "xf86str.h" #include "xaa.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c:1.21 xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c:1.22 --- xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c:1.21 Mon Nov 10 13:22:41 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c Fri Oct 14 11:17:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.21 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.22 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" @@ -6,7 +6,7 @@ #include "xf86_OSproc.h" #include "servermd.h" -#include "X.h" +#include #include "scrnintstr.h" #include "mi.h" #include "pixmapstr.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c:1.35 xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c:1.37 --- xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c:1.35 Thu Jul 19 14:50:16 2001 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c Fri Oct 14 11:17:11 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.35 2001/07/19 18:50:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.37 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" @@ -479,8 +479,12 @@ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; XAAPixmapPtr pPriv; PixmapPtr pPix = NULL; - int size = w * h; + int size; + + if ((w > MAXSHORT) || (h > MAXSHORT)) + return NullPixmap; + size = w * h; if (!infoRec->offscreenDepthsInitialized) XAAInitializeOffscreenDepths (pScreen); Index: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c:1.36 xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c:1.38 --- xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c:1.36 Sat Jan 11 22:55:51 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c Thu Mar 16 11:50:35 2006 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.36 2003/01/12 03:55:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.38 2006/03/16 16:50:35 dawes Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "xf86str.h" #include "xaa.h" @@ -121,7 +121,7 @@ /*ARGSUSED*/ static pointer -xaaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) +xaaSetup(ModuleDescPtr Module, pointer Options, int *ErrorMajor, int *ErrorMinor) { static Bool Initialised = FALSE; Index: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c:1.6 xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c:1.7 --- xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c:1.6 Wed Sep 18 14:15:00 2002 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c Fri Oct 14 11:17:11 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.6 2002/09/18 18:15:00 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.7 2005/10/14 15:17:11 tsi Exp $ */ -#include "X.h" +#include #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c:1.5 xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c:1.6 --- xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c:1.5 Thu Jan 14 08:05:27 1999 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c Fri Oct 14 11:17:11 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.5 1999/01/14 13:05:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.6 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "miline.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c:1.14 xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c:1.15 --- xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c:1.14 Fri Nov 14 16:54:51 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c Fri Oct 14 11:17:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.14 2003/11/14 21:54:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.15 2005/10/14 15:17:11 tsi Exp $ */ /******************************************************************** @@ -23,8 +23,8 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" -#include "font.h" +#include +#include #include "scrnintstr.h" #include "dixfontstr.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c:1.6 xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c:1.7 --- xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c:1.6 Thu Jul 19 14:50:16 2001 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c Fri Oct 14 11:17:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.6 2001/07/19 18:50:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.7 2005/10/14 15:17:11 tsi Exp $ */ /* Copyright (c) 1999 - The XFree86 Project Inc. @@ -12,7 +12,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c:1.16 xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c:1.18 --- xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c:1.16 Tue Apr 6 16:53:22 2004 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c Sun Feb 19 10:51:30 2006 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.16 2004/04/06 20:53:22 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.18 2006/02/19 15:51:30 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" @@ -16,11 +16,6 @@ #include "pixmapstr.h" #include "mioverlay.h" -#ifdef PANORAMIX -#include "panoramiX.h" -#include "panoramiXsrv.h" -#endif - static void XAACopyWindow8_32( WindowPtr pWin, @@ -166,16 +161,6 @@ xorg = pBgWin->drawable.x; yorg = pBgWin->drawable.y; -#ifdef PANORAMIX - if(!noPanoramiXExtension) { - int index = pScreen->myNum; - if(WindowTable[index] == pBgWin) { - xorg -= panoramiXdataPtr[index].x; - yorg -= panoramiXdataPtr[index].y; - } - } -#endif - if(IS_OFFSCREEN_PIXMAP(pPix) && infoRec->FillCacheBltRects) { XAACacheInfoPtr pCache = &(infoRec->ScratchCacheInfoRec); Index: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c:1.2 xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c:1.3 --- xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c:1.2 Mon Nov 10 13:22:41 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c Fri Oct 14 11:17:11 2005 @@ -3,7 +3,7 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.2 2003/11/10 18:22:41 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.3 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" @@ -11,7 +11,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c:1.33 xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c:1.37 --- xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c:1.33 Mon Nov 3 00:11:54 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c Sat Jan 28 21:21:24 2006 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.33 2003/11/03 05:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.37 2006/01/29 02:21:24 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "gc.h" #include "mi.h" @@ -28,7 +28,7 @@ static int CacheInitIndex = -1; #define CACHEINIT(p) ((p)->privates[CacheInitIndex].val) - + typedef struct _CacheLink { int x; @@ -45,7 +45,7 @@ while(num--) { array->x = list->x; array->y = list->y; - array->w = list->w; + array->w = list->w; array->h = list->h; array->serialNumber = 0; array->fg = array->bg = -1; @@ -56,7 +56,7 @@ -static CacheLinkPtr +static CacheLinkPtr Enlist(CacheLinkPtr link, int x, int y, int w, int h) { CacheLinkPtr newLink; @@ -64,7 +64,7 @@ newLink = xalloc(sizeof(CacheLink)); newLink->next = link; newLink->x = x; newLink->y = y; - newLink->w = w; newLink->h = h; + newLink->w = w; newLink->h = h; return newLink; } @@ -77,7 +77,7 @@ if(link) { ret = link->next; xfree(link); - } + } return ret; } @@ -97,15 +97,15 @@ static CacheLinkPtr -QuadLinks(CacheLinkPtr big, CacheLinkPtr little) +QuadLinks(CacheLinkPtr big, CacheLinkPtr little) { /* CAUTION: This doesn't free big */ int w1, w2, h1, h2; while(big) { - w1 = big->w >> 1; + w1 = big->w >> 1; w2 = big->w - w1; - h1 = big->h >> 1; + h1 = big->h >> 1; h2 = big->h - h1; little = Enlist(little, big->x, big->y, w1, h1); @@ -114,7 +114,7 @@ little = Enlist(little, big->x + w1, big->y + h1, w2, h2); big = big->next; - } + } return little; } @@ -152,7 +152,7 @@ xfree(pPriv->InfoMono); if(pPriv->InfoPartial) xfree(pPriv->InfoPartial); - + xfree(pPriv); } @@ -160,7 +160,7 @@ XAAClosePixmapCache(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); - + if(infoRec->PixmapCachePrivate) FreePixmapCachePrivate( (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate); @@ -172,9 +172,9 @@ static CacheLinkPtr ThinOutPartials( - CacheLinkPtr ListPartial, + CacheLinkPtr ListPartial, int *num, int *maxw, int *maxh -) { +) { /* This guy's job is to get at least 4 big slots out of a list of fragments */ CacheLinkPtr List64, List32, List16, List8, pCur, next, ListKeepers; @@ -227,7 +227,7 @@ Num32 += Num64 * 4; Num64 = 0; } - + if(Num32 >= 4) { ListKeepers = List32; List32 = NULL; NumKeepers = Num32; @@ -252,30 +252,30 @@ ListKeepers = List8; List8 = NULL; NumKeepers = Num8; goto GOT_EM; - } + } GOT_EM: /* Free the ones we aren't using */ - + if(List64) FreeList(List64); if(List32) FreeList(List32); if(List16) FreeList(List16); if(List8) FreeList(List8); - + /* Enlarge the slots if we can */ if(ListKeepers) { CacheLinkPtr pLink = ListKeepers; w = h = 128; - + while(pLink) { if(pLink->w < w) w = pLink->w; if(pLink->h < h) h = pLink->h; pLink = pLink->next; } - } + } *maxw = w; *maxh = h; @@ -285,21 +285,21 @@ static void ConvertColorToMono( - CacheLinkPtr *ColorList, + CacheLinkPtr *ColorList, int ColorW, int ColorH, - CacheLinkPtr *MonoList, + CacheLinkPtr *MonoList, int MonoW, int MonoH ){ int x, y, w; x = (*ColorList)->x; y = (*ColorList)->y; *ColorList = Delist(*ColorList); - + while(ColorH) { ColorH -= MonoH; for(w = 0; w <= (ColorW - MonoW); w += MonoW) *MonoList = Enlist(*MonoList, x + w, y + ColorH, MonoW, MonoH); - } + } } static void @@ -308,7 +308,7 @@ CacheLinkPtr ListPartial, CacheLinkPtr *ListMono, CacheLinkPtr *ListColor, - XAAInfoRecPtr infoRec + XAAInfoRecPtr infoRec ){ /* This guy extracts as many 8x8 slots as it can out of fragments */ @@ -322,7 +322,7 @@ CacheLinkPtr pLink = ListPartial; CacheLinkPtr MonoList = *ListMono, ColorList = *ListColor; - if(DoColor && DoMono) { + if(DoColor && DoMono) { /* we assume color patterns take more space than color ones */ if(MonoH > ColorH) ColorH = MonoH; if(MonoW > ColorW) ColorW = MonoW; @@ -337,7 +337,7 @@ y = pLink->y; if(DoColor) { - while(Height >= ColorH) { + while(Height >= ColorH) { Height -= ColorH; for(w = 0; w <= (Width - ColorW); w += ColorW) { ColorList = Enlist( @@ -346,9 +346,9 @@ } } } - - if(DoMono && (Height >= MonoH)) { - while(Height >= MonoH) { + + if(DoMono && (Height >= MonoH)) { + while(Height >= MonoH) { Height -= MonoH; for(w = 0; w <= (Width - MonoW); w += MonoW) { MonoList = Enlist( @@ -374,15 +374,15 @@ CacheLinkPtr list = *initList; CacheLinkPtr prev = NULL; - while(list) { - if((list->w >= w) && (list->h >= h)) + while(list) { + if((list->w >= w) && (list->h >= h)) break; prev = list; list = list->next; } if(list) { - if(prev) + if(prev) prev->next = list->next; else *initList = list->next; @@ -390,7 +390,7 @@ list->next = NULL; } - return list; + return list; } @@ -401,7 +401,7 @@ CacheLinkPtr *ListMono, CacheLinkPtr *ListColor, int *maxw, int *maxh, - XAAInfoRecPtr infoRec + XAAInfoRecPtr infoRec ){ /* This guy tries to get 4 of each type of 8x8 slot requested out of a list of fragments all while trying to retain some big fragments @@ -419,7 +419,7 @@ int w, h, Width, Height; int MonosPerColor = 1; - if(DoColor && DoMono) { + if(DoColor && DoMono) { /* we assume color patterns take more space than color ones */ if(MonoH > ColorH) ColorH = MonoH; if(MonoW > ColorW) ColorW = MonoW; @@ -460,9 +460,9 @@ ColorList = Enlist( ColorList, pCur->x + w, pCur->y + h, ColorW, ColorH); (*NumColor)++; - } + } } - } + } if(DoMono && (pCur->w >= MonoW) && (h >= MonoH)) { while(h >= MonoH) { h -= MonoH; @@ -470,9 +470,9 @@ MonoList = Enlist( MonoList, pCur->x + w, pCur->y + h, MonoW, MonoH); (*NumMono)++; - } + } } - } + } xfree(pCur); } @@ -486,11 +486,11 @@ while(*NumColor < 4) { theOne = NULL; if(Num8) { - if((theOne = ExtractOneThatFits(&List8, ColorW, ColorH))) + if((theOne = ExtractOneThatFits(&List8, ColorW, ColorH))) Num8--; } - if(Num16 && !theOne) { - if((theOne = ExtractOneThatFits(&List16, ColorW, ColorH))) + if(Num16 && !theOne) { + if((theOne = ExtractOneThatFits(&List16, ColorW, ColorH))) Num16--; } if(Num32 && !theOne) { @@ -504,13 +504,13 @@ if(!theOne) break; - - ConvertAllPartialsTo8x8(NumMono, NumColor, theOne, + + ConvertAllPartialsTo8x8(NumMono, NumColor, theOne, &MonoList, &ColorList, infoRec); if(DoMono) { while(*NumColor && (*NumMono < 4)) { - ConvertColorToMono(&ColorList, ColorW, ColorH, + ConvertColorToMono(&ColorList, ColorW, ColorH, &MonoList, MonoW, MonoH); (*NumColor)--; *NumMono += MonosPerColor; } @@ -523,11 +523,11 @@ while(*NumMono < 4) { theOne = NULL; if(Num8) { - if((theOne = ExtractOneThatFits(&List8, MonoW, MonoH))) + if((theOne = ExtractOneThatFits(&List8, MonoW, MonoH))) Num8--; } - if(Num16 && !theOne) { - if((theOne = ExtractOneThatFits(&List16, MonoW, MonoH))) + if(Num16 && !theOne) { + if((theOne = ExtractOneThatFits(&List16, MonoW, MonoH))) Num16--; } if(Num32 && !theOne) { @@ -540,8 +540,8 @@ } if(!theOne) break; - - ConvertAllPartialsTo8x8(NumMono, NumColor, theOne, + + ConvertAllPartialsTo8x8(NumMono, NumColor, theOne, &MonoList, &ColorList, infoRec); } } @@ -559,7 +559,7 @@ Num32 += Num64 * 4; Num64 = 0; } - + if(Num32 >= 4) { ListKeepers = List32; List32 = NULL; NumKeepers = Num32; @@ -584,38 +584,38 @@ ListKeepers = List8; List8 = NULL; NumKeepers = Num8; goto GOT_EM; - } + } GOT_EM: /* Free the ones we aren't using */ - - if(List64) - ConvertAllPartialsTo8x8(NumMono, NumColor, List64, + + if(List64) + ConvertAllPartialsTo8x8(NumMono, NumColor, List64, &MonoList, &ColorList, infoRec); - if(List32) - ConvertAllPartialsTo8x8(NumMono, NumColor, List32, + if(List32) + ConvertAllPartialsTo8x8(NumMono, NumColor, List32, &MonoList, &ColorList, infoRec); - if(List16) - ConvertAllPartialsTo8x8(NumMono, NumColor, List16, + if(List16) + ConvertAllPartialsTo8x8(NumMono, NumColor, List16, &MonoList, &ColorList, infoRec); - if(List8) - ConvertAllPartialsTo8x8(NumMono, NumColor, List8, + if(List8) + ConvertAllPartialsTo8x8(NumMono, NumColor, List8, &MonoList, &ColorList, infoRec); - + /* Enlarge the slots if we can */ if(ListKeepers) { CacheLinkPtr pLink = ListKeepers; Width = Height = 128; - + while(pLink) { if(pLink->w < Width) Width = pLink->w; if(pLink->h < Height) Height = pLink->h; pLink = pLink->next; } - } + } *ListMono = MonoList; *ListColor = ColorList; @@ -626,9 +626,9 @@ } -void -XAAInitPixmapCache( - ScreenPtr pScreen, +void +XAAInitPixmapCache( + ScreenPtr pScreen, RegionPtr areas, pointer data ) { @@ -678,15 +678,15 @@ if(tmp) x += (granularity - tmp); } width = pBox->x2 - x; - if(width <= 0) {pBox++; continue;} + if(width <= 0) {pBox++; continue;} y = pBox->y1; - height = pBox->y2 - y; + height = pBox->y2 - y; - for(h = 0; h <= (height - 512); h += 512) { + for(h = 0; h <= (height - 512); h += 512) { for(w = 0; w <= (width - 512); w += 512) { List512 = Enlist(List512, x + w, y + h, 512, 512); - Num512++; + Num512++; } for(; w <= (width - 256); w += 256) { List256 = Enlist(List256, x + w, y + h, 256, 256); @@ -707,9 +707,9 @@ ListPartial = Enlist(ListPartial, x + w, y + h + 256, d, 128); ListPartial = Enlist(ListPartial, x + w, y + h + 384, d, 128); NumPartial += 4; - } + } } - for(; h <= (height - 256); h += 256) { + for(; h <= (height - 256); h += 256) { for(w = 0; w <= (width - 256); w += 256) { List256 = Enlist(List256, x + w, y + h, 256, 256); Num256++; @@ -724,9 +724,9 @@ ListPartial = Enlist(ListPartial, x + w, y + h, d, 128); ListPartial = Enlist(ListPartial, x + w, y + h + 128, d, 128); NumPartial += 2; - } - } - for(; h <= (height - 128); h += 128) { + } + } + for(; h <= (height - 128); h += 128) { for(w = 0; w <= (width - 128); w += 128) { List128 = Enlist(List128, x + w, y + h, 128, 128); Num128++; @@ -735,9 +735,9 @@ ListPartial = Enlist( ListPartial, x + w, y + h, width - w, 128); NumPartial++; - } - } - if(h < height) { + } + } + if(h < height) { int d = height - h; for(w = 0; w <= (width - 128); w += 128) { ListPartial = Enlist(ListPartial, x + w, y + h, 128, d); @@ -746,13 +746,13 @@ if(w < width) { ListPartial = Enlist(ListPartial, x + w, y + h, width - w, d); NumPartial++; - } - } + } + } pBox++; } -/* +/* by this point we've carved the space into as many 512x512, 256x256 and 128x128 blocks as we could fit. We will then break larger blocks into smaller ones if we need to. The rules are as follows: @@ -777,8 +777,8 @@ */ - ntotal = Num128 + (Num256<<2) + (Num512<<4); - + ntotal = Num128 + (Num256<<2) + (Num512<<4); + Target512 = ntotal >> 5; if(Target512 < 4) Target512 = 0; if(!Target512) Target256 = ntotal >> 3; @@ -828,7 +828,7 @@ Num128 += 4; Num256--; } else break; } - } + } if(Num128 && ((Num128 < 4) || (Num128 > MAX_128))) { CacheLinkPtr next; @@ -840,7 +840,7 @@ */ next = List128->next; while(Num128 > max) { - List128->next = ListPartial; + List128->next = ListPartial; ListPartial = List128; if((List128 = next)) next = List128->next; @@ -858,7 +858,7 @@ if(!(infoRec->PixmapCacheFlags & (CACHE_MONO_8x8 | CACHE_COLOR_8x8))) { if(NumPartial) { if(Num128) { /* don't bother with partials */ - FreeList(ListPartial); + FreeList(ListPartial); NumPartial = 0; ListPartial = NULL; } else { /* We have no big slots. Weed out the unusable partials */ @@ -877,8 +877,8 @@ if(DoColor) infoRec->CanDoColor8x8 = FALSE; if(DoMono) infoRec->CanDoMono8x8 = FALSE; - - if(DoColor && DoMono) { + + if(DoColor && DoMono) { /* we assume color patterns take more space than color ones */ if(MonoH > ColorH) ColorH = MonoH; if(MonoW > ColorW) ColorW = MonoW; @@ -887,32 +887,32 @@ if(Num128) { if(NumPartial) { /* use all for 8x8 slots */ - ConvertAllPartialsTo8x8(&NumMono, &NumColor, + ConvertAllPartialsTo8x8(&NumMono, &NumColor, ListPartial, &ListMono, &ListColor, infoRec); NumPartial = 0; ListPartial = NULL; - } + } /* Get some 8x8 slots from the 128 slots */ - while((Num128 > 4) && + while((Num128 > 4) && ((NumMono < MAX_MONO) && (NumColor < MAX_COLOR))) { CacheLinkPtr tmp = NULL; - tmp = Enlist(tmp, List128->x, List128->y, + tmp = Enlist(tmp, List128->x, List128->y, List128->w, List128->h); List128 = Delist(List128); Num128--; - ConvertAllPartialsTo8x8(&NumMono, &NumColor, + ConvertAllPartialsTo8x8(&NumMono, &NumColor, tmp, &ListMono, &ListColor, infoRec); } } else if(NumPartial) { /* We have share partials between 8x8 slots and tiles. */ - ListPartial = ConvertSomePartialsTo8x8(&NumMono, &NumColor, - &NumPartial, ListPartial, &ListMono, &ListColor, + ListPartial = ConvertSomePartialsTo8x8(&NumMono, &NumColor, + &NumPartial, ListPartial, &ListMono, &ListColor, &MaxPartialWidth, &MaxPartialHeight, infoRec); - } + } + - if(DoMono && DoColor) { if(NumColor && ((NumColor > MAX_COLOR) || (NumColor < 4))) { int max = (NumColor > MAX_COLOR) ? MAX_COLOR : 0; @@ -926,9 +926,9 @@ /* favor Mono slots over Color ones */ while((NumColor > 4) && (NumMono < MAX_MONO)) { - ConvertColorToMono(&ListColor, ColorW, ColorH, + ConvertColorToMono(&ListColor, ColorW, ColorH, &ListMono, MonoW, MonoH); - NumColor--; NumMono += MonosPerColor; + NumColor--; NumMono += MonosPerColor; } } @@ -969,30 +969,30 @@ if(!pCachePriv->Info512) Num512 = 0; if(Num512) TransferList(List512, pCachePriv->Info512, Num512); FreeList(List512); - pCachePriv->Num512x512 = Num512; + pCachePriv->Num512x512 = Num512; } if(Num256) { pCachePriv->Info256 = xcalloc(Num256, sizeof(XAACacheInfoRec)); if(!pCachePriv->Info256) Num256 = 0; if(Num256) TransferList(List256, pCachePriv->Info256, Num256); FreeList(List256); - pCachePriv->Num256x256 = Num256; + pCachePriv->Num256x256 = Num256; } if(Num128) { pCachePriv->Info128 = xcalloc(Num128, sizeof(XAACacheInfoRec)); if(!pCachePriv->Info128) Num128 = 0; if(Num128) TransferList(List128, pCachePriv->Info128, Num128); FreeList(List128); - pCachePriv->Num128x128 = Num128; + pCachePriv->Num128x128 = Num128; } if(NumPartial) { pCachePriv->InfoPartial = xcalloc(NumPartial, sizeof(XAACacheInfoRec)); if(!pCachePriv->InfoPartial) NumPartial = 0; - if(NumPartial) + if(NumPartial) TransferList(ListPartial, pCachePriv->InfoPartial, NumPartial); FreeList(ListPartial); - pCachePriv->NumPartial = NumPartial; + pCachePriv->NumPartial = NumPartial; } if(NumColor) { @@ -1000,7 +1000,7 @@ if(!pCachePriv->InfoColor) NumColor = 0; if(NumColor) TransferList(ListColor, pCachePriv->InfoColor, NumColor); FreeList(ListColor); - pCachePriv->NumColor = NumColor; + pCachePriv->NumColor = NumColor; } if(NumMono) { @@ -1008,7 +1008,7 @@ if(!pCachePriv->InfoMono) NumMono = 0; if(NumMono) TransferList(ListMono, pCachePriv->InfoMono, NumMono); FreeList(ListMono); - pCachePriv->NumMono = NumMono; + pCachePriv->NumMono = NumMono; } @@ -1016,28 +1016,28 @@ infoRec->MaxCacheableTileWidth = MaxPartialWidth; infoRec->MaxCacheableTileHeight = MaxPartialHeight; } - if(Num128) + if(Num128) infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 128; - if(Num256) + if(Num256) infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 256; - if(Num512) + if(Num512) infoRec->MaxCacheableTileWidth = infoRec->MaxCacheableTileHeight = 512; - + infoRec->MaxCacheableStippleHeight = infoRec->MaxCacheableTileHeight; - infoRec->MaxCacheableStippleWidth = + infoRec->MaxCacheableStippleWidth = infoRec->MaxCacheableTileWidth * pScrn->bitsPerPixel; - if(infoRec->ScreenToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) + if(infoRec->ScreenToScreenColorExpandFillFlags & TRIPLE_BITS_24BPP) infoRec->MaxCacheableStippleWidth /= 3; if(NumMono) { - if(!(infoRec->Mono8x8PatternFillFlags & - (HARDWARE_PATTERN_PROGRAMMED_ORIGIN | + if(!(infoRec->Mono8x8PatternFillFlags & + (HARDWARE_PATTERN_PROGRAMMED_ORIGIN | HARDWARE_PATTERN_PROGRAMMED_BITS))) { - int numPerLine = + int numPerLine = infoRec->CacheWidthMono8x8Pattern/infoRec->MonoPatternPitch; - for(i = 0; i < 64; i++) { + for(i = 0; i < 64; i++) { pCachePriv->MonoOffsets[i].y = i/numPerLine; pCachePriv->MonoOffsets[i].x = (i % numPerLine) * infoRec->MonoPatternPitch; @@ -1046,10 +1046,10 @@ infoRec->CanDoMono8x8 = TRUE; } if(NumColor) { - if(!(infoRec->Color8x8PatternFillFlags & + if(!(infoRec->Color8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_ORIGIN)) { - for(i = 0; i < 64; i++) { + for(i = 0; i < 64; i++) { pCachePriv->ColorOffsets[i].y = i & 0x07; pCachePriv->ColorOffsets[i].x = i & ~0x07; } @@ -1059,15 +1059,15 @@ if(!CACHEINIT(pScrn)) { xf86ErrorF("\tSetting up tile and stipple cache:\n"); - if(NumPartial) - xf86ErrorF("\t\t%i %ix%i slots\n", + if(NumPartial) + xf86ErrorF("\t\t%i %ix%i slots\n", NumPartial, MaxPartialWidth, MaxPartialHeight); if(Num128) xf86ErrorF("\t\t%i 128x128 slots\n", Num128); if(Num256) xf86ErrorF("\t\t%i 256x256 slots\n", Num256); if(Num512) xf86ErrorF("\t\t%i 512x512 slots\n", Num512); if(NumColor) xf86ErrorF("\t\t%i 8x8 color pattern slots\n", NumColor); if(NumMono) xf86ErrorF("\t\t%i 8x8 color expansion slots\n", NumMono); - } + } if(!(NumPartial | Num128 | Num256 | Num512 | NumColor | NumMono)) { if(!CACHEINIT(pScrn)) @@ -1108,65 +1108,65 @@ pPriv->flags |= REDUCIBILITY_CHECKED | REDUCIBLE_TO_2_COLOR; pPriv->flags &= ~REDUCIBLE_TO_8x8; - if((w > 32) || (h > 32) || (w & (w - 1)) || (h & (h - 1))) + if((w > 32) || (h > 32) || (w & (w - 1)) || (h & (h - 1))) return FALSE; i = (h > 8) ? 8 : h; switch(w) { case 32: - while(i--) { + while(i--) { bits[i] = IntPtr[i] & mask; if( (bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask, 8)), 8)) || (bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask,16)),16)) || (bits[i] != SHIFT_R((IntPtr[i] & SHIFT_L(mask,24)),24))) - return FALSE; + return FALSE; } break; case 16: while(i--) { bits[i] = IntPtr[i] & mask; if(bits[i] != ((IntPtr[i] & SHIFT_R(SHIFT_L(mask,8),8)))) - return FALSE; + return FALSE; } break; - default: + default: while(i--) bits[i] = IntPtr[i] & mask; break; - } + } switch(h) { - case 32: + case 32: if( (IntPtr[8] != IntPtr[16]) || (IntPtr[9] != IntPtr[17]) || - (IntPtr[10] != IntPtr[18]) || (IntPtr[11] != IntPtr[19]) || - (IntPtr[12] != IntPtr[20]) || (IntPtr[13] != IntPtr[21]) || - (IntPtr[14] != IntPtr[22]) || (IntPtr[15] != IntPtr[23]) || + (IntPtr[10] != IntPtr[18]) || (IntPtr[11] != IntPtr[19]) || + (IntPtr[12] != IntPtr[20]) || (IntPtr[13] != IntPtr[21]) || + (IntPtr[14] != IntPtr[22]) || (IntPtr[15] != IntPtr[23]) || (IntPtr[16] != IntPtr[24]) || (IntPtr[17] != IntPtr[25]) || - (IntPtr[18] != IntPtr[26]) || (IntPtr[19] != IntPtr[27]) || - (IntPtr[20] != IntPtr[28]) || (IntPtr[21] != IntPtr[29]) || - (IntPtr[22] != IntPtr[30]) || (IntPtr[23] != IntPtr[31])) + (IntPtr[18] != IntPtr[26]) || (IntPtr[19] != IntPtr[27]) || + (IntPtr[20] != IntPtr[28]) || (IntPtr[21] != IntPtr[29]) || + (IntPtr[22] != IntPtr[30]) || (IntPtr[23] != IntPtr[31])) return FALSE; /* fall through */ case 16: if( (IntPtr[0] != IntPtr[8]) || (IntPtr[1] != IntPtr[9]) || - (IntPtr[2] != IntPtr[10]) || (IntPtr[3] != IntPtr[11]) || - (IntPtr[4] != IntPtr[12]) || (IntPtr[5] != IntPtr[13]) || - (IntPtr[6] != IntPtr[14]) || (IntPtr[7] != IntPtr[15])) + (IntPtr[2] != IntPtr[10]) || (IntPtr[3] != IntPtr[11]) || + (IntPtr[4] != IntPtr[12]) || (IntPtr[5] != IntPtr[13]) || + (IntPtr[6] != IntPtr[14]) || (IntPtr[7] != IntPtr[15])) return FALSE; case 8: break; case 1: bits[1] = bits[0]; case 2: bits[2] = bits[0]; bits[3] = bits[1]; case 4: bits[4] = bits[0]; bits[5] = bits[1]; bits[6] = bits[2]; bits[7] = bits[3]; - break; + break; } - + pPriv->flags |= REDUCIBLE_TO_8x8; pPriv->pattern0 = bits[0] | SHIFT_L(bits[1],8) | SHIFT_L(bits[2],16) | SHIFT_L(bits[3],24); pPriv->pattern1 = bits[4] | SHIFT_L(bits[5],8) | SHIFT_L(bits[6],16) | SHIFT_L(bits[7],24); - + if(w < 8) { pPriv->pattern0 &= StippleMasks[w - 1]; pPriv->pattern1 &= StippleMasks[w - 1]; @@ -1202,9 +1202,9 @@ int dwords, i, j; pPriv->flags |= REDUCIBILITY_CHECKED; - pPriv->flags &= ~(REDUCIBILITY_CHECKED | REDUCIBLE_TO_2_COLOR); + pPriv->flags &= ~(REDUCIBLE_TO_8x8 | REDUCIBLE_TO_2_COLOR); - if((w > 32) || (h > 32) || (w & (w - 1)) || (h & (h - 1))) + if((w > 32) || (h > 32) || (w & (w - 1)) || (h & (h - 1))) return FALSE; dwords = ((w * pPixmap->drawable.bitsPerPixel) + 31) >> 5; @@ -1254,11 +1254,11 @@ if(h == 32) { CARD32 *IntPtr2, *IntPtr3, *IntPtr4; - i = 8; + i = 8; IntPtr = (CARD32*)pPixmap->devPrivate.ptr; - IntPtr2 = IntPtr + (pitch << 3); - IntPtr3 = IntPtr2 + (pitch << 3); - IntPtr4 = IntPtr3 + (pitch << 3); + IntPtr2 = IntPtr + (pitch << 3); + IntPtr3 = IntPtr2 + (pitch << 3); + IntPtr4 = IntPtr3 + (pitch << 3); while(i--) { for(j = 0; j < dwords; j++) if((IntPtr[j] != IntPtr2[j]) || (IntPtr[j] != IntPtr3[j]) || @@ -1270,10 +1270,10 @@ IntPtr4 += pitch; } } else if (h == 16) { - CARD32 *IntPtr2; + CARD32 *IntPtr2; i = 8; IntPtr = (CARD32*)pPixmap->devPrivate.ptr; - IntPtr2 = IntPtr + (pitch << 3); + IntPtr2 = IntPtr + (pitch << 3); while(i--) { for(j = 0; j < dwords; j++) if(IntPtr[j] != IntPtr2[j]) @@ -1282,15 +1282,15 @@ IntPtr2 += pitch; } } - + pPriv->flags |= REDUCIBLE_TO_8x8; if(checkMono) { - XAAInfoRecPtr infoRec = + XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_DRAWABLE(&pPixmap->drawable); unsigned char bits[8]; int fg, bg = -1, x, y; - + i = (h > 8) ? 8 : h; j = (w > 8) ? 8 : w; @@ -1325,21 +1325,24 @@ } else if(pPixmap->drawable.bitsPerPixel == 24) { CARD32 val; unsigned char *srcp = pPixmap->devPrivate.ptr; - fg = *((CARD32*)srcp) & 0x00FFFFFF; +# define Pixel24(ppix) \ + ((((*((ppix) + 2) << 8) | *((ppix) + 1)) << 8) | *(ppix)) + fg = Pixel24(srcp); pitch = pPixmap->devKind; j *= 3; for(y = 0; y < i; y++) { bits[y] = 0; for(x = 0; x < j; x+=3) { - val = *((CARD32*)(srcp+x)) & 0x00FFFFFF; + val = Pixel24(srcp + x); if(val != fg) { if(bg == -1) bg = val; - else if(bg != val) + else if(bg != val) return TRUE; } else bits[y] |= 1 << (x/3); } srcp += pitch; } +# undef Pixel24 } else if(pPixmap->drawable.bitsPerPixel == 32) { IntPtr = (CARD32*)pPixmap->devPrivate.ptr; fg = IntPtr[0]; @@ -1355,11 +1358,11 @@ } } else return TRUE; - pPriv->fg = fg; + pPriv->fg = fg; if(bg == -1) pPriv->bg = fg; - else pPriv->bg = bg; - - if(h < 8) { + else pPriv->bg = bg; + + if(h < 8) { switch(h) { case 1: bits[1] = bits[0]; case 2: bits[2] = bits[0]; bits[3] = bits[1]; @@ -1367,13 +1370,13 @@ bits[6] = bits[2]; bits[7] = bits[3]; break; } - } + } - pPriv->pattern0 = + pPriv->pattern0 = bits[0] | (bits[1]<<8) | (bits[2]<<16) | (bits[3]<<24); - pPriv->pattern1 = + pPriv->pattern1 = bits[4] | (bits[5]<<8) | (bits[6]<<16) | (bits[7]<<24); - + if(w < 8) { switch(w) { case 1: pPriv->pattern0 |= (pPriv->pattern0 << 1); @@ -1398,7 +1401,7 @@ void XAATileCache( - ScrnInfoPtr pScrn, + ScrnInfoPtr pScrn, XAACacheInfoPtr pCache, int w, int h ) { @@ -1436,7 +1439,7 @@ int h = pPix->drawable.height; int size = max(w, h); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; XAACacheInfoPtr pCache, cacheRoot = NULL; int i, max = 0; @@ -1444,25 +1447,25 @@ if(size <= 128) { if(pCachePriv->Info128) { - cacheRoot = pCachePriv->Info128; + cacheRoot = pCachePriv->Info128; max = pCachePriv->Num128x128; current = &pCachePriv->Current128; - } else { + } else { cacheRoot = pCachePriv->InfoPartial; max = pCachePriv->NumPartial; current = &pCachePriv->CurrentPartial; } } else if(size <= 256) { - cacheRoot = pCachePriv->Info256; + cacheRoot = pCachePriv->Info256; max = pCachePriv->Num256x256; current = &pCachePriv->Current256; } else if(size <= 512) { - cacheRoot = pCachePriv->Info512; + cacheRoot = pCachePriv->Info512; max = pCachePriv->Num512x512; current = &pCachePriv->Current512; - } else { /* something's wrong */ + } else { /* something's wrong */ ErrorF("Something's wrong in XAACacheTile()\n"); - return pCachePriv->Info128; + return pCachePriv->Info128; } pCache = cacheRoot; @@ -1484,7 +1487,7 @@ (*infoRec->WritePixmapToCache)( pScrn, pCache->x, pCache->y, w, h, pPix->devPrivate.ptr, pPix->devKind, pPix->drawable.bitsPerPixel, pPix->drawable.depth); - if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_COLOR_DATA) && + if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_COLOR_DATA) && ((w != pCache->w) || (h != pCache->h))) XAATileCache(pScrn, pCache, w, h); @@ -1497,7 +1500,7 @@ int w = pPix->drawable.width; int h = pPix->drawable.height; XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; XAACacheInfoPtr pCache, cacheRoot = NULL; int i, max = 0, funcNo, pad, dwords, bpp = pScrn->bitsPerPixel; @@ -1507,25 +1510,25 @@ if((h <= 128) && (w <= 128 * bpp)) { if(pCachePriv->Info128) { - cacheRoot = pCachePriv->Info128; + cacheRoot = pCachePriv->Info128; max = pCachePriv->Num128x128; current = &pCachePriv->Current128; - } else { + } else { cacheRoot = pCachePriv->InfoPartial; max = pCachePriv->NumPartial; current = &pCachePriv->CurrentPartial; } } else if((h <= 256) && (w <= 256 * bpp)){ - cacheRoot = pCachePriv->Info256; + cacheRoot = pCachePriv->Info256; max = pCachePriv->Num256x256; current = &pCachePriv->Current256; } else if((h <= 512) && (w <= 526 * bpp)){ - cacheRoot = pCachePriv->Info512; + cacheRoot = pCachePriv->Info512; max = pCachePriv->Num512x512; current = &pCachePriv->Current512; - } else { /* something's wrong */ + } else { /* something's wrong */ ErrorF("Something's wrong in XAACacheMonoStipple()\n"); - return pCachePriv->Info128; + return pCachePriv->Info128; } pCache = cacheRoot; @@ -1547,8 +1550,8 @@ pCache->orig_w = w; pCache->orig_h = h; if(w <= 32) { - if(w & (w - 1)) funcNo = 1; - else funcNo = 0; + if(w & (w - 1)) funcNo = 1; + else funcNo = 0; } else funcNo = 2; pad = BitmapBytePad(pCache->w * bpp); @@ -1576,8 +1579,8 @@ memcpy(data + (pad * h), data, pad * h); h <<= 1; } - - if(h < pCache->h) + + if(h < pCache->h) memcpy(data + (pad * h), data, pad * (pCache->h - h)); (*infoRec->WritePixmapToCache)( @@ -1595,7 +1598,7 @@ int w = pPix->drawable.width; int h = pPix->drawable.height; XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; XAACacheInfoPtr pCache, cacheRoot = NULL; int i, max = 0; @@ -1603,25 +1606,25 @@ if((h <= 128) && (w <= 128)) { if(pCachePriv->Info128) { - cacheRoot = pCachePriv->Info128; + cacheRoot = pCachePriv->Info128; max = pCachePriv->Num128x128; current = &pCachePriv->Current128; - } else { + } else { cacheRoot = pCachePriv->InfoPartial; max = pCachePriv->NumPartial; current = &pCachePriv->CurrentPartial; } } else if((h <= 256) && (w <= 256)){ - cacheRoot = pCachePriv->Info256; + cacheRoot = pCachePriv->Info256; max = pCachePriv->Num256x256; current = &pCachePriv->Current256; } else if((h <= 512) && (w <= 526)){ - cacheRoot = pCachePriv->Info512; + cacheRoot = pCachePriv->Info512; max = pCachePriv->Num512x512; current = &pCachePriv->Current512; - } else { /* something's wrong */ + } else { /* something's wrong */ ErrorF("Something's wrong in XAACachePlanarMonoStipple()\n"); - return pCachePriv->Info128; + return pCachePriv->Info128; } pCache = cacheRoot; @@ -1643,10 +1646,10 @@ pCache->orig_w = w; pCache->orig_h = h; /* Plane 0 holds the stipple. Plane 1 holds the inverted stipple */ - (*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, + (*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, pPix->drawable.width, pPix->drawable.height, pPix->devPrivate.ptr, pPix->devKind, 1, 2); - if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_MONO_DATA) && + if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_MONO_DATA) && ((w != pCache->w) || (h != pCache->h))) XAATileCache(pScrn, pCache, w, h); @@ -1662,7 +1665,7 @@ int h = pPix->drawable.height; int size = max(w, h); XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; XAACacheInfoPtr pCache, cacheRoot = NULL; int i, max = 0; @@ -1670,25 +1673,25 @@ if(size <= 128) { if(pCachePriv->Info128) { - cacheRoot = pCachePriv->Info128; + cacheRoot = pCachePriv->Info128; max = pCachePriv->Num128x128; current = &pCachePriv->Current128; - } else { + } else { cacheRoot = pCachePriv->InfoPartial; max = pCachePriv->NumPartial; current = &pCachePriv->CurrentPartial; } } else if(size <= 256) { - cacheRoot = pCachePriv->Info256; + cacheRoot = pCachePriv->Info256; max = pCachePriv->Num256x256; current = &pCachePriv->Current256; } else if(size <= 512) { - cacheRoot = pCachePriv->Info512; + cacheRoot = pCachePriv->Info512; max = pCachePriv->Num512x512; current = &pCachePriv->Current512; } else { /* something's wrong */ ErrorF("Something's wrong in XAACacheStipple()\n"); - return pCachePriv->Info128; + return pCachePriv->Info128; } pCache = cacheRoot; @@ -1722,10 +1725,10 @@ pCache->bg = bg; pCache->orig_w = w; pCache->orig_h = h; - (*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, + (*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, pPix->drawable.width, pPix->drawable.height, pPix->devPrivate.ptr, pPix->devKind, fg, bg); - if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_COLOR_DATA) && + if(!(infoRec->PixmapCacheFlags & DO_NOT_TILE_COLOR_DATA) && ((w != pCache->w) || (h != pCache->h))) XAATileCache(pScrn, pCache, w, h); @@ -1738,20 +1741,20 @@ XAACacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0, int pat1) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; XAACacheInfoPtr pCache = pCachePriv->InfoMono; int i; for(i = 0; i < pCachePriv->NumMono; i++, pCache++) { - if(pCache->serialNumber && + if(pCache->serialNumber && (pCache->pat0 == pat0) && (pCache->pat1 == pat1)) return pCache; } /* OK, let's cache it */ - pCache = &pCachePriv->InfoMono[pCachePriv->CurrentMono++]; - if(pCachePriv->CurrentMono >= pCachePriv->NumMono) + pCache = &pCachePriv->InfoMono[pCachePriv->CurrentMono++]; + if(pCachePriv->CurrentMono >= pCachePriv->NumMono) pCachePriv->CurrentMono = 0; pCache->serialNumber = 1; /* we don't care since we do lookups by pattern */ @@ -1769,7 +1772,7 @@ XAACacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; XAACacheInfoPtr pCache = pCachePriv->InfoColor; XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pPix); @@ -1779,11 +1782,11 @@ for(i = 0; i < pCachePriv->NumColor; i++, pCache++) { if(pCache->serialNumber == pPix->drawable.serialNumber) { pCache->trans_color = -1; - return pCache; + return pCache; } } - pCache = &pCachePriv->InfoColor[pCachePriv->CurrentColor++]; - if(pCachePriv->CurrentColor >= pCachePriv->NumColor) + pCache = &pCachePriv->InfoColor[pCachePriv->CurrentColor++]; + if(pCachePriv->CurrentColor >= pCachePriv->NumColor) pCachePriv->CurrentColor = 0; pCache->serialNumber = pPix->drawable.serialNumber; @@ -1802,7 +1805,7 @@ (pCache->pat0 == pat0) && (pCache->pat1 == pat1) && (pCache->fg == fg) && (pCache->bg != fg)) { pCache->trans_color = pCache->bg; - return pCache; + return pCache; } } } else { /* opaque stipple */ @@ -1811,15 +1814,15 @@ (pCache->pat0 == pat0) && (pCache->pat1 == pat1) && (pCache->fg == fg) && (pCache->bg == bg)) { pCache->trans_color = -1; - return pCache; + return pCache; } } } - pCache = &pCachePriv->InfoColor[pCachePriv->CurrentColor++]; - if(pCachePriv->CurrentColor >= pCachePriv->NumColor) + pCache = &pCachePriv->InfoColor[pCachePriv->CurrentColor++]; + if(pCachePriv->CurrentColor >= pCachePriv->NumColor) pCachePriv->CurrentColor = 0; - if(bg == -1) + if(bg == -1) pCache->trans_color = bg = fg ^ 1; else pCache->trans_color = -1; @@ -1835,7 +1838,7 @@ } -void +void XAAWriteBitmapToCache( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1845,11 +1848,11 @@ ) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); - (*infoRec->WriteBitmap)(pScrn, x, y, w, h, src, srcwidth, + (*infoRec->WriteBitmap)(pScrn, x, y, w, h, src, srcwidth, 0, fg, bg, GXcopy, ~0); } -void +void XAAWriteBitmapToCacheLinear( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1864,12 +1867,12 @@ pScreenPix = (*pScreen->GetScreenPixmap)(pScreen); - pDstPix = GetScratchPixmapHeader(pScreen, pScreenPix->drawable.width, - y + h, pScreenPix->drawable.depth, - pScreenPix->drawable.bitsPerPixel, + pDstPix = GetScratchPixmapHeader(pScreen, pScreenPix->drawable.width, + y + h, pScreenPix->drawable.depth, + pScreenPix->drawable.bitsPerPixel, pScreenPix->devKind, pScreenPix->devPrivate.ptr); - + pGC = GetScratchGC(pScreenPix->drawable.depth, pScreen); gcvals[0] = fg; gcvals[1] = bg; @@ -1887,7 +1890,7 @@ } -void +void XAAWritePixmapToCache( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1903,7 +1906,7 @@ -void +void XAAWritePixmapToCacheLinear( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1917,10 +1920,10 @@ pScreenPix = (*pScreen->GetScreenPixmap)(pScreen); - pDstPix = GetScratchPixmapHeader(pScreen, x + w, y + h, + pDstPix = GetScratchPixmapHeader(pScreen, x + w, y + h, depth, bpp, pScreenPix->devKind, pScreenPix->devPrivate.ptr); - + pGC = GetScratchGC(depth, pScreen); ValidateGC((DrawablePtr)pDstPix, pGC); @@ -1928,17 +1931,17 @@ SYNC_CHECK(pScrn); if(bpp == BitsPerPixel(depth)) - (*pGC->ops->PutImage)((DrawablePtr)pDstPix, pGC, depth, x, y, w, + (*pGC->ops->PutImage)((DrawablePtr)pDstPix, pGC, depth, x, y, w, h, 0, ZPixmap, (pointer)src); else { PixmapPtr pSrcPix; pSrcPix = GetScratchPixmapHeader(pScreen, w, h, depth, bpp, srcwidth, (pointer)src); - + (*pGC->ops->CopyArea)((DrawablePtr)pSrcPix, (DrawablePtr)pDstPix, pGC, 0, 0, w, h, x, y); - + FreeScratchPixmapHeader(pSrcPix); } @@ -1947,17 +1950,17 @@ } -void +void XAAWriteMono8x8PatternToCache( - ScrnInfoPtr pScrn, + ScrnInfoPtr pScrn, XAACacheInfoPtr pCache ){ XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; unsigned char *data; int pad, Bpp = (pScrn->bitsPerPixel >> 3); - + pCache->offsets = pCachePriv->MonoOffsets; pad = BitmapBytePad(pCache->w * pScrn->bitsPerPixel); @@ -1976,28 +1979,28 @@ for(i = 0; i < 64; i++, pPoint++) { patx = pCache->pat0; paty = pCache->pat1; XAARotateMonoPattern(&patx, &paty, i & 0x07, i >> 3, - (infoRec->Mono8x8PatternFillFlags & + (infoRec->Mono8x8PatternFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST)); ptr = (CARD32*)(data + (pad * pPoint->y) + (Bpp * pPoint->x)); ptr[0] = patx; ptr[1] = paty; } } - (*infoRec->WritePixmapToCache)(pScrn, pCache->x, pCache->y, + (*infoRec->WritePixmapToCache)(pScrn, pCache->x, pCache->y, pCache->w, pCache->h, data, pad, pScrn->bitsPerPixel, pScrn->depth); DEALLOCATE_LOCAL(data); } -void +void XAAWriteColor8x8PatternToCache( - ScrnInfoPtr pScrn, - PixmapPtr pPix, + ScrnInfoPtr pScrn, + PixmapPtr pPix, XAACacheInfoPtr pCache ){ XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE(pPix); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; int pad, i, w, h, nw, nh, Bpp; unsigned char *data, *srcPtr, *dstPtr; @@ -2010,31 +2013,31 @@ data = (unsigned char*)ALLOCATE_LOCAL(pad * pCache->h); if(!data) return; - if(infoRec->Color8x8PatternFillFlags & + if(infoRec->Color8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_ORIGIN) { ptr = (CARD32*)data; ptr[0] = pCache->pat0; ptr[1] = pCache->pat1; } else { int patx, paty; - + ptr = (CARD32*)data; ptr[0] = ptr[2] = pCache->pat0; ptr[1] = ptr[3] = pCache->pat1; for(i = 1; i < 8; i++) { patx = pCache->pat0; paty = pCache->pat1; XAARotateMonoPattern(&patx, &paty, i, 0, - (infoRec->Mono8x8PatternFillFlags & + (infoRec->Mono8x8PatternFillFlags & BIT_ORDER_IN_BYTE_MSBFIRST)); ptr = (CARD32*)(data + (pad * i)); ptr[0] = ptr[2] = patx; ptr[1] = ptr[3] = paty; } } - (*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, + (*infoRec->WriteBitmapToCache)(pScrn, pCache->x, pCache->y, pCache->w, pCache->h, data, pad, pCache->fg, pCache->bg); - DEALLOCATE_LOCAL(data); + DEALLOCATE_LOCAL(data); return; - } + } Bpp = pScrn->bitsPerPixel >> 3; h = min(8,pPix->drawable.height); @@ -2045,26 +2048,26 @@ if(!data) return; /* Write and expand horizontally. */ - for (i = h, dstPtr = data, srcPtr = pPix->devPrivate.ptr; i--; + for (i = h, dstPtr = data, srcPtr = pPix->devPrivate.ptr; i--; srcPtr += pPix->devKind, dstPtr += pScrn->bitsPerPixel) { - nw = w; - memcpy(dstPtr, srcPtr, w * Bpp); - while (nw != 8) { - memcpy(dstPtr + (nw * Bpp), dstPtr, nw * Bpp); - nw <<= 1; - } + nw = w; + memcpy(dstPtr, srcPtr, w * Bpp); + while (nw != 8) { + memcpy(dstPtr + (nw * Bpp), dstPtr, nw * Bpp); + nw <<= 1; + } } nh = h; /* Expand vertically. */ while (nh != 8) { - memcpy(data + (nh*pScrn->bitsPerPixel), data, nh*pScrn->bitsPerPixel); - nh <<= 1; + memcpy(data + (nh*pScrn->bitsPerPixel), data, nh*pScrn->bitsPerPixel); + nh <<= 1; } - if(!(infoRec->Color8x8PatternFillFlags & + if(!(infoRec->Color8x8PatternFillFlags & HARDWARE_PATTERN_PROGRAMMED_ORIGIN)){ int j; - unsigned char *ptr = data + (128 * Bpp); + unsigned char *ptr = data + (128 * Bpp); memcpy(data + (64 * Bpp), data, 64 * Bpp); for(i = 1; i < 8; i++, ptr += (128 * Bpp)) { @@ -2077,10 +2080,10 @@ } } - (*infoRec->WritePixmapToCache)(pScrn, pCache->x, pCache->y, + (*infoRec->WritePixmapToCache)(pScrn, pCache->x, pCache->y, pCache->w, pCache->h, data, pad, pScrn->bitsPerPixel, pScrn->depth); - DEALLOCATE_LOCAL(data); + DEALLOCATE_LOCAL(data); } @@ -2099,9 +2102,9 @@ if(pPriv->flags & REDUCIBLE_TO_8x8) { - if(infoRec->CanDoMono8x8 && - !(infoRec->FillMono8x8PatternSpansFlags & NO_TRANSPARENCY) && - ((pGC->alu == GXcopy) || !(infoRec->FillMono8x8PatternSpansFlags & + if(infoRec->CanDoMono8x8 && + !(infoRec->FillMono8x8PatternSpansFlags & NO_TRANSPARENCY) && + ((pGC->alu == GXcopy) || !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_GXCOPY_ONLY)) && CHECK_ROP(pGC,infoRec->FillMono8x8PatternSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillMono8x8PatternSpansFlags) && @@ -2111,8 +2114,8 @@ return DO_MONO_8x8; } - if(infoRec->CanDoColor8x8 && - !(infoRec->FillColor8x8PatternSpansFlags & NO_TRANSPARENCY) && + if(infoRec->CanDoColor8x8 && + !(infoRec->FillColor8x8PatternSpansFlags & NO_TRANSPARENCY) && ((pGC->alu == GXcopy) || !(infoRec->FillColor8x8PatternSpansFlags & TRANSPARENCY_GXCOPY_ONLY)) && CHECK_ROP(pGC,infoRec->FillColor8x8PatternSpansFlags) && @@ -2123,12 +2126,12 @@ } } - if(infoRec->UsingPixmapCache && infoRec->FillCacheExpandSpans && + if(infoRec->UsingPixmapCache && infoRec->FillCacheExpandSpans && (pPixmap->drawable.height <= infoRec->MaxCacheableStippleHeight) && (pPixmap->drawable.width <= infoRec->MaxCacheableStippleWidth / infoRec->CacheColorExpandDensity) && - !(infoRec->FillCacheExpandSpansFlags & NO_TRANSPARENCY) && - ((pGC->alu == GXcopy) || !(infoRec->FillCacheExpandSpansFlags & + !(infoRec->FillCacheExpandSpansFlags & NO_TRANSPARENCY) && + ((pGC->alu == GXcopy) || !(infoRec->FillCacheExpandSpansFlags & TRANSPARENCY_GXCOPY_ONLY)) && CHECK_ROP(pGC,infoRec->FillCacheExpandSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillCacheExpandSpansFlags) && @@ -2139,13 +2142,13 @@ } - if(infoRec->UsingPixmapCache && - !(infoRec->PixmapCacheFlags & DO_NOT_BLIT_STIPPLES) && - infoRec->FillCacheBltSpans && + if(infoRec->UsingPixmapCache && + !(infoRec->PixmapCacheFlags & DO_NOT_BLIT_STIPPLES) && + infoRec->FillCacheBltSpans && (pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) && (pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) && - !(infoRec->FillCacheBltSpansFlags & NO_TRANSPARENCY) && - ((pGC->alu == GXcopy) || !(infoRec->FillCacheBltSpansFlags & + !(infoRec->FillCacheBltSpansFlags & NO_TRANSPARENCY) && + ((pGC->alu == GXcopy) || !(infoRec->FillCacheBltSpansFlags & TRANSPARENCY_GXCOPY_ONLY)) && CHECK_ROP(pGC,infoRec->FillCacheBltSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillCacheBltSpansFlags) && @@ -2154,9 +2157,9 @@ return DO_CACHE_BLT; } - if(infoRec->FillColorExpandSpans && - !(infoRec->FillColorExpandSpansFlags & NO_TRANSPARENCY) && - ((pGC->alu == GXcopy) || !(infoRec->FillColorExpandSpansFlags & + if(infoRec->FillColorExpandSpans && + !(infoRec->FillColorExpandSpansFlags & NO_TRANSPARENCY) && + ((pGC->alu == GXcopy) || !(infoRec->FillColorExpandSpansFlags & TRANSPARENCY_GXCOPY_ONLY)) && CHECK_ROP(pGC,infoRec->FillColorExpandSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillColorExpandSpansFlags) && @@ -2186,8 +2189,8 @@ } if(pPriv->flags & REDUCIBLE_TO_8x8) { - if(infoRec->CanDoMono8x8 && - !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_ONLY) && + if(infoRec->CanDoMono8x8 && + !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_ONLY) && CHECK_ROP(pGC,infoRec->FillMono8x8PatternSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillMono8x8PatternSpansFlags) && CHECK_COLORS(pGC,infoRec->FillMono8x8PatternSpansFlags) && @@ -2196,7 +2199,7 @@ return DO_MONO_8x8; } - if(infoRec->CanDoColor8x8 && + if(infoRec->CanDoColor8x8 && CHECK_ROP(pGC,infoRec->FillColor8x8PatternSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillColor8x8PatternSpansFlags) && CHECK_PLANEMASK(pGC,infoRec->FillColor8x8PatternSpansFlags)) { @@ -2205,22 +2208,22 @@ } } - if(infoRec->UsingPixmapCache && infoRec->FillCacheExpandSpans && + if(infoRec->UsingPixmapCache && infoRec->FillCacheExpandSpans && (pPixmap->drawable.height <= infoRec->MaxCacheableStippleHeight) && (pPixmap->drawable.width <= infoRec->MaxCacheableStippleWidth / infoRec->CacheColorExpandDensity) && - !(infoRec->FillCacheExpandSpansFlags & TRANSPARENCY_ONLY) && + !(infoRec->FillCacheExpandSpansFlags & TRANSPARENCY_ONLY) && CHECK_ROP(pGC,infoRec->FillCacheExpandSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillCacheExpandSpansFlags) && CHECK_COLORS(pGC,infoRec->FillCacheExpandSpansFlags) && CHECK_PLANEMASK(pGC,infoRec->FillCacheExpandSpansFlags)) { return DO_CACHE_EXPAND; - } + } if(infoRec->UsingPixmapCache && - !(infoRec->PixmapCacheFlags & DO_NOT_BLIT_STIPPLES) && - infoRec->FillCacheBltSpans && + !(infoRec->PixmapCacheFlags & DO_NOT_BLIT_STIPPLES) && + infoRec->FillCacheBltSpans && (pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) && (pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) && CHECK_ROP(pGC,infoRec->FillCacheBltSpansFlags) && @@ -2228,10 +2231,10 @@ CHECK_PLANEMASK(pGC,infoRec->FillCacheBltSpansFlags)) { return DO_CACHE_BLT; - } + } - if(infoRec->FillColorExpandSpans && - !(infoRec->FillColorExpandSpansFlags & TRANSPARENCY_ONLY) && + if(infoRec->FillColorExpandSpans && + !(infoRec->FillColorExpandSpansFlags & TRANSPARENCY_ONLY) && CHECK_ROP(pGC,infoRec->FillColorExpandSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillColorExpandSpansFlags) && CHECK_COLORS(pGC,infoRec->FillColorExpandSpansFlags) && @@ -2266,18 +2269,18 @@ } if(pPriv->flags & REDUCIBLE_TO_8x8) { - if((pPriv->flags & REDUCIBLE_TO_2_COLOR) && infoRec->CanDoMono8x8 && - !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_ONLY) && + if((pPriv->flags & REDUCIBLE_TO_2_COLOR) && infoRec->CanDoMono8x8 && + !(infoRec->FillMono8x8PatternSpansFlags & TRANSPARENCY_ONLY) && CHECK_ROP(pGC,infoRec->FillMono8x8PatternSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillMono8x8PatternSpansFlags) && - (!(infoRec->FillMono8x8PatternSpansFlags & RGB_EQUAL) || + (!(infoRec->FillMono8x8PatternSpansFlags & RGB_EQUAL) || (CHECK_RGB_EQUAL(pPriv->fg) && CHECK_RGB_EQUAL(pPriv->bg))) && CHECK_PLANEMASK(pGC,infoRec->FillMono8x8PatternSpansFlags)) { return DO_MONO_8x8; } - if(infoRec->CanDoColor8x8 && + if(infoRec->CanDoColor8x8 && CHECK_ROP(pGC,infoRec->FillColor8x8PatternSpansFlags) && CHECK_ROPSRC(pGC,infoRec->FillColor8x8PatternSpansFlags) && CHECK_PLANEMASK(pGC,infoRec->FillColor8x8PatternSpansFlags)) { @@ -2286,7 +2289,7 @@ } } - if(infoRec->UsingPixmapCache && infoRec->FillCacheBltSpans && + if(infoRec->UsingPixmapCache && infoRec->FillCacheBltSpans && (pPixmap->drawable.height <= infoRec->MaxCacheableTileHeight) && (pPixmap->drawable.width <= infoRec->MaxCacheableTileWidth) && CHECK_ROP(pGC,infoRec->FillCacheBltSpansFlags) && @@ -2296,7 +2299,7 @@ return DO_CACHE_BLT; } - if(infoRec->FillImageWriteRects && + if(infoRec->FillImageWriteRects && CHECK_NO_GXCOPY(pGC,infoRec->FillImageWriteRectsFlags) && CHECK_ROP(pGC,infoRec->FillImageWriteRectsFlags) && CHECK_ROPSRC(pGC,infoRec->FillImageWriteRectsFlags) && @@ -2318,20 +2321,20 @@ 0xFFFFFFFF, 0x00FFFFFF, 0x0000FFFF, 0x000000FF }; -void +void XAARotateMonoPattern( int *pat0, int *pat1, int xorg, int yorg, Bool msbfirst ){ - int tmp, mask; + int tmp, mask; if(xorg) { if(msbfirst) xorg = 8 - xorg; mask = RotateMasksX[xorg]; *pat0 = ((*pat0 >> xorg) & mask) | ((*pat0 << (8 - xorg)) & ~mask); *pat1 = ((*pat1 >> xorg) & mask) | ((*pat1 << (8 - xorg)) & ~mask); - } + } if(yorg >= 4) { tmp = *pat0; *pat0 = *pat1; *pat1 = tmp; yorg -= 4; @@ -2340,7 +2343,7 @@ mask = RotateMasksY[yorg]; yorg <<= 3; tmp = *pat0; - *pat0 = ((*pat0 >> yorg) & mask) | ((*pat1 << (32 - yorg)) & ~mask); + *pat0 = ((*pat0 >> yorg) & mask) | ((*pat1 << (32 - yorg)) & ~mask); *pat1 = ((*pat1 >> yorg) & mask) | ((tmp << (32 - yorg)) & ~mask); } } @@ -2351,22 +2354,22 @@ XAAInvalidatePixmapCache(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); - XAAPixmapCachePrivatePtr pCachePriv = + XAAPixmapCachePrivatePtr pCachePriv = (XAAPixmapCachePrivatePtr)infoRec->PixmapCachePrivate; int i; if(!pCachePriv) return; - for(i = 0; i < pCachePriv->Num512x512; i++) + for(i = 0; i < pCachePriv->Num512x512; i++) (pCachePriv->Info512)[i].serialNumber = 0; - for(i = 0; i < pCachePriv->Num256x256; i++) + for(i = 0; i < pCachePriv->Num256x256; i++) (pCachePriv->Info256)[i].serialNumber = 0; - for(i = 0; i < pCachePriv->Num128x128; i++) + for(i = 0; i < pCachePriv->Num128x128; i++) (pCachePriv->Info128)[i].serialNumber = 0; - for(i = 0; i < pCachePriv->NumPartial; i++) + for(i = 0; i < pCachePriv->NumPartial; i++) (pCachePriv->InfoPartial)[i].serialNumber = 0; - for(i = 0; i < pCachePriv->NumMono; i++) + for(i = 0; i < pCachePriv->NumMono; i++) (pCachePriv->InfoMono)[i].serialNumber = 0; - for(i = 0; i < pCachePriv->NumColor; i++) + for(i = 0; i < pCachePriv->NumColor; i++) (pCachePriv->InfoColor)[i].serialNumber = 0; } Index: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c:1.11 xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c:1.13 --- xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c:1.11 Mon Feb 17 11:08:29 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c Sun Feb 19 10:51:30 2006 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.11 2003/02/17 16:08:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.13 2006/02/19 15:51:30 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "xf86str.h" @@ -15,11 +15,6 @@ #include "pixmapstr.h" #include "xaawrap.h" -#ifdef PANORAMIX -#include "panoramiX.h" -#include "panoramiXsrv.h" -#endif - void XAAPaintWindow( WindowPtr pWin, @@ -91,16 +86,6 @@ xorg = pBgWin->drawable.x; yorg = pBgWin->drawable.y; -#ifdef PANORAMIX - if(!noPanoramiXExtension) { - int index = pScreen->myNum; - if(WindowTable[index] == pBgWin) { - xorg -= panoramiXdataPtr[index].x; - yorg -= panoramiXdataPtr[index].y; - } - } -#endif - if(IS_OFFSCREEN_PIXMAP(pPix) && infoRec->FillCacheBltRects) { XAACacheInfoPtr pCache = &(infoRec->ScratchCacheInfoRec); Index: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c:1.19 xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c:1.20 --- xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c:1.19 Mon Jan 26 13:54:55 2004 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c Fri Oct 14 11:17:11 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.19 2004/01/26 18:54:55 mvojkovi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.20 2005/10/14 15:17:11 tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -27,7 +27,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c:1.2 xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c:1.3 --- xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c:1.2 Thu Sep 28 16:48:01 2000 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c Fri Oct 14 11:17:11 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c,v 1.2 2000/09/28 20:48:01 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaROP.c,v 1.3 2005/10/14 15:17:11 tsi Exp $ */ -#include "X.h" +#include #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c:1.3 xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c:1.4 --- xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c:1.3 Sat May 29 23:03:33 1999 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c Fri Oct 14 11:17:11 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.3 1999/05/30 03:03:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.4 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c:1.15 xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c:1.16 --- xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c:1.15 Sat Oct 27 23:34:04 2001 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c Fri Oct 14 11:17:11 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.16 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c:3.3 xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c:3.4 --- xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c:3.3 Fri Aug 22 15:27:31 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c Fri Oct 14 11:17:11 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.3 2003/08/22 19:27:31 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.4 2005/10/14 15:17:11 tsi Exp $ */ #include "misc.h" #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c:1.10 xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c:1.12 --- xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c:1.10 Sat Oct 23 11:29:32 2004 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c Thu Jul 28 23:12:31 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.10 2004/10/23 15:29:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.12 2005/07/29 03:12:31 tsi Exp $ */ /* * Copyright (c) 1998-2004 by The XFree86 Project, Inc. @@ -124,50 +124,50 @@ GlyphScanlineFuncPtr glyph_scanline_func[32] = { - DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, - DrawTETextScanlineGeneric, + DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, + DrawTETextScanlineGeneric, #ifdef USEASSEMBLER # ifdef FIXEDBASE # ifdef MSBFIRST - DrawTETextScanlineWidth6PMSBFirstFixedBase, - DrawTETextScanlineWidth7, - DrawTETextScanlineWidth8PMSBFirstFixedBase, - DrawTETextScanlineWidth9PMSBFirstFixedBase, + DrawTETextScanlineWidth6PMSBFirstFixedBase, + DrawTETextScanlineWidth7, + DrawTETextScanlineWidth8PMSBFirstFixedBase, + DrawTETextScanlineWidth9PMSBFirstFixedBase, # else - DrawTETextScanlineWidth6PLSBFirstFixedBase, - DrawTETextScanlineWidth7, - DrawTETextScanlineWidth8PLSBFirstFixedBase, - DrawTETextScanlineWidth9PLSBFirstFixedBase, + DrawTETextScanlineWidth6PLSBFirstFixedBase, + DrawTETextScanlineWidth7, + DrawTETextScanlineWidth8PLSBFirstFixedBase, + DrawTETextScanlineWidth9PLSBFirstFixedBase, # endif # else # ifdef MSBFIRST - DrawTETextScanlineWidth6PMSBFirst, - DrawTETextScanlineWidth7, - DrawTETextScanlineWidth8PMSBFirst, - DrawTETextScanlineWidth9PMSBFirst, + DrawTETextScanlineWidth6PMSBFirst, + DrawTETextScanlineWidth7, + DrawTETextScanlineWidth8PMSBFirst, + DrawTETextScanlineWidth9PMSBFirst, # else - DrawTETextScanlineWidth6PLSBFirst, - DrawTETextScanlineWidth7, - DrawTETextScanlineWidth8PLSBFirst, - DrawTETextScanlineWidth9PLSBFirst, + DrawTETextScanlineWidth6PLSBFirst, + DrawTETextScanlineWidth7, + DrawTETextScanlineWidth8PLSBFirst, + DrawTETextScanlineWidth9PLSBFirst, # endif # endif #else - DrawTETextScanlineWidth6, DrawTETextScanlineWidth7, - DrawTETextScanlineWidth8, DrawTETextScanlineWidth9, + DrawTETextScanlineWidth6, DrawTETextScanlineWidth7, + DrawTETextScanlineWidth8, DrawTETextScanlineWidth9, #endif - DrawTETextScanlineWidth10, + DrawTETextScanlineWidth10, DrawTETextScanlineGeneric, DrawTETextScanlineWidth12, - DrawTETextScanlineGeneric, DrawTETextScanlineWidth14, + DrawTETextScanlineGeneric, DrawTETextScanlineWidth14, DrawTETextScanlineGeneric, DrawTETextScanlineWidth16, - DrawTETextScanlineGeneric, DrawTETextScanlineWidth18, + DrawTETextScanlineGeneric, DrawTETextScanlineWidth18, + DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, - DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineWidth24, - DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, - DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, + DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, + DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric }; @@ -184,10 +184,10 @@ /* This gets built for MSBFIRST or LSBFIRST with FIXEDBASE or not. A total of 4 versions */ -void +void EXPNAME(XAATEGlyphRenderer)( ScrnInfoPtr pScrn, - int x, int y, int w, int h, int skipleft, int startline, + int x, int y, int w, int h, int skipleft, int startline, unsigned int **glyphs, int glyphWidth, int fg, int bg, int rop, unsigned planemask ) @@ -198,26 +198,26 @@ int dwords = 0; if((bg != -1) && (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) { - (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask); - (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); + (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask); + (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); bg = -1; } (*infoRec->SetupForCPUToScreenColorExpandFill)( pScrn, fg, bg, rop, planemask); - if(skipleft && - (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) || - (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) && + if(skipleft && + (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) || + (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) && (skipleft > x)))) { /* draw the first character only */ int count = h, line = startline; - int width = glyphWidth - skipleft; + int width = glyphWidth - skipleft; if(width > w) width = w; - (*infoRec->SubsequentCPUToScreenColorExpandFill)( + (*infoRec->SubsequentCPUToScreenColorExpandFill)( pScrn, x, y, width, h, 0); base = (CARD32*)infoRec->ColorExpandBase; @@ -226,7 +226,7 @@ register CARD32 tmp = SHIFT_R(glyphs[0][line++],skipleft); WRITE_BITS(tmp); } - + w -= width; if((infoRec->TEGlyphRendererFlags & CPU_TRANSFER_PAD_QWORD) && ((((width + 31) >> 5) * h) & 1)) { @@ -235,9 +235,9 @@ } if(!w) goto THE_END; glyphs++; - x += width; + x += width; skipleft = 0; /* nicely aligned again */ - } + } w += skipleft; x -= skipleft; @@ -267,23 +267,23 @@ THE_END: - if(infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND) + if(infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND) (*infoRec->Sync)(pScrn); else SET_SYNC_FLAG(infoRec); } /******************************************************************** - + This is the GlyphRenderer for TRIPLE_BITS_24BPP. It renders to a buffer with the non FIXEDBASE LSB_FIRST code before tripling, and possibly reversing the bits and sending them to the screen ********************************************************************/ -void +void EXPNAME(XAATEGlyphRenderer3)( ScrnInfoPtr pScrn, - int x, int y, int w, int h, int skipleft, int startline, + int x, int y, int w, int h, int skipleft, int startline, unsigned int **glyphs, int glyphWidth, int fg, int bg, int rop, unsigned planemask ) @@ -293,12 +293,12 @@ GlyphScanlineFuncPtr GlyphFunc = XAAGlyphScanlineFuncLSBFirst[glyphWidth - 1]; int dwords = 0; - if((bg != -1) && + if((bg != -1) && ((infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY) || - ((infoRec->TEGlyphRendererFlags & RGB_EQUAL) && + ((infoRec->TEGlyphRendererFlags & RGB_EQUAL) && (!CHECK_RGB_EQUAL(bg))))) { - (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask); - (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); + (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask); + (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); bg = -1; } @@ -309,20 +309,20 @@ /* draw the first character only */ int count = h, line = startline; - int width = glyphWidth - skipleft; + int width = glyphWidth - skipleft; CARD32 bits; if(width > w) width = w; - (*infoRec->SubsequentCPUToScreenColorExpandFill)( + (*infoRec->SubsequentCPUToScreenColorExpandFill)( pScrn, x, y, width, h, 0); base = (CARD32*)infoRec->ColorExpandBase; - while(count--) { + while(count--) { bits = SHIFT_R(glyphs[0][line++],skipleft); - if (width >= 22) { + if (width >= 22) { WRITE_BITS3(bits); - } else if (width >= 11) { + } else if (width >= 11) { WRITE_BITS2(bits); } else { WRITE_BITS1(bits); @@ -337,12 +337,12 @@ } if(!w) goto THE_END; glyphs++; - x += width; + x += width; skipleft = 0; /* nicely aligned again */ - } + } dwords = ((3 * w + 31) >> 5) * h; - mem = (CARD32*)ALLOCATE_LOCAL(((w + 31) >> 3) * sizeof(char)); + mem = (CARD32*)ALLOCATE_LOCAL(((w + 31) >> 5) * sizeof(CARD32)); if (!mem) return; (*infoRec->SubsequentCPUToScreenColorExpandFill)(pScrn, x, y, w, h, 0); @@ -350,7 +350,7 @@ base = (CARD32*)infoRec->ColorExpandBase; # ifndef FIXEDBASE - if((((3 * w + 31) >> 5) * h) <= infoRec->ColorExpandRange) + if(dwords <= infoRec->ColorExpandRange) while(h--) { (*GlyphFunc)(mem, glyphs, startline++, w, glyphWidth); base = DrawTextScanline3(base, mem, w); @@ -372,7 +372,7 @@ THE_END: - if(infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND) + if(infoRec->TEGlyphRendererFlags & SYNC_AFTER_COLOR_EXPAND) (*infoRec->Sync)(pScrn); else SET_SYNC_FLAG(infoRec); } @@ -381,10 +381,10 @@ #ifndef FIXEDBASE /* Scanline version of above gets built for LSBFIRST and MSBFIRST */ -void +void EXPNAME(XAATEGlyphRendererScanline)( ScrnInfoPtr pScrn, - int x, int y, int w, int h, int skipleft, int startline, + int x, int y, int w, int h, int skipleft, int startline, unsigned int **glyphs, int glyphWidth, int fg, int bg, int rop, unsigned planemask ) @@ -395,16 +395,16 @@ GlyphScanlineFuncPtr GlyphFunc = glyph_scanline_func[glyphWidth - 1]; if((bg != -1) && (infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY)) { - (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask); - (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); + (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask); + (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); bg = -1; } (*infoRec->SetupForScanlineCPUToScreenColorExpandFill)( pScrn, fg, bg, rop, planemask); - if(skipleft && - (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) || + if(skipleft && + (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING) || (!(infoRec->TEGlyphRendererFlags & LEFT_EDGE_CLIPPING_NEGATIVE_X) && (skipleft > x)))) { /* draw the first character only */ @@ -414,18 +414,18 @@ if(width > w) width = w; - (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)( + (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)( pScrn, x, y, width, h, 0); bufferNo = 0; - while(count--) { + while(count--) { register CARD32 tmp = SHIFT_R(glyphs[0][line++],skipleft); base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo]; WRITE_BITS(tmp); (*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++); if(bufferNo >= infoRec->NumScanlineColorExpandBuffers) - bufferNo = 0; + bufferNo = 0; } w -= width; @@ -433,12 +433,12 @@ glyphs++; x += width; skipleft = 0; /* nicely aligned again */ - } + } w += skipleft; x -= skipleft; - (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)( + (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)( pScrn, x, y, w, h, skipleft); bufferNo = 0; @@ -456,10 +456,10 @@ SET_SYNC_FLAG(infoRec); } -void +void EXPNAME(XAATEGlyphRendererScanline3)( ScrnInfoPtr pScrn, - int x, int y, int w, int h, int skipleft, int startline, + int x, int y, int w, int h, int skipleft, int startline, unsigned int **glyphs, int glyphWidth, int fg, int bg, int rop, unsigned planemask ) @@ -469,12 +469,12 @@ CARD32 *base, *mem; GlyphScanlineFuncPtr GlyphFunc = XAAGlyphScanlineFuncLSBFirst[glyphWidth - 1]; - if((bg != -1) && + if((bg != -1) && ((infoRec->TEGlyphRendererFlags & TRANSPARENCY_ONLY) || - ((infoRec->TEGlyphRendererFlags & RGB_EQUAL) && + ((infoRec->TEGlyphRendererFlags & RGB_EQUAL) && (!CHECK_RGB_EQUAL(bg))))) { - (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask); - (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); + (*infoRec->SetupForSolidFill)(pScrn, bg, rop, planemask); + (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h); bg = -1; } @@ -487,15 +487,15 @@ int count = h, line = startline; int width = glyphWidth - skipleft; CARD32 bits; - + if(width > w) width = w; - (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)( + (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)( pScrn, x, y, width, h, 0); bufferNo = 0; - while(count--) { + while(count--) { base = (CARD32*)infoRec->ScanlineColorExpandBuffers[bufferNo]; bits = SHIFT_R(glyphs[0][line++],skipleft); if (width >= 22) { @@ -507,7 +507,7 @@ } (*infoRec->SubsequentColorExpandScanline)(pScrn, bufferNo++); if(bufferNo >= infoRec->NumScanlineColorExpandBuffers) - bufferNo = 0; + bufferNo = 0; } w -= width; @@ -515,14 +515,12 @@ glyphs++; x += width; skipleft = 0; /* nicely aligned again */ - } + } - w += skipleft; - x -= skipleft; - mem = (CARD32*)ALLOCATE_LOCAL(((w + 31) >> 3) * sizeof(char)); + mem = (CARD32*)ALLOCATE_LOCAL(((w + 31) >> 5) * sizeof(CARD32)); if (!mem) return; - (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)( + (*infoRec->SubsequentScanlineCPUToScreenColorExpandFill)( pScrn, x, y, w, h, skipleft); bufferNo = 0; @@ -537,7 +535,7 @@ } DEALLOCATE_LOCAL(mem); - + THE_END: SET_SYNC_FLAG(infoRec); @@ -596,18 +594,18 @@ int line, int width, int glyphwidth ) { CARD32 bits = (*glyphp)[line]; - int shift = glyphwidth; + int shift = glyphwidth; while(width > 32) { while(shift < 32) { glyphp++; - bits |= SHIFT_L((*glyphp)[line], shift); + bits |= SHIFT_L((*glyphp)[line], shift); shift += glyphwidth; } WRITE_BITS(bits); shift &= 31; - if(shift) - bits = SHIFT_R((*glyphp)[line],(glyphwidth - shift)); + if(shift) + bits = SHIFT_R((*glyphp)[line],(glyphwidth - shift)); else bits = 0; width -= 32; } @@ -616,7 +614,7 @@ width -= shift; while(width > 0) { glyphp++; - bits |= SHIFT_L((*glyphp)[line],shift); + bits |= SHIFT_L((*glyphp)[line],shift); shift += glyphwidth; width -= glyphwidth; } @@ -635,7 +633,7 @@ #ifndef USEASSEMBLER -static CARD32* +static CARD32* DrawTETextScanlineWidth6( CARD32 *base, unsigned int **glyphp, @@ -643,35 +641,35 @@ { while (1) { unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],6); - bits |= SHIFT_L(glyphp[2][line],12); - bits |= SHIFT_L(glyphp[3][line],18); - bits |= SHIFT_L(glyphp[4][line],24); - bits |= SHIFT_L(glyphp[5][line],30); - WRITE_IN_BITORDER(base, 0, bits); + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],6); + bits |= SHIFT_L(glyphp[2][line],12); + bits |= SHIFT_L(glyphp[3][line],18); + bits |= SHIFT_L(glyphp[4][line],24); + bits |= SHIFT_L(glyphp[5][line],30); + WRITE_IN_BITORDER(base, 0, bits); CHECKRETURN(1); - bits = SHIFT_R(glyphp[5][line],2); - bits |= SHIFT_L(glyphp[6][line],4); - bits |= SHIFT_L(glyphp[7][line],10); - bits |= SHIFT_L(glyphp[8][line],16); - bits |= SHIFT_L(glyphp[9][line],22); - bits |= SHIFT_L(glyphp[10][line],28); - WRITE_IN_BITORDER(base, 1, bits); + bits = SHIFT_R(glyphp[5][line],2); + bits |= SHIFT_L(glyphp[6][line],4); + bits |= SHIFT_L(glyphp[7][line],10); + bits |= SHIFT_L(glyphp[8][line],16); + bits |= SHIFT_L(glyphp[9][line],22); + bits |= SHIFT_L(glyphp[10][line],28); + WRITE_IN_BITORDER(base, 1, bits); CHECKRETURN(2); - bits = SHIFT_R(glyphp[10][line],4); - bits |= SHIFT_L(glyphp[11][line],2); - bits |= SHIFT_L(glyphp[12][line],8); - bits |= SHIFT_L(glyphp[13][line],14); - bits |= SHIFT_L(glyphp[14][line],20); - bits |= SHIFT_L(glyphp[15][line],26); - WRITE_IN_BITORDER(base, 2, bits); + bits = SHIFT_R(glyphp[10][line],4); + bits |= SHIFT_L(glyphp[11][line],2); + bits |= SHIFT_L(glyphp[12][line],8); + bits |= SHIFT_L(glyphp[13][line],14); + bits |= SHIFT_L(glyphp[14][line],20); + bits |= SHIFT_L(glyphp[15][line],26); + WRITE_IN_BITORDER(base, 2, bits); CHECKRETURN(3); #ifndef FIXEDBASE - base += 3; + base += 3; #endif width -= 96; - glyphp += 16; + glyphp += 16; } } #endif @@ -683,425 +681,425 @@ int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],7); - bits |= SHIFT_L(glyphp[2][line],14); - bits |= SHIFT_L(glyphp[3][line],21); - bits |= SHIFT_L(glyphp[4][line],28); - WRITE_IN_BITORDER(base, 0, bits); - CHECKRETURN(1); - bits = SHIFT_R(glyphp[4][line],4); - bits |= SHIFT_L(glyphp[5][line],3); - bits |= SHIFT_L(glyphp[6][line],10); - bits |= SHIFT_L(glyphp[7][line],17); - bits |= SHIFT_L(glyphp[8][line],24); - bits |= SHIFT_L(glyphp[9][line],31); - WRITE_IN_BITORDER(base, 1, bits); - CHECKRETURN(2); - bits = SHIFT_R(glyphp[9][line],1); - bits |= SHIFT_L(glyphp[10][line],6); - bits |= SHIFT_L(glyphp[11][line],13); - bits |= SHIFT_L(glyphp[12][line],20); - bits |= SHIFT_L(glyphp[13][line],27); - WRITE_IN_BITORDER(base, 2, bits); - CHECKRETURN(3); - bits = SHIFT_R(glyphp[13][line],5); - bits |= SHIFT_L(glyphp[14][line],2); - bits |= SHIFT_L(glyphp[15][line],9); - bits |= SHIFT_L(glyphp[16][line],16); - bits |= SHIFT_L(glyphp[17][line],23); - bits |= SHIFT_L(glyphp[18][line],30); - WRITE_IN_BITORDER(base, 3, bits); - CHECKRETURN(4); - bits = SHIFT_R(glyphp[18][line],2); - bits |= SHIFT_L(glyphp[19][line],5); - bits |= SHIFT_L(glyphp[20][line],12); - bits |= SHIFT_L(glyphp[21][line],19); - bits |= SHIFT_L(glyphp[22][line],26); - WRITE_IN_BITORDER(base, 4, bits); - CHECKRETURN(5); - bits = SHIFT_R(glyphp[22][line],6); - bits |= SHIFT_L(glyphp[23][line],1); - bits |= SHIFT_L(glyphp[24][line],8); - bits |= SHIFT_L(glyphp[25][line],15); - bits |= SHIFT_L(glyphp[26][line],22); - bits |= SHIFT_L(glyphp[27][line],29); - WRITE_IN_BITORDER(base, 5, bits); - CHECKRETURN(6); - bits = SHIFT_R(glyphp[27][line],3); - bits |= SHIFT_L(glyphp[28][line],4); - bits |= SHIFT_L(glyphp[29][line],11); - bits |= SHIFT_L(glyphp[30][line],18); - bits |= SHIFT_L(glyphp[31][line],25); - WRITE_IN_BITORDER(base, 6, bits); - CHECKRETURN(7); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],7); + bits |= SHIFT_L(glyphp[2][line],14); + bits |= SHIFT_L(glyphp[3][line],21); + bits |= SHIFT_L(glyphp[4][line],28); + WRITE_IN_BITORDER(base, 0, bits); + CHECKRETURN(1); + bits = SHIFT_R(glyphp[4][line],4); + bits |= SHIFT_L(glyphp[5][line],3); + bits |= SHIFT_L(glyphp[6][line],10); + bits |= SHIFT_L(glyphp[7][line],17); + bits |= SHIFT_L(glyphp[8][line],24); + bits |= SHIFT_L(glyphp[9][line],31); + WRITE_IN_BITORDER(base, 1, bits); + CHECKRETURN(2); + bits = SHIFT_R(glyphp[9][line],1); + bits |= SHIFT_L(glyphp[10][line],6); + bits |= SHIFT_L(glyphp[11][line],13); + bits |= SHIFT_L(glyphp[12][line],20); + bits |= SHIFT_L(glyphp[13][line],27); + WRITE_IN_BITORDER(base, 2, bits); + CHECKRETURN(3); + bits = SHIFT_R(glyphp[13][line],5); + bits |= SHIFT_L(glyphp[14][line],2); + bits |= SHIFT_L(glyphp[15][line],9); + bits |= SHIFT_L(glyphp[16][line],16); + bits |= SHIFT_L(glyphp[17][line],23); + bits |= SHIFT_L(glyphp[18][line],30); + WRITE_IN_BITORDER(base, 3, bits); + CHECKRETURN(4); + bits = SHIFT_R(glyphp[18][line],2); + bits |= SHIFT_L(glyphp[19][line],5); + bits |= SHIFT_L(glyphp[20][line],12); + bits |= SHIFT_L(glyphp[21][line],19); + bits |= SHIFT_L(glyphp[22][line],26); + WRITE_IN_BITORDER(base, 4, bits); + CHECKRETURN(5); + bits = SHIFT_R(glyphp[22][line],6); + bits |= SHIFT_L(glyphp[23][line],1); + bits |= SHIFT_L(glyphp[24][line],8); + bits |= SHIFT_L(glyphp[25][line],15); + bits |= SHIFT_L(glyphp[26][line],22); + bits |= SHIFT_L(glyphp[27][line],29); + WRITE_IN_BITORDER(base, 5, bits); + CHECKRETURN(6); + bits = SHIFT_R(glyphp[27][line],3); + bits |= SHIFT_L(glyphp[28][line],4); + bits |= SHIFT_L(glyphp[29][line],11); + bits |= SHIFT_L(glyphp[30][line],18); + bits |= SHIFT_L(glyphp[31][line],25); + WRITE_IN_BITORDER(base, 6, bits); + CHECKRETURN(7); #ifndef FIXEDBASE - base += 7; + base += 7; #endif - width -= 224; - glyphp += 32; + width -= 224; + glyphp += 32; } } #ifndef USEASSEMBLER -static CARD32* +static CARD32* DrawTETextScanlineWidth8( CARD32 *base, unsigned int **glyphp, int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],8); - bits |= SHIFT_L(glyphp[2][line],16); - bits |= SHIFT_L(glyphp[3][line],24); - WRITE_IN_BITORDER(base, 0, bits); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],8); + bits |= SHIFT_L(glyphp[2][line],16); + bits |= SHIFT_L(glyphp[3][line],24); + WRITE_IN_BITORDER(base, 0, bits); CHECKRETURN(1); - bits = glyphp[4][line]; - bits |= SHIFT_L(glyphp[5][line],8); - bits |= SHIFT_L(glyphp[6][line],16); - bits |= SHIFT_L(glyphp[7][line],24); - WRITE_IN_BITORDER(base, 1, bits); + bits = glyphp[4][line]; + bits |= SHIFT_L(glyphp[5][line],8); + bits |= SHIFT_L(glyphp[6][line],16); + bits |= SHIFT_L(glyphp[7][line],24); + WRITE_IN_BITORDER(base, 1, bits); CHECKRETURN(2); #ifndef FIXEDBASE - base += 2; + base += 2; #endif width -= 64; - glyphp += 8; + glyphp += 8; } } #endif #ifndef USEASSEMBLER -static CARD32* +static CARD32* DrawTETextScanlineWidth9( CARD32 *base, unsigned int **glyphp, int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],9); - bits |= SHIFT_L(glyphp[2][line],18); - bits |= SHIFT_L(glyphp[3][line],27); - WRITE_IN_BITORDER(base, 0, bits); - CHECKRETURN(1); - bits = SHIFT_R(glyphp[3][line],5); - bits |= SHIFT_L(glyphp[4][line],4); - bits |= SHIFT_L(glyphp[5][line],13); - bits |= SHIFT_L(glyphp[6][line],22); - bits |= SHIFT_L(glyphp[7][line],31); - WRITE_IN_BITORDER(base, 1, bits); - CHECKRETURN(2); - bits = SHIFT_R(glyphp[7][line],1); - bits |= SHIFT_L(glyphp[8][line],8); - bits |= SHIFT_L(glyphp[9][line],17); - bits |= SHIFT_L(glyphp[10][line],26); - WRITE_IN_BITORDER(base, 2, bits); - CHECKRETURN(3); - bits = SHIFT_R(glyphp[10][line],6); - bits |= SHIFT_L(glyphp[11][line],3); - bits |= SHIFT_L(glyphp[12][line],12); - bits |= SHIFT_L(glyphp[13][line],21); - bits |= SHIFT_L(glyphp[14][line],30); - WRITE_IN_BITORDER(base, 3, bits); - CHECKRETURN(4); - bits = SHIFT_R(glyphp[14][line],2); - bits |= SHIFT_L(glyphp[15][line],7); - bits |= SHIFT_L(glyphp[16][line],16); - bits |= SHIFT_L(glyphp[17][line],25); - WRITE_IN_BITORDER(base, 4, bits); - CHECKRETURN(5); - bits = SHIFT_R(glyphp[17][line],7); - bits |= SHIFT_L(glyphp[18][line],2); - bits |= SHIFT_L(glyphp[19][line],11); - bits |= SHIFT_L(glyphp[20][line],20); - bits |= SHIFT_L(glyphp[21][line],29); - WRITE_IN_BITORDER(base, 5, bits); - CHECKRETURN(6); - bits = SHIFT_R(glyphp[21][line],3); - bits |= SHIFT_L(glyphp[22][line],6); - bits |= SHIFT_L(glyphp[23][line],15); - bits |= SHIFT_L(glyphp[24][line],24); - WRITE_IN_BITORDER(base, 6, bits); - CHECKRETURN(7); - bits = SHIFT_R(glyphp[24][line],8); - bits |= SHIFT_L(glyphp[25][line],1); - bits |= SHIFT_L(glyphp[26][line],10); - bits |= SHIFT_L(glyphp[27][line],19); - bits |= SHIFT_L(glyphp[28][line],28); - WRITE_IN_BITORDER(base, 7, bits); - CHECKRETURN(8); - bits = SHIFT_R(glyphp[28][line],4); - bits |= SHIFT_L(glyphp[29][line],5); - bits |= SHIFT_L(glyphp[30][line],14); - bits |= SHIFT_L(glyphp[31][line],23); - WRITE_IN_BITORDER(base, 8, bits); - CHECKRETURN(9); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],9); + bits |= SHIFT_L(glyphp[2][line],18); + bits |= SHIFT_L(glyphp[3][line],27); + WRITE_IN_BITORDER(base, 0, bits); + CHECKRETURN(1); + bits = SHIFT_R(glyphp[3][line],5); + bits |= SHIFT_L(glyphp[4][line],4); + bits |= SHIFT_L(glyphp[5][line],13); + bits |= SHIFT_L(glyphp[6][line],22); + bits |= SHIFT_L(glyphp[7][line],31); + WRITE_IN_BITORDER(base, 1, bits); + CHECKRETURN(2); + bits = SHIFT_R(glyphp[7][line],1); + bits |= SHIFT_L(glyphp[8][line],8); + bits |= SHIFT_L(glyphp[9][line],17); + bits |= SHIFT_L(glyphp[10][line],26); + WRITE_IN_BITORDER(base, 2, bits); + CHECKRETURN(3); + bits = SHIFT_R(glyphp[10][line],6); + bits |= SHIFT_L(glyphp[11][line],3); + bits |= SHIFT_L(glyphp[12][line],12); + bits |= SHIFT_L(glyphp[13][line],21); + bits |= SHIFT_L(glyphp[14][line],30); + WRITE_IN_BITORDER(base, 3, bits); + CHECKRETURN(4); + bits = SHIFT_R(glyphp[14][line],2); + bits |= SHIFT_L(glyphp[15][line],7); + bits |= SHIFT_L(glyphp[16][line],16); + bits |= SHIFT_L(glyphp[17][line],25); + WRITE_IN_BITORDER(base, 4, bits); + CHECKRETURN(5); + bits = SHIFT_R(glyphp[17][line],7); + bits |= SHIFT_L(glyphp[18][line],2); + bits |= SHIFT_L(glyphp[19][line],11); + bits |= SHIFT_L(glyphp[20][line],20); + bits |= SHIFT_L(glyphp[21][line],29); + WRITE_IN_BITORDER(base, 5, bits); + CHECKRETURN(6); + bits = SHIFT_R(glyphp[21][line],3); + bits |= SHIFT_L(glyphp[22][line],6); + bits |= SHIFT_L(glyphp[23][line],15); + bits |= SHIFT_L(glyphp[24][line],24); + WRITE_IN_BITORDER(base, 6, bits); + CHECKRETURN(7); + bits = SHIFT_R(glyphp[24][line],8); + bits |= SHIFT_L(glyphp[25][line],1); + bits |= SHIFT_L(glyphp[26][line],10); + bits |= SHIFT_L(glyphp[27][line],19); + bits |= SHIFT_L(glyphp[28][line],28); + WRITE_IN_BITORDER(base, 7, bits); + CHECKRETURN(8); + bits = SHIFT_R(glyphp[28][line],4); + bits |= SHIFT_L(glyphp[29][line],5); + bits |= SHIFT_L(glyphp[30][line],14); + bits |= SHIFT_L(glyphp[31][line],23); + WRITE_IN_BITORDER(base, 8, bits); + CHECKRETURN(9); #ifndef FIXEDBASE - base += 9; + base += 9; #endif - width -= 288; - glyphp += 32; + width -= 288; + glyphp += 32; } } #endif -static CARD32* +static CARD32* DrawTETextScanlineWidth10( CARD32 *base, unsigned int **glyphp, int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],10); - bits |= SHIFT_L(glyphp[2][line],20); - bits |= SHIFT_L(glyphp[3][line],30); - WRITE_IN_BITORDER(base, 0, bits); - CHECKRETURN(1); - bits = SHIFT_R(glyphp[3][line],2); - bits |= SHIFT_L(glyphp[4][line],8); - bits |= SHIFT_L(glyphp[5][line],18); - bits |= SHIFT_L(glyphp[6][line],28); - WRITE_IN_BITORDER(base, 1, bits); - CHECKRETURN(2); - bits = SHIFT_R(glyphp[6][line],4); - bits |= SHIFT_L(glyphp[7][line],6); - bits |= SHIFT_L(glyphp[8][line],16); - bits |= SHIFT_L(glyphp[9][line],26); - WRITE_IN_BITORDER(base, 2, bits); - CHECKRETURN(3); - bits = SHIFT_R(glyphp[9][line],6); - bits |= SHIFT_L(glyphp[10][line],4); - bits |= SHIFT_L(glyphp[11][line],14); - bits |= SHIFT_L(glyphp[12][line],24); - WRITE_IN_BITORDER(base, 3, bits); - CHECKRETURN(4); - bits = SHIFT_R(glyphp[12][line],8); - bits |= SHIFT_L(glyphp[13][line],2); - bits |= SHIFT_L(glyphp[14][line],12); - bits |= SHIFT_L(glyphp[15][line],22); - WRITE_IN_BITORDER(base, 4, bits); - CHECKRETURN(5); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],10); + bits |= SHIFT_L(glyphp[2][line],20); + bits |= SHIFT_L(glyphp[3][line],30); + WRITE_IN_BITORDER(base, 0, bits); + CHECKRETURN(1); + bits = SHIFT_R(glyphp[3][line],2); + bits |= SHIFT_L(glyphp[4][line],8); + bits |= SHIFT_L(glyphp[5][line],18); + bits |= SHIFT_L(glyphp[6][line],28); + WRITE_IN_BITORDER(base, 1, bits); + CHECKRETURN(2); + bits = SHIFT_R(glyphp[6][line],4); + bits |= SHIFT_L(glyphp[7][line],6); + bits |= SHIFT_L(glyphp[8][line],16); + bits |= SHIFT_L(glyphp[9][line],26); + WRITE_IN_BITORDER(base, 2, bits); + CHECKRETURN(3); + bits = SHIFT_R(glyphp[9][line],6); + bits |= SHIFT_L(glyphp[10][line],4); + bits |= SHIFT_L(glyphp[11][line],14); + bits |= SHIFT_L(glyphp[12][line],24); + WRITE_IN_BITORDER(base, 3, bits); + CHECKRETURN(4); + bits = SHIFT_R(glyphp[12][line],8); + bits |= SHIFT_L(glyphp[13][line],2); + bits |= SHIFT_L(glyphp[14][line],12); + bits |= SHIFT_L(glyphp[15][line],22); + WRITE_IN_BITORDER(base, 4, bits); + CHECKRETURN(5); #ifndef FIXEDBASE - base += 5; + base += 5; #endif - width -= 160; - glyphp += 16; + width -= 160; + glyphp += 16; } } -static CARD32* +static CARD32* DrawTETextScanlineWidth12( CARD32 *base, unsigned int **glyphp, int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],12); - bits |= SHIFT_L(glyphp[2][line],24); - WRITE_IN_BITORDER(base, 0, bits); - CHECKRETURN(1); - bits = SHIFT_R(glyphp[2][line],8); - bits |= SHIFT_L(glyphp[3][line],4); - bits |= SHIFT_L(glyphp[4][line],16); - bits |= SHIFT_L(glyphp[5][line],28); - WRITE_IN_BITORDER(base, 1, bits); - CHECKRETURN(2); - bits = SHIFT_R(glyphp[5][line],4); - bits |= SHIFT_L(glyphp[6][line],8); - bits |= SHIFT_L(glyphp[7][line],20); - WRITE_IN_BITORDER(base, 2, bits); - CHECKRETURN(3); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],12); + bits |= SHIFT_L(glyphp[2][line],24); + WRITE_IN_BITORDER(base, 0, bits); + CHECKRETURN(1); + bits = SHIFT_R(glyphp[2][line],8); + bits |= SHIFT_L(glyphp[3][line],4); + bits |= SHIFT_L(glyphp[4][line],16); + bits |= SHIFT_L(glyphp[5][line],28); + WRITE_IN_BITORDER(base, 1, bits); + CHECKRETURN(2); + bits = SHIFT_R(glyphp[5][line],4); + bits |= SHIFT_L(glyphp[6][line],8); + bits |= SHIFT_L(glyphp[7][line],20); + WRITE_IN_BITORDER(base, 2, bits); + CHECKRETURN(3); #ifndef FIXEDBASE - base += 3; + base += 3; #endif - width -= 96; - glyphp += 8; + width -= 96; + glyphp += 8; } } -static CARD32* +static CARD32* DrawTETextScanlineWidth14( CARD32 *base, unsigned int **glyphp, int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],14); - bits |= SHIFT_L(glyphp[2][line],28); - WRITE_IN_BITORDER(base, 0, bits); - CHECKRETURN(1); - bits = SHIFT_R(glyphp[2][line],4); - bits |= SHIFT_L(glyphp[3][line],10); - bits |= SHIFT_L(glyphp[4][line],24); - WRITE_IN_BITORDER(base, 1, bits); - CHECKRETURN(2); - bits = SHIFT_R(glyphp[4][line],8); - bits |= SHIFT_L(glyphp[5][line],6); - bits |= SHIFT_L(glyphp[6][line],20); - WRITE_IN_BITORDER(base, 2, bits); - CHECKRETURN(3); - bits = SHIFT_R(glyphp[6][line],12); - bits |= SHIFT_L(glyphp[7][line],2); - bits |= SHIFT_L(glyphp[8][line],16); - bits |= SHIFT_L(glyphp[9][line],30); - WRITE_IN_BITORDER(base, 3, bits); - CHECKRETURN(4); - bits = SHIFT_R(glyphp[9][line],2); - bits |= SHIFT_L(glyphp[10][line],12); - bits |= SHIFT_L(glyphp[11][line],26); - WRITE_IN_BITORDER(base, 4, bits); - CHECKRETURN(5); - bits = SHIFT_R(glyphp[11][line],6); - bits |= SHIFT_L(glyphp[12][line],8); - bits |= SHIFT_L(glyphp[13][line],22); - WRITE_IN_BITORDER(base, 5, bits); - CHECKRETURN(6); - bits = SHIFT_R(glyphp[13][line],10); - bits |= SHIFT_L(glyphp[14][line],4); - bits |= SHIFT_L(glyphp[15][line],18); - WRITE_IN_BITORDER(base, 6, bits); - CHECKRETURN(7); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],14); + bits |= SHIFT_L(glyphp[2][line],28); + WRITE_IN_BITORDER(base, 0, bits); + CHECKRETURN(1); + bits = SHIFT_R(glyphp[2][line],4); + bits |= SHIFT_L(glyphp[3][line],10); + bits |= SHIFT_L(glyphp[4][line],24); + WRITE_IN_BITORDER(base, 1, bits); + CHECKRETURN(2); + bits = SHIFT_R(glyphp[4][line],8); + bits |= SHIFT_L(glyphp[5][line],6); + bits |= SHIFT_L(glyphp[6][line],20); + WRITE_IN_BITORDER(base, 2, bits); + CHECKRETURN(3); + bits = SHIFT_R(glyphp[6][line],12); + bits |= SHIFT_L(glyphp[7][line],2); + bits |= SHIFT_L(glyphp[8][line],16); + bits |= SHIFT_L(glyphp[9][line],30); + WRITE_IN_BITORDER(base, 3, bits); + CHECKRETURN(4); + bits = SHIFT_R(glyphp[9][line],2); + bits |= SHIFT_L(glyphp[10][line],12); + bits |= SHIFT_L(glyphp[11][line],26); + WRITE_IN_BITORDER(base, 4, bits); + CHECKRETURN(5); + bits = SHIFT_R(glyphp[11][line],6); + bits |= SHIFT_L(glyphp[12][line],8); + bits |= SHIFT_L(glyphp[13][line],22); + WRITE_IN_BITORDER(base, 5, bits); + CHECKRETURN(6); + bits = SHIFT_R(glyphp[13][line],10); + bits |= SHIFT_L(glyphp[14][line],4); + bits |= SHIFT_L(glyphp[15][line],18); + WRITE_IN_BITORDER(base, 6, bits); + CHECKRETURN(7); #ifndef FIXEDBASE - base += 7; + base += 7; #endif - width -= 224; - glyphp += 16; + width -= 224; + glyphp += 16; } } -static CARD32* +static CARD32* DrawTETextScanlineWidth16( CARD32 *base, unsigned int **glyphp, int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],16); - WRITE_IN_BITORDER(base, 0, bits); - CHECKRETURN(1); - bits = glyphp[2][line]; - bits |= SHIFT_L(glyphp[3][line],16); - WRITE_IN_BITORDER(base, 1, bits); - CHECKRETURN(2); - bits = glyphp[4][line]; - bits |= SHIFT_L(glyphp[5][line],16); - WRITE_IN_BITORDER(base, 2, bits); - CHECKRETURN(3); - bits = glyphp[6][line]; - bits |= SHIFT_L(glyphp[7][line],16); - WRITE_IN_BITORDER(base, 3, bits); - CHECKRETURN(4); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],16); + WRITE_IN_BITORDER(base, 0, bits); + CHECKRETURN(1); + bits = glyphp[2][line]; + bits |= SHIFT_L(glyphp[3][line],16); + WRITE_IN_BITORDER(base, 1, bits); + CHECKRETURN(2); + bits = glyphp[4][line]; + bits |= SHIFT_L(glyphp[5][line],16); + WRITE_IN_BITORDER(base, 2, bits); + CHECKRETURN(3); + bits = glyphp[6][line]; + bits |= SHIFT_L(glyphp[7][line],16); + WRITE_IN_BITORDER(base, 3, bits); + CHECKRETURN(4); #ifndef FIXEDBASE - base += 4; + base += 4; #endif - width -= 128; - glyphp += 8; + width -= 128; + glyphp += 8; } } -static CARD32* +static CARD32* DrawTETextScanlineWidth18( CARD32 *base, unsigned int **glyphp, int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],18); - WRITE_IN_BITORDER(base, 0, bits); - CHECKRETURN(1); - bits = SHIFT_R(glyphp[1][line],14); - bits |= SHIFT_L(glyphp[2][line],4); - bits |= SHIFT_L(glyphp[3][line],22); - WRITE_IN_BITORDER(base, 1, bits); - CHECKRETURN(2); - bits = SHIFT_R(glyphp[3][line],10); - bits |= SHIFT_L(glyphp[4][line],8); - bits |= SHIFT_L(glyphp[5][line],26); - WRITE_IN_BITORDER(base, 2, bits); - CHECKRETURN(3); - bits = SHIFT_R(glyphp[5][line],6); - bits |= SHIFT_L(glyphp[6][line],12); - bits |= SHIFT_L(glyphp[7][line],30); - WRITE_IN_BITORDER(base, 3, bits); - CHECKRETURN(4); - bits = SHIFT_R(glyphp[7][line],2); - bits |= SHIFT_L(glyphp[8][line],16); - WRITE_IN_BITORDER(base, 4, bits); - CHECKRETURN(5); - bits = SHIFT_R(glyphp[8][line],16); - bits |= SHIFT_L(glyphp[9][line],2); - bits |= SHIFT_L(glyphp[10][line],20); - WRITE_IN_BITORDER(base, 5, bits); - CHECKRETURN(6); - bits = SHIFT_R(glyphp[10][line],12); - bits |= SHIFT_L(glyphp[11][line],6); - bits |= SHIFT_L(glyphp[12][line],24); - WRITE_IN_BITORDER(base, 6, bits); - CHECKRETURN(7); - bits = SHIFT_R(glyphp[12][line],8); - bits |= SHIFT_L(glyphp[13][line],10); - bits |= SHIFT_L(glyphp[14][line],28); - WRITE_IN_BITORDER(base, 7, bits); - CHECKRETURN(8); - bits = SHIFT_R(glyphp[14][line],4); - bits |= SHIFT_L(glyphp[15][line],14); - WRITE_IN_BITORDER(base, 8, bits); - CHECKRETURN(9); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],18); + WRITE_IN_BITORDER(base, 0, bits); + CHECKRETURN(1); + bits = SHIFT_R(glyphp[1][line],14); + bits |= SHIFT_L(glyphp[2][line],4); + bits |= SHIFT_L(glyphp[3][line],22); + WRITE_IN_BITORDER(base, 1, bits); + CHECKRETURN(2); + bits = SHIFT_R(glyphp[3][line],10); + bits |= SHIFT_L(glyphp[4][line],8); + bits |= SHIFT_L(glyphp[5][line],26); + WRITE_IN_BITORDER(base, 2, bits); + CHECKRETURN(3); + bits = SHIFT_R(glyphp[5][line],6); + bits |= SHIFT_L(glyphp[6][line],12); + bits |= SHIFT_L(glyphp[7][line],30); + WRITE_IN_BITORDER(base, 3, bits); + CHECKRETURN(4); + bits = SHIFT_R(glyphp[7][line],2); + bits |= SHIFT_L(glyphp[8][line],16); + WRITE_IN_BITORDER(base, 4, bits); + CHECKRETURN(5); + bits = SHIFT_R(glyphp[8][line],16); + bits |= SHIFT_L(glyphp[9][line],2); + bits |= SHIFT_L(glyphp[10][line],20); + WRITE_IN_BITORDER(base, 5, bits); + CHECKRETURN(6); + bits = SHIFT_R(glyphp[10][line],12); + bits |= SHIFT_L(glyphp[11][line],6); + bits |= SHIFT_L(glyphp[12][line],24); + WRITE_IN_BITORDER(base, 6, bits); + CHECKRETURN(7); + bits = SHIFT_R(glyphp[12][line],8); + bits |= SHIFT_L(glyphp[13][line],10); + bits |= SHIFT_L(glyphp[14][line],28); + WRITE_IN_BITORDER(base, 7, bits); + CHECKRETURN(8); + bits = SHIFT_R(glyphp[14][line],4); + bits |= SHIFT_L(glyphp[15][line],14); + WRITE_IN_BITORDER(base, 8, bits); + CHECKRETURN(9); #ifndef FIXEDBASE - base += 9; + base += 9; #endif - width -= 288; - glyphp += 16; + width -= 288; + glyphp += 16; } } -static CARD32* +static CARD32* DrawTETextScanlineWidth24( CARD32 *base, unsigned int **glyphp, int line, int width, int glyphwidth ) { while (1) { - unsigned int bits; - bits = glyphp[0][line]; - bits |= SHIFT_L(glyphp[1][line],24); - WRITE_IN_BITORDER(base, 0, bits); - CHECKRETURN(1); - bits = SHIFT_R(glyphp[1][line],8); - bits |= SHIFT_L(glyphp[2][line],16); - WRITE_IN_BITORDER(base, 1, bits); - CHECKRETURN(2); - bits = SHIFT_R(glyphp[2][line],16); - bits |= SHIFT_L(glyphp[3][line],8); - WRITE_IN_BITORDER(base, 2, bits); - CHECKRETURN(3); + unsigned int bits; + bits = glyphp[0][line]; + bits |= SHIFT_L(glyphp[1][line],24); + WRITE_IN_BITORDER(base, 0, bits); + CHECKRETURN(1); + bits = SHIFT_R(glyphp[1][line],8); + bits |= SHIFT_L(glyphp[2][line],16); + WRITE_IN_BITORDER(base, 1, bits); + CHECKRETURN(2); + bits = SHIFT_R(glyphp[2][line],16); + bits |= SHIFT_L(glyphp[3][line],8); + WRITE_IN_BITORDER(base, 2, bits); + CHECKRETURN(3); #ifndef FIXEDBASE - base += 3; + base += 3; #endif - width -= 96; - glyphp += 4; + width -= 96; + glyphp += 4; } } Index: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c:1.7 xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c:1.8 --- xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c:1.7 Sat May 29 23:03:33 1999 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c Fri Oct 14 11:17:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.7 1999/05/30 03:03:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.8 2005/10/14 15:17:11 tsi Exp $ */ /******************************************************************** @@ -23,8 +23,8 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" -#include "font.h" +#include +#include #include "scrnintstr.h" #include "dixfontstr.h" #include "xf86str.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c diff -u xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c:1.11 xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c:1.12 --- xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c:1.11 Tue Jul 15 21:38:48 2003 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c Fri Oct 14 11:17:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.11 2003/07/16 01:38:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.12 2005/10/14 15:17:11 tsi Exp $ */ /* @@ -29,7 +29,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "windowstr.h" #include "gcstruct.h" #include "regionstr.h" Index: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h diff -u xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h:1.5 xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h:1.8 --- xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h:1.5 Mon Jun 12 22:51:25 2000 +++ xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h Fri Oct 14 11:17:11 2005 @@ -1,7 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.5 2000/06/13 02:51:25 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.8 2005/10/14 15:17:11 tsi Exp $ */ -#include "Xarch.h" +#include #ifndef FIXEDBASE #define CHECKRETURN(b) if(width <= ((b) * 32)) return(base + (b)) @@ -18,93 +18,117 @@ #endif #ifndef MSBFIRST +# define BYTE_EXPAND3 byte_expand3 # ifdef FIXEDBASE -# define WRITE_IN_BITORDER(dest, offset, data) *(dest) = data; -# else -# define WRITE_IN_BITORDER(dest, offset, data) *(dest + offset) = data; +# define WRITE_IN_BITORDER(dest, offset, data) \ + *(dest) = data; +# else +# define WRITE_IN_BITORDER(dest, offset, data) \ + *(dest + offset) = data; # endif -#else +#else +# define BYTE_EXPAND3 byte_reversed_expand3 # ifdef FIXEDBASE -# define WRITE_IN_BITORDER(dest, offset, data) *(dest) = SWAP_BITS_IN_BYTES(data); -# else -# define WRITE_IN_BITORDER(dest, offset, data) *(dest + offset) = SWAP_BITS_IN_BYTES(data) +# define WRITE_IN_BITORDER(dest, offset, data) \ + *(dest) = SWAP_BITS_IN_BYTES(data); +# else +# define WRITE_IN_BITORDER(dest, offset, data) \ + *(dest + offset) = SWAP_BITS_IN_BYTES(data) # endif #endif #ifdef FIXEDBASE # ifdef MSBFIRST # define WRITE_BITS(b) *base = SWAP_BITS_IN_BYTES(b) +# else +# define WRITE_BITS(b) *base = (b) +# endif +# if X_BYTE_ORDER == X_BIG_ENDIAN # define WRITE_BITS1(b) { \ - *base = byte_reversed_expand3[(b) & 0xFF] | \ - byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; } + CARD32 tmp = (b); \ + *base = BYTE_EXPAND3[*(CARD8 *)(&tmp)] << 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 16; } # define WRITE_BITS2(b) { \ - *base = byte_reversed_expand3[(b) & 0xFF] | \ - byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; \ - *base = byte_reversed_expand3[((b) & 0xFF00) >> 8] >> 8 | \ - byte_reversed_expand3[((b) & 0xFF0000) >> 16] << 16; } + CARD32 tmp = (b); \ + *base = BYTE_EXPAND3[*(CARD8 *)(&tmp)] << 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 16; \ + *base = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 16 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] >> 8; } # define WRITE_BITS3(b) { \ - *base = byte_reversed_expand3[(b) & 0xFF] | \ - byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; \ - *base = byte_reversed_expand3[((b) & 0xFF00) >> 8] >> 8 | \ - byte_reversed_expand3[((b) & 0xFF0000) >> 16] << 16; \ - *base = byte_reversed_expand3[((b) & 0xFF0000) >> 16] >> 16 | \ - byte_reversed_expand3[((b) & 0xFF000000) >> 24] << 8; } + CARD32 tmp = (b); \ + *base = BYTE_EXPAND3[*(CARD8 *)(&tmp)] << 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 16; \ + *base = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 16 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] >> 8; \ + *base = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] << 24 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 3)]; } # else -# define WRITE_BITS(b) *base = (b) # define WRITE_BITS1(b) { \ - *base = byte_expand3[(b) & 0xFF] | \ - byte_expand3[((b) & 0xFF00) >> 8] << 24; } + CARD32 tmp = (b); \ + *base = BYTE_EXPAND3[*(CARD8 *)(&tmp)] | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 24; } # define WRITE_BITS2(b) { \ - *base = byte_expand3[(b) & 0xFF] | \ - byte_expand3[((b) & 0xFF00) >> 8] << 24; \ - *base = byte_expand3[((b) & 0xFF00) >> 8] >> 8 | \ - byte_expand3[((b) & 0xFF0000) >> 16] << 16; } + CARD32 tmp = (b); \ + *base = BYTE_EXPAND3[*(CARD8 *)(&tmp)] | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 24; \ + *base = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] << 16; } # define WRITE_BITS3(b) { \ - *base = byte_expand3[(b) & 0xFF] | \ - byte_expand3[((b) & 0xFF00) >> 8] << 24; \ - *base = byte_expand3[((b) & 0xFF00) >> 8] >> 8 | \ - byte_expand3[((b) & 0xFF0000) >> 16] << 16; \ - *base = byte_expand3[((b) & 0xFF0000) >> 16] >> 16 | \ - byte_expand3[((b) & 0xFF000000) >> 24] << 8; } + CARD32 tmp = (b); \ + *base = BYTE_EXPAND3[*(CARD8 *)(&tmp)] | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 24; \ + *base = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] << 16; \ + *base = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] >> 16 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 3)] << 8; } # endif #else # ifdef MSBFIRST # define WRITE_BITS(b) *(base++) = SWAP_BITS_IN_BYTES(b) +# else +# define WRITE_BITS(b) *(base++) = (b) +# endif +# if X_BYTE_ORDER == X_BIG_ENDIAN # define WRITE_BITS1(b) { \ - *(base++) = byte_reversed_expand3[(b) & 0xFF] | \ - byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; } + CARD32 tmp = (b); \ + *(base++) = BYTE_EXPAND3[*(CARD8 *)(&tmp)] << 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 16; } # define WRITE_BITS2(b) { \ - *(base) = byte_reversed_expand3[(b) & 0xFF] | \ - byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; \ - *(base + 1) = byte_reversed_expand3[((b) & 0xFF00) >> 8] >> 8 | \ - byte_reversed_expand3[((b) & 0xFF0000) >> 16] << 16; \ + CARD32 tmp = (b); \ + *(base) = BYTE_EXPAND3[*(CARD8 *)(&tmp)] << 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 16; \ + *(base + 1) = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 16 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] >> 8; \ base += 2; } # define WRITE_BITS3(b) { \ - *(base) = byte_reversed_expand3[(b) & 0xFF] | \ - byte_reversed_expand3[((b) & 0xFF00) >> 8] << 24; \ - *(base + 1) = byte_reversed_expand3[((b) & 0xFF00) >> 8] >> 8 | \ - byte_reversed_expand3[((b) & 0xFF0000) >> 16] << 16; \ - *(base + 2) = byte_reversed_expand3[((b) & 0xFF0000) >> 16] >> 16 | \ - byte_reversed_expand3[((b) & 0xFF000000) >> 24] << 8; \ + CARD32 tmp = (b); \ + *(base) = BYTE_EXPAND3[*(CARD8 *)(&tmp)] << 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 16; \ + *(base + 1) = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 16 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] >> 8; \ + *(base + 2) = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] << 24 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 3)]; \ base += 3; } # else -# define WRITE_BITS(b) *(base++) = (b) # define WRITE_BITS1(b) { \ - *(base++) = byte_expand3[(b) & 0xFF] | \ - byte_expand3[((b) & 0xFF00) >> 8] << 24; } + CARD32 tmp = (b); \ + *(base++) = BYTE_EXPAND3[*(CARD8 *)(&tmp)] | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 24; } # define WRITE_BITS2(b) { \ - *(base) = byte_expand3[(b) & 0xFF] | \ - byte_expand3[((b) & 0xFF00) >> 8] << 24; \ - *(base + 1) = byte_expand3[((b) & 0xFF00) >> 8] >> 8 | \ - byte_expand3[((b) & 0xFF0000) >> 16] << 16; \ + CARD32 tmp = (b); \ + *(base) = BYTE_EXPAND3[*(CARD8 *)(&tmp)] | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 24; \ + *(base + 1) = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] << 16; \ base += 2; } # define WRITE_BITS3(b) { \ - *(base) = byte_expand3[(b) & 0xFF] | \ - byte_expand3[((b) & 0xFF00) >> 8] << 24; \ - *(base + 1) = byte_expand3[((b) & 0xFF00) >> 8] >> 8 | \ - byte_expand3[((b) & 0xFF0000) >> 16] << 16; \ - *(base + 2) = byte_expand3[((b) & 0xFF0000) >> 16] >> 16 | \ - byte_expand3[((b) & 0xFF000000) >> 24] << 8; \ + CARD32 tmp = (b); \ + *(base) = BYTE_EXPAND3[*(CARD8 *)(&tmp)] | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] << 24; \ + *(base + 1) = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 1)] >> 8 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] << 16; \ + *(base + 2) = BYTE_EXPAND3[*((CARD8 *)(&tmp) + 2)] >> 16 | \ + BYTE_EXPAND3[*((CARD8 *)(&tmp) + 3)] << 8; \ base += 3; } # endif #endif Index: xc/programs/Xserver/hw/xfree86/xf1bpp/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xf1bpp/Imakefile:1.8 xc/programs/Xserver/hw/xfree86/xf1bpp/Imakefile:1.9 --- xc/programs/Xserver/hw/xfree86/xf1bpp/Imakefile:1.8 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/hw/xfree86/xf1bpp/Imakefile Fri Oct 14 11:17:12 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/Imakefile,v 1.8 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/Imakefile,v 1.9 2005/10/14 15:17:12 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -82,8 +82,8 @@ mfbtewhite.o mfbteblack.o mfbmisc.o mfbbstore.o \ mfbplywhite.o mfbplyblack.o mfbplyinv.o $(XFMODOBJ) -INCLUDES = -I. -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I$(FONTINCSRC) $(XF86INCL) +INCLUDES = -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ + $(XF86INCL) LINTDEFS = -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite \ -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite \ -DEQWHOLEWORD=\=\~0 -DOPEQ=\|= Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/Imakefile:1.6 xc/programs/Xserver/hw/xfree86/xf24_32bpp/Imakefile:1.7 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/Imakefile:1.6 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/Imakefile Fri Oct 14 11:17:12 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/Imakefile,v 1.6 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/Imakefile,v 1.7 2005/10/14 15:17:12 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -63,11 +63,9 @@ cfbimage.o cfbscrinit.o cfbwindow.o \ $(XFMODOBJ) cfbgc24.o cfbgc32.o -INCLUDES = -I. -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ +INCLUDES = -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XF86OSSRC) -I$(XF86COMSRC) \ - -I$(FONTINCSRC) -I$(XINCLUDESRC) - + -I$(XF86OSSRC) -I$(XF86COMSRC) ModuleObjectRule() LibraryModuleTarget(xf24_32bpp,$(OBJS),.) Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32module.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32module.c:1.3 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32module.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32module.c:1.3 Tue Jan 26 00:54:20 1999 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32module.c Thu Mar 16 11:50:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32module.c,v 1.3 1999/01/26 05:54:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfb24_32module.c,v 1.4 2006/03/16 16:50:35 dawes Exp $ */ #ifdef XFree86LOADER @@ -23,7 +23,7 @@ XF86ModuleData xf24_32bppModuleData = { &VersRec, xf24_32bppSetup, NULL }; static pointer -xf24_32bppSetup(pointer module, pointer opts, int *errmaj, int *errmin) +xf24_32bppSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { if (!LoadSubModule(module, "cfb24", NULL, NULL, NULL, NULL, errmaj, errmin)) Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbbstore.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbbstore.c:1.1 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbbstore.c:1.2 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbbstore.c:1.1 Sat Jan 23 04:56:13 1999 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbbstore.c Fri Oct 14 11:17:12 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbbstore.c,v 1.1 1999/01/23 09:56:13 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbbstore.c,v 1.2 2005/10/14 15:17:12 tsi Exp $ */ #define PSZ 8 #include "cfb.h" @@ -6,7 +6,7 @@ #include "cfb24.h" #include "cfb32.h" #include "cfb24_32.h" -#include "X.h" +#include #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbcpyarea.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbcpyarea.c:1.6 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbcpyarea.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbcpyarea.c:1.6 Tue Jul 15 21:38:49 2003 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbcpyarea.c Fri Oct 14 11:17:12 2005 @@ -1,7 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbcpyarea.c,v 1.6 2003/07/16 01:38:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbcpyarea.c,v 1.7 2005/10/14 15:17:12 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c:1.3 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c:1.3 Fri Dec 14 14:59:51 2001 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c Fri Oct 14 11:17:12 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c,v 1.3 2001/12/14 19:59:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgc.c,v 1.4 2005/10/14 15:17:12 tsi Exp $ */ /*********************************************************** @@ -62,11 +62,11 @@ /* This gets built twice. Once for 24bpp and another for 32bpp */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "cfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgcmisc.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgcmisc.c:1.1 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgcmisc.c:1.2 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgcmisc.c:1.1 Sat Jan 23 04:56:14 1999 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgcmisc.c Fri Oct 14 11:17:12 2005 @@ -1,15 +1,15 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgcmisc.c,v 1.1 1999/01/23 09:56:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbgcmisc.c,v 1.2 2005/10/14 15:17:12 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #define PSZ 8 #include "cfb.h" #undef PSZ #include "cfb24.h" #include "cfb32.h" #include "cfb24_32.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbimage.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbimage.c:1.4 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbimage.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbimage.c:1.4 Tue Jul 15 21:38:49 2003 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbimage.c Fri Oct 14 11:17:12 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbimage.c,v 1.4 2003/07/16 01:38:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbimage.c,v 1.5 2005/10/14 15:17:12 tsi Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c:1.3 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c:1.3 Fri Mar 31 19:17:19 2000 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c Fri Oct 14 11:17:12 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c,v 1.3 2000/04/01 00:17:19 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbpixmap.c,v 1.4 2005/10/14 15:17:12 tsi Exp $ */ -#include "Xmd.h" +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbscrinit.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbscrinit.c:1.6 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbscrinit.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbscrinit.c:1.6 Sat Sep 13 17:33:09 2003 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbscrinit.c Fri Oct 14 11:17:12 2005 @@ -1,8 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbscrinit.c,v 1.6 2003/09/13 21:33:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbscrinit.c,v 1.7 2005/10/14 15:17:12 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "servermd.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbwindow.c diff -u xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbwindow.c:1.5 xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbwindow.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbwindow.c:1.5 Mon Nov 10 13:22:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbwindow.c Fri Oct 14 11:17:12 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbwindow.c,v 1.5 2003/11/10 18:22:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf24_32bpp/cfbwindow.c,v 1.6 2005/10/14 15:17:12 tsi Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/hw/xfree86/xf4bpp/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/Imakefile:1.8 xc/programs/Xserver/hw/xfree86/xf4bpp/Imakefile:1.9 --- xc/programs/Xserver/hw/xfree86/xf4bpp/Imakefile:1.8 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/Imakefile Fri Oct 14 11:17:13 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/Imakefile,v 1.8 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/Imakefile,v 1.9 2005/10/14 15:17:13 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -78,10 +78,9 @@ DEFINES = -DXF86VGA16 -INCLUDES = -I. -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ +INCLUDES = -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XF86OSSRC) -I$(XF86COMSRC) \ - -I$(FONTINCSRC) -I$(XINCLUDESRC) + -I$(XF86OSSRC) -I$(XF86COMSRC) ModuleObjectRule() LibraryModuleTarget(xf4bpp,$(OBJS),.) Index: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h:1.4 Tue Jul 25 21:52:26 2000 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h Mon Jan 9 10:00:27 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.4 2000/07/26 01:52:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.5 2006/01/09 15:00:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,7 +21,6 @@ * SOFTWARE. * */ -/* $XConsortium: OScompiler.h /main/4 1996/02/21 17:56:09 kaleb $ */ #ifndef __COMPILER_DEPENDANCIES__ #define __COMPILER_DEPENDANCIES__ Index: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c:1.3 Sun Jun 6 04:48:54 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,7 +21,6 @@ * SOFTWARE. * */ -/* $XConsortium: emulOpStip.c /main/4 1996/02/21 17:56:12 kaleb $ */ /* ppc OpaqueStipple * @@ -36,15 +35,10 @@ #include "mfb.h" void -xf4bppOpaqueStipple( pWin, pStipple, fg, bg, alu, planes, x, y, w, h, xSrc, ySrc ) -WindowPtr pWin; /* GJA */ -register PixmapPtr pStipple ; -unsigned long int fg ; -unsigned long int bg ; -int alu ; -unsigned long int planes ; -register int x, y, w, h ; -int xSrc, ySrc ; +xf4bppOpaqueStipple(WindowPtr pWin, PixmapPtr pStipple, + unsigned long fg, unsigned long bg, + int alu, unsigned long planes, int x, int y, int w, int h, + int xSrc, int ySrc) { /* DO BACKGROUND */ switch ( alu ) { @@ -58,7 +52,7 @@ case GXcopy: /* 0x3 src */ case GXcopyInverted: /* 0xc NOT src */ { /* Special Case Code */ - register int vtarget, htarget ; + int vtarget, htarget ; /* We Can Draw Just One Copy Then Blit The Rest !! */ /* Draw The One Copy */ @@ -80,9 +74,9 @@ default: /* Hard Cases -- i.e. Final Result DOES Depend On Initial Dest. */ { /* Do The Background */ - register int i, j; - register PixmapPtr pInvPixmap = xf4bppCopyPixmap( pStipple ) ; - register unsigned char *data = pInvPixmap->devPrivate.ptr ; + int i, j; + PixmapPtr pInvPixmap = xf4bppCopyPixmap( pStipple ) ; + unsigned char *data = pInvPixmap->devPrivate.ptr ; /* INVERT PIXMAP OK, jeff, this is for you */ for ( i = pInvPixmap->drawable.height ; i-- ; ) Index: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c:1.3 Sun Jun 6 04:48:54 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,7 +21,6 @@ * SOFTWARE. * */ -/* $XConsortium: emulRepAre.c /main/5 1996/02/21 17:56:16 kaleb $ */ /* ppc Replicate Area -- A Divide & Conquer Algorithm * a "ppc" Helper Function For Stipples And Tiling @@ -30,12 +29,10 @@ #include "xf4bpp.h" -void xf4bppReplicateArea( pWin, x, y, planeMask, goalWidth, goalHeight, - currentHoriz, currentVert) -WindowPtr pWin; /* GJA */ -register int x, y, planeMask ; -int goalWidth, goalHeight ; -int currentHoriz, currentVert ; +void +xf4bppReplicateArea(WindowPtr pWin, int x, int y, int planeMask, + int goalWidth, int goalHeight, + int currentHoriz, int currentVert) { for ( ; currentHoriz <= ( goalWidth >> 1 ) ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c:1.4 Mon Nov 3 00:11:56 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.4 2003/11/03 05:11:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,7 +21,6 @@ * SOFTWARE. * */ -/* $XConsortium: emulTile.c /main/4 1996/02/21 17:56:23 kaleb $ */ /* ppc Tile * P. Shupak 11/87 @@ -35,22 +34,11 @@ #include "ibmTrace.h" static void -DrawFirstTile -( - WindowPtr pWin, /* GJA */ - register PixmapPtr pTile, - register int x, - register int y, - int w, - int h, - int alu, - unsigned long int planes, - int xOffset, - int yOffset -) +DrawFirstTile(WindowPtr pWin, PixmapPtr pTile, int x, int y, int w, int h, + int alu, unsigned long planes, int xOffset, int yOffset) { -register int htarget ; -register int vtarget ; +int htarget ; +int vtarget ; if ( xOffset ) { /* Not X-Aligned */ if ( yOffset ) { /* Nor Y-Aligned */ @@ -169,14 +157,9 @@ * robustness. */ void -xf4bppTileRect( pWin, pTile, alu, planes, x0, y0, w, h, xSrc, ySrc ) -WindowPtr pWin; /* GJA */ -register PixmapPtr pTile ; -const int alu ; -const unsigned long int planes ; -register int x0, y0, w, h ; -int xSrc ; -int ySrc ; +xf4bppTileRect(WindowPtr pWin, PixmapPtr pTile, const int alu, + const unsigned long planes, int x0, int y0, int w, int h, + int xSrc, int ySrc) { int xOffset ; int yOffset ; @@ -234,8 +217,8 @@ case GXor: /* 0x7 src OR dst */ default: { - register unsigned char *data ; - register int hcount, vcount ; /* Number of tiles in center */ + unsigned char *data ; + int hcount, vcount ; /* Number of tiles in center */ int xcount, ycount; /* Temporaries */ int x1, y1; /* Left upper corner of center */ int x2, y2; /* Left upper corner of lower right margin */ Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h:1.2 xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h:1.3 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h:1.2 Sat Jul 25 12:59:28 1998 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h Mon Jan 9 10:00:27 2006 @@ -1,10 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.2 1998/07/25 16:59:28 dawes Exp $ */ - - - - - -/* $XConsortium: ibmTrace.h /main/3 1996/02/21 17:56:27 kaleb $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.3 2006/01/09 15:00:27 dawes Exp $ */ #define TRACE(x) /* empty */ Index: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c:1.3 Sun Jun 6 04:48:54 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.3 1999/06/06 08:48:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -48,7 +48,6 @@ ******************************************************************/ /* GJA -- modified this file for vga16 */ -/* $XConsortium: mfbbres.c /main/5 1996/02/21 17:56:30 kaleb $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -59,30 +58,19 @@ #include "wm3.h" /* Solid bresenham line */ -/* NOTES - e2 is used less often than e1, so it's not in a register -*/ void -xf4bppBresS(addrlbase, nlwidth, signdx, signdy, axis, x1, y1, e, e1, e2, len) -PixelType *addrlbase; /* pointer to base of bitmap */ -int nlwidth; /* width in longwords of bitmap */ -int signdx, signdy; /* signs of directions */ -int axis; /* major axis (Y_AXIS or X_AXIS) */ -int x1, y1; /* initial point */ -register int e; /* error accumulator */ -register int e1; /* bresenham increments */ -int e2; -int len; /* length of line */ +xf4bppBresS(PixelType *addrlbase, int nlwidth, int signdx, int signdy, + int axis, int x1, int y1, int e, int e1, int e2, int len) { - register int yinc; /* increment to next scanline, in bytes */ - register PixelType *addrl; /* bitmask long pointer + int yinc; /* increment to next scanline, in bytes */ + PixelType *addrl; /* bitmask long pointer *dont* * cast to char pointer */ - register PixelType bit; /* current bit being set/cleared/etc. */ + PixelType bit; /* current bit being set/cleared/etc. */ PixelType leftbit = mask[0]; /* leftmost bit to process in new word */ PixelType rightbit = mask[PPW-1]; /* rightmost bit to process in new word */ - register int e3 = e2-e1; + int e3 = e2-e1; /* point to longword containing first point */ addrl = mfbScanline(addrlbase, x1, y1, nlwidth); Index: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c:1.4 Fri Jan 25 16:56:22 2002 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.4 2002/01/25 21:56:22 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -47,7 +47,6 @@ ******************************************************************/ /* GJA -- modified this file for vga16 */ -/* $XConsortium: mfbbresd.c /main/5 1996/02/21 17:56:34 kaleb $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -75,33 +74,18 @@ } void -xf4bppBresD(pDrawable, fgink, bgink, - pdashIndex, pDash, numInDashList, pdashOffset, isDoubleDash, - addrlbase, nlwidth, - signdx, signdy, axis, x1, y1, e, e1, e2, len) -DrawablePtr pDrawable; -int fgink, bgink; -int *pdashIndex; /* current dash */ -unsigned char *pDash; /* dash list */ -int numInDashList; /* total length of dash list */ -int *pdashOffset; /* offset into current dash */ -int isDoubleDash; -PixelType *addrlbase; /* pointer to base of bitmap */ -int nlwidth; /* width in longwords of bitmap */ -int signdx, signdy; /* signs of directions */ -int axis; /* major axis (Y_AXIS or X_AXIS) */ -int x1, y1; /* initial point */ -register int e; /* error accumulator */ -register int e1; /* bresenham increments */ -int e2; -int len; /* length of line */ +xf4bppBresD(DrawablePtr pDrawable, int fgink, int bgink, int *pdashIndex, + unsigned char *pDash, int numInDashList, int *pdashOffset, + int isDoubleDash, PixelType *addrlbase, int nlwidth, + int signdx, int signdy, int axis, int x1, int y1, int e, int e1, + int e2, int len) { IOADDRESS REGBASE = xf86Screens[pDrawable->pScreen->myNum]->domainIOBase + 0x300; - register int yinc; /* increment to next scanline, in bytes */ - register PixelType *addrl; - register int e3 = e2-e1; - register unsigned long bit; + int yinc; /* increment to next scanline, in bytes */ + PixelType *addrl; + int e3 = e2-e1; + unsigned long bit; PixelType leftbit = mask[0]; /* leftmost bit to process in new word */ PixelType rightbit = mask[PPW-1]; /* rightmost bit to process in new word */ int dashIndex; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c:1.6 xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c:1.6 Mon Nov 3 00:11:56 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.6 2003/11/03 05:11:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.7 2005/03/28 02:51:07 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -28,8 +28,6 @@ /* GJA -- Took mfb code and modified it. */ -/* $XConsortium: mfbfillarc.c /main/4 1996/02/21 17:56:37 kaleb $ */ - #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" @@ -43,21 +41,17 @@ extern ScrnInfoPtr *xf86Screens; static void -v16FillEllipseSolid -( - DrawablePtr pDraw, - xArc *arc -) +v16FillEllipseSolid(DrawablePtr pDraw, xArc *arc) { int x, y, e; int yk, xk, ym, xm, dx, dy, xorg, yorg; - register int slw; + int slw; miFillArcRec info; int *addrlt, *addrlb; - register int *addrl; - register int n; + int *addrl; + int n; int nlwidth; - register int xpos; + int xpos; int startmask, endmask, nlmiddle; if (pDraw->type == DRAWABLE_WINDOW) @@ -173,17 +167,12 @@ } static void -v16FillArcSliceSolidCopy -( - DrawablePtr pDraw, - GCPtr pGC, - xArc *arc -) +v16FillArcSliceSolidCopy(DrawablePtr pDraw, GCPtr pGC, xArc *arc) { - register int *addrl; - register int n; + int *addrl; + int n; int yk, xk, ym, xm, dx, dy, xorg, yorg, slw; - register int x, y, e; + int x, y, e; miFillArcRec info; miArcSliceRec slice; int xl, xr, xc; @@ -236,16 +225,10 @@ } static void -xf4bppPolyFillArcSolid -( - register DrawablePtr pDraw, - GCPtr pGC, - int narcs, - xArc *parcs -) +xf4bppPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { - register xArc *arc; - register int i; + xArc *arc; + int i; BoxRec box; RegionPtr cclip; #if 0 @@ -285,11 +268,7 @@ } void -xf4bppPolyFillArc(pDraw, pGC, narcs, parcs) - register DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +xf4bppPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { if ( !xf86Screens[pDraw->pScreen->myNum]->vtSema || (pGC->fillStyle != FillSolid) ) { miPolyFillArc(pDraw, pGC, narcs, parcs); Index: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c:1.3 Sun Jun 6 04:48:55 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -48,7 +48,6 @@ ******************************************************************/ /* GJA -- modified this file for vga16 */ -/* $XConsortium: mfbhrzvert.c /main/3 1996/02/21 17:56:41 kaleb $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -62,16 +61,11 @@ */ void -xf4bppHorzS(addrl, nlwidth, x1, y1, len) -register PixelType *addrl; /* pointer to base of bitmap */ -register int nlwidth; /* width in longwords of bitmap */ -int x1; /* initial point */ -int y1; -int len; /* length of line */ +xf4bppHorzS(PixelType *addrl, int nlwidth, int x1, int y1, int len) { - register PixelType startmask; - register PixelType endmask; - register int nlmiddle; + PixelType startmask; + PixelType endmask; + int nlmiddle; /* force the line to go left to right @@ -112,13 +106,9 @@ */ void -xf4bppVertS(addrl, nlwidth, x1, y1, len) -register PixelType *addrl; /* pointer to base of bitmap */ -register int nlwidth; /* width in longwords of bitmap */ -int x1, y1; /* initial point */ -register int len; /* length of line */ +xf4bppVertS(PixelType *addrl, int nlwidth, int x1, int y1, int len) { - register PixelType bitmask; + PixelType bitmask; addrl = mfbScanline(addrl, x1, y1, nlwidth); Index: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c:1.9 xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c:1.10 --- xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c:1.9 Mon Nov 17 17:20:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.9 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.10 2005/03/28 02:51:07 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -48,7 +48,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: mfbimggblt.c /main/5 1996/02/21 17:56:44 kaleb $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -94,31 +93,16 @@ mfbImageGlyphBltWhite |= mfbImageGlyphBltBlack &=~ - the register allocations for startmask and endmask may not -be the right thing. are there two other deserving candidates? -xoff, pdst, pglyph, and tmpSrc seem like the right things, though. */ /* Forward declarations -- GJA */ -static void doImageGlyphBlt( - DrawablePtr, - GC *, - int, - int, - unsigned int, - CharInfoPtr *, - unsigned char *, - ExtentInfoRec * -); +static void doImageGlyphBlt(DrawablePtr pDrawable, GC *pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, + unsigned char *pglyphBase, ExtentInfoRec *infop); void -xf4bppImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +xf4bppImageGlyphBlt(DrawablePtr pDrawable, GC *pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { ExtentInfoRec info; /* used by QueryGlyphExtents() */ xRectangle backrect;/* backing rectangle to paint. @@ -180,14 +164,9 @@ } static void -doImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase,infop) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - unsigned char *pglyphBase; /* start of array of glyphs */ - ExtentInfoRec* infop; /* used by QueryGlyphExtents() */ +doImageGlyphBlt(DrawablePtr pDrawable, GC *pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, + unsigned char *pglyphBase, ExtentInfoRec *infop) { BoxRec bbox; /* string's bounding box */ @@ -201,23 +180,23 @@ int xchar; /* xorigin of char (mod 32) */ /* these are used for placing the glyph */ - register int xoff; /* x offset of left edge of glyph (mod 32) */ - register CARD32 *pdst; + int xoff; /* x offset of left edge of glyph (mod 32) */ + CARD32 *pdst; /* pointer to current longword in dst */ int w; /* width of glyph in bits */ int h; /* height of glyph */ int widthGlyph; /* width of glyph, in bytes */ - register unsigned char *pglyph; + unsigned char *pglyph; /* pointer to current row of glyph */ /* used for putting down glyph */ - register unsigned int tmpSrc; + unsigned int tmpSrc; /* for getting bits from glyph */ - register int startmask; - register int endmask; + int startmask; + int endmask; - register int nFirst;/* bits of glyph in current longword */ + int nFirst;/* bits of glyph in current longword */ xorg = pDrawable->x; yorg = pDrawable->y; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c:1.6 xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c:1.6 Mon Nov 17 17:20:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.7 2005/03/28 02:51:07 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -47,7 +47,6 @@ ******************************************************************/ /* GJA -- modified this file for vga16 */ -/* $XConsortium: mfbline.c /main/4 1996/02/21 17:56:48 kaleb $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -96,11 +95,7 @@ ); void -xf4bppSegmentSS (pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - register xSegment *pSeg; +xf4bppSegmentSS(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) { if ( ! xf86Screens[pDrawable->pScreen->myNum]->vtSema ) { miPolySegment(pDrawable, pGC, nseg, pSeg); @@ -110,17 +105,11 @@ } #else -static void DoV16LineSS( - DrawablePtr, GCPtr, int, int, DDXPointPtr -); +static void DoV16LineSS(DrawablePtr, GCPtr, int, int, DDXPointPtr); void -xf4bppLineSS (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +xf4bppLineSS(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) { if ( ! xf86Screens[pDrawable->pScreen->myNum]->vtSema ) { miZeroLine(pDrawable, pGC, mode, npt, pptInit); @@ -132,26 +121,18 @@ static void #ifdef POLYSEGMENT -DoV16SegmentSS (pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - register xSegment *pSeg; -#else -DoV16LineSS (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +DoV16SegmentSS(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) +#else +DoV16LineSS(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) #endif { int nboxInit; - register int nbox; + int nbox; BoxPtr pboxInit; - register BoxPtr pbox; + BoxPtr pbox; #ifndef POLYSEGMENT - register DDXPointPtr ppt; /* pointer to list of translated points */ + DDXPointPtr ppt; /* pointer to list of translated points */ #endif unsigned int oc1; /* outcode of point 1 */ @@ -175,8 +156,8 @@ unsigned int bias = miGetZeroLineBias(pDrawable->pScreen); /* a bunch of temporaries */ - register int y1, y2; - register int x1, x2; + int y1, y2; + int x1, x2; RegionPtr cclip; #ifndef POLYSEGMENT int alu = pGC->alu; /* GJA */ @@ -232,7 +213,7 @@ */ if (y1 > y2) { - register int tmp; + int tmp; tmp = y2; y2 = y1 + 1; @@ -285,7 +266,7 @@ */ if (x1 > x2) { - register int tmp; + int tmp; tmp = x2; x2 = x1 + 1; @@ -495,16 +476,10 @@ */ #ifdef POLYSEGMENT -static void DoV16SegmentSD( - DrawablePtr, GCPtr, int, xSegment* -); +static void DoV16SegmentSD(DrawablePtr, GCPtr, int, xSegment*); void -xf4bppSegmentSD (pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - register xSegment *pSeg; +xf4bppSegmentSD(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) { if ( ! xf86Screens[pDrawable->pScreen->myNum]->vtSema ) { miPolySegment(pDrawable, pGC, nseg, pSeg); @@ -514,17 +489,11 @@ } #else -static void DoV16LineSD( - DrawablePtr, GCPtr, int, int, DDXPointPtr -); +static void DoV16LineSD(DrawablePtr, GCPtr, int, int, DDXPointPtr); void -xf4bppLineSD (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +xf4bppLineSD(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) { if ( ! xf86Screens[pDrawable->pScreen->myNum]->vtSema ) { miZeroDashLine(pDrawable, pGC, mode, npt, pptInit); @@ -536,30 +505,22 @@ static void #ifdef POLYSEGMENT -DoV16SegmentSD (pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - register GCPtr pGC; - int nseg; - register xSegment *pSeg; -#else -DoV16LineSD( pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - register GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +DoV16SegmentSD(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) +#else +DoV16LineSD(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) #endif { int nboxInit; - register int nbox; + int nbox; BoxPtr pboxInit; - register BoxPtr pbox; + BoxPtr pbox; #ifndef POLYSEGMENT - register DDXPointPtr ppt; /* pointer to list of translated points */ + DDXPointPtr ppt; /* pointer to list of translated points */ #endif - register unsigned int oc1; /* outcode of point 1 */ - register unsigned int oc2; /* outcode of point 2 */ + unsigned int oc1; /* outcode of point 1 */ + unsigned int oc2; /* outcode of point 2 */ PixelType *addrl; /* address of destination pixmap */ int nlwidth; /* width in longwords of destination pixmap */ @@ -819,23 +780,15 @@ */ int -mfbClipLine(pbox, box, - ppt1Orig, ppt1, ppt2, - adx, ady, signdx, signdy, axis, - pclip1, pclip2) -BoxPtr pbox; /* box to clip to */ -BoxRec box; /* box to do calculations with */ -DDXPointPtr ppt1Orig, ppt1, ppt2; -int adx, ady; -int signdx, signdy; -register int axis; -int *pclip1, *pclip2; +mfbClipLine(BoxPtr pbox, BoxRec box, DDXPointPtr ppt1Orig, + DDXPointPtr ppt1, DDXPointPtr ppt2, int adx, int ady, + int signdx, int signdy, int axis, int *pclip1, int *pclip2) { DDXPointRec pt1Orig, pt1, pt2; - register int swapped = 0; + int swapped = 0; int clipDone = 0; - register unsigned int utmp; - register int oc1, oc2; + unsigned int utmp; + int oc1, oc2; int clip1, clip2; pt1Orig = *ppt1Orig; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c:1.5 xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c:1.5 Tue Feb 18 16:29:59 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.6 2005/03/28 02:51:07 dawes Exp $ */ /************************************************************ @@ -28,8 +28,6 @@ ********************************************************/ /* GJA -- Took mfb code and modified it. */ -/* $XConsortium: mfbzerarc.c /main/4 1996/02/21 17:56:52 kaleb $ */ - /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" * by M. L. V. Pitteway @@ -71,12 +69,12 @@ #define PixelateWhite(addr,off) \ { \ - register int *tmpaddr = &((addr)[(off)>>PWSH]); \ + int *tmpaddr = &((addr)[(off)>>PWSH]); \ UPDRW(tmpaddr,SCRRIGHT (LEFTMOST, ((off) & PIM))); \ } #define PixelateBlack(addr,off) \ { \ - register int *tmpaddr = &((addr)[(off)>>PWSH]); \ + int *tmpaddr = &((addr)[(off)>>PWSH]); \ UPDRW(tmpaddr,~(SCRRIGHT (LEFTMOST, ((off) & PIM)))); \ } @@ -90,23 +88,18 @@ #define DoPix(bit,base,off) if (msk & bit) Pixelate(base,off); static void -v16ZeroArcSS -( - DrawablePtr pDraw, - GCPtr pGC, - xArc *arc -) +v16ZeroArcSS(DrawablePtr pDraw, GCPtr pGC, xArc *arc) { miZeroArcRec info; Bool do360; - register int x, y, a, b, d, msk; - register int k1, k3, dx, dy; + int x, y, a, b, d, msk; + int k1, k3, dx, dy; int *addrl; int *yorgl, *yorgol; unsigned long pixel; int nlwidth, yoffset, dyoffset; int pmask; - register int *paddr; + int *paddr; if (((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop == RROP_BLACK) @@ -217,16 +210,10 @@ } static void -xf4bppZeroPolyArcSS -( - DrawablePtr pDraw, - GCPtr pGC, - int narcs, - xArc *parcs -) +xf4bppZeroPolyArcSS(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { - register xArc *arc; - register int i; + xArc *arc; + int i; BoxRec box; RegionPtr cclip; @@ -252,11 +239,7 @@ } void -xf4bppZeroPolyArc(pDraw, pGC, narcs, parcs) - DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +xf4bppZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { if ( !xf86Screens[pDraw->pScreen->myNum]->vtSema ) { miZeroPolyArc(pDraw, pGC, narcs, parcs); Index: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c:1.5 xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c:1.5 Tue Jul 31 20:44:56 2001 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c Mon Jan 9 10:00:27 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.5 2001/08/01 00:44:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.6 2006/01/09 15:00:27 dawes Exp $ */ /* * Copyright 1993 Gerrit Jan Akkerman * @@ -41,7 +41,6 @@ * SOFTWARE. * */ -/* $XConsortium: offscreen.c /main/4 1996/02/21 17:56:55 kaleb $ */ #include "xf4bpp.h" #include "vgaVideo.h" Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c:1.4 Tue Feb 18 16:29:59 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,7 +21,6 @@ * SOFTWARE. * */ -/* $XConsortium: ppcArea.c /main/4 1996/02/21 17:57:02 kaleb $ */ /* * ppc solid area fill @@ -36,13 +35,9 @@ #include "ibmTrace.h" void -xf4bppFillArea( pWin, nboxes, pBox, pGC ) - register WindowPtr pWin ; - register int nboxes ; - register BoxPtr pBox ; - GCPtr pGC ; +xf4bppFillArea(WindowPtr pWin, int nboxes, BoxPtr pBox, GCPtr pGC) { -register int x, y, w, h ; +int x, y, w, h ; int alu ; unsigned long int fg, bg, pm ; int xSrc, ySrc ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c:1.3 Sun Jun 6 04:48:57 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.3 1999/06/06 08:48:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* Copyright (c) 1987 X Consortium @@ -60,7 +60,6 @@ software without specific, written prior permission. */ -/* $XConsortium: ppcBStore.c /main/5 1996/02/21 17:57:06 kaleb $ */ #include "xf4bpp.h" #include "vgaVideo.h" @@ -80,15 +79,11 @@ *----------------------------------------------------------------------- */ void -xf4bppSaveAreas( pPixmap, prgnSave, xorg, yorg, pWin ) - register PixmapPtr pPixmap ; /* Backing pixmap */ - RegionPtr prgnSave ; /* Region to save (pixmap-relative) */ - int xorg ; /* X origin of region */ - int yorg ; /* Y origin of region */ - WindowPtr pWin; +xf4bppSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, + WindowPtr pWin) { - register BoxPtr pBox ; - register int nBox ; + BoxPtr pBox ; + int nBox ; TRACE( ( "xf4bppSaveAreas(0x%x,0x%x,%d,%d)\n", pPixmap, prgnSave, xorg, yorg ) ) ; @@ -123,15 +118,11 @@ *----------------------------------------------------------------------- */ void -xf4bppRestoreAreas( pPixmap, prgnRestore, xorg, yorg, pWin ) - register PixmapPtr pPixmap ; /* Backing pixmap */ - RegionPtr prgnRestore ; /* Region to restore (screen-relative)*/ - int xorg ; /* X origin of window */ - int yorg ; /* Y origin of window */ - WindowPtr pWin; +xf4bppRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, + int yorg, WindowPtr pWin) { - register BoxPtr pBox ; - register int nBox ; + BoxPtr pBox ; + int nBox ; TRACE( ( "xf4bppRestoreAreas(0x%x,0x%x,%d,%d)\n", pPixmap, prgnRestore, xorg, yorg ) ) ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c:1.3 Sun Jun 6 04:48:58 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -22,8 +22,6 @@ * */ -/* $XConsortium: ppcCReduce.c /main/3 1996/02/21 17:57:17 kaleb $ */ - #include "xf4bpp.h" #include "ppcGCstr.h" @@ -33,16 +31,9 @@ */ static void -ppcReduceGeneral -( - register int alu, - register unsigned long pm, - register unsigned long fg, - register unsigned long bg, - register int fillStyle, - int drawableDepth, - ppcReducedRrop *returnLoc -) +ppcReduceGeneral(int alu, unsigned long pm, unsigned long fg, + unsigned long bg, int fillStyle, int drawableDepth, + ppcReducedRrop *returnLoc) { if ( ( alu == GXnoop ) @@ -218,10 +209,7 @@ } void -xf4bppGetReducedColorRrop( pGC, drawableDepth, returnLoc ) -GC *pGC ; -int drawableDepth ; -ppcReducedRrop *returnLoc ; +xf4bppGetReducedColorRrop(GC *pGC, int drawableDepth, ppcReducedRrop *returnLoc) { ppcReduceGeneral( pGC->alu, Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c:1.5 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c:1.5 Sat Sep 25 10:38:16 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.5 1999/09/25 14:38:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.6 2005/03/28 02:51:07 dawes Exp $ */ /* Copyright (c) 1987 X Consortium @@ -68,7 +68,6 @@ SOFTWARE. */ -/* $XConsortium: ppcClip.c /main/4 1996/02/21 17:57:21 kaleb $ */ #include "xf4bpp.h" #include "mfbmap.h" @@ -76,8 +75,7 @@ #include "scrnintstr.h" void -xf4bppDestroyClip(pGC) - GCPtr pGC; +xf4bppDestroyClip(GCPtr pGC) { if(pGC->clientClipType == CT_NONE) return; @@ -97,11 +95,7 @@ } void -xf4bppChangeClip(pGC, type, pvalue, nrects) - GCPtr pGC; - int type; - pointer pvalue; - int nrects; +xf4bppChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) { xf4bppDestroyClip(pGC); if(type == CT_PIXMAP) @@ -131,8 +125,7 @@ } void -xf4bppCopyClip (pgcDst, pgcSrc) - GCPtr pgcDst, pgcSrc; +xf4bppCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { RegionPtr prgnNew; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c:1.7 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c:1.8 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c:1.7 Mon Nov 10 13:22:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.7 2003/11/10 18:22:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.8 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -22,8 +22,6 @@ * */ -/* $XConsortium: ppcCpArea.c /main/6 1996/02/21 17:57:24 kaleb $ */ - /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -61,15 +59,8 @@ * Graft in the DoBitblt from cfb. It does everything correctly. */ static void -vga16DoBitblt -( - DrawablePtr pSrc, - DrawablePtr pDst, - int alu, - RegionPtr prgnDst, - DDXPointPtr pptSrc, - unsigned long planemask -) +vga16DoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, + RegionPtr prgnDst, DDXPointPtr pptSrc, unsigned long planemask) { int widthSrc, widthDst; /* add to get to same position in next line */ BoxPtr pbox; @@ -221,14 +212,8 @@ */ RegionPtr -xf4bppCopyArea(pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty) -register DrawablePtr pSrcDrawable; -register DrawablePtr pDstDrawable; -register GC *pGC; -int srcx, srcy; -int width, height; -int dstx, dsty; +xf4bppCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GC *pGC, + int srcx, int srcy, int width, int height, int dstx, int dsty) { RegionPtr prgnSrcClip = NULL; /* may be a new region, or just a copy */ Bool freeSrcClip = FALSE; @@ -236,11 +221,11 @@ RegionPtr prgnExposed; RegionRec rgnDst; DDXPointPtr pptSrc; - register DDXPointPtr ppt; - register BoxPtr pbox; + DDXPointPtr ppt; + BoxPtr pbox; int i; - register int dx; - register int dy; + int dx; + int dy; xRectangle origSource; DDXPointRec origDest; int numRects; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c:1.3 Sun Jun 6 04:48:58 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.3 1999/06/06 08:48:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -22,8 +22,6 @@ * */ -/* $XConsortium: ppcDepth.c /main/3 1996/02/21 17:57:31 kaleb $ */ - /* Check to see if the alleged depth is acceptable for the Screen * * T. Paquin 9/87 @@ -34,12 +32,10 @@ #include "scrnintstr.h" Bool -xf4bppDepthOK(pDraw,depth) -register DrawablePtr pDraw; -register int depth; +xf4bppDepthOK(DrawablePtr pDraw, int depth) { -register ScreenPtr pScreen= pDraw->pScreen; -register int i = pScreen->numDepths; +ScreenPtr pScreen= pDraw->pScreen; +int i = pScreen->numDepths; if ( ( pDraw->type == DRAWABLE_PIXMAP ) && ( depth == 1 ) ) return TRUE ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c:1.6 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c:1.6 Mon Nov 3 00:11:57 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.7 2005/03/28 02:51:07 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +47,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcFillRct.c /main/5 1996/02/21 17:57:35 kaleb $ */ #include "xf4bpp.h" #include "mfbmap.h" @@ -66,16 +65,13 @@ #define NUM_STACK_RECTS 1024 void -xf4bppPolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +xf4bppPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, + xRectangle *prectInit) { xRectangle *prect; RegionPtr prgnClip; - register BoxPtr pbox; - register BoxPtr pboxClipped; + BoxPtr pbox; + BoxPtr pboxClipped; BoxPtr pboxClippedBase; BoxPtr pextent; BoxRec stackRects[NUM_STACK_RECTS]; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c:1.8 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c:1.9 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c:1.8 Tue Feb 18 16:29:59 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.8 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.9 2005/03/28 02:51:07 dawes Exp $ */ /* Copyright (c) 1987 X Consortium @@ -69,12 +69,11 @@ */ -/* $XConsortium: ppcGC.c /main/6 1996/02/21 17:57:38 kaleb $ */ - #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" #include "mi.h" +#include "migc.h" #include "scrnintstr.h" #include "ppcGCstr.h" #include "vgaVideo.h" @@ -91,8 +90,8 @@ */ static GCFuncs vgaGCFuncs = { xf4bppValidateGC, - (void (*)())NoopDDA, - (void (*)())NoopDDA, + miChangeGC, + miCopyGC, xf4bppDestroyGC, xf4bppChangeClip, xf4bppDestroyClip, @@ -147,8 +146,7 @@ }; Bool -xf4bppCreateGC( pGC ) -register GCPtr pGC ; +xf4bppCreateGC(GCPtr pGC) { ppcPrivGC *pPriv ; GCOps *pOps ; @@ -195,9 +193,7 @@ } void -xf4bppDestroyGC( pGC ) - register GC *pGC ; - +xf4bppDestroyGC(GCPtr pGC) { TRACE( ( "xf4bppDestroyGC(pGC=0x%x)\n", pGC ) ) ; @@ -215,14 +211,10 @@ } static Mask -ppcChangePixmapGC -( - register GC *pGC, - register Mask changes -) +ppcChangePixmapGC(GC *pGC, Mask changes) { -register ppcPrivGCPtr devPriv = (ppcPrivGCPtr) (pGC->devPrivates[mfbGCPrivateIndex].ptr ) ; -register unsigned long int idx ; /* used for stepping through bitfields */ +ppcPrivGCPtr devPriv = (ppcPrivGCPtr) (pGC->devPrivates[mfbGCPrivateIndex].ptr ) ; +unsigned long int idx ; /* used for stepping through bitfields */ #define LOWBIT( x ) ( x & - x ) /* Two's complement */ while ((idx = LOWBIT(changes))) { @@ -295,12 +287,9 @@ */ void -xf4bppValidateGC( pGC, changes, pDrawable ) - GCPtr pGC; - unsigned long changes; - DrawablePtr pDrawable; +xf4bppValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { - register ppcPrivGCPtr devPriv ; + ppcPrivGCPtr devPriv ; WindowPtr pWin ; devPriv = (ppcPrivGCPtr) (pGC->devPrivates[mfbGCPrivateIndex].ptr ) ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h:1.4 Mon Nov 17 17:20:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h Mon Jan 9 10:00:27 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.4 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.5 2006/01/09 15:00:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -43,7 +43,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcGCstr.h /main/3 1996/02/21 17:57:42 kaleb $ */ #include "gc.h" #include "mfb.h" Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c:1.3 Sun Jun 6 04:48:59 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.3 1999/06/06 08:48:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -70,8 +70,6 @@ ******************************************************************/ -/* $XConsortium: ppcGetSp.c /main/5 1996/02/21 17:57:45 kaleb $ */ - #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" @@ -85,18 +83,13 @@ * out to an integral number of words. */ void -xf4bppGetSpans( pDrawable, wMax, ppt, pwidth, nspans, pdstStart ) - DrawablePtr pDrawable ; /* drawable from which to get bits */ - int wMax ; /* largest value of all *pwidths */ - DDXPointPtr ppt ; /* points to start copying from */ - int *pwidth ; /* list of number of bits to copy */ - int nspans ; /* number of scanlines to copy */ - char *pdstStart ; +xf4bppGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, + int nspans, char *pdstStart) { - register int j ; - register unsigned char *pdst ; /* where to put the bits */ - register unsigned char *psrc ; /* where to get the bits */ - register int pixmapStride ; + int j ; + unsigned char *pdst ; /* where to put the bits */ + unsigned char *psrc ; /* where to get the bits */ + int pixmapStride ; TRACE( ( "xf4bppGetSpans(pDrawable=0x%x,wMax=%d,ppt=0x%x,pwidth=0x%x,nspans=%d)\n", @@ -122,7 +115,7 @@ } } else { /* OK, if we are here, we had better be a DRAWABLE PIXMAP */ - register int widthSrc = /* width of pixmap in bytes */ + int widthSrc = /* width of pixmap in bytes */ (int) ( (PixmapPtr) pDrawable )->devKind ; psrc = (unsigned char *) ( (PixmapPtr) pDrawable )->devPrivate.ptr ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c:1.6 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c:1.6 Mon Nov 3 00:11:57 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.7 2005/03/28 02:51:07 dawes Exp $ */ /* Copyright (c) 1990 X Consortium @@ -48,7 +48,6 @@ SOFTWARE. */ -/* $XConsortium: ppcIO.c /main/8 1996/02/21 17:57:49 kaleb $ */ #include "xf4bpp.h" #include "mfbmap.h" @@ -93,11 +92,7 @@ /*ARGSUSED*/ static Bool -vgaScreenClose -( - int idx, - ScreenPtr pScreen -) +vgaScreenClose(int idx, ScreenPtr pScreen) { pScreen->defColormap = 0 ; return TRUE; @@ -130,10 +125,7 @@ * screen pixmap here. */ static Bool -v16CreateScreenResources -( - ScreenPtr pScreen -) +v16CreateScreenResources(ScreenPtr pScreen) { miScreenInitParmsPtr pScrInitParms; pointer value; @@ -174,12 +166,8 @@ Bool -xf4bppScreenInit( pScreen, pbits, virtx, virty, dpix, dpiy, width ) - ScreenPtr pScreen; - pointer pbits; - int virtx, virty; - int dpix, dpiy; - int width; +xf4bppScreenInit(ScreenPtr pScreen, pointer pbits, int virtx, int virty, + int dpix, int dpiy, int width) { Bool ret; VisualPtr visuals; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c:1.5 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c:1.5 Tue Feb 18 16:29:59 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.5 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.6 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -22,8 +22,6 @@ * */ -/* $XConsortium: ppcImg.c /main/4 1996/02/21 17:57:53 kaleb $ */ - #include "xf4bpp.h" #include "OScompiler.h" #include "mi.h" @@ -49,12 +47,8 @@ * get the single plane specified in planemask */ void -xf4bppGetImage( pDraw, sx, sy, w, h, format, planeMask, pdstLine ) - DrawablePtr pDraw ; - int sx, sy, w, h ; - unsigned int format ; - unsigned long planeMask ; - char * pdstLine ; +xf4bppGetImage(DrawablePtr pDraw, int sx, int sy, int w, int h, + unsigned int format, unsigned long planeMask, char *pdstLine) { #if 1 int depth, i, linelength, width ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c:1.5 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c:1.5 Mon Nov 3 00:11:57 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.6 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -44,7 +44,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcPixFS.c /main/3 1996/02/21 17:57:57 kaleb $ */ #include "xf4bpp.h" #include "mfbmap.h" @@ -75,11 +74,7 @@ /* A mod definition that goes smoothly into the negative. */ static int -modulo -( - int n1, - int n2 -) +modulo(int n1, int n2) { int tmp; if ( n1 < 0 ) { @@ -95,22 +90,17 @@ } void -xf4bppSolidPixmapFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) - DrawablePtr pDrawable ; - GCPtr pGC ; - int nInit ; /* number of spans to fill */ - DDXPointPtr pptInit ; /* pointer to list of start points */ - int *pwidthInit ; /* pointer to list of n widths */ - int fSorted ; +xf4bppSolidPixmapFS(DrawablePtr pDrawable, GCPtr pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - register unsigned long int pm, npm ; - register unsigned long int fg ; - register int alu ; + unsigned long int pm, npm ; + unsigned long int fg ; + int alu ; /* next three parameters are post-clip */ int n ; /* number of spans to fill */ - register DDXPointPtr ppt ; /* pointer to list of start points */ - register int *pwidth ; /* pointer to list of n widths */ - register unsigned char *addrl ; /* pointer to current longword in bitmap */ + DDXPointPtr ppt ; /* pointer to list of start points */ + int *pwidth ; /* pointer to list of n widths */ + unsigned char *addrl ; /* pointer to current longword in bitmap */ int i ; int *pwidthFree ; /* copies of the pointers to free */ DDXPointPtr pptFree ; @@ -165,17 +155,13 @@ /* GJA -- copied from vgaStipple.c */ static unsigned char -vgagetbits -( - register const int x, - register const unsigned int patternWidth, - register const unsigned char * const lineptr -) +vgagetbits(const int x, const unsigned int patternWidth, + const unsigned char * const lineptr) { -register unsigned char bits ; -register const unsigned char *cptr ; -register int shift ; -register int wrap ; +unsigned char bits ; +const unsigned char *cptr ; +int shift ; +int wrap ; cptr = lineptr + ( x >> 3 ) ; bits = *cptr ; @@ -219,23 +205,18 @@ } void -xf4bppStipplePixmapFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) -register DrawablePtr pDrawable ; -GC *pGC ; -int nInit ; /* number of spans to fill */ -DDXPointPtr pptInit ; /* pointer to list of start points */ -int *pwidthInit ; /* pointer to list of n widths */ -int fSorted ; +xf4bppStipplePixmapFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - register unsigned char *pdst ; /* pointer to current word in bitmap */ - register int *psrc ; /* pointer to current word in tile */ - register unsigned long int pm, npm ; - register unsigned long int fg ; - register int alu ; + unsigned char *pdst ; /* pointer to current word in bitmap */ + int *psrc ; /* pointer to current word in tile */ + unsigned long int pm, npm ; + unsigned long int fg ; + int alu ; /* next three parameters are post-clip */ int n ; /* number of spans to fill */ - register DDXPointPtr ppt ; /* pointer to list of start points */ - register int *pwidth ; /* pointer to list of n widths */ + DDXPointPtr ppt ; /* pointer to list of start points */ + int *pwidth ; /* pointer to list of n widths */ PixmapPtr pTile ; /* pointer to tile we want to fill with */ int width, x, xSrc, ySrc ; int tlwidth, tileWidth ; @@ -321,23 +302,18 @@ } void -xf4bppOpStipplePixmapFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) -DrawablePtr pDrawable ; -GC *pGC ; -int nInit ; /* number of spans to fill */ -DDXPointPtr pptInit ; /* pointer to list of start points */ -int *pwidthInit ; /* pointer to list of n widths */ -int fSorted ; +xf4bppOpStipplePixmapFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - register unsigned char *pdst ; /* pointer to current word in bitmap */ - register unsigned long int pm, npm ; - register unsigned long int fg, bg ; - register int alu ; + unsigned char *pdst ; /* pointer to current word in bitmap */ + unsigned long int pm, npm ; + unsigned long int fg, bg ; + int alu ; /* next three parameters are post-clip */ int n ; /* number of spans to fill */ - register DDXPointPtr ppt ; /* pointer to list of start points */ - register int *pwidth ; /* pointer to list of n widths */ - register int *psrc ; /* pointer to current word in tile */ + DDXPointPtr ppt ; /* pointer to list of start points */ + int *pwidth ; /* pointer to list of n widths */ + int *psrc ; /* pointer to current word in tile */ PixmapPtr pTile ; /* pointer to tile we want to fill with */ int width ; int xSrc, ySrc ; @@ -422,19 +398,14 @@ } void -xf4bppTilePixmapFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) -register DrawablePtr pDrawable ; -GC *pGC ; -int nInit ; /* number of spans to fill */ -DDXPointPtr pptInit ; /* pointer to list of start points */ -int *pwidthInit ; /* pointer to list of n widths */ -int fSorted ; +xf4bppTilePixmapFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - register DDXPointPtr ppt ; /* pointer to list of start points */ - register int *pwidth ; /* pointer to list of n widths */ - register unsigned char *pdst ; /* pointer to current word in bitmap */ - register unsigned char *psrc ; /* pointer to current word in tile */ - register PixmapPtr pTile ; /* pointer to tile we want to fill with */ + DDXPointPtr ppt ; /* pointer to list of start points */ + int *pwidth ; /* pointer to list of n widths */ + unsigned char *pdst ; /* pointer to current word in bitmap */ + unsigned char *psrc ; /* pointer to current word in tile */ + PixmapPtr pTile ; /* pointer to tile we want to fill with */ int i ; int alu ; unsigned char pm, npm ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c:1.5 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c:1.5 Thu Apr 27 12:26:49 2000 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c Wed Sep 14 11:13:51 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.5 2000/04/27 16:26:49 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.7 2005/09/14 15:13:51 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -69,7 +69,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcPixmap.c /main/5 1996/02/21 17:58:00 kaleb $ */ #include "xf4bpp.h" #include "servermd.h" @@ -78,19 +77,15 @@ #include "scrnintstr.h" PixmapPtr -xf4bppCreatePixmap( pScreen, width, height, depth ) - ScreenPtr pScreen ; - int width ; - int height ; - int depth ; +xf4bppCreatePixmap(ScreenPtr pScreen, int width, int height, int depth) { - register PixmapPtr pPixmap = (PixmapPtr)NULL; + PixmapPtr pPixmap = (PixmapPtr)NULL; int size ; TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ; - if ( depth > 8 ) - return (PixmapPtr) NULL ; + if ((depth > 8) || (width > MAXSHORT) || (height > MAXSHORT)) + return NullPixmap; size = PixmapBytePad(width, depth); pPixmap = AllocatePixmap (pScreen, (height * size)); @@ -122,10 +117,9 @@ } PixmapPtr -xf4bppCopyPixmap(pSrc) - register PixmapPtr pSrc; +xf4bppCopyPixmap(PixmapPtr pSrc) { - register PixmapPtr pDst; + PixmapPtr pDst; int size; TRACE(("xf4bppCopyPixmap(pSrc=0x%x)\n", pSrc)) ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c:1.4 Mon Nov 17 17:20:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.4 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -69,7 +69,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcPntWin.c /main/5 1996/02/21 17:58:04 kaleb $ */ #include "xf4bpp.h" #include "mfbmap.h" @@ -91,13 +90,10 @@ ); void -xf4bppPaintWindow(pWin, pRegion, what) - WindowPtr pWin; - RegionPtr pRegion; - int what; +xf4bppPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what) { - register mfbPrivWin *pPrivWin; + mfbPrivWin *pPrivWin; pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr); TRACE(("xf4bppPaintWindow( pWin= 0x%x, pRegion= 0x%x, what= %d )\n", @@ -144,15 +140,12 @@ } static void -xf4bppPaintWindowSolid(pWin, pRegion, what) - register WindowPtr pWin; - register RegionPtr pRegion; - int what; +xf4bppPaintWindowSolid(WindowPtr pWin, RegionPtr pRegion, int what) { - register int nbox; - register BoxPtr pbox; - register unsigned long int pixel; - register unsigned long int pm ; + int nbox; + BoxPtr pbox; + unsigned long int pixel; + unsigned long int pm ; TRACE(("xf4bppPaintWindowSolid(pWin= 0x%x, pRegion= 0x%x, what= %d)\n", pWin, pRegion, what)); @@ -178,15 +171,12 @@ } static void -xf4bppPaintWindowTile(pWin, pRegion, what) - register WindowPtr pWin; - register RegionPtr pRegion; - int what; +xf4bppPaintWindowTile(WindowPtr pWin, RegionPtr pRegion, int what) { - register int nbox; - register BoxPtr pbox; - register PixmapPtr pTile; - register unsigned long int pm ; + int nbox; + BoxPtr pbox; + PixmapPtr pTile; + unsigned long int pm ; TRACE(("xf4bppPaintWindowTile(pWin= 0x%x, pRegion= 0x%x, what= %d)\n", pWin, pRegion, what)); Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c:1.4 Sat Sep 25 10:38:17 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ /* Copyright (c) 1987 X Consortium @@ -68,7 +68,6 @@ SOFTWARE. */ -/* $XConsortium: ppcPolyPnt.c /main/5 1996/02/21 17:58:07 kaleb $ */ #include "xf4bpp.h" #include "mfbmap.h" @@ -79,14 +78,10 @@ #include "ibmTrace.h" void -xf4bppPolyPoint( pDrawable, pGC, mode, npt, pptInit ) -DrawablePtr pDrawable ; -GCPtr pGC ; -int mode ; /* Origin or Previous */ -int npt ; -xPoint *pptInit ; +xf4bppPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + xPoint *pptInit) { -register xPoint *ppt ; +xPoint *ppt ; ppcPrivGC *devPriv ; int alu ; int nptTmp ; @@ -113,8 +108,8 @@ } if ( pGC->miTranslate ) { - register int xorg = pDrawable->x ; - register int yorg = pDrawable->y ; + int xorg = pDrawable->x ; + int yorg = pDrawable->y ; for ( ppt = pptInit, nptTmp = npt ; nptTmp-- ; ppt++ ) { ppt->x += xorg ; ppt->y += yorg ; @@ -122,9 +117,9 @@ } { - register RegionPtr pRegion = pGC->pCompositeClip ; - register unsigned long int fg = devPriv->colorRrop.fgPixel ; - register unsigned long int pm = devPriv->colorRrop.planemask ; + RegionPtr pRegion = pGC->pCompositeClip ; + unsigned long int fg = devPriv->colorRrop.fgPixel ; + unsigned long int pm = devPriv->colorRrop.planemask ; BoxRec box ; /* Scratch Space */ if ( ! REGION_NUM_RECTS(pRegion)) Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c:1.3 Sun Jun 6 04:49:01 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -68,16 +68,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcPolyRec.c /main/4 1996/02/21 17:58:11 kaleb $ */ #include "xf4bpp.h" void -xf4bppPolyRectangle(pDraw, pGC, nrects, pRects) - DrawablePtr pDraw; - GCPtr pGC; - int nrects; - xRectangle *pRects; +xf4bppPolyRectangle(DrawablePtr pDraw, GCPtr pGC, int nrects, + xRectangle *pRects) { int i; xRectangle *pR = pRects; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c:1.3 Sun Jun 6 04:49:01 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,18 +21,12 @@ * SOFTWARE. * */ -/* $XConsortium: ppcQuery.c /main/3 1996/02/21 17:58:18 kaleb $ */ #include "xf4bpp.h" void -xf4bppQueryBestSize -( - register int class, - register unsigned short *pwidth, - register unsigned short *pheight, - ScreenPtr pScreen -) +xf4bppQueryBestSize(int class, unsigned short *pwidth, unsigned short *pheight, + ScreenPtr pScreen) { if ( class == CursorShape ) *pwidth = *pheight = 32 ; /* ppc's cursor max out at 32 by 32 */ Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c:1.5 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c:1.5 Mon Dec 17 15:00:46 2001 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.5 2001/12/17 20:00:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.6 2005/03/28 02:51:07 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -51,8 +51,6 @@ * */ -/* $XConsortium: ppcRslvC.c /main/7 1996/02/21 17:58:25 kaleb $ */ - /* Generic Color Resolution Scheme * P. Shupak 12/31/87 */ @@ -85,11 +83,10 @@ }; Bool -xf4bppInitializeColormap(pmap) - register ColormapPtr pmap; +xf4bppInitializeColormap(ColormapPtr pmap) { - register unsigned i; - register VisualPtr pVisual; + unsigned i; + VisualPtr pVisual; unsigned lim, maxent, shift; pVisual = pmap->pVisual; @@ -136,11 +133,8 @@ } void -xf4bppResolveColor( pred, pgreen, pblue, pVisual ) -register unsigned short* pred ; -register unsigned short* pgreen ; -register unsigned short* pblue ; -register VisualPtr pVisual ; +xf4bppResolveColor(unsigned short *pred, unsigned short *pgreen, + unsigned short *pblue, VisualPtr pVisual ) { unsigned lim, maxent, shift; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c:1.3 Sun Jun 6 04:49:02 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.3 1999/06/06 08:49:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.4 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -69,7 +69,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcSetSp.c /main/5 1996/02/21 17:58:32 kaleb $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -84,17 +83,11 @@ * further on.) */ static void -ppcSetScanline -( - register int pixCount, /* width of scanline in bits */ - register char *psrc, - register unsigned char *pdst, /* where to put the bits */ - register int pm, /* plane mask */ - const int alu /* raster op */ -) +ppcSetScanline(int pixCount, char *psrc, unsigned char *pdst, int pm, + const int alu) { -register int npm = ~pm ; /* inverted plane mask */ -register char tmpx ; +int npm = ~pm ; /* inverted plane mask */ +char tmpx ; pm &= 0x0F; npm &= 0x0F; /* GJA */ @@ -184,21 +177,15 @@ * on a word boundary. */ void -xf4bppSetSpans( pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted ) - register DrawablePtr pDrawable ; - GCPtr pGC ; - char *psrc ; - register DDXPointPtr ppt ; - int *pwidth ; - int nspans ; - int fSorted ; +xf4bppSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc, + DDXPointPtr ppt, int *pwidth, int nspans, int fSorted) { unsigned char *pdstBase = NULL; /* start of dst bitmap */ int widthDst = 0; /* width of bitmap in words */ - register BoxPtr pbox, pboxLast, pboxTest ; - register DDXPointPtr pptLast ; + BoxPtr pbox, pboxLast, pboxTest ; + DDXPointPtr pptLast ; RegionPtr prgnDst ; - register int width ; + int width ; int xStart, xEnd ; int yMax ; int alu ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h:1.2 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h:1.3 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h:1.2 Sat Jul 25 12:59:42 1998 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h Mon Jan 9 10:00:27 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.2 1998/07/25 16:59:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.3 2006/01/09 15:00:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,7 +21,6 @@ * SOFTWARE. * */ -/* $XConsortium: ppcSpMcro.h /main/3 1996/02/21 17:58:36 kaleb $ */ /* This screwy macro is used in all the spans routines and you find it all over the place, so it is a macro just to tidy things up. Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c:1.4 Mon Nov 3 00:11:57 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.4 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -44,7 +44,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcWinFS.c /main/3 1996/02/21 17:58:39 kaleb $ */ #include "xf4bpp.h" #include "mfbmap.h" @@ -68,21 +67,16 @@ */ void -xf4bppSolidWindowFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) - DrawablePtr pDrawable ; - GCPtr pGC ; - int nInit ; /* number of spans to fill */ - DDXPointPtr pptInit ; /* pointer to list of start points */ - int *pwidthInit ; /* pointer to list of n widths */ - int fSorted ; +xf4bppSolidWindowFS(DrawablePtr pDrawable, GCPtr pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - register unsigned long int pm ; - register unsigned long int fg ; - register int alu ; + unsigned long int pm ; + unsigned long int fg ; + int alu ; /* next three parameters are post-clip */ int n ; /* number of spans to fill */ - register DDXPointPtr ppt ; /* pointer to list of start points */ - register int *pwidth ; /* pointer to list of n widths */ + DDXPointPtr ppt ; /* pointer to list of start points */ + int *pwidth ; /* pointer to list of n widths */ int *pwidthFree ; /* copies of the pointers to free */ DDXPointPtr pptFree ; @@ -126,21 +120,16 @@ } void -xf4bppStippleWindowFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) -DrawablePtr pDrawable ; -register GC *pGC ; -int nInit ; /* number of spans to fill */ -DDXPointPtr pptInit ; /* pointer to list of start points */ -int *pwidthInit ; /* pointer to list of n widths */ -int fSorted ; +xf4bppStippleWindowFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - register unsigned long int pm ; - register unsigned long int fg ; - register int alu ; + unsigned long int pm ; + unsigned long int fg ; + int alu ; /* next three parameters are post-clip */ int n ; /* number of spans to fill */ - register DDXPointPtr ppt ; /* pointer to list of start points */ - register int *pwidth ; /* pointer to list of n widths */ + DDXPointPtr ppt ; /* pointer to list of start points */ + int *pwidth ; /* pointer to list of n widths */ PixmapPtr pTile ; /* pointer to tile we want to fill with */ int xSrc ; int ySrc ; @@ -185,16 +174,11 @@ } void -xf4bppOpStippleWindowFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) -DrawablePtr pDrawable ; -register GC *pGC ; -int nInit ; /* number of spans to fill */ -DDXPointPtr pptInit ; /* pointer to list of start points */ -int *pwidthInit ; /* pointer to list of n widths */ -int fSorted ; +xf4bppOpStippleWindowFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - register DDXPointPtr ppt ; /* pointer to list of start points */ - register int *pwidth ; /* pointer to list of n widths */ + DDXPointPtr ppt ; /* pointer to list of start points */ + int *pwidth ; /* pointer to list of n widths */ int n ; /* number of spans to fill */ int xSrc ; int ySrc ; @@ -236,17 +220,12 @@ } void -xf4bppTileWindowFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) -DrawablePtr pDrawable ; -register GC *pGC ; -int nInit ; /* number of spans to fill */ -DDXPointPtr pptInit ; /* pointer to list of start points */ -int *pwidthInit ; /* pointer to list of n widths */ -int fSorted ; +xf4bppTileWindowFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ - register DDXPointPtr ppt ; /* pointer to list of start points */ - register int *pwidth ; /* pointer to list of n widths */ + DDXPointPtr ppt ; /* pointer to list of start points */ + int *pwidth ; /* pointer to list of n widths */ int n ; /* number of spans to fill */ unsigned char pm ; int alu ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c:1.4 Sat Sep 25 10:38:17 1999 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.4 1999/09/25 14:38:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ /* Copyright (c) 1987 X Consortium @@ -68,7 +68,6 @@ SOFTWARE. */ -/* $XConsortium: ppcWindow.c /main/5 1996/02/21 17:58:43 kaleb $ */ #include "xf4bpp.h" #include "mfbmap.h" @@ -82,16 +81,13 @@ */ void -xf4bppCopyWindow(pWin, ptOldOrg, prgnSrc) - register WindowPtr pWin ; - DDXPointRec ptOldOrg ; - RegionPtr prgnSrc ; +xf4bppCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { RegionPtr prgnDst ; - register BoxPtr pbox ; - register int dx, dy ; - register int nbox ; - register int pm ; + BoxPtr pbox ; + int dx, dy ; + int nbox ; + int pm ; BoxPtr pboxTmp, pboxNext, pboxBase, pboxNew ; /* temporaries for shuffling rectangles */ @@ -191,26 +187,23 @@ REGION_DESTROY(pWin->drawable.pScreen, prgnDst); } -Bool xf4bppPositionWindow(pWin, x, y) -register WindowPtr pWin ; -register int x, y ; +Bool +xf4bppPositionWindow(WindowPtr pWin, int x, int y) { return TRUE ; } Bool -xf4bppDestroyWindow(pWin) -register WindowPtr pWin ; +xf4bppDestroyWindow(WindowPtr pWin) { return pWin ? TRUE : FALSE ; } /* As The Name Says -- Used For ega, vga and apa8c */ Bool -xf4bppCreateWindowForXYhardware(pWin) -register WindowPtr pWin ; +xf4bppCreateWindowForXYhardware(WindowPtr pWin) { - register mfbPrivWin *pPrivWin; + mfbPrivWin *pPrivWin; TRACE(("xf4bppCreateWindowForXYhardware (pWin= 0x%x)\n", pWin)); Index: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c:1.6 xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c:1.6 Mon Nov 17 17:20:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c Sun Mar 27 21:51:07 2005 @@ -1,10 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.6 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.7 2005/03/28 02:51:07 dawes Exp $ */ /* GJA -- span move routines */ - - -/* $XConsortium: vgaBitBlt.c /main/8 1996/10/27 11:06:39 kaleb $ */ - #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" @@ -116,15 +112,11 @@ WindowPtr, int, int, int, int, int, int, int ); -static void shift_center( - WindowPtr, int, int, int, int, int, int, int -); +static void shift_center(WindowPtr, int, int, int, int, int, int, int); -void xf4bppBitBlt(pWin,alu,writeplanes,x0,y0,x1,y1,w,h) -WindowPtr pWin; /* GJA */ -int alu; -int writeplanes; /* planes */ -int x0, y0, x1, y1, w, h; +void +xf4bppBitBlt(WindowPtr pWin, int alu, int writeplanes, int x0, int y0, + int x1, int y1, int w, int h) { IOADDRESS REGBASE; int plane, bit; @@ -166,15 +158,7 @@ /* Copy a span a number of places to the right. */ static void -shift(pWin,x0,x1,y0,y1,w,h,alu) -WindowPtr pWin; /* GJA */ -int x0; /* left edge of source */ -int x1; /* left edge of target */ -int y0; -int y1; -int w; /* length of source, and of target */ -int h; -int alu; +shift(WindowPtr pWin, int x0, int x1, int y0, int y1, int w, int h, int alu) { if ( ((x1 & WMASK) + w) <= WORDSZ ) { shift_thin_rect(pWin,x0,x1,y0,y1,w,h,alu); @@ -199,15 +183,8 @@ /* The whole rectangle is so thin that it fits in one byte written */ static void -shift_thin_rect(pWin,x0,x1,y0,y1,w,h,alu) -WindowPtr pWin; /* GJA */ -int x0; /* left edge of source */ -int x1; /* left edge of target */ -int y0; -int y1; -int w; /* length of source, and of target */ -int h; -int alu; +shift_thin_rect(WindowPtr pWin, int x0, int x1, int y0, int y1, int w, int h, + int alu) { int l0 = x0 & WMASK; /* Left edge of source, as bit */ int l1 = x1 & WMASK; /* Left edge of target, as bit */ @@ -265,15 +242,8 @@ } static void -shift_center(pWin,x0,x1,y0,y1,w,h,alu) -WindowPtr pWin; /* GJA */ -int x0; /* left edge of source */ -int x1; /* left edge of target */ -int y0; -int y1; -int w; /* length of source, and of target */ -int h; -int alu; +shift_center(WindowPtr pWin, int x0, int x1, int y0, int y1, int w, int h, + int alu) { int l1 = x1 & WMASK; /* Left edge of target, as bit */ int r1 = (x1 + w) & WMASK; /* Right edge of target, as bit */ @@ -388,16 +358,8 @@ /* Copy a rectangle. */ static void -aligned_blit(pWin,x0,x1,y0,y1,w,h,alu,planes) -WindowPtr pWin; /* GJA */ -int x0; /* left edge of source */ -int x1; /* left edge of target */ -int y0; -int y1; -int w; /* length of source, and of target */ -int h; -int alu; -int planes; +aligned_blit(WindowPtr pWin, int x0, int x1, int y0, int y1, int w, int h, + int alu, int planes) { IOADDRESS REGBASE = xf86Screens[((DrawablePtr)pWin)->pScreen->myNum]->domainIOBase + 0x300; @@ -511,14 +473,8 @@ } static void -aligned_blit_center(pWin,x0,x1,y0,y1,w,h) -WindowPtr pWin; /* GJA */ -int x0; /* left edge of source */ -int x1; /* left edge of target */ -int y0; -int y1; -int w; /* length of source, and of target */ -int h; +aligned_blit_center(WindowPtr pWin, int x0, int x1, int y0, int y1, int w, + int h) { int l1 = x1 & WMASK; /* Left edge of target, as bit */ int r1 = (x1 + w) & WMASK; /* Right edge of target, as bit */ @@ -588,20 +544,16 @@ #else /* PC98_EGC */ static void -egc_fast_blt (pWin, alu, writeplanes, x0, y0, x1, y1, w, h) -WindowPtr pWin; -const int alu, writeplanes ; -register int x0, x1 ; -int y0, y1 ; -register int w, h ; +egc_fast_blt(WindowPtr pWin, const int alu, const int writeplanes, + int x0, int y0, int x1, int y1, int w, int h) { -register volatile unsigned char *src ; -register volatile unsigned char *dst ; +volatile unsigned char *src ; +volatile unsigned char *dst ; unsigned short *src_x ; unsigned short *dst_x ; int x_direction, y_interval ; int src_off, dst_off ; -register int k, i ; +int k, i ; unsigned short ROP_value; src = (unsigned char *)SCREENADDRESS( pWin, 0, y0); @@ -720,11 +672,8 @@ } void -xf4bppBitBlt( pWin,alu, writeplanes, x0, y0, x1, y1, w, h ) -WindowPtr pWin; /* GJA */ -int alu; -int writeplanes; /* planes */ -int x0, y0, x1, y1, w, h; +xf4bppBitBlt(WindowPtr pWin, int alu, int writeplanes, int x0, int y0, + int x1, int y1, int w, int h) { if ( ! xf86Screens[((DrawablePtr)pWin)->pScreen->myNum]->vtSema ) { xf4bppOffBitBlt( pWin, alu, writeplanes, Index: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c:1.4 Tue Feb 18 16:29:59 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.4 2003/02/18 21:29:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ /* Copyright (c) 1987 X Consortium @@ -69,8 +69,6 @@ */ -/* $XConsortium: vgaGC.c /main/6 1996/02/21 17:58:54 kaleb $ */ - #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" @@ -78,9 +76,7 @@ #include "ppcGCstr.h" void -xf4bppChangeGCtype( pGC, devPriv ) -register GC *pGC ; -register ppcPrivGCPtr devPriv ; +xf4bppChangeGCtype(GC *pGC, ppcPrivGCPtr devPriv) { if ( devPriv->lastDrawableType == DRAWABLE_PIXMAP ) { pGC->ops->CopyArea = miCopyArea ; @@ -102,12 +98,10 @@ } Mask -xf4bppChangeWindowGC( pGC, changes ) -register GC *pGC ; -register Mask changes ; +xf4bppChangeWindowGC(GC *pGC, Mask changes) { -register ppcPrivGCPtr devPriv = (ppcPrivGCPtr) (pGC->devPrivates[mfbGCPrivateIndex].ptr) ; -register unsigned long int idx ; /* used for stepping through bitfields */ +ppcPrivGCPtr devPriv = (ppcPrivGCPtr) (pGC->devPrivates[mfbGCPrivateIndex].ptr) ; +unsigned long int idx ; /* used for stepping through bitfields */ #define LOWBIT( x ) ( x & - x ) /* Two's complement */ while ((idx = LOWBIT(changes))) { Index: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c:1.5 xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c:1.5 Mon Nov 3 00:11:57 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.6 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,7 +21,6 @@ * SOFTWARE. * */ -/* $XConsortium: vgaImages.c /main/5 1996/02/21 17:58:58 kaleb $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -37,26 +36,21 @@ #define FALSE 0 void -xf4bppDrawColorImage( pWin, x, y, w, h, data, RowIncrement, alu, planes ) -WindowPtr pWin; /* GJA */ -int x, y ; -register int w, h ; -unsigned char *data ; -register int RowIncrement ; -const int alu ; -const unsigned long int planes ; +xf4bppDrawColorImage(WindowPtr pWin, int x, int y, int w, int h, + unsigned char *data, int RowIncrement, const int alu, + const unsigned long planes) { IOADDRESS REGBASE; -register unsigned long int tmp ; -register const unsigned char *src ; -register volatile unsigned char *dst ; -register int Pixel_Count ; -register unsigned int currMask ; -register unsigned int InitialMask ; -register volatile unsigned char *StartByte ; +unsigned long int tmp ; +const unsigned char *src ; +volatile unsigned char *dst ; +int Pixel_Count ; +unsigned int currMask ; +unsigned int InitialMask ; +volatile unsigned char *StartByte ; unsigned int invert_source_data = FALSE ; #ifdef PC98_EGC /* new EGC test */ -register unsigned char tmp1; +unsigned char tmp1; #endif { /* Start GJA */ @@ -273,14 +267,10 @@ #ifndef PC98_EGC static unsigned long int -read8Z -( - IOADDRESS REGBASE, - register volatile unsigned char *screen_ptr -) +read8Z(IOADDRESS REGBASE, volatile unsigned char *screen_ptr) { -register unsigned long int i ; -register unsigned long int j ; +unsigned long int i ; +unsigned long int j ; /* Read One Byte At A Time to get * i == [ Plane 3 ] [ Plane 2 ] [ Plane 1 ] [ Plane 0 ] @@ -349,16 +339,12 @@ #endif /* not PC98_EGC */ void -xf4bppReadColorImage( pWin, x, y, lx, ly, data, RowIncrement ) -WindowPtr pWin; /* GJA */ -int x, y ; -int lx, ly ; -register unsigned char *data ; -int RowIncrement ; +xf4bppReadColorImage(WindowPtr pWin, int x, int y, int lx, int ly, + unsigned char *data, int RowIncrement) { IOADDRESS REGBASE; -register unsigned long int tmp ; -register volatile unsigned char *src ; +unsigned long int tmp ; +volatile unsigned char *src ; volatile unsigned char *masterSrc ; int savCenterWidth ; int dx ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h:1.4 Fri Jan 25 16:56:22 2002 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h Mon Jan 9 10:00:27 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.4 2002/01/25 21:56:22 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.5 2006/01/09 15:00:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -22,8 +22,6 @@ * */ -/* $XConsortium: vgaReg.h /main/4 1996/02/21 17:59:02 kaleb $ */ - #define SET_BYTE_REGISTER( ioport, value ) outb( ioport, value ) #define SET_INDEX_REGISTER( ioport, value ) SET_BYTE_REGISTER( ioport, value ) #define SET_DATA_REGISTER( ioport, value ) SET_BYTE_REGISTER( ioport, value ) Index: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c:1.6 xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c:1.8 --- xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c:1.6 Mon Nov 3 00:11:57 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c Tue Mar 29 13:17:01 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.8 2005/03/29 18:17:01 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -22,8 +22,6 @@ * */ -/* $XConsortium: vgaSolid.c /main/5 1996/02/21 17:59:06 kaleb $ */ - #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" @@ -43,18 +41,16 @@ extern void fastFillRMW(); #else -static void fastFill -( - register volatile unsigned char *destination, - register const unsigned int bytes_per_line, - register const unsigned int bytewidth, /* MUST BE > 0 !! */ - register unsigned int height /* MUST BE > 0 !! */ -) +static void +fastFill(volatile unsigned char *destination, + const unsigned int bytes_per_line, + const unsigned int bytewidth, /* MUST BE > 0 !! */ + unsigned int height) /* MUST BE > 0 !! */ { int stop_count = bytewidth ; -register int row_jump = bytes_per_line - bytewidth ; +int row_jump = bytes_per_line - bytewidth ; #if !defined(OLDHC) && defined(BSDrt) && !defined(i386) -register const unsigned int notZero = ((unsigned char)(~0x0)); +const unsigned int notZero = ((unsigned char)(~0x0)); #else #define notZero ((unsigned char)(~0)) #endif @@ -101,20 +97,18 @@ } /* For Read-Modify-Write Case */ -static void fastFillRMW -( - register volatile unsigned char *destination, - register const unsigned int bytes_per_line, - register const unsigned int bytewidth, /* MUST BE > 0 !! */ - register unsigned int height /* MUST BE > 0 !! */ -) +static void +fastFillRMW(volatile unsigned char *destination, + const unsigned int bytes_per_line, + const unsigned int bytewidth, /* MUST BE > 0 !! */ + unsigned int height) /* MUST BE > 0 !! */ { int stop_count = bytewidth ; -register int row_jump = bytes_per_line - bytewidth ; +int row_jump = bytes_per_line - bytewidth ; #if !defined(OLDHC) && defined(BSDrt) && !defined(i386) -register const unsigned int notZero = ((unsigned char)(~0x0)); +const unsigned int notZero = ((unsigned char)(~0x0)); #endif -register int tmp ; +int tmp ; #define SINGLE_STORE \ tmp = *( (VgaMemoryPtr) destination ) ; (void)tmp; \ @@ -160,21 +154,16 @@ #endif -void xf4bppFillSolid( pWin, color, alu, planes, x0, y0, lx, ly ) -WindowPtr pWin; /* GJA */ -unsigned long int color ; -const int alu ; -unsigned long int planes ; -register int x0 ; -register const int y0 ; -register int lx ; -register const int ly ; /* MUST BE > 0 !! */ +void +xf4bppFillSolid(WindowPtr pWin, unsigned long int color, const int alu, + unsigned long int planes, int x0, const int y0, + int lx, const int ly) { IOADDRESS REGBASE; -register volatile unsigned char *dst ; -register int tmp ; -register int tmp2 ; -register int tmp3 ; +volatile unsigned char *dst ; +int tmp ; +int tmp2 ; +int tmp3 ; unsigned int data_rotate_value = VGA_COPY_MODE ; unsigned int read_write_modify = FALSE ; unsigned int invert_existing_data = FALSE ; @@ -360,16 +349,16 @@ } #else /* for PC98 EGC */ -static void WordfastFill( destination, bytes_per_line, wordwidth, height ) -register volatile unsigned char *destination ; -register const unsigned int bytes_per_line ; -register const unsigned int wordwidth ; /* MUST BE > 0 !! */ -register unsigned int height ; /* MUST BE > 0 !! */ +static void +WordfastFill(volatile unsigned char *destination, + const unsigned int bytes_per_line, + const unsigned int wordwidth ; /* MUST BE > 0 !! */ + unsigned int height) /* MUST BE > 0 !! */ { int stop_count = wordwidth ; -register int row_jump = bytes_per_line - wordwidth*2 ; +int row_jump = bytes_per_line - wordwidth*2 ; #if !defined(OLDHC) && defined(BSDrt) && !defined(i386) && 0 -register const int notZero = ~0x0 ; +const int notZero = ~0x0 ; #else #define notZero ( ~0 ) #endif @@ -415,20 +404,14 @@ /*NOTREACHED*/ } -void xf4bppFillSolid( pWin, color, alu, planes, x0, y0, lx, ly ) -WindowPtr pWin; /* GJA */ -unsigned long int color ; -const int alu ; -unsigned long int planes ; -register int x0 ; -register const int y0 ; -register int lx ; -register const int ly ; /* MUST BE > 0 !! */ +void +xf4bppFillSolid(WindowPtr pWin, unsigned long color, const int alu, + unsigned long planes, int x0, int y0, int lx, const int ly) { -register volatile unsigned char *dst ; -register tmp ; -register tmp2 ; -register unsigned short tmp3 ; +volatile unsigned char *dst ; +tmp ; +tmp2 ; +unsigned short tmp3 ; unsigned short ROP_value; unsigned int data_rotate_value = VGA_COPY_MODE ; unsigned int read_write_modify = FALSE ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c:1.6 xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c:1.6 Mon Nov 3 00:11:57 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c Sun Mar 27 21:51:07 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.6 2003/11/03 05:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.7 2005/03/28 02:51:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -21,7 +21,6 @@ * SOFTWARE. * */ -/* $XConsortium: vgaStipple.c /main/5 1996/02/21 17:59:10 kaleb $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -33,17 +32,13 @@ #ifndef PC98_EGC static unsigned char -getbits -( - register const int x, - register const unsigned int patternWidth, - register const unsigned char * const lineptr -) +getbits(const int x, const unsigned int patternWidth, + const unsigned char * const lineptr) { -register unsigned char bits ; -register const unsigned char *cptr ; -register int shift ; -register int wrap ; +unsigned char bits ; +const unsigned char *cptr ; +int shift ; +int wrap ; cptr = lineptr + ( x >> 3 ) ; bits = *cptr ; @@ -96,28 +91,18 @@ * This is taken care of above. */ static void -DoMonoSingle -( - WindowPtr pWin, /* GJA */ - int w, - int x, - int y, - register const unsigned char *mastersrc, - int h, - register unsigned int width, - register unsigned int paddedByteWidth, - unsigned int height, - int xshift, - int yshift -) +DoMonoSingle(WindowPtr pWin, int w, int x, int y, + const unsigned char *mastersrc, int h, unsigned int width, + unsigned int paddedByteWidth, unsigned int height, + int xshift, int yshift) { IOADDRESS REGBASE = xf86Screens[((DrawablePtr)pWin)->pScreen->myNum]->domainIOBase + 0x300; -register volatile unsigned char *xDst ; -register VideoAdapterObject tmp2 ; -register int NeedValX ; -register int counter ; -register int tmp1 ; +volatile unsigned char *xDst ; +VideoAdapterObject tmp2 ; +int NeedValX ; +int counter ; +int tmp1 ; unsigned int rowCounter ; int byte_cnt ; #ifdef PC98_EGC @@ -192,7 +177,7 @@ for ( tmp1 = yshift, rowCounter = h; rowCounter ; rowCounter-- , tmp1++ ) { - register const unsigned char *l_ptr ; + const unsigned char *l_ptr ; if ( tmp1 >= (int)height ) tmp1 -= height ; l_ptr = mastersrc + ( tmp1 * paddedByteWidth ) ; @@ -276,10 +261,10 @@ int w, int x, int y, - register const unsigned char *mastersrc, + const unsigned char *mastersrc, int h, - register unsigned int width, - register unsigned int paddedByteWidth, + unsigned int width, + unsigned int paddedByteWidth, unsigned int height, int xshift, int yshift @@ -287,11 +272,11 @@ { IOADDRESS REGBASE = xf86Screens[((DrawablePtr)pWin)->pScreen->myNum]->domainIOBase + 0x300; -register volatile unsigned char *xDst ; -register VideoAdapterObject tmp2 ; -register int NeedValX ; -register int byte_cnt ; -register int tmp1 ; +volatile unsigned char *xDst ; +VideoAdapterObject tmp2 ; +int NeedValX ; +int byte_cnt ; +int tmp1 ; unsigned DestinationRow ; unsigned int SourceRow ; volatile unsigned char *dst ; @@ -319,7 +304,7 @@ for ( tmp1 = yshift, SourceRow = 0, dst = SCREENADDRESS( pWin, x, y ) ; SourceRow < height ; tmp1++, SourceRow++, dst += BYTES_PER_LINE(pWin) ) { - register unsigned bitPattern ; + unsigned bitPattern ; if ( tmp1 >= (int)height ) tmp1 -= height ; @@ -377,7 +362,7 @@ for ( tmp1 = yshift, SourceRow = 0, dst = SCREENADDRESS( pWin, x, y ) ; SourceRow < height ; tmp1++, SourceRow++, dst += BYTES_PER_LINE(pWin) - byte_cnt ) { - register const unsigned char *l_ptr ; + const unsigned char *l_ptr ; if ( tmp1 >= (int)height ) tmp1 -= height ; l_ptr = mastersrc + ( tmp1 * paddedByteWidth ) ; @@ -387,9 +372,9 @@ for ( tmp2 = byte_cnt, NeedValX = SavNeedX ; tmp2-- ; dst++ ) { - register unsigned bitPattern ; + unsigned bitPattern ; #ifndef PC98_EGC - register VideoAdapterObject tmp3 ; + VideoAdapterObject tmp3 ; #endif /* * For Each Time Pattern Repeats In Y @@ -436,7 +421,7 @@ dst = SCREENADDRESS( pWin, ( x + w ), y ) ; SourceRow < height ; tmp1++, SourceRow++, dst += BYTES_PER_LINE(pWin) ) { - register unsigned bitPattern ; + unsigned bitPattern ; if ( tmp1 >= (int)height ) tmp1 -= height ; /* @@ -482,12 +467,8 @@ #define DO_RECURSE 0x10000 static void -vgaSetMonoRegisters -( - DrawablePtr pDrawable, - register unsigned long int plane_mask, - register unsigned long int desiredState -) +vgaSetMonoRegisters(DrawablePtr pDrawable, unsigned long int plane_mask, + unsigned long int desiredState) { IOADDRESS REGBASE = xf86Screens[pDrawable->pScreen->myNum]->domainIOBase + 0x300; @@ -550,14 +531,10 @@ } static unsigned long -vgaCalcMonoMode -( - int rasterOp, - register unsigned long int color -) +vgaCalcMonoMode(int rasterOp, unsigned long int color) { -register unsigned int data_rotate_value = VGA_COPY_MODE << 8 ; -register unsigned int invert_existing_data = 0 ; +unsigned int data_rotate_value = VGA_COPY_MODE << 8 ; +unsigned int invert_existing_data = 0 ; /* Test The Raster-Op */ switch ( rasterOp ) { @@ -608,18 +585,9 @@ } static void -vgaDrawMonoImage -( - WindowPtr pWin, /* GJA */ - unsigned char *data, - int x, - int y, - int w, - int h, - unsigned long int fg, - int alu, - unsigned long int planes -) +vgaDrawMonoImage(WindowPtr pWin, unsigned char *data, int x, int y, + int w, int h, unsigned long int fg, int alu, + unsigned long int planes) { unsigned long regState ; @@ -652,14 +620,9 @@ } void -xf4bppFillStipple( pWin, pStipple, fg, alu, planes, x, y, w, h, xSrc, ySrc ) -WindowPtr pWin; /* GJA */ -register PixmapPtr const pStipple ; -unsigned long int fg ; -const int alu ; -unsigned long int planes ; -int x, y, w, h ; -const int xSrc, ySrc ; +xf4bppFillStipple(WindowPtr pWin, PixmapPtr const pStipple, unsigned long fg, + const int alu, unsigned long planes, + int x, int y, int w, int h, const int xSrc, const int ySrc) { unsigned int width ; unsigned int height ; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h:1.2 xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h:1.3 --- xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h:1.2 Sat Jul 25 12:59:45 1998 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h Mon Jan 9 10:00:27 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.2 1998/07/25 16:59:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.3 2006/01/09 15:00:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -22,8 +22,6 @@ * */ -/* $XConsortium: vgaVideo.h /main/4 1996/02/21 17:59:14 kaleb $ */ - #include "misc.h" /* GJA -- for pointer data type */ #ifdef lint #if defined(volatile) Index: xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c:1.9 xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c:1.10 --- xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c:1.9 Fri Feb 13 18:58:52 2004 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c Thu Mar 16 11:50:35 2006 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c,v 1.9 2004/02/13 23:58:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgamodule.c,v 1.10 2006/03/16 16:50:35 dawes Exp $ */ /* - * Copyright (C) 1998 The XFree86 Project, Inc. + * Copyright (C) 1998-2006 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -68,7 +68,7 @@ XF86ModuleData xf4bppModuleData = { &VersRec, xf4bppSetup, NULL }; static pointer -xf4bppSetup(pointer module, pointer opts, int *errmaj, int *errmin) +xf4bppSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { /* This module requires xf1bpp for bitmap support */ return LoadSubModule(module, "xf1bpp", NULL, NULL, NULL, NULL, Index: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c:1.4 xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c:1.4 Fri Jan 25 16:56:23 2002 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c Sun Mar 27 21:51:07 2005 @@ -1,10 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.4 2002/01/25 21:56:23 tsi Exp $ */ - - - - - -/* $XConsortium: wm3.c /main/5 1996/02/21 17:59:21 kaleb $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.5 2005/03/28 02:51:07 dawes Exp $ */ #include "xf4bpp.h" #include "OScompiler.h" @@ -19,8 +13,7 @@ #define XOR (3 << 3) int -wm3_set_regs(pGC) -GC *pGC; +wm3_set_regs(GC *pGC) { #ifndef PC98_EGC IOADDRESS REGBASE = xf86Screens[pGC->pScreen->myNum]->domainIOBase + 0x300; Index: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h:1.3 xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h:1.4 --- xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h:1.3 Tue Sep 26 11:57:21 2000 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h Thu Jun 2 21:24:07 2005 @@ -1,10 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.3 2000/09/26 15:57:21 tsi Exp $ */ - - - - - -/* $XConsortium: wm3.h /main/4 1996/02/21 17:59:24 kaleb $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.4 2005/06/03 01:24:07 tsi Exp $ */ #include "vgaReg.h" @@ -65,11 +59,10 @@ { volatile char *_dtmp = (volatile char *)(destp); \ unsigned int _stmp = (src); \ volatile int dummy; /* Bit bucket. */ \ - _stmp = ldl_u(&_stmp); \ - dummy = *_dtmp; *_dtmp = _stmp; _dtmp++; _stmp >>= 8; \ - dummy = *_dtmp; *_dtmp = _stmp; _dtmp++; _stmp >>= 8; \ - dummy = *_dtmp; *_dtmp = _stmp; _dtmp++; _stmp >>= 8; \ - dummy = *_dtmp; *_dtmp = _stmp; } + dummy = *_dtmp; *_dtmp = ((char *)(&_stmp))[0]; _dtmp++; \ + dummy = *_dtmp; *_dtmp = ((char *)(&_stmp))[1]; _dtmp++; \ + dummy = *_dtmp; *_dtmp = ((char *)(&_stmp))[2]; _dtmp++; \ + dummy = *_dtmp; *_dtmp = ((char *)(&_stmp))[3]; } #endif #define UPDRWB(destp,src) \ Index: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h diff -u xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h:1.10 xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h:1.11 --- xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h:1.10 Mon Nov 17 17:20:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h Fri Oct 14 11:17:13 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.10 2003/11/17 22:20:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.11 2005/10/14 15:17:13 tsi Exp $ */ #ifndef __XF4BPP_H__ @@ -8,7 +8,7 @@ #include "windowstr.h" #include "gcstruct.h" #include "colormapst.h" -#include "fontstruct.h" +#include #ifndef PixelType #define PixelType CARD32 #endif Index: xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile:1.29 xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile:1.35 --- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile:1.29 Fri Nov 26 06:27:20 2004 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Mar 11 12:36:50 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v 1.29 2004/11/26 11:27:20 tsi Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v 1.35 2006/03/11 17:36:50 tsi Exp $ XCOMM CDEBUGFLAGS=-g -Wall -ansi -pedantic @@ -96,9 +96,6 @@ #if DoLoadableServer LOADERLIB = -L../loader -lxloader -L../dummylib -ldummy MODULEDEFINES = -DUSE_MODULES -INCLUDES = -I../common -I../scanpci -I../loader -I$(XF86OSSRC) \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(FONTLIBSRC)/include #if !HasStrlcat STRLCAT_DEFS = -DNEED_STRLCAT #endif @@ -106,6 +103,7 @@ SNPRINTF_DEFS = -DNEED_SNPRINTF #endif WRAPPERDEFINES = -DSELF_CONTAINED_WRAPPER $(STRLCAT_DEFS) $(SNPRINTF_DEFS) +DEPEND_DEFINES = -DSELF_CONTAINED_WRAPPER #endif #if HasNCurses @@ -126,10 +124,20 @@ DLLIB = DlLibrary #endif -LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \ +#if UseMemLeak +STRACELIB = $(TOP)/util/memleak/LibraryTargetName(memleak) +#elif UseStackTrace && DoLoadableServer +STRACELIB = $(TOP)/util/memleak/LibraryTargetName(stacktrace) +#endif + +INCLUDES = -I$(XF86SRC)/common -I$(XF86SRC)/scanpci \ + -I$(XF86SRC)/loader -I$(XF86SRC)/parser -I$(XF86OSSRC) \ + -I$(SERVERSRC)/include -I$(FONTLIBSRC)/include +LOCAL_LIBRARIES = $(XF86SRC)/parser/LibraryTargetName(xf86config) \ + $(XKBUILIB) $(XKBFILELIB) $(XXF86MISCLIB) \ $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \ $(XPMLIB) $(LOADERLIB) $(DLLIB) $(XLIB) $(CURSESLIB) \ - RegexLibrary -lm + $(STRACELIB) RegexLibrary -lm NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),) InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter) Index: xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad:1.14 xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad:1.15 --- xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad:1.14 Fri Jun 22 21:45:56 2001 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad Fri Jul 29 10:26:17 2005 @@ -26,7 +26,7 @@ !! !! Author: Paulo César Pereira de Andrade !! -!! $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad,v 1.14 2001/06/23 01:45:56 paulo Exp $ +!! $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/XF86Cfg.ad,v 1.15 2005/07/29 14:26:17 tsi Exp $ !! *Form.background: gray85 @@ -527,7 +527,7 @@ *options*viewport.right: chainRight *options*list.longest: 376 -*options*driverOpts.label: Options for module\ +*options*driverOpts.label: Options for module\ \n *options*driverOpts.justify: left *options*driverOpts.width: 278 *options*popdown.label: Popdown dialog @@ -1179,22 +1179,22 @@ *accessx*enter.height: 74 *accessx*0.width: 104 *accessx*lock.label: Num\nLock -*accessx*div.label: /\n\ -*accessx*mul.label: *\n\ -*accessx*minus.label: -\n\ -*accessx*7.label: 7\n\ -*accessx*8.label: 8\n\ -*accessx*9.label: 9\n\ -*accessx*plus.label: +\n\ \n\ \n\ \n\ -*accessx*4.label: 4\n\ -*accessx*5.label: 5\n\ -*accessx*6.label: 6\n\ -*accessx*1.label: 1\n\ -*accessx*2.label: 2\n\ -*accessx*3.label: 3\n\ -*accessx*enter.label: Enter\n\ \n\ \n\ \n\ -*accessx*0.label: 0\n\ -*accessx*del.label: .\n\ \n\ +*accessx*div.label: /\n\ \n +*accessx*mul.label: *\n\ \n +*accessx*minus.label: -\n\ \n +*accessx*7.label: 7\n\ \n +*accessx*8.label: 8\n\ \n +*accessx*9.label: 9\n\ \n +*accessx*plus.label: +\n\ \n\ \n\ \n\ \n +*accessx*4.label: 4\n\ \n +*accessx*5.label: 5\n\ \n +*accessx*6.label: 6\n\ \n +*accessx*1.label: 1\n\ \n +*accessx*2.label: 2\n\ \n +*accessx*3.label: 3\n\ \n +*accessx*enter.label: Enter\n\ \n\ \n\ \n\ \n +*accessx*0.label: 0\n\ \n +*accessx*del.label: .\n\ \n\ \n *accessx*label.displayList:\ foreground white;\ lines +1,-1,-1,-1,-1,+1;\ @@ -1203,7 +1203,7 @@ *accessx*label.label:\ If your mouse does not work, use\n\ the numeric keypad, following\n\ -the diagram bellow. +the diagram below. *accessx*div.displayList:\ foreground gray20;\ lines +1,-1,-1,-1,-1,+1;\ Index: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/config.h:1.23 xc/programs/Xserver/hw/xfree86/xf86cfg/config.h:1.24 --- xc/programs/Xserver/hw/xfree86/xf86cfg/config.h:1.23 Sun Apr 4 21:34:12 2004 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/config.h Fri Feb 17 13:08:22 2006 @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.23 2004/04/05 01:34:12 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.24 2006/02/17 18:08:22 dawes Exp $ */ #include @@ -219,6 +219,8 @@ void ExpertConfigureEnd(void); void ExpertCloseAction(Widget, XEvent*, String*, Cardinal*); void ExpertCallback(Widget, XtPointer, XtPointer); +int getArgc(void); +const char *getArgv(int i); /* * Initialization Index: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c:1.15 xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c:1.16 --- xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c:1.15 Mon Nov 3 00:11:58 2003 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c Fri Jul 29 10:26:17 2005 @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.15 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.16 2005/07/29 14:26:17 tsi Exp $ */ #include "config.h" @@ -4844,7 +4844,7 @@ XtSetArg(args[3], XtNcanvasHeight, canvasHeight); XtSetValues(panner, args, 4); - /* needs to do the apparently NOP code bellow to correctly layout the + /* needs to do the apparently NOP code below to correctly layout the * tree widget */ /* close all open entries */ Index: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/help.c:1.8 xc/programs/Xserver/hw/xfree86/xf86cfg/help.c:1.9 --- xc/programs/Xserver/hw/xfree86/xf86cfg/help.c:1.8 Mon Nov 3 00:11:58 2003 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/help.c Fri Jul 29 10:26:17 2005 @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.8 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.9 2005/07/29 14:26:17 tsi Exp $ */ #include @@ -162,7 +162,7 @@ } -/* bellow is a modified version of the html-mode.c I wrote for xedit +/* Below is a modified version of the html-mode.c I wrote for xedit * (at least) temporarily dead. */ Index: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c:1.37 xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c:1.38 --- xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c:1.37 Mon Oct 21 00:18:36 2002 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c Fri Feb 17 13:08:22 2006 @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.37 2002/10/21 04:18:36 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.38 2006/02/17 18:08:22 dawes Exp $ */ #include @@ -138,6 +138,9 @@ #endif int noverify = False; +static int myArgc; +static char **myArgv; + xf86cfgComputer computer; xf86cfgDevice cpu_device; Cursor no_cursor; @@ -289,6 +292,9 @@ Usage(); } + myArgc = argc; + myArgv = argv; + #ifdef HAS_NCURSES if (textmode) { TextMode(); @@ -2278,3 +2284,19 @@ UpdateScreenUI(); AdjustScreenUI(); } + +int +getArgc() +{ + return myArgc; +} + +const char * +getArgv(int i) +{ + if (i >= 0 && i < myArgc) + return myArgv[i]; + else + return NULL; +} + Index: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c:1.18 xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c:1.20 --- xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c:1.18 Thu Jun 12 10:12:38 2003 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c Thu Mar 16 11:50:36 2006 @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.18 2003/06/12 14:12:38 eich Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.20 2006/03/16 16:50:36 dawes Exp $ */ #ifdef USE_MODULES @@ -182,7 +182,7 @@ SYMFUNC(xf86memchr) SYMFUNC(xf86memcmp) SYMFUNC(xf86memcpy) -#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__AMD64__) +#if (defined(__powerpc__) && (defined(Lynx) || defined(linux))) || defined(__sparc__) || defined(__ia64__) || defined (__amd64__) || defined(__x86_64__) /* * Some PPC, SPARC, and IA64 compilers generate calls to memcpy to handle * structure copies. This causes a problem both here and in shared @@ -552,7 +552,7 @@ } void -xf86AddDriver(DriverPtr drv, void *module, int flags) +xf86AddDriver(DriverPtr drv, ModuleDescPtr module, int flags) { driver = drv; if (driver) @@ -567,13 +567,13 @@ } void -xf86AddInputDriver(InputDriverPtr inp, void *module, int flags) +xf86AddInputDriver(InputDriverPtr inp, ModuleDescPtr module, int flags) { module_type = InputModule; } void -xf86AddModuleInfo(ModuleInfoPtr inf, void *module) +xf86AddModuleInfo(ModuleInfoPtr inf, ModuleDescPtr module) { info = inf; } @@ -649,7 +649,7 @@ } /*ARGSUSED*/ -void * +ModuleDescPtr xf86LoadDrvSubModule(DriverPtr drv, const char *name) { pointer ret; Index: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c:1.9 xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c:1.10 --- xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c:1.9 Thu Jun 6 17:03:32 2002 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c Wed Sep 14 10:23:15 2005 @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.9 2002/06/06 21:03:32 paulo Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.10 2005/09/14 14:23:15 tsi Exp $ */ #include @@ -695,7 +695,7 @@ if (lefscr == NULL && rigscr == NULL && topscr == NULL && lefscr == NULL) { XF86ConfScreenPtr s; - if (adj->adj_where >= CONF_ADJ_RIGHTOF < adj->adj_where <= CONF_ADJ_BELOW) { + if ((adj->adj_where >= CONF_ADJ_RIGHTOF) && (adj->adj_where <= CONF_ADJ_BELOW)) { s = xf86findScreen(adj->adj_refscreen, XF86Config->conf_screen_lst); for (i = 0; i < computer.num_screens; i++) if (computer.screens[i]->screen == s) Index: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c:1.8 xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c:1.9 --- xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c:1.8 Mon Nov 3 00:11:58 2003 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c Fri Jul 29 10:26:18 2005 @@ -26,7 +26,7 @@ * * Author: Paulo César Pereira de Andrade * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.8 2003/11/03 05:11:58 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.9 2005/07/29 14:26:18 tsi Exp $ */ /* @@ -137,9 +137,9 @@ static int MajorVersion, MinorVersion, EventBase, ErrorBase; static XtIntervalId timeout; -/* The information bellow is extracted from +/* The information below is extracted from * xc/programs/Xserver/hw/xfree86/etc/vesamodes - * If that file is changed, please update the table bellow also. Or even + * If that file is changed, please update the table below also. Or even * better, write a script to generate the table. */ static xf86cfgVesaModeInfo vesamodes[] = { Index: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man diff -u xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man:1.10 xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man:1.11 --- xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man:1.10 Thu May 29 17:48:10 2003 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man Thu Aug 18 10:37:08 2005 @@ -26,7 +26,7 @@ .\" .\" Author: Paulo César Pereira de Andrade .\" -.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man,v 1.10 2003/05/29 21:48:10 herrb Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man,v 1.11 2005/08/18 14:37:08 tsi Exp $ .\" .TH xf86cfg 1 __vendorversion__ .SH NAME @@ -145,7 +145,7 @@ .SH AUTHORS .TP 8 -Paulo César Pereira de Andrade \fI\fP +Paulo C\('esar Pereira de Andrade \fI\fP The XFree86 Project .SH BUGS Index: xc/programs/Xserver/hw/xfree86/xf86config/Cards diff -u xc/programs/Xserver/hw/xfree86/xf86config/Cards:3.80 xc/programs/Xserver/hw/xfree86/xf86config/Cards:3.81 --- xc/programs/Xserver/hw/xfree86/xf86config/Cards:3.80 Mon Nov 18 00:24:19 2002 +++ xc/programs/Xserver/hw/xfree86/xf86config/Cards Mon Jan 9 10:00:27 2006 @@ -1,4 +1,5 @@ -# $XConsortium: Cards /main/27 1996/10/28 05:43:53 kaleb $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.81 2006/01/09 15:00:27 dawes Exp $ +# # This is the database of card definitions used by xf86config. # Each definition should have a NAME entry, CHIPSET (descriptive) and # SERVER (one of Mono, VGA16, SVGA, S3, 8514, Mach8, Mach32, Mach64, AGX, @@ -18,7 +19,6 @@ # The majority of entries are just a binding of a model name to a # chipset/server and untested. # -# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards,v 3.80 2002/11/18 05:24:19 paulo Exp $ # VGA Index: xc/programs/Xserver/hw/xfree86/xf86config/Cards98 diff -u xc/programs/Xserver/hw/xfree86/xf86config/Cards98:1.1 xc/programs/Xserver/hw/xfree86/xf86config/Cards98:1.2 --- xc/programs/Xserver/hw/xfree86/xf86config/Cards98:1.1 Sun Jul 11 06:50:41 1999 +++ xc/programs/Xserver/hw/xfree86/xf86config/Cards98 Mon Jan 9 10:00:27 2006 @@ -1,8 +1,5 @@ -# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards98,v 1.1 1999/07/11 10:50:41 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Cards98,v 1.2 2006/01/09 15:00:27 dawes Exp $ # -# -# -# $XConsortium: Cards /main/27 1996/10/28 05:43:53 kaleb $ # This is the database of card definitions used by xf86config. # Each definition should have a NAME entry, CHIPSET (descriptive) and # SERVER (one of EGC, GANBWAP, PEGC, NKVNEC, WABS, WABEP, WSNA, TGUI, Index: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:3.16 xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:3.17 --- xc/programs/Xserver/hw/xfree86/xf86config/Imakefile:3.16 Mon Mar 7 11:39:18 2005 +++ xc/programs/Xserver/hw/xfree86/xf86config/Imakefile Mon Jan 9 10:00:28 2006 @@ -1,10 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.16 2005/03/07 16:39:18 tsi Exp $ - - - - - -XCOMM $XConsortium: Imakefile /main/5 1996/02/21 18:12:46 kaleb $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/Imakefile,v 3.17 2006/01/09 15:00:28 dawes Exp $ SRCS = xf86config.c cards.c OBJS = xf86config.o cards.o Index: xc/programs/Xserver/hw/xfree86/xf86config/cards.c diff -u xc/programs/Xserver/hw/xfree86/xf86config/cards.c:3.17 xc/programs/Xserver/hw/xfree86/xf86config/cards.c:3.18 --- xc/programs/Xserver/hw/xfree86/xf86config/cards.c:3.17 Fri May 31 14:46:04 2002 +++ xc/programs/Xserver/hw/xfree86/xf86config/cards.c Mon Jan 9 10:00:28 2006 @@ -1,10 +1,4 @@ -/* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */ - - - - - -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.17 2002/05/31 18:46:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.18 2006/01/09 15:00:28 dawes Exp $ */ /* * Functions to manipulate card database. Index: xc/programs/Xserver/hw/xfree86/xf86config/cards.h diff -u xc/programs/Xserver/hw/xfree86/xf86config/cards.h:3.5 xc/programs/Xserver/hw/xfree86/xf86config/cards.h:3.6 --- xc/programs/Xserver/hw/xfree86/xf86config/cards.h:3.5 Mon Jul 5 08:12:06 1999 +++ xc/programs/Xserver/hw/xfree86/xf86config/cards.h Mon Jan 9 10:00:28 2006 @@ -1,10 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.5 1999/07/05 12:12:06 dawes Exp $ */ - - - - - -/* $XConsortium: cards.h /main/3 1996/02/21 18:12:53 kaleb $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.6 2006/01/09 15:00:28 dawes Exp $ */ #ifndef CARD_DATABASE_FILE #define CARD_DATABASE_FILE "Cards" Index: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c diff -u xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c:3.72 xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c:3.73 --- xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c:3.72 Mon Oct 25 17:23:58 2004 +++ xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c Mon Jan 9 10:00:28 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.72 2004/10/25 21:23:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.73 2006/01/09 15:00:28 dawes Exp $ */ /* * This is a configuration program that will create a base XF86Config @@ -93,7 +93,6 @@ * - Add font path "/fonts/TrueType/" and "/fonts/freefont/". * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) */ -/* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ #include #include Index: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man diff -u xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man:1.6 xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man:1.7 --- xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man:1.6 Sat Oct 12 12:06:44 2002 +++ xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man Mon Jan 9 10:00:28 2006 @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man,v 1.6 2002/10/12 16:06:44 herrb Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.man,v 1.7 2006/01/09 15:00:28 dawes Exp $ .TH xf86config 1 __vendorversion__ .SH NAME xf86config \- generate an XF86Config file @@ -19,4 +19,3 @@ XFree86(1), XF86Config(__filemansuffix__), reconfig(1) .SH AUTHOR Harm Hanemaayer. -.\" $TOG: xf86conf.man /main/9 1997/07/19 10:53:08 kaleb $ Index: xc/programs/Xserver/hw/xfree86/xf8_16bpp/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xf8_16bpp/Imakefile:1.5 xc/programs/Xserver/hw/xfree86/xf8_16bpp/Imakefile:1.6 --- xc/programs/Xserver/hw/xfree86/xf8_16bpp/Imakefile:1.5 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/hw/xfree86/xf8_16bpp/Imakefile Fri Oct 14 11:17:13 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/Imakefile,v 1.5 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/Imakefile,v 1.6 2005/10/14 15:17:13 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -59,10 +59,9 @@ OBJS = cfbscrinit.o cfbwindow.o $(XFMODOBJ) -INCLUDES = -I. -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ +INCLUDES = -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XF86OSSRC) -I$(XF86COMSRC) \ - -I$(FONTINCSRC) -I$(XINCLUDESRC) + -I$(XF86OSSRC) -I$(XF86COMSRC) ModuleObjectRule() Index: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c diff -u xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c:1.1 xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c:1.2 --- xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c:1.1 Sun Jan 31 07:22:16 1999 +++ xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c Thu Mar 16 11:50:36 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c,v 1.1 1999/01/31 12:22:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16module.c,v 1.2 2006/03/16 16:50:36 dawes Exp $ */ #ifdef XFree86LOADER @@ -23,7 +23,7 @@ XF86ModuleData xf8_16bppModuleData = { &VersRec, xf8_16bppSetup, NULL }; static pointer -xf8_16bppSetup(pointer module, pointer opts, int *errmaj, int *errmin) +xf8_16bppSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { if (!LoadSubModule(module, "cfb", NULL, NULL, NULL, NULL, errmaj, errmin)) Index: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c diff -u xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c:1.8 xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c:1.10 --- xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c:1.8 Mon Feb 17 11:08:30 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c Fri Oct 14 11:17:13 2005 @@ -4,10 +4,10 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.8 2003/02/17 16:08:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.10 2005/10/14 15:17:13 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "servermd.h" #include "scrnintstr.h" @@ -117,6 +117,18 @@ return TRUE; } +static void +DestroyColormapNoop(ColormapPtr pColormap) +{ + /* NOOP */ +} + +static void +StoreColorsNoop(ColormapPtr pColormap, int ndef, xColorItem *pdef) +{ + /* NOOP */ +} + static Bool cfb8_16SetupScreen( ScreenPtr pScreen, @@ -147,11 +159,11 @@ pScreen->UnrealizeFont = mfbUnrealizeFont; pScreen->CreateGC = cfb8_16CreateGC; pScreen->CreateColormap = miInitializeColormap; - pScreen->DestroyColormap = (void (*)())NoopDDA; + pScreen->DestroyColormap = DestroyColormapNoop; pScreen->InstallColormap = miInstallColormap; pScreen->UninstallColormap = miUninstallColormap; pScreen->ListInstalledColormaps = miListInstalledColormaps; - pScreen->StoreColors = (void (*)())NoopDDA; + pScreen->StoreColors = StoreColorsNoop; pScreen->ResolveColor = miResolveColor; pScreen->BitmapToRegion = mfbPixmapToRegion; Index: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c diff -u xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c:1.5 xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c:1.6 --- xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c:1.5 Mon Nov 10 13:22:42 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c Fri Oct 14 11:17:13 2005 @@ -4,9 +4,9 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.5 2003/11/10 18:22:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.6 2005/10/14 15:17:13 tsi Exp $ */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #define PSZ 8 Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/Imakefile:1.9 xc/programs/Xserver/hw/xfree86/xf8_32bpp/Imakefile:1.10 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/Imakefile:1.9 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/Imakefile Fri Oct 14 11:17:13 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/Imakefile,v 1.9 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/Imakefile,v 1.10 2005/10/14 15:17:13 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -59,15 +59,13 @@ cfbimage.c cfbpntwin.c cfbscrinit.c cfbwindow.c xf86overlay.c \ $(XFMODSRC) cfbgc8.c cfbgc32.c cfbgcunder.c - OBJS = cfbbstore.o cfbcpyarea.o cfbcpyplane.o cfbgcmisc.o \ cfbimage.o cfbpntwin.o cfbscrinit.o cfbwindow.o xf86overlay.o \ $(XFMODOBJ) cfbgc8.o cfbgc32.o cfbgcunder.o -INCLUDES = -I. -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ +INCLUDES = -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XF86OSSRC) -I$(XF86COMSRC) -I$(EXTINCSRC) \ - -I$(FONTINCSRC) -I$(XINCLUDESRC) -I$(SERVERSRC)/Xext + -I$(XF86OSSRC) -I$(XF86COMSRC) -I$(SERVERSRC)/Xext ModuleObjectRule() Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c:1.6 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c:1.6 Tue Jan 26 00:54:20 1999 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c Thu Mar 16 11:50:36 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.6 1999/01/26 05:54:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.7 2006/03/16 16:50:36 dawes Exp $ */ #ifdef XFree86LOADER @@ -24,7 +24,7 @@ XF86ModuleData xf8_32bppModuleData = { &VersRec, xf8_32bppSetup, NULL }; static pointer -xf8_32bppSetup(pointer module, pointer opts, int *errmaj, int *errmin) +xf8_32bppSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { if (!LoadSubModule(module, "cfb", NULL, NULL, NULL, NULL, errmaj, errmin)) Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c:1.3 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c:1.3 Tue Jul 15 21:38:50 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c Fri Oct 14 11:17:13 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.4 2005/10/14 15:17:13 tsi Exp $ */ #define PSZ 8 #include "cfb.h" #undef PSZ #include "cfb32.h" #include "cfb8_32.h" -#include "X.h" +#include #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c:1.6 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c:1.6 Tue Jul 15 21:38:50 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c Fri Oct 14 11:17:13 2005 @@ -1,7 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.7 2005/10/14 15:17:13 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c:1.1 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c:1.2 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c:1.1 Sat Jan 2 22:58:55 1999 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c Fri Oct 14 11:17:13 2005 @@ -1,8 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c,v 1.1 1999/01/03 03:58:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyplane.c,v 1.2 2005/10/14 15:17:13 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c:1.4 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c:1.5 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c:1.4 Fri Dec 14 14:59:52 2001 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c Fri Oct 14 11:17:13 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.4 2001/12/14 19:59:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.5 2005/10/14 15:17:13 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -61,11 +61,11 @@ /* This gets built twice. Once for 8bpp and another for 32bpp */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "cfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c:1.3 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c:1.3 Mon Feb 28 19:17:16 2000 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c Fri Oct 14 11:17:13 2005 @@ -1,14 +1,14 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c,v 1.3 2000/02/29 00:17:16 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcmisc.c,v 1.4 2005/10/14 15:17:13 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #define PSZ 8 #include "cfb.h" #undef PSZ #include "cfb32.h" #include "cfb8_32.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c:1.6 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c:1.6 Tue Jul 15 21:38:50 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c Fri Oct 14 11:17:13 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.6 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.7 2005/10/14 15:17:13 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,11 +47,11 @@ ******************************************************************/ #define PSZ 32 -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "cfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c:1.3 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c:1.3 Tue Jul 15 21:38:50 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c Fri Oct 14 11:17:13 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.3 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.4 2005/10/14 15:17:13 tsi Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c:1.5 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c:1.7 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c:1.5 Mon Oct 1 09:44:15 2001 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c Sun Feb 19 10:51:30 2006 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.7 2006/02/19 15:51:30 tsi Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" @@ -14,11 +14,6 @@ #include "cfb8_32.h" #include "mi.h" -#ifdef PANORAMIX -#include "panoramiX.h" -#include "panoramiXsrv.h" -#endif - void cfb8_32PaintWindow( WindowPtr pWin, @@ -43,15 +38,7 @@ case BackgroundPixmap: xorg = pWin->drawable.x; yorg = pWin->drawable.y; -#ifdef PANORAMIX - if(!noPanoramiXExtension) { - int index = pWin->drawable.pScreen->myNum; - if(WindowTable[index] == pWin) { - xorg -= panoramiXdataPtr[index].x; - yorg -= panoramiXdataPtr[index].y; - } - } -#endif + cfb32FillBoxTileOddGeneral ((DrawablePtr)pWin, (int)REGION_NUM_RECTS(pRegion), REGION_RECTS(pRegion), pWin->background.pixmap, xorg, yorg, GXcopy, @@ -91,15 +78,6 @@ xorg = pBgWin->drawable.x; yorg = pBgWin->drawable.y; -#ifdef PANORAMIX - if(!noPanoramiXExtension) { - int index = pWin->drawable.pScreen->myNum; - if(WindowTable[index] == pBgWin) { - xorg -= panoramiXdataPtr[index].x; - yorg -= panoramiXdataPtr[index].y; - } - } -#endif cfb32FillBoxTileOddGeneral ((DrawablePtr)pWin, (int)REGION_NUM_RECTS(pRegion), REGION_RECTS(pRegion), pWin->border.pixmap, xorg, yorg, GXcopy, Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c:1.12 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c:1.13 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c:1.12 Tue Jul 15 21:38:50 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c Fri Oct 14 11:17:13 2005 @@ -1,8 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.12 2003/07/16 01:38:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.13 2005/10/14 15:17:13 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "servermd.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c:1.9 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c:1.10 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c:1.9 Mon Nov 10 13:22:43 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c Fri Oct 14 11:17:13 2005 @@ -1,7 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.9 2003/11/10 18:22:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.10 2005/10/14 15:17:13 tsi Exp $ */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #define PSZ 8 Index: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c:1.9 xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c:1.10 --- xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c:1.9 Sun Feb 10 19:07:25 2002 +++ xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c Fri Oct 14 11:17:13 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.9 2002/02/11 00:07:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.10 2005/10/14 15:17:13 tsi Exp $ */ /* Copyright (C) 1998. The XFree86 Project Inc. @@ -11,7 +11,7 @@ #include "xf86_ansic.h" #include "xf86_OSproc.h" -#include "X.h" +#include #include "scrnintstr.h" #include "regionstr.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile diff -u xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile:1.3 xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile:1.4 --- xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile:1.3 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile,v 1.3 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/Imakefile,v 1.4 2005/10/14 15:17:14 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -59,10 +59,9 @@ OBJS = cfbscrinit.o cfbwindow.o cfbwid.o $(XFMODOBJ) -INCLUDES = -I. -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ +INCLUDES = -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/mfb \ -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XF86OSSRC) -I$(XF86COMSRC) \ - -I$(FONTINCSRC) -I$(XINCLUDESRC) + -I$(XF86OSSRC) -I$(XF86COMSRC) ModuleObjectRule() Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c:1.1 xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c:1.2 --- xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c:1.1 Sat May 20 21:02:43 2000 +++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c Sun Mar 19 12:34:44 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfb8_32widmodule.c,v 1.2 2006/03/19 17:34:44 tsi Exp $ */ #ifdef XFree86LOADER @@ -23,7 +23,7 @@ XF86ModuleData xf8_32widModuleData = { &VersRec, xf8_32widSetup, NULL }; static pointer -xf8_32widSetup(pointer module, pointer opts, int *errmaj, int *errmin) +xf8_32widSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { if (!LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL, errmaj, errmin)) Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c:1.1 xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c:1.3 --- xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c:1.1 Sat May 20 21:02:43 2000 +++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c Fri Feb 17 22:31:39 2006 @@ -7,10 +7,10 @@ Mark Vojkovich's work. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c,v 1.1 2000/05/21 01:02:43 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbscrinit.c,v 1.3 2006/02/18 03:31:39 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "servermd.h" #include "scrnintstr.h" @@ -38,7 +38,6 @@ int cfb8_32WidScreenPrivateIndex; static unsigned long cfb8_32WidGeneration = 0; -extern WindowPtr *WindowTable; static PixmapPtr cfb8_32WidGetWindowPixmap(WindowPtr pWin); @@ -154,11 +153,11 @@ pScreen->UnrealizeFont = mfbUnrealizeFont; pScreen->CreateGC = cfb8_32WidCreateGC; pScreen->CreateColormap = miInitializeColormap; - pScreen->DestroyColormap = (void (*)())NoopDDA; + pScreen->DestroyColormap = (DestroyColormapProcPtr)NoopDDA; pScreen->InstallColormap = miInstallColormap; pScreen->UninstallColormap = miUninstallColormap; pScreen->ListInstalledColormaps = miListInstalledColormaps; - pScreen->StoreColors = (void (*)())NoopDDA; + pScreen->StoreColors = (StoreColorsProcPtr)NoopDDA; pScreen->ResolveColor = miResolveColor; pScreen->BitmapToRegion = mfbPixmapToRegion; Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c:1.1 xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c:1.2 --- xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c:1.1 Sat May 20 21:02:44 2000 +++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c Fri Oct 14 11:17:14 2005 @@ -1,7 +1,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c,v 1.1 2000/05/21 01:02:44 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwid.c,v 1.2 2005/10/14 15:17:14 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "servermd.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c diff -u xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c:1.3 xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c:1.4 --- xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c:1.3 Mon Nov 10 13:22:43 2003 +++ xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c Fri Oct 14 11:17:14 2005 @@ -7,9 +7,9 @@ Mark Vojkovich's work. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.3 2003/11/10 18:22:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.4 2005/10/14 15:17:14 tsi Exp $ */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #define PSZ 8 Index: xc/programs/Xserver/hw/xnest/Args.c diff -u xc/programs/Xserver/hw/xnest/Args.c:1.2 xc/programs/Xserver/hw/xnest/Args.c:1.4 --- xc/programs/Xserver/hw/xnest/Args.c:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Args.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,3 @@ -/* $Xorg: Args.c,v 1.3 2000/08/17 19:53:26 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +11,10 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Args.c,v 1.4 2005/10/14 15:17:14 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "screenint.h" #include "input.h" #include "misc.h" @@ -46,6 +45,7 @@ int xnestNumScreens = 0; Bool xnestDoDirectColormaps = False; Window xnestParentWindow = 0; +Bool xnestInputEnabled = True; int ddxProcessArgument (int argc, char *argv[], int i) @@ -122,6 +122,10 @@ xnestSoftwareScreenSaver = True; return 1; } + if (!strcmp(argv[i], "-noinput")) { + xnestInputEnabled = False; + return 1; + } if (!strcmp(argv[i], "-geometry")) { if (++i < argc) { xnestUserGeometry = XParseGeometry(argv[i], @@ -185,4 +189,5 @@ ErrorF("-name string window name\n"); ErrorF("-scrns int number of screens to generate\n"); ErrorF("-install instal colormaps directly\n"); + ErrorF("-noinput do not capture mouse or keyboard events\n"); } Index: xc/programs/Xserver/hw/xnest/Args.h diff -u xc/programs/Xserver/hw/xnest/Args.h:1.2 xc/programs/Xserver/hw/xnest/Args.h:1.3 --- xc/programs/Xserver/hw/xnest/Args.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Args.h Tue Jul 19 20:32:38 2005 @@ -1,4 +1,3 @@ -/* $Xorg: Args.h,v 1.3 2000/08/17 19:53:27 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Args.h,v 1.3 2005/07/20 00:32:38 dawes Exp $ */ #ifndef XNESTARGC_H #define XNESTARGS_H @@ -36,5 +35,6 @@ extern int xnestNumScreens; extern Bool xnestDoDirectColormaps; extern Window xnestParentWindow; +extern Bool xnestInputEnabled; #endif /* XNESTARGS_H */ Index: xc/programs/Xserver/hw/xnest/Color.c diff -u xc/programs/Xserver/hw/xnest/Color.c:1.4 xc/programs/Xserver/hw/xnest/Color.c:1.5 --- xc/programs/Xserver/hw/xnest/Color.c:1.4 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Color.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Color.c,v 1.3 2000/08/17 19:53:27 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Color.c,v 1.5 2005/10/14 15:17:14 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +12,9 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Color.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "scrnintstr.h" #include "window.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xnest/Color.h diff -u xc/programs/Xserver/hw/xnest/Color.h:1.2 xc/programs/Xserver/hw/xnest/Color.h:1.3 --- xc/programs/Xserver/hw/xnest/Color.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Color.h Mon Jan 9 10:00:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Color.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Color.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Color.h,v 1.3 2006/01/09 15:00:29 dawes Exp $ */ #ifndef XNESTCOLOR_H #define XNESTCOLOR_H Index: xc/programs/Xserver/hw/xnest/Cursor.c diff -u xc/programs/Xserver/hw/xnest/Cursor.c:1.4 xc/programs/Xserver/hw/xnest/Cursor.c:1.5 --- xc/programs/Xserver/hw/xnest/Cursor.c:1.4 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Cursor.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Cursor.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.5 2005/10/14 15:17:14 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +12,9 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "screenint.h" #include "input.h" #include "misc.h" Index: xc/programs/Xserver/hw/xnest/Display.c diff -u xc/programs/Xserver/hw/xnest/Display.c:3.5 xc/programs/Xserver/hw/xnest/Display.c:3.6 --- xc/programs/Xserver/hw/xnest/Display.c:3.5 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Display.c Mon Jan 9 10:00:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Display.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.5 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.6 2006/01/09 15:00:29 dawes Exp $ */ #include Index: xc/programs/Xserver/hw/xnest/Display.h diff -u xc/programs/Xserver/hw/xnest/Display.h:1.7 xc/programs/Xserver/hw/xnest/Display.h:1.8 --- xc/programs/Xserver/hw/xnest/Display.h:1.7 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Display.h Mon Jan 9 10:00:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Display.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.7 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.8 2006/01/09 15:00:29 dawes Exp $ */ #ifndef XNESTCOMMON_H #define XNESTCOMMON_H Index: xc/programs/Xserver/hw/xnest/Drawable.h diff -u xc/programs/Xserver/hw/xnest/Drawable.h:1.3 xc/programs/Xserver/hw/xnest/Drawable.h:1.4 --- xc/programs/Xserver/hw/xnest/Drawable.h:1.3 Sat Nov 23 14:27:50 2002 +++ xc/programs/Xserver/hw/xnest/Drawable.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Drawable.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Drawable.h,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Drawable.h,v 1.4 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTDRAWABLE_H #define XNESTDRAWABLE_H Index: xc/programs/Xserver/hw/xnest/Events.c diff -u xc/programs/Xserver/hw/xnest/Events.c:1.3 xc/programs/Xserver/hw/xnest/Events.c:1.4 --- xc/programs/Xserver/hw/xnest/Events.c:1.3 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Events.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Events.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.4 2005/10/14 15:17:14 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,11 +12,10 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" +#include #define NEED_EVENTS -#include "Xproto.h" +#include #include "screenint.h" #include "input.h" #include "misc.h" Index: xc/programs/Xserver/hw/xnest/Events.h diff -u xc/programs/Xserver/hw/xnest/Events.h:1.2 xc/programs/Xserver/hw/xnest/Events.h:1.3 --- xc/programs/Xserver/hw/xnest/Events.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Events.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Events.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Events.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Events.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTEVENTS_H #define XNESTEVENTS_H Index: xc/programs/Xserver/hw/xnest/Font.c diff -u xc/programs/Xserver/hw/xnest/Font.c:3.7 xc/programs/Xserver/hw/xnest/Font.c:3.8 --- xc/programs/Xserver/hw/xnest/Font.c:3.7 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Font.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Font.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.8 2005/10/14 15:17:14 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,15 +12,14 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xatom.h" -#include "Xproto.h" +#include +#include +#include #include "misc.h" #include "regionstr.h" -#include "font.h" -#include "fontstruct.h" +#include +#include #include "scrnintstr.h" #include "Xnest.h" Index: xc/programs/Xserver/hw/xnest/GC.c diff -u xc/programs/Xserver/hw/xnest/GC.c:3.7 xc/programs/Xserver/hw/xnest/GC.c:3.8 --- xc/programs/Xserver/hw/xnest/GC.c:3.7 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/GC.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: GC.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.8 2005/10/14 15:17:14 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,15 +12,14 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.7 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" -#include "fontstruct.h" +#include #include "mistruct.h" #include "region.h" Index: xc/programs/Xserver/hw/xnest/GCOps.c diff -u xc/programs/Xserver/hw/xnest/GCOps.c:3.6 xc/programs/Xserver/hw/xnest/GCOps.c:3.7 --- xc/programs/Xserver/hw/xnest/GCOps.c:3.6 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/GCOps.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: GCOps.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.7 2005/10/14 15:17:14 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,12 +12,11 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "regionstr.h" -#include "fontstruct.h" +#include #include "gcstruct.h" #include "scrnintstr.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xnest/GCOps.h diff -u xc/programs/Xserver/hw/xnest/GCOps.h:1.2 xc/programs/Xserver/hw/xnest/GCOps.h:1.3 --- xc/programs/Xserver/hw/xnest/GCOps.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/GCOps.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GCOps.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTGCOPS_H #define XNESTGCOPS_H Index: xc/programs/Xserver/hw/xnest/GetTime.c diff -u xc/programs/Xserver/hw/xnest/GetTime.c:1.2 xc/programs/Xserver/hw/xnest/GetTime.c:1.3 --- xc/programs/Xserver/hw/xnest/GetTime.c:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/GetTime.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: GetTime.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/GetTime.c,v 1.3 2005/10/14 15:17:14 tsi Exp $ */ /* Copyright (c) 1993 X Consortium @@ -28,10 +28,9 @@ from the X Consortium. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GetTime.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ -#include "Xos.h" +#include #include "os.h" #include Index: xc/programs/Xserver/hw/xnest/Handlers.c diff -u xc/programs/Xserver/hw/xnest/Handlers.c:1.3 xc/programs/Xserver/hw/xnest/Handlers.c:1.4 --- xc/programs/Xserver/hw/xnest/Handlers.c:1.3 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Handlers.c Fri Oct 14 11:17:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Handlers.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.4 2005/10/14 15:17:14 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +12,9 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "screenint.h" #include "input.h" #include "misc.h" Index: xc/programs/Xserver/hw/xnest/Handlers.h diff -u xc/programs/Xserver/hw/xnest/Handlers.h:1.2 xc/programs/Xserver/hw/xnest/Handlers.h:1.3 --- xc/programs/Xserver/hw/xnest/Handlers.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Handlers.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Handlers.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTHANDLERS_H #define XNESTHANDLERS_H Index: xc/programs/Xserver/hw/xnest/Imakefile diff -u xc/programs/Xserver/hw/xnest/Imakefile:3.29 xc/programs/Xserver/hw/xnest/Imakefile:3.31 --- xc/programs/Xserver/hw/xnest/Imakefile:3.29 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Imakefile Sun Feb 19 10:51:30 2006 @@ -1,11 +1,35 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.31 2006/02/19 15:51:30 tsi Exp $ +#include +#define IHaveSubdirs +#if BuildXKB +XKBDIRS = xkb +#endif -XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Imakefile,v 3.29 2003/11/16 05:05:20 dawes Exp $ +#if BuildRender +RENDERDIRS = render +#endif -#include +#if BuildRandR +RANDRDIRS = randr +#endif + +#if BuildRECORD +RECORDDIRS = record +#endif + +#if BuildDBE +DBEDIRS = dbe +#endif + +#if BuildXTrap +XTRAPDIRS = XTrap +#endif + +SUBDIRS = dix os Xext $(XKBDIRS) $(RENDERDIRS) $(RANDRDIRS) $(RECORDDIRS) \ + $(DBEDIRS) $(XTRAPDIRS) #ifdef OS2Architecture SRCS1 = os2Stub.c @@ -30,7 +54,6 @@ TestExt.c \ Visual.c \ Window.c \ - stubs.c \ miinitext.c $(SRCS1) OBJS = Args.o \ @@ -51,26 +74,24 @@ TestExt.o \ Visual.o \ Window.o \ - stubs.o \ miinitext.o $(OBJS1) +#ifdef XnestExcludedExtensions +XNEST_DEFINES = XnestExcludedExtensions +#endif -INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ - -I../../mi -I../../include -I../../os \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) -I$(LIBSRC) -I$(SERVERSRC)/Xext - -DEFINES = $(OS_DEFINES) $(EXT_DEFINES) -DNO_HW_ONLY_EXTS \ - -UXFree86LOADER -UMITSHM +INCLUDES = -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/os -I$(LIBSRC) -I$(SERVERSRC)/Xext XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb/\" +DEFINES = $(OS_DEFINES) $(XKB_DEFINES) $(EXT_DEFINES) $(XNEST_DEFINES) + all:: $(OBJS) -LinkSourceFile(stubs.c,$(SERVERSRC)/Xi) -SpecialCObjectRule(Init,$(ICONFIGFILES),$(_NOOP_)) +SpecialCObjectRule(Init,$(ICONFIGFILES),NullParameter) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) -SpecialCObjectRule(miinitext,$(ICONFIGFILES),-UDPMSExtension) -SpecialCObjectRule(Keyboard,$(ICONFIGFILES),$(XKB_DEFINES)) +SpecialCObjectRule(miinitext,$(ICONFIGFILES),NullParameter) NormalLibraryObjectRule() NormalLibraryTarget(xnest,$(OBJS)) @@ -78,3 +99,6 @@ InstallManPage(Xnest,$(MANDIR)) DependTarget() + +MakeSubdirs($(SUBDIRS)) +DependSubdirs($(SUBDIRS)) Index: xc/programs/Xserver/hw/xnest/Init.c diff -u xc/programs/Xserver/hw/xnest/Init.c:3.26 xc/programs/Xserver/hw/xnest/Init.c:3.28 --- xc/programs/Xserver/hw/xnest/Init.c:3.26 Wed Jun 2 18:43:05 2004 +++ xc/programs/Xserver/hw/xnest/Init.c Sun Feb 19 10:51:30 2006 @@ -11,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.26 2004/06/02 22:43:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.28 2006/02/19 15:51:30 tsi Exp $ */ /* * Copyright (c) 1996-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -59,8 +59,8 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "screenint.h" #include "input.h" #include "misc.h" @@ -68,7 +68,7 @@ #include "windowstr.h" #include "servermd.h" #include "mi.h" -#include "fontstruct.h" +#include #include "Xnest.h" @@ -82,9 +82,6 @@ #include "Drawable.h" #include "XNGC.h" #include "XNFont.h" -#ifdef DPMSExtension -#include "dpmsproc.h" -#endif Bool xnestDoFullGeneration = True; @@ -204,29 +201,3 @@ #ifdef AIXV3 int SelectWaitTime = 10000; /* usec */ #endif - -#ifdef DPMSExtension -/************************************************************** - * DPMSSet(), DPMSGet(), DPMSSupported() - * - * stubs - * - ***************************************************************/ - -void -DPMSSet(int level) -{ -} - -int -DPMSGet(int *level) -{ - return -1; -} - -Bool -DPMSSupported() -{ - return FALSE; -} -#endif Index: xc/programs/Xserver/hw/xnest/Init.h diff -u xc/programs/Xserver/hw/xnest/Init.h:1.1.1.2 xc/programs/Xserver/hw/xnest/Init.h:1.2 --- xc/programs/Xserver/hw/xnest/Init.h:1.1.1.2 Tue Jan 16 17:43:48 2001 +++ xc/programs/Xserver/hw/xnest/Init.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Init.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Init.h,v 1.2 2006/01/09 15:00:30 dawes Exp $ */ /* Copyright 1993 by Davor Matic Index: xc/programs/Xserver/hw/xnest/Keyboard.c diff -u xc/programs/Xserver/hw/xnest/Keyboard.c:1.10 xc/programs/Xserver/hw/xnest/Keyboard.c:1.12 --- xc/programs/Xserver/hw/xnest/Keyboard.c:1.10 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Keyboard.c Fri Oct 14 11:17:15 2005 @@ -1,4 +1,3 @@ -/* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,12 +11,12 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.10 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.12 2005/10/14 15:17:15 tsi Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "keysym.h" +#include +#include +#include #include "screenint.h" #include "inputstr.h" #include "misc.h" @@ -262,13 +261,17 @@ break; case DEVICE_ON: xnestEventMask |= XNEST_KEYBOARD_EVENT_MASK; - for (i = 0; i < xnestNumScreens; i++) - XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask); + if (xnestInputEnabled) { + for (i = 0; i < xnestNumScreens; i++) + XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask); + } break; case DEVICE_OFF: xnestEventMask &= ~XNEST_KEYBOARD_EVENT_MASK; - for (i = 0; i < xnestNumScreens; i++) - XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask); + if (xnestInputEnabled) { + for (i = 0; i < xnestNumScreens; i++) + XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask); + } break; case DEVICE_CLOSE: break; Index: xc/programs/Xserver/hw/xnest/Keyboard.h diff -u xc/programs/Xserver/hw/xnest/Keyboard.h:1.2 xc/programs/Xserver/hw/xnest/Keyboard.h:1.3 --- xc/programs/Xserver/hw/xnest/Keyboard.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Keyboard.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Keyboard.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTKEYBOARD_H #define XNESTKEYBOARD_H Index: xc/programs/Xserver/hw/xnest/Pixmap.c diff -u xc/programs/Xserver/hw/xnest/Pixmap.c:3.8 xc/programs/Xserver/hw/xnest/Pixmap.c:3.9 --- xc/programs/Xserver/hw/xnest/Pixmap.c:3.8 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Pixmap.c Fri Oct 14 11:17:15 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Pixmap.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.9 2005/10/14 15:17:15 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +12,9 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "regionstr.h" #include "pixmapstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/hw/xnest/Pointer.c diff -u xc/programs/Xserver/hw/xnest/Pointer.c:1.2 xc/programs/Xserver/hw/xnest/Pointer.c:1.4 --- xc/programs/Xserver/hw/xnest/Pointer.c:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Pointer.c Fri Oct 14 11:17:15 2005 @@ -1,4 +1,3 @@ -/* $Xorg: Pointer.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +11,10 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.c,v 1.4 2005/10/14 15:17:15 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "screenint.h" #include "inputstr.h" #include "input.h" @@ -58,13 +57,17 @@ break; case DEVICE_ON: xnestEventMask |= XNEST_POINTER_EVENT_MASK; - for (i = 0; i < xnestNumScreens; i++) - XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask); + if (xnestInputEnabled) { + for (i = 0; i < xnestNumScreens; i++) + XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask); + } break; case DEVICE_OFF: xnestEventMask &= ~XNEST_POINTER_EVENT_MASK; - for (i = 0; i < xnestNumScreens; i++) - XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask); + if (xnestInputEnabled) { + for (i = 0; i < xnestNumScreens; i++) + XSelectInput(xnestDisplay, xnestDefaultWindows[i], xnestEventMask); + } break; case DEVICE_CLOSE: break; Index: xc/programs/Xserver/hw/xnest/Pointer.h diff -u xc/programs/Xserver/hw/xnest/Pointer.h:1.2 xc/programs/Xserver/hw/xnest/Pointer.h:1.3 --- xc/programs/Xserver/hw/xnest/Pointer.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Pointer.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Pointer.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Pointer.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTPOINTER_H #define XNESTPOINTER_H Index: xc/programs/Xserver/hw/xnest/Screen.c diff -u xc/programs/Xserver/hw/xnest/Screen.c:3.13 xc/programs/Xserver/hw/xnest/Screen.c:3.16 --- xc/programs/Xserver/hw/xnest/Screen.c:3.13 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Screen.c Thu Feb 9 12:38:08 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Screen.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +11,10 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.13 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.16 2006/02/09 17:38:08 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "scrnintstr.h" #include "dix.h" #include "mi.h" @@ -230,7 +229,7 @@ GlxWrapInitVisuals(&proc); /* GlxInitVisuals ignores the last three arguments. */ - proc(&visuals, &depths, &numVisuals, &numDepths, + (*proc)(&visuals, &depths, &numVisuals, &numDepths, &rootDepth, &defaultVisual, 0, 0, 0); } #endif @@ -372,7 +371,8 @@ if (xnestParentWindow != 0) { xnestDefaultWindows[pScreen->myNum] = xnestParentWindow; - XSelectInput (xnestDisplay, xnestDefaultWindows[pScreen->myNum], + if (xnestInputEnabled) + XSelectInput (xnestDisplay, xnestDefaultWindows[pScreen->myNum], xnestEventMask); } else xnestDefaultWindows[pScreen->myNum] = Index: xc/programs/Xserver/hw/xnest/Screen.h diff -u xc/programs/Xserver/hw/xnest/Screen.h:1.2 xc/programs/Xserver/hw/xnest/Screen.h:1.3 --- xc/programs/Xserver/hw/xnest/Screen.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Screen.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Screen.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTSCREEN_H #define XNESTSCREEN_H Index: xc/programs/Xserver/hw/xnest/TestExt.c diff -u xc/programs/Xserver/hw/xnest/TestExt.c:3.6 xc/programs/Xserver/hw/xnest/TestExt.c:3.7 --- xc/programs/Xserver/hw/xnest/TestExt.c:3.6 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/TestExt.c Fri Oct 14 11:17:15 2005 @@ -1,4 +1,4 @@ -/* $Xorg: TestExt.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.7 2005/10/14 15:17:15 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +12,6 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/TestExt.c,v 3.6 2003/11/16 05:05:20 dawes Exp $ */ #include #include @@ -25,7 +24,7 @@ #include "servermd.h" #include "mipointer.h" #define XTestSERVER_SIDE -#include "xtestext1.h" +#include #include "xtest1dd.h" extern CARD32 lastEventTime; Index: xc/programs/Xserver/hw/xnest/Visual.c diff -u xc/programs/Xserver/hw/xnest/Visual.c:1.2 xc/programs/Xserver/hw/xnest/Visual.c:1.3 --- xc/programs/Xserver/hw/xnest/Visual.c:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Visual.c Fri Oct 14 11:17:15 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Visual.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.c,v 1.3 2005/10/14 15:17:15 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +12,9 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.c,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "scrnintstr.h" #include "dix.h" #include "mi.h" Index: xc/programs/Xserver/hw/xnest/Visual.h diff -u xc/programs/Xserver/hw/xnest/Visual.h:1.2 xc/programs/Xserver/hw/xnest/Visual.h:1.3 --- xc/programs/Xserver/hw/xnest/Visual.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Visual.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Visual.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Visual.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTVISUAL_H #define XNESTVISUAL_H Index: xc/programs/Xserver/hw/xnest/Window.c diff -u xc/programs/Xserver/hw/xnest/Window.c:3.8 xc/programs/Xserver/hw/xnest/Window.c:3.9 --- xc/programs/Xserver/hw/xnest/Window.c:3.8 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/Window.c Fri Oct 14 11:17:15 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Window.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.9 2005/10/14 15:17:15 tsi Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,10 +12,9 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.8 2003/11/16 05:05:20 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "gcstruct.h" #include "window.h" #include "windowstr.h" Index: xc/programs/Xserver/hw/xnest/XNCursor.h diff -u xc/programs/Xserver/hw/xnest/XNCursor.h:1.3 xc/programs/Xserver/hw/xnest/XNCursor.h:1.4 --- xc/programs/Xserver/hw/xnest/XNCursor.h:1.3 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/XNCursor.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Cursor.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.3 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.4 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTCURSOR_H #define XNESTCURSOR_H Index: xc/programs/Xserver/hw/xnest/XNFont.h diff -u xc/programs/Xserver/hw/xnest/XNFont.h:1.2 xc/programs/Xserver/hw/xnest/XNFont.h:1.3 --- xc/programs/Xserver/hw/xnest/XNFont.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/XNFont.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XNFont.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNFont.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNFont.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTFONT_H Index: xc/programs/Xserver/hw/xnest/XNGC.h diff -u xc/programs/Xserver/hw/xnest/XNGC.h:1.2 xc/programs/Xserver/hw/xnest/XNGC.h:1.3 --- xc/programs/Xserver/hw/xnest/XNGC.h:1.2 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/XNGC.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XNGC.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNGC.h,v 1.2 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNGC.h,v 1.3 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTGC_H #define XNESTGC_H Index: xc/programs/Xserver/hw/xnest/XNPixmap.h diff -u xc/programs/Xserver/hw/xnest/XNPixmap.h:1.4 xc/programs/Xserver/hw/xnest/XNPixmap.h:1.5 --- xc/programs/Xserver/hw/xnest/XNPixmap.h:1.4 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/XNPixmap.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Pixmap.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.5 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTPIXMAP_H #define XNESTPIXMAP_H Index: xc/programs/Xserver/hw/xnest/XNWindow.h diff -u xc/programs/Xserver/hw/xnest/XNWindow.h:1.4 xc/programs/Xserver/hw/xnest/XNWindow.h:1.5 --- xc/programs/Xserver/hw/xnest/XNWindow.h:1.4 Sun Nov 16 00:05:20 2003 +++ xc/programs/Xserver/hw/xnest/XNWindow.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XNWindow.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,7 @@ is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.4 2003/11/16 05:05:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.5 2006/01/09 15:00:30 dawes Exp $ */ #ifndef XNESTWINDOW_H #define XNESTWINDOW_H Index: xc/programs/Xserver/hw/xnest/Xnest.h diff -u xc/programs/Xserver/hw/xnest/Xnest.h:1.3 xc/programs/Xserver/hw/xnest/Xnest.h:1.4 --- xc/programs/Xserver/hw/xnest/Xnest.h:1.3 Tue Aug 28 12:48:08 2001 +++ xc/programs/Xserver/hw/xnest/Xnest.h Mon Jan 9 10:00:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xnest.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright (c) 1995 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Xnest.h,v 1.3 2001/08/28 16:48:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/Xnest.h,v 1.4 2006/01/09 15:00:30 dawes Exp $ */ /* ** Machines with a 64 bit library interface and a 32 bit server require Index: xc/programs/Xserver/hw/xnest/Xnest.man diff -u xc/programs/Xserver/hw/xnest/Xnest.man:1.8 xc/programs/Xserver/hw/xnest/Xnest.man:1.9 --- xc/programs/Xserver/hw/xnest/Xnest.man:1.8 Thu Feb 10 22:03:11 2005 +++ xc/programs/Xserver/hw/xnest/Xnest.man Tue Jul 19 20:32:38 2005 @@ -1,4 +1,3 @@ -.\" $Xorg: Xnest.man,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.8 2005/02/11 03:03:11 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.9 2005/07/20 00:32:38 dawes Exp $ .\" .TH XNEST 1 __vendorversion__ .SH NAME @@ -156,6 +155,11 @@ This option tells \fIXnest\fP to use the \fIwindow_id\fP as the root window instead of creating a window. This option is used by the xrx xnestplugin. +.TP 4 +.B \-noinput +This option disables input for +.IR Xnest , +running it in a view-only mode. .SH USAGE Starting up \fIXnest\fP is as simple as starting up \fIxclock\fP from a terminal emulator. If a user wishes to run \fIXnest\fP on the same Index: xc/programs/Xserver/hw/xnest/os2Stub.c diff -u xc/programs/Xserver/hw/xnest/os2Stub.c:3.2 xc/programs/Xserver/hw/xnest/os2Stub.c:3.3 --- xc/programs/Xserver/hw/xnest/os2Stub.c:3.2 Wed Nov 5 22:25:46 2003 +++ xc/programs/Xserver/hw/xnest/os2Stub.c Fri Oct 14 11:17:15 2005 @@ -26,14 +26,14 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.2 2003/11/06 03:25:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.3 2005/10/14 15:17:15 tsi Exp $ */ /* This below implements select() for calls in xnest. It has been */ /* somewhat optimized for improved performance, but assumes a few */ /* things so it cannot be used as a general select. */ #define I_NEED_OS2_H -#include "Xpoll.h" +#include #include #include #include Index: xc/programs/Xserver/hw/xnest/XTrap/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/XTrap/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/XTrap/Imakefile Sun Feb 19 10:51:30 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/XTrap/Imakefile,v 1.1 2006/02/19 15:51:30 tsi Exp $ +/* + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../XTrap + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../XTrap/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xnest/Xext/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/Xext/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/Xext/Imakefile Sun Feb 19 10:51:30 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/Xext/Imakefile,v 1.1 2006/02/19 15:51:30 tsi Exp $ +/* + * Copyright (c) 2004-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../Xext + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../Xext/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xnest/dbe/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/dbe/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/dbe/Imakefile Sun Feb 19 10:51:30 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/dbe/Imakefile,v 1.1 2006/02/19 15:51:30 tsi Exp $ +/* + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../dbe + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../dbe/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xnest/dix/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/dix/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/dix/Imakefile Sun Feb 19 10:51:30 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/dix/Imakefile,v 1.1 2006/02/19 15:51:30 tsi Exp $ +/* + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../dix + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../dix/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xnest/os/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/os/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/os/Imakefile Sun Feb 19 10:51:30 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/os/Imakefile,v 1.1 2006/02/19 15:51:30 tsi Exp $ +/* + * Copyright (c) 2004-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../os + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../os/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xnest/randr/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/randr/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/randr/Imakefile Sun Feb 19 10:51:30 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/randr/Imakefile,v 1.1 2006/02/19 15:51:30 tsi Exp $ +/* + * Copyright (c) 2004-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../randr + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../randr/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xnest/record/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/record/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/record/Imakefile Sun Feb 19 10:51:30 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/record/Imakefile,v 1.1 2006/02/19 15:51:30 tsi Exp $ +/* + * Copyright (c) 2004-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../record + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../record/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xnest/render/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/render/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/render/Imakefile Sun Feb 19 10:51:31 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/render/Imakefile,v 1.1 2006/02/19 15:51:31 tsi Exp $ +/* + * Copyright (c) 2004-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../render + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../render/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xnest/xkb/Imakefile diff -u /dev/null xc/programs/Xserver/hw/xnest/xkb/Imakefile:1.1 --- /dev/null Tue May 9 21:58:03 2006 +++ xc/programs/Xserver/hw/xnest/xkb/Imakefile Sun Feb 19 10:51:31 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/hw/xnest/xkb/Imakefile,v 1.1 2006/02/19 15:51:31 tsi Exp $ +/* + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XnestExcludedExtensions +#define LinkDirectory ../../../xkb + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../../xkb/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/hw/xwin/Imakefile diff -u xc/programs/Xserver/hw/xwin/Imakefile:1.18 xc/programs/Xserver/hw/xwin/Imakefile:1.20 --- xc/programs/Xserver/hw/xwin/Imakefile:1.18 Thu Oct 2 09:30:09 2003 +++ xc/programs/Xserver/hw/xwin/Imakefile Mon Jan 9 10:00:31 2006 @@ -1,5 +1,4 @@ -XCOMM $XConsortium: Imakefile /main/10 1996/12/02 10:20:33 lehors $ -XCOMM $XFree86: xc/programs/Xserver/hw/xwin/Imakefile,v 1.18 2003/10/02 13:30:09 eich Exp $ +XCOMM $XFree86: xc/programs/Xserver/hw/xwin/Imakefile,v 1.20 2006/01/09 15:00:31 dawes Exp $ #include @@ -145,11 +144,9 @@ winprefsyacc.o \ winprefslex.o -INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ - -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ +INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/miext/shadow -I$(SERVERSRC)/miext/layer \ -I$(SERVERSRC)/include -I$(SERVERSRC)/os \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) \ -I$(SERVERSRC)/render -I$(SERVERSRC)/randr DEFINES = $(OS_DEFINES) $(SHMDEF) $(MMAPDEF) -UXFree86LOADER -UXF86DRI \ Index: xc/programs/Xserver/hw/xwin/InitInput.c diff -u xc/programs/Xserver/hw/xwin/InitInput.c:1.13 xc/programs/Xserver/hw/xwin/InitInput.c:1.14 --- xc/programs/Xserver/hw/xwin/InitInput.c:1.13 Tue Jul 29 17:25:15 2003 +++ xc/programs/Xserver/hw/xwin/InitInput.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,3 @@ -/* $TOG: InitInput.c /main/12 1998/02/10 13:23:52 kaleb $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.13 2003/07/29 21:25:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.14 2006/01/09 15:00:31 dawes Exp $ */ #include "win.h" #include "../../Xext/xf86miscproc.h" Index: xc/programs/Xserver/hw/xwin/InitOutput.c diff -u xc/programs/Xserver/hw/xwin/InitOutput.c:1.36 xc/programs/Xserver/hw/xwin/InitOutput.c:1.37 --- xc/programs/Xserver/hw/xwin/InitOutput.c:1.36 Wed Jun 2 18:43:05 2004 +++ xc/programs/Xserver/hw/xwin/InitOutput.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,3 @@ -/* $TOG: InitOutput.c /main/20 1998/02/10 13:23:56 kaleb $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.36 2004/06/02 22:43:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.37 2006/01/09 15:00:31 dawes Exp $ */ #include "win.h" #include "winconfig.h" Index: xc/programs/Xserver/hw/xwin/win.h diff -u xc/programs/Xserver/hw/xwin/win.h:1.38 xc/programs/Xserver/hw/xwin/win.h:1.39 --- xc/programs/Xserver/hw/xwin/win.h:1.38 Wed Oct 8 07:13:02 2003 +++ xc/programs/Xserver/hw/xwin/win.h Fri Oct 14 11:17:15 2005 @@ -31,7 +31,7 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.38 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.39 2005/10/14 15:17:15 tsi Exp $ */ #ifndef _WIN_H_ #define _WIN_H_ @@ -142,10 +142,10 @@ #endif /* MAP_FILE */ #endif /* HAS_MMAP */ -#include "X.h" -#include "Xproto.h" -#include "Xos.h" -#include "Xprotostr.h" +#include +#include +#include +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "pixmap.h" @@ -164,7 +164,7 @@ #include "mibstore.h" #include "input.h" #include "mipointer.h" -#include "keysym.h" +#include #include "mibstore.h" #include "micoord.h" #include "dix.h" Index: xc/programs/Xserver/hw/xwin/winclipboard.h diff -u xc/programs/Xserver/hw/xwin/winclipboard.h:1.3 xc/programs/Xserver/hw/xwin/winclipboard.h:1.4 --- xc/programs/Xserver/hw/xwin/winclipboard.h:1.3 Thu Oct 2 09:30:10 2003 +++ xc/programs/Xserver/hw/xwin/winclipboard.h Fri Oct 14 11:17:15 2005 @@ -27,7 +27,7 @@ * * Authors: Harold Hunt */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboard.h,v 1.3 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winclipboard.h,v 1.4 2005/10/14 15:17:15 tsi Exp $ */ #ifndef _WINCLIPBOARD_H_ @@ -44,15 +44,15 @@ #include /* X headers */ -#include "X.h" -#include "Xatom.h" +#include +#include /* NOTE: For some unknown reason, including Xproto.h solves * tons of problems with including windows.h. Unknowns reasons * are usually bad, so someone should investigate this. */ -#include "Xproto.h" -#include "Xutil.h" -#include "Xlocale.h" +#include +#include +#include /* Fixups to prevent collisions between Windows and X headers */ #define ATOM DWORD Index: xc/programs/Xserver/hw/xwin/winconfig.c diff -u xc/programs/Xserver/hw/xwin/winconfig.c:1.4 xc/programs/Xserver/hw/xwin/winconfig.c:1.5 --- xc/programs/Xserver/hw/xwin/winconfig.c:1.4 Wed Oct 8 07:13:02 2003 +++ xc/programs/Xserver/hw/xwin/winconfig.c Fri Oct 14 11:17:15 2005 @@ -27,7 +27,7 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.4 2003/10/08 11:13:02 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.5 2005/10/14 15:17:15 tsi Exp $ */ #include "win.h" #include "winconfig.h" @@ -36,7 +36,7 @@ #ifdef XKB #define XKB_IN_SERVER -#include "XKBsrv.h" +#include #endif #ifndef CONFIGPATH Index: xc/programs/Xserver/hw/xwin/wincutpaste.c diff -u xc/programs/Xserver/hw/xwin/wincutpaste.c:1.3 xc/programs/Xserver/hw/xwin/wincutpaste.c:1.4 --- xc/programs/Xserver/hw/xwin/wincutpaste.c:1.3 Tue Jul 29 17:25:17 2003 +++ xc/programs/Xserver/hw/xwin/wincutpaste.c Fri Oct 14 11:17:16 2005 @@ -27,7 +27,7 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincutpaste.c,v 1.3 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/wincutpaste.c,v 1.4 2005/10/14 15:17:16 tsi Exp $ */ #include #include @@ -43,11 +43,11 @@ #endif /* MAP_FILE */ #endif /* HAS_MMAP */ -#include "X.h" -#include "Xos.h" +#include +#include #include "regionstr.h" #include "miscstruct.h" -#include "keysym.h" +#include #include #undef MINSHORT @@ -102,11 +102,11 @@ #if 0 #define NEED_EVENTS -#include -#include +#include +#include #include "selection.h" #include "input.h" -#include +#include extern WindowPtr *WindowTable; /* Why isn't this in a header file? */ extern Selection *CurrentSelections; Index: xc/programs/Xserver/hw/xwin/winkeybd.c diff -u xc/programs/Xserver/hw/xwin/winkeybd.c:1.13 xc/programs/Xserver/hw/xwin/winkeybd.c:1.14 --- xc/programs/Xserver/hw/xwin/winkeybd.c:1.13 Tue Jul 29 17:25:17 2003 +++ xc/programs/Xserver/hw/xwin/winkeybd.c Fri Oct 14 11:17:16 2005 @@ -30,7 +30,7 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.13 2003/07/29 21:25:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.14 2005/10/14 15:17:16 tsi Exp $ */ #include "win.h" @@ -39,7 +39,7 @@ #ifdef XKB #define XKB_IN_SERVER -#include "XKBsrv.h" +#include #endif static Bool g_winKeyState[NUM_KEYCODES]; Index: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c diff -u xc/programs/Xserver/hw/xwin/winmultiwindowclass.c:1.2 xc/programs/Xserver/hw/xwin/winmultiwindowclass.c:1.3 --- xc/programs/Xserver/hw/xwin/winmultiwindowclass.c:1.2 Thu Oct 2 09:30:10 2003 +++ xc/programs/Xserver/hw/xwin/winmultiwindowclass.c Fri Oct 14 11:17:16 2005 @@ -27,9 +27,9 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v 1.2 2003/10/02 13:30:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowclass.c,v 1.3 2005/10/14 15:17:16 tsi Exp $ */ -#include +#include #include "propertyst.h" #include "windowstr.h" #include "winmultiwindowclass.h" Index: xc/programs/Xserver/hw/xwin/winpushpxl.c diff -u xc/programs/Xserver/hw/xwin/winpushpxl.c:1.1 xc/programs/Xserver/hw/xwin/winpushpxl.c:1.2 --- xc/programs/Xserver/hw/xwin/winpushpxl.c:1.1 Thu Aug 7 19:47:58 2003 +++ xc/programs/Xserver/hw/xwin/winpushpxl.c Fri Oct 14 11:17:16 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.1 2003/08/07 23:47:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winpushpxl.c,v 1.2 2005/10/14 15:17:16 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ -#include "X.h" +#include #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/hw/xwin/winvideo.c diff -u xc/programs/Xserver/hw/xwin/winvideo.c:1.2 xc/programs/Xserver/hw/xwin/winvideo.c:1.3 --- xc/programs/Xserver/hw/xwin/winvideo.c:1.2 Mon Nov 10 13:22:44 2003 +++ xc/programs/Xserver/hw/xwin/winvideo.c Fri Oct 14 11:17:16 2005 @@ -27,11 +27,11 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xwin/winvideo.c,v 1.3 2005/10/14 15:17:16 tsi Exp $ */ #include "win.h" -#include "Xv.h" -#include "Xvproto.h" +#include +#include /* @@ -62,7 +62,7 @@ #include "../xfree86/common/xf86.h" #include "../Xext/xvdix.h" #include "../xfree86/common/xf86xv.h" -#include "Xv.h" +#include #endif #include "win.h" Index: xc/programs/Xserver/ilbm/Imakefile diff -u xc/programs/Xserver/ilbm/Imakefile:3.9 xc/programs/Xserver/ilbm/Imakefile:3.10 --- xc/programs/Xserver/ilbm/Imakefile:3.9 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/ilbm/Imakefile Fri Oct 14 11:17:16 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/ilbm/Imakefile,v 3.9 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/ilbm/Imakefile,v 3.10 2005/10/14 15:17:16 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -67,8 +67,7 @@ ilbmpntwin.o ilbmpntarea.o ilbmbres.o ilbmhrzvert.o ilbmline.o \ ilbmseg.o -INCLUDES = -I. -I../cfb -I../mfb -I../mi -I../include -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) $(EXTRAINCLUDES) +INCLUDES = -I../cfb -I../mfb -I../mi -I../include $(EXTRAINCLUDES) LINTDEFS = -DMFBPOLYGLYPHBLT=ilbmPolyGlyphBltWhite \ -DMFBIMAGEGLYPHBLT=ilbmImageGlyphBltWhite \ -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE -DOPEQ=MFB_OPEQ_WHITE Index: xc/programs/Xserver/ilbm/ilbm.h diff -u xc/programs/Xserver/ilbm/ilbm.h:3.3 xc/programs/Xserver/ilbm/ilbm.h:3.4 --- xc/programs/Xserver/ilbm/ilbm.h:3.3 Mon Nov 17 17:20:43 2003 +++ xc/programs/Xserver/ilbm/ilbm.h Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbm.h,v 3.4 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +47,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbm.h,v 5.31 94/04/17 20:28:15 dpw Exp $ */ /* Monochrome Frame Buffer definitions written by drewry, september 1986 */ Index: xc/programs/Xserver/ilbm/ilbmbitblt.c diff -u xc/programs/Xserver/ilbm/ilbmbitblt.c:3.3 xc/programs/Xserver/ilbm/ilbmbitblt.c:3.5 --- xc/programs/Xserver/ilbm/ilbmbitblt.c:3.3 Mon Nov 10 13:22:44 2003 +++ xc/programs/Xserver/ilbm/ilbmbitblt.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.3 2003/11/10 18:22:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbitblt.c,v 3.5 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "miscstruct.h" #include "regionstr.h" Index: xc/programs/Xserver/ilbm/ilbmblt.c diff -u xc/programs/Xserver/ilbm/ilbmblt.c:3.0 xc/programs/Xserver/ilbm/ilbmblt.c:3.2 --- xc/programs/Xserver/ilbm/ilbmblt.c:3.0 Sat Aug 17 21:53:39 1996 +++ xc/programs/Xserver/ilbm/ilbmblt.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmblt.c,v 3.0 1996/08/18 01:53:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmblt.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /* * ilbm copy area */ @@ -31,14 +31,13 @@ Author: Keith Packard */ -/* $XConsortium: ilbmblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ilbm.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmbres.c diff -u xc/programs/Xserver/ilbm/ilbmbres.c:3.0 xc/programs/Xserver/ilbm/ilbmbres.c:3.2 --- xc/programs/Xserver/ilbm/ilbmbres.c:3.0 Sat Aug 17 21:53:40 1996 +++ xc/programs/Xserver/ilbm/ilbmbres.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbres.c,v 3.0 1996/08/18 01:53:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbres.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,12 +47,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "misc.h" #include "ilbm.h" #include "maskbits.h" Index: xc/programs/Xserver/ilbm/ilbmbresd.c diff -u xc/programs/Xserver/ilbm/ilbmbresd.c:3.0 xc/programs/Xserver/ilbm/ilbmbresd.c:3.2 --- xc/programs/Xserver/ilbm/ilbmbresd.c:3.0 Sat Aug 17 21:53:41 1996 +++ xc/programs/Xserver/ilbm/ilbmbresd.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbresd.c,v 3.0 1996/08/18 01:53:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbresd.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "misc.h" #include "ilbm.h" #include "maskbits.h" Index: xc/programs/Xserver/ilbm/ilbmbstore.c diff -u xc/programs/Xserver/ilbm/ilbmbstore.c:3.0 xc/programs/Xserver/ilbm/ilbmbstore.c:3.2 --- xc/programs/Xserver/ilbm/ilbmbstore.c:3.0 Sat Aug 17 21:53:43 1996 +++ xc/programs/Xserver/ilbm/ilbmbstore.c Mon Jan 9 10:00:31 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmbstore.c,v 3.0 1996/08/18 01:53:43 dawes Exp $ */ -/* $XConsortium: ilbmbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmbstore.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* @@ -35,14 +34,14 @@ to use interleaved bitplanes instead of normal bitplanes */ #include "ilbm.h" -#include "X.h" +#include #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" -/*- +/* *----------------------------------------------------------------------- * ilbmSaveAreas -- * Function called by miSaveAreas to actually fetch the areas to be @@ -98,7 +97,7 @@ DEALLOCATE_LOCAL(pPtsInit); } -/*- +/* *----------------------------------------------------------------------- * ilbmRestoreAreas -- * Function called by miRestoreAreas to actually fetch the areas to be Index: xc/programs/Xserver/ilbm/ilbmclip.c diff -u xc/programs/Xserver/ilbm/ilbmclip.c:3.0 xc/programs/Xserver/ilbm/ilbmclip.c:3.2 --- xc/programs/Xserver/ilbm/ilbmclip.c:3.0 Sat Aug 17 21:53:44 1996 +++ xc/programs/Xserver/ilbm/ilbmclip.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmclip.c,v 3.0 1996/08/18 01:53:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmclip.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "miscstruct.h" #include "pixmapstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/ilbm/ilbmcmap.c diff -u xc/programs/Xserver/ilbm/ilbmcmap.c:3.1 xc/programs/Xserver/ilbm/ilbmcmap.c:3.3 --- xc/programs/Xserver/ilbm/ilbmcmap.c:3.1 Sun Nov 22 05:37:40 1998 +++ xc/programs/Xserver/ilbm/ilbmcmap.c Mon Jan 9 10:00:31 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.1 1998/11/22 10:37:40 dawes Exp $ */ -/* $XConsortium: ilbmcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmcmap.c,v 3.3 2006/01/09 15:00:31 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,8 +31,8 @@ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" Index: xc/programs/Xserver/ilbm/ilbmfillarc.c diff -u xc/programs/Xserver/ilbm/ilbmfillarc.c:3.1 xc/programs/Xserver/ilbm/ilbmfillarc.c:3.3 --- xc/programs/Xserver/ilbm/ilbmfillarc.c:3.1 Fri Mar 20 16:08:01 1998 +++ xc/programs/Xserver/ilbm/ilbmfillarc.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillarc.c,v 3.3 2006/01/09 15:00:31 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -26,13 +26,11 @@ ********************************************************/ -/* $XConsortium: ilbmfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */ - /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "miscstruct.h" #include "gcstruct.h" #include "pixmapstr.h" Index: xc/programs/Xserver/ilbm/ilbmfillrct.c diff -u xc/programs/Xserver/ilbm/ilbmfillrct.c:3.1 xc/programs/Xserver/ilbm/ilbmfillrct.c:3.3 --- xc/programs/Xserver/ilbm/ilbmfillrct.c:3.1 Fri Mar 20 16:08:01 1998 +++ xc/programs/Xserver/ilbm/ilbmfillrct.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillrct.c,v 3.3 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmfillrct.c,v 5.10 94/04/17 20:28:21 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmfillsp.c diff -u xc/programs/Xserver/ilbm/ilbmfillsp.c:3.1 xc/programs/Xserver/ilbm/ilbmfillsp.c:3.3 --- xc/programs/Xserver/ilbm/ilbmfillsp.c:3.1 Fri Mar 20 16:08:01 1998 +++ xc/programs/Xserver/ilbm/ilbmfillsp.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.1 1998/03/20 21:08:01 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfillsp.c,v 3.3 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" Index: xc/programs/Xserver/ilbm/ilbmfont.c diff -u xc/programs/Xserver/ilbm/ilbmfont.c:3.0 xc/programs/Xserver/ilbm/ilbmfont.c:3.2 --- xc/programs/Xserver/ilbm/ilbmfont.c:3.0 Sat Aug 17 21:53:51 1996 +++ xc/programs/Xserver/ilbm/ilbmfont.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmfont.c,v 3.0 1996/08/18 01:53:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmfont.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /* Copyright (c) 1987 X Consortium @@ -46,16 +46,15 @@ SOFTWARE. */ -/* $XConsortium: ilbmfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ilbm.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/ilbm/ilbmgc.c diff -u xc/programs/Xserver/ilbm/ilbmgc.c:3.1 xc/programs/Xserver/ilbm/ilbmgc.c:3.3 --- xc/programs/Xserver/ilbm/ilbmgc.c:3.1 Fri Mar 20 16:08:02 1998 +++ xc/programs/Xserver/ilbm/ilbmgc.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmgc.c,v 3.3 2006/01/09 15:00:31 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,17 +46,16 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmgc.c,v 5.35 94/04/17 20:28:23 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ilbm.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/ilbm/ilbmgetsp.c diff -u xc/programs/Xserver/ilbm/ilbmgetsp.c:3.0 xc/programs/Xserver/ilbm/ilbmgetsp.c:3.2 --- xc/programs/Xserver/ilbm/ilbmgetsp.c:3.0 Sat Aug 17 21:53:54 1996 +++ xc/programs/Xserver/ilbm/ilbmgetsp.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmgetsp.c,v 3.0 1996/08/18 01:53:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmgetsp.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmgetsp.c,v 5.10 94/04/17 20:28:24 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "region.h" Index: xc/programs/Xserver/ilbm/ilbmhrzvert.c diff -u xc/programs/Xserver/ilbm/ilbmhrzvert.c:3.0 xc/programs/Xserver/ilbm/ilbmhrzvert.c:3.2 --- xc/programs/Xserver/ilbm/ilbmhrzvert.c:3.0 Sat Aug 17 21:53:55 1996 +++ xc/programs/Xserver/ilbm/ilbmhrzvert.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmhrzvert.c,v 3.0 1996/08/18 01:53:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmhrzvert.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,12 +47,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmhrzvert.c,v 1.15 94/04/17 20:28:24 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "gc.h" #include "window.h" Index: xc/programs/Xserver/ilbm/ilbmimage.c diff -u xc/programs/Xserver/ilbm/ilbmimage.c:3.1 xc/programs/Xserver/ilbm/ilbmimage.c:3.2 --- xc/programs/Xserver/ilbm/ilbmimage.c:3.1 Fri Mar 20 16:08:02 1998 +++ xc/programs/Xserver/ilbm/ilbmimage.c Fri Oct 14 11:17:17 2005 @@ -1,10 +1,10 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.2 2005/10/14 15:17:17 tsi Exp $ */ #include /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/ilbm/ilbmimggblt.c diff -u xc/programs/Xserver/ilbm/ilbmimggblt.c:3.1 xc/programs/Xserver/ilbm/ilbmimggblt.c:3.3 --- xc/programs/Xserver/ilbm/ilbmimggblt.c:3.1 Fri Mar 20 16:08:02 1998 +++ xc/programs/Xserver/ilbm/ilbmimggblt.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmimggblt.c,v 3.3 2006/01/09 15:00:31 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,16 +47,15 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ilbm.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmline.c diff -u xc/programs/Xserver/ilbm/ilbmline.c:3.1 xc/programs/Xserver/ilbm/ilbmline.c:3.3 --- xc/programs/Xserver/ilbm/ilbmline.c:3.1 Fri Mar 20 16:08:02 1998 +++ xc/programs/Xserver/ilbm/ilbmline.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.1 1998/03/20 21:08:02 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmline.c,v 3.3 2006/01/09 15:00:31 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmline.c,v 5.18 94/04/17 20:28:26 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmmisc.c diff -u xc/programs/Xserver/ilbm/ilbmmisc.c:3.0 xc/programs/Xserver/ilbm/ilbmmisc.c:3.2 --- xc/programs/Xserver/ilbm/ilbmmisc.c:3.0 Sat Aug 17 21:53:59 1996 +++ xc/programs/Xserver/ilbm/ilbmmisc.c Mon Jan 9 10:00:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmmisc.c,v 3.0 1996/08/18 01:53:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmmisc.c,v 3.2 2006/01/09 15:00:31 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "misc.h" #include "cursor.h" #include "scrnintstr.h" Index: xc/programs/Xserver/ilbm/ilbmpixmap.c diff -u xc/programs/Xserver/ilbm/ilbmpixmap.c:3.0 xc/programs/Xserver/ilbm/ilbmpixmap.c:3.3 --- xc/programs/Xserver/ilbm/ilbmpixmap.c:3.0 Sat Aug 17 21:54:01 1996 +++ xc/programs/Xserver/ilbm/ilbmpixmap.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpixmap.c,v 3.0 1996/08/18 01:54:01 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpixmap.c,v 3.3 2006/01/09 15:00:32 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmpixmap.c,v 5.13 94/04/17 20:28:28 dpw Exp $ */ /* pixmap management written by drewry, september 1986 @@ -57,7 +56,7 @@ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "Xmd.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "maskbits.h" @@ -78,6 +77,9 @@ int datasize; int paddedWidth; + if ((width > MAXSHORT) || (height > MAXSHORT)) + return NullPixmap; + paddedWidth = BitmapBytePad(width); datasize = height * paddedWidth * depth; pPixmap = AllocatePixmap(pScreen, datasize); Index: xc/programs/Xserver/ilbm/ilbmply1rct.c diff -u xc/programs/Xserver/ilbm/ilbmply1rct.c:3.1 xc/programs/Xserver/ilbm/ilbmply1rct.c:3.3 --- xc/programs/Xserver/ilbm/ilbmply1rct.c:3.1 Fri Mar 20 16:08:03 1998 +++ xc/programs/Xserver/ilbm/ilbmply1rct.c Mon Jan 9 10:00:32 2006 @@ -1,6 +1,5 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmply1rct.c,v 3.3 2006/01/09 15:00:32 dawes Exp $ */ /* - * $XConsortium: ilbmply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $ * Copyright (c) 1990 X Consortium @@ -31,7 +30,7 @@ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmplygblt.c diff -u xc/programs/Xserver/ilbm/ilbmplygblt.c:3.1 xc/programs/Xserver/ilbm/ilbmplygblt.c:3.3 --- xc/programs/Xserver/ilbm/ilbmplygblt.c:3.1 Fri Mar 20 16:08:03 1998 +++ xc/programs/Xserver/ilbm/ilbmplygblt.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmplygblt.c,v 3.3 2006/01/09 15:00:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,16 +47,15 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ilbm.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmpntarea.c diff -u xc/programs/Xserver/ilbm/ilbmpntarea.c:3.0 xc/programs/Xserver/ilbm/ilbmpntarea.c:3.2 --- xc/programs/Xserver/ilbm/ilbmpntarea.c:3.0 Sat Aug 17 21:54:04 1996 +++ xc/programs/Xserver/ilbm/ilbmpntarea.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntarea.c,v 3.0 1996/08/18 01:54:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntarea.c,v 3.2 2006/01/09 15:00:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,12 +47,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" Index: xc/programs/Xserver/ilbm/ilbmpntwin.c diff -u xc/programs/Xserver/ilbm/ilbmpntwin.c:3.0 xc/programs/Xserver/ilbm/ilbmpntwin.c:3.2 --- xc/programs/Xserver/ilbm/ilbmpntwin.c:3.0 Sat Aug 17 21:54:05 1996 +++ xc/programs/Xserver/ilbm/ilbmpntwin.c Mon Jan 9 10:00:32 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntwin.c,v 3.0 1996/08/18 01:54:05 dawes Exp $ */ -/* $XConsortium: ilbmpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpntwin.c,v 3.2 2006/01/09 15:00:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -52,7 +51,7 @@ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" Index: xc/programs/Xserver/ilbm/ilbmpolypnt.c diff -u xc/programs/Xserver/ilbm/ilbmpolypnt.c:3.1 xc/programs/Xserver/ilbm/ilbmpolypnt.c:3.3 --- xc/programs/Xserver/ilbm/ilbmpolypnt.c:3.1 Fri Mar 20 16:08:03 1998 +++ xc/programs/Xserver/ilbm/ilbmpolypnt.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpolypnt.c,v 3.3 2006/01/09 15:00:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmpolypnt.c,v 5.6 94/04/17 20:28:30 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmpushpxl.c diff -u xc/programs/Xserver/ilbm/ilbmpushpxl.c:3.1 xc/programs/Xserver/ilbm/ilbmpushpxl.c:3.3 --- xc/programs/Xserver/ilbm/ilbmpushpxl.c:3.1 Fri Mar 20 16:08:03 1998 +++ xc/programs/Xserver/ilbm/ilbmpushpxl.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.1 1998/03/20 21:08:03 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmpushpxl.c,v 3.3 2006/01/09 15:00:32 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmpushpxl.c,v 5.6 94/04/17 20:28:31 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/ilbm/ilbmscrinit.c diff -u xc/programs/Xserver/ilbm/ilbmscrinit.c:3.5 xc/programs/Xserver/ilbm/ilbmscrinit.c:3.7 --- xc/programs/Xserver/ilbm/ilbmscrinit.c:3.5 Sun Nov 22 05:37:40 1998 +++ xc/programs/Xserver/ilbm/ilbmscrinit.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.5 1998/11/22 10:37:40 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmscrinit.c,v 3.7 2006/01/09 15:00:32 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,14 +46,13 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xproto.h" /* for xColorItem */ -#include "Xmd.h" +#include +#include /* for xColorItem */ +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmsetsp.c diff -u xc/programs/Xserver/ilbm/ilbmsetsp.c:3.1 xc/programs/Xserver/ilbm/ilbmsetsp.c:3.3 --- xc/programs/Xserver/ilbm/ilbmsetsp.c:3.1 Fri Mar 20 16:08:04 1998 +++ xc/programs/Xserver/ilbm/ilbmsetsp.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmsetsp.c,v 3.3 2006/01/09 15:00:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmsetsp.c,v 5.8 94/04/17 20:28:34 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "regionstr.h" Index: xc/programs/Xserver/ilbm/ilbmtegblt.c diff -u xc/programs/Xserver/ilbm/ilbmtegblt.c:3.1 xc/programs/Xserver/ilbm/ilbmtegblt.c:3.3 --- xc/programs/Xserver/ilbm/ilbmtegblt.c:3.1 Fri Mar 20 16:08:04 1998 +++ xc/programs/Xserver/ilbm/ilbmtegblt.c Mon Jan 9 10:00:32 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ -/* $XConsortium: ilbmtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmtegblt.c,v 3.3 2006/01/09 15:00:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -52,11 +51,11 @@ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ilbm.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/ilbm/ilbmtile.c diff -u xc/programs/Xserver/ilbm/ilbmtile.c:3.0 xc/programs/Xserver/ilbm/ilbmtile.c:3.2 --- xc/programs/Xserver/ilbm/ilbmtile.c:3.0 Sat Aug 17 21:54:12 1996 +++ xc/programs/Xserver/ilbm/ilbmtile.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmtile.c,v 3.0 1996/08/18 01:54:12 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmtile.c,v 3.2 2006/01/09 15:00:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,12 +47,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ilbmtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" Index: xc/programs/Xserver/ilbm/ilbmwindow.c diff -u xc/programs/Xserver/ilbm/ilbmwindow.c:3.0 xc/programs/Xserver/ilbm/ilbmwindow.c:3.2 --- xc/programs/Xserver/ilbm/ilbmwindow.c:3.0 Sat Aug 17 21:54:14 1996 +++ xc/programs/Xserver/ilbm/ilbmwindow.c Mon Jan 9 10:00:32 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmwindow.c,v 3.0 1996/08/18 01:54:14 dawes Exp $ */ -/* $XConsortium: ilbmwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmwindow.c,v 3.2 2006/01/09 15:00:32 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -52,7 +51,7 @@ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "ilbm.h" Index: xc/programs/Xserver/ilbm/ilbmzerarc.c diff -u xc/programs/Xserver/ilbm/ilbmzerarc.c:3.1 xc/programs/Xserver/ilbm/ilbmzerarc.c:3.3 --- xc/programs/Xserver/ilbm/ilbmzerarc.c:3.1 Fri Mar 20 16:08:04 1998 +++ xc/programs/Xserver/ilbm/ilbmzerarc.c Mon Jan 9 10:00:32 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.1 1998/03/20 21:08:04 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/ilbm/ilbmzerarc.c,v 3.3 2006/01/09 15:00:32 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -26,8 +26,6 @@ ********************************************************/ -/* $XConsortium: ilbmzerarc.c,v 5.19 94/04/17 20:28:37 dpw Exp $ */ - /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" * by M. L. V. Pitteway @@ -37,8 +35,8 @@ /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "miscstruct.h" #include "gcstruct.h" #include "pixmapstr.h" Index: xc/programs/Xserver/include/Imakefile diff -u xc/programs/Xserver/include/Imakefile:3.22 xc/programs/Xserver/include/Imakefile:3.23 --- xc/programs/Xserver/include/Imakefile:3.22 Mon Jan 26 20:29:03 2004 +++ xc/programs/Xserver/include/Imakefile Sun Mar 27 21:51:08 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.22 2004/01/27 01:29:03 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.23 2005/03/28 02:51:08 dawes Exp $ #if defined(XFree86Version) || defined(BSDOSArchitecture) #if DoLoadableServer @@ -21,6 +16,11 @@ LinkFile(xxwindow.h,window.h) #endif +#if !HasStrlcat +LinkSourceFile(strlcat.h,$(LIBSRC)/misc) +LinkSourceFile(strlcpy.h,$(LIBSRC)/misc) +#endif + all:: depend:: Index: xc/programs/Xserver/include/closestr.h diff -u xc/programs/Xserver/include/closestr.h:3.5 xc/programs/Xserver/include/closestr.h:3.6 --- xc/programs/Xserver/include/closestr.h:3.5 Mon Nov 17 17:20:43 2003 +++ xc/programs/Xserver/include/closestr.h Fri Oct 14 11:17:18 2005 @@ -1,4 +1,4 @@ -/* $Xorg: closestr.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.6 2005/10/14 15:17:18 tsi Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,14 +26,13 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.5 2003/11/17 22:20:43 dawes Exp $ */ #ifndef CLOSESTR_H #define CLOSESTR_H #define NEED_REPLIES -#include "Xproto.h" +#include #include "closure.h" #include "dix.h" #include "misc.h" Index: xc/programs/Xserver/include/closure.h diff -u xc/programs/Xserver/include/closure.h:1.2 xc/programs/Xserver/include/closure.h:1.3 --- xc/programs/Xserver/include/closure.h:1.2 Fri Dec 14 14:59:53 2001 +++ xc/programs/Xserver/include/closure.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: closure.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/include/closure.h,v 1.3 2006/01/09 15:00:33 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/programs/Xserver/include/colormap.h diff -u xc/programs/Xserver/include/colormap.h:1.6 xc/programs/Xserver/include/colormap.h:1.7 --- xc/programs/Xserver/include/colormap.h:1.6 Sun Apr 27 17:31:04 2003 +++ xc/programs/Xserver/include/colormap.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/colormap.h,v 1.7 2006/01/09 15:00:33 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. */ -/* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ #ifndef CMAP_H #define CMAP_H 1 Index: xc/programs/Xserver/include/colormapst.h diff -u xc/programs/Xserver/include/colormapst.h:1.2 xc/programs/Xserver/include/colormapst.h:1.3 --- xc/programs/Xserver/include/colormapst.h:1.2 Fri Dec 14 14:59:53 2001 +++ xc/programs/Xserver/include/colormapst.h Mon Jan 9 10:00:33 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/Xserver/include/colormapst.h,v 1.3 2006/01/09 15:00:33 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,7 +45,7 @@ SOFTWARE. */ -/* $Xorg: colormapst.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ + #ifndef CMAPSTRUCT_H #define CMAPSTRUCT_H 1 Index: xc/programs/Xserver/include/cursor.h diff -u xc/programs/Xserver/include/cursor.h:1.7 xc/programs/Xserver/include/cursor.h:1.8 --- xc/programs/Xserver/include/cursor.h:1.7 Sun Apr 27 17:31:04 2003 +++ xc/programs/Xserver/include/cursor.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.8 2006/01/09 15:00:33 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cursor.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ + #ifndef CURSOR_H #define CURSOR_H Index: xc/programs/Xserver/include/cursorstr.h diff -u xc/programs/Xserver/include/cursorstr.h:1.9 xc/programs/Xserver/include/cursorstr.h:1.10 --- xc/programs/Xserver/include/cursorstr.h:1.9 Sat Jan 11 21:44:27 2003 +++ xc/programs/Xserver/include/cursorstr.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cursorstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.9 2003/01/12 02:44:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.10 2006/01/09 15:00:33 dawes Exp $ */ #ifndef CURSORSTRUCT_H #define CURSORSTRUCT_H Index: xc/programs/Xserver/include/dix.h diff -u xc/programs/Xserver/include/dix.h:3.27 xc/programs/Xserver/include/dix.h:3.31 --- xc/programs/Xserver/include/dix.h:3.27 Sun Apr 27 17:31:04 2003 +++ xc/programs/Xserver/include/dix.h Mon Feb 20 11:34:11 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.27 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dix.h,v 3.31 2006/02/20 16:34:11 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: dix.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef DIX_H #define DIX_H @@ -89,15 +88,9 @@ ((client->lastDrawableID == did) ? \ client->lastDrawable : (DrawablePtr)LookupDrawable(did, client)) -#ifdef XCSECURITY - #define SECURITY_VERIFY_DRAWABLE(pDraw, did, client, mode)\ - if (client->lastDrawableID == did && !client->trustLevel)\ - pDraw = client->lastDrawable;\ - else \ - {\ - pDraw = (DrawablePtr) SecurityLookupIDByClass(client, did, \ - RC_DRAWABLE, mode);\ + do {\ + pDraw = SecurityVerifyDrawable(did, client, mode);\ if (!pDraw) \ {\ client->errorValue = did; \ @@ -105,32 +98,27 @@ }\ if (pDraw->type == UNDRAWABLE_WINDOW)\ return BadMatch;\ - } + } while (0) #define SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, mode)\ - if (client->lastDrawableID == did && !client->trustLevel)\ - pDraw = client->lastDrawable;\ - else \ - {\ - pDraw = (DrawablePtr) SecurityLookupIDByClass(client, did, \ - RC_DRAWABLE, mode);\ + do {\ + pDraw = SecurityVerifyDrawable(did, client, mode);\ if (!pDraw) \ {\ client->errorValue = did; \ return BadDrawable;\ }\ - } + } while (0) #define SECURITY_VERIFY_GC(pGC, rid, client, mode)\ - if (client->lastGCID == rid && !client->trustLevel)\ - pGC = client->lastGC;\ - else\ - pGC = (GC *) SecurityLookupIDByType(client, rid, RT_GC, mode);\ - if (!pGC)\ - {\ - client->errorValue = rid;\ - return (BadGC);\ - } + do {\ + pGC = SecurityVerifyGC(rid, client, mode);\ + if (!pGC)\ + {\ + client->errorValue = rid;\ + return BadGC;\ + }\ + } while (0) #define VERIFY_DRAWABLE(pDraw, did, client)\ SECURITY_VERIFY_DRAWABLE(pDraw, did, client, SecurityUnknownAccess) @@ -141,109 +129,91 @@ #define VERIFY_GC(pGC, rid, client)\ SECURITY_VERIFY_GC(pGC, rid, client, SecurityUnknownAccess) -#else /* not XCSECURITY */ - -#define VERIFY_DRAWABLE(pDraw, did, client)\ - if (client->lastDrawableID == did)\ - pDraw = client->lastDrawable;\ - else \ - {\ - pDraw = (DrawablePtr) LookupIDByClass(did, RC_DRAWABLE);\ - if (!pDraw) \ - {\ - client->errorValue = did; \ - return BadDrawable;\ - }\ - if (pDraw->type == UNDRAWABLE_WINDOW)\ - return BadMatch;\ - } +/* + * We think that most hardware implementations of DBE will want + * LookupID*(dbe_back_buffer_id) to return the window structure that the id is + * a back buffer for. Since both front and back buffers will return the same + * structure, you need to be able to distinguish somewhere what kind of buffer + * (front/back) was being asked for, so that ddx can render to the right place. + * That's the problem that the following code solves. Note: we couldn't embed + * this in the LookupID* functions because the VALIDATE_DRAWABLE_AND_GC() macro + * often circumvents those functions by checking a one-element cache. That's + * why we're mucking with VALIDATE_DRAWABLE_AND_GC. + * + * If you put -DNEED_DBE_BUF_BITS into PervasiveDBEDefines, the window + * structure will have two additional bits defined, srcBuffer and dstBuffer, + * and their values will be maintained via the macros SET_DBE_DSTBUF() and + * SET_DBE_SRCBUF() (below). If you also put -DNEED_DBE_BUF_VALIDATE into + * PervasiveDBEDefines, the function DbeValidateBuffer() will be called any + * time the bits change to give you a chance to do some setup. If you further + * put -DNEED_DBE_BUF_REVALIDATE into PervasiveDBEDefines, DbeValidateBuffer() + * will instead be called whenever a (front or back) buffer XID is seen by the + * protocol, this whether or not the window structure's srcBuffer and/or + * dstBuffer bits have been changed. See the DBE code for more details on this + * function. We put in these levels of conditionality so that you can do just + * what you need to do, and no more. If none of these defines are used, the + * bits won't be there, and VALIDATE_DRAWABLE_AND_GC will be unchanged. + * dpw + */ -#define VERIFY_GEOMETRABLE(pDraw, did, client)\ - if (client->lastDrawableID == did)\ - pDraw = client->lastDrawable;\ - else \ - {\ - pDraw = (DrawablePtr) LookupIDByClass(did, RC_DRAWABLE);\ - if (!pDraw) \ - {\ - client->errorValue = did; \ - return BadDrawable;\ - }\ - } +#if defined(DBE) && defined(NEED_DBE_BUF_BITS) -#define VERIFY_GC(pGC, rid, client)\ - if (client->lastGCID == rid)\ - pGC = client->lastGC;\ - else\ - pGC = (GC *)LookupIDByType(rid, RT_GC);\ - if (!pGC)\ - {\ - client->errorValue = rid;\ - return (BadGC);\ - } +#if defined(NEED_DBE_BUF_VALIDATE) -#define SECURITY_VERIFY_DRAWABLE(pDraw, did, client, mode)\ - VERIFY_DRAWABLE(pDraw, did, client) +#if defined(XFree86LOADER) +# if !defined(IN_DBE) +# define DbeValidateBuffer xf86DbeValidateBuffer +# endif +extern void xf86DbeRegisterValidateBuffer(void); +#endif -#define SECURITY_VERIFY_GEOMETRABLE(pDraw, did, client, mode)\ - VERIFY_GEOMETRABLE(pDraw, did, client) +/* #include'ing "dbeproc.h" here causes circular #include's */ +extern void DbeValidateBuffer(WindowPtr pWin, XID drawID, Bool dstbuf); -#define SECURITY_VERIFY_GC(pGC, rid, client, mode)\ - VERIFY_GC(pGC, rid, client) +#if defined(NEED_DBE_BUF_REVALIDATE) -#endif /* XCSECURITY */ +#define SET_DBE_BUF(_pDraw, _drawID, _whichBuffer, _dstbuf) \ + if (_pDraw->type == DRAWABLE_WINDOW)\ + {\ + ((WindowPtr)_pDraw)->_whichBuffer = (_pDraw->id == _drawID);\ + DbeValidateBuffer((WindowPtr)_pDraw, _drawID, _dstbuf);\ + } -/* - * We think that most hardware implementations of DBE will want - * LookupID*(dbe_back_buffer_id) to return the window structure that the - * id is a back buffer for. Since both front and back buffers will - * return the same structure, you need to be able to distinguish - * somewhere what kind of buffer (front/back) was being asked for, so - * that ddx can render to the right place. That's the problem that the - * following code solves. Note: we couldn't embed this in the LookupID* - * functions because the VALIDATE_DRAWABLE_AND_GC macro often circumvents - * those functions by checking a one-element cache. That's why we're - * mucking with VALIDATE_DRAWABLE_AND_GC. - * - * If you put -DNEED_DBE_BUF_BITS into PervasiveDBEDefines, the window - * structure will have two additional bits defined, srcBuffer and - * dstBuffer, and their values will be maintained via the macros - * SET_DBE_DSTBUF and SET_DBE_SRCBUF (below). If you also - * put -DNEED_DBE_BUF_VALIDATE into PervasiveDBEDefines, the function - * DbeValidateBuffer will be called any time the bits change to give you - * a chance to do some setup. See the DBE code for more details on this - * function. We put in these levels of conditionality so that you can do - * just what you need to do, and no more. If neither of these defines - * are used, the bits won't be there, and VALIDATE_DRAWABLE_AND_GC will - * be unchanged. dpw - */ +#else -#if defined(NEED_DBE_BUF_BITS) -#define SET_DBE_DSTBUF(_pDraw, _drawID) \ - SET_DBE_BUF(_pDraw, _drawID, dstBuffer, TRUE) -#define SET_DBE_SRCBUF(_pDraw, _drawID) \ - SET_DBE_BUF(_pDraw, _drawID, srcBuffer, FALSE) -#if defined (NEED_DBE_BUF_VALIDATE) #define SET_DBE_BUF(_pDraw, _drawID, _whichBuffer, _dstbuf) \ if (_pDraw->type == DRAWABLE_WINDOW)\ {\ int thisbuf = (_pDraw->id == _drawID);\ if (thisbuf != ((WindowPtr)_pDraw)->_whichBuffer)\ {\ - ((WindowPtr)_pDraw)->_whichBuffer = thisbuf;\ - DbeValidateBuffer((WindowPtr)_pDraw, _drawID, _dstbuf);\ + ((WindowPtr)_pDraw)->_whichBuffer = thisbuf;\ + DbeValidateBuffer((WindowPtr)_pDraw, _drawID, _dstbuf);\ }\ - } + } + +#endif /* NEED_DBE_BUF_REVALIDATE */ + #else /* want buffer bits, but don't need to call DbeValidateBuffer */ + #define SET_DBE_BUF(_pDraw, _drawID, _whichBuffer, _dstbuf) \ if (_pDraw->type == DRAWABLE_WINDOW)\ {\ ((WindowPtr)_pDraw)->_whichBuffer = (_pDraw->id == _drawID);\ } + #endif /* NEED_DBE_BUF_VALIDATE */ + +#define SET_DBE_DSTBUF(_pDraw, _drawID) \ + SET_DBE_BUF(_pDraw, _drawID, dstBuffer, TRUE) +#define SET_DBE_SRCBUF(_pDraw, _drawID) \ + SET_DBE_BUF(_pDraw, _drawID, srcBuffer, FALSE) + #else /* don't want buffer bits in window */ + #define SET_DBE_DSTBUF(_pDraw, _drawID) /**/ #define SET_DBE_SRCBUF(_pDraw, _drawID) /**/ + #endif /* NEED_DBE_BUF_BITS */ #define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, pGC, client)\ @@ -379,8 +349,6 @@ unsigned char * /*source*/, int /*length*/); -#ifdef XCSECURITY - extern WindowPtr SecurityLookupWindow( XID /*rid*/, ClientPtr /*client*/, @@ -399,27 +367,19 @@ XID /*rid*/, ClientPtr /*client*/); -#else - -extern WindowPtr LookupWindow( - XID /*rid*/, - ClientPtr /*client*/); - -extern pointer LookupDrawable( +extern ClientPtr LookupClient( XID /*rid*/, ClientPtr /*client*/); -#define SecurityLookupWindow(rid, client, access_mode) \ - LookupWindow(rid, client) - -#define SecurityLookupDrawable(rid, client, access_mode) \ - LookupDrawable(rid, client) - -#endif /* XCSECURITY */ +extern DrawablePtr SecurityVerifyDrawable( + XID /*did*/, + ClientPtr /*client*/, + Mask /*access_mode*/); -extern ClientPtr LookupClient( +extern GCPtr SecurityVerifyGC( XID /*rid*/, - ClientPtr /*client*/); + ClientPtr /*client*/, + Mask /*access_mode*/); extern void NoopDDA(void); @@ -460,10 +420,10 @@ extern void ProcessWorkQueueZombies(void); +typedef Bool (*WorkQueueProcPtr)(ClientPtr pClient, pointer closure); + extern Bool QueueWorkProc( - Bool (* /*function*/)( - ClientPtr /*clientUnused*/, - pointer /*closure*/), + WorkQueueProcPtr /*function*/, ClientPtr /*client*/, pointer /*closure*/ ); @@ -678,12 +638,16 @@ Mask /*filter*/, GrabPtr /*grab*/); +extern Bool IsXineramaActive(void); + extern void WindowsRestructured(void); +#ifdef PANORAMIX +extern void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff); +#endif #ifdef RANDR -void -ScreenRestructured (ScreenPtr pScreen); +extern void ScreenRestructured (ScreenPtr pScreen); #endif extern void ResetClientPrivates(void); @@ -785,4 +749,7 @@ int count; } DeviceEventInfoRec; +extern void SetVendorRelease(int release); +extern void SetVendorString(const char *string); + #endif /* DIX_H */ Index: xc/programs/Xserver/include/dixfont.h diff -u xc/programs/Xserver/include/dixfont.h:3.8 xc/programs/Xserver/include/dixfont.h:3.9 --- xc/programs/Xserver/include/dixfont.h:3.8 Thu Apr 5 13:42:35 2001 +++ xc/programs/Xserver/include/dixfont.h Fri Oct 14 11:17:18 2005 @@ -1,4 +1,4 @@ -/* $Xorg: dixfont.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.9 2005/10/14 15:17:18 tsi Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,15 +21,14 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.8 2001/04/05 17:42:35 dawes Exp $ */ #ifndef DIXFONT_H #define DIXFONT_H 1 #include "dix.h" -#include "font.h" +#include #include "closure.h" -#include "fontstruct.h" +#include #define NullDIXFontProp ((DIXFontPropPtr)0) Index: xc/programs/Xserver/include/dixfontstr.h diff -u xc/programs/Xserver/include/dixfontstr.h:1.1.1.2 xc/programs/Xserver/include/dixfontstr.h:1.2 --- xc/programs/Xserver/include/dixfontstr.h:1.1.1.2 Tue Jan 16 17:43:59 2001 +++ xc/programs/Xserver/include/dixfontstr.h Fri Oct 14 11:17:18 2005 @@ -1,4 +1,4 @@ -/* $Xorg: dixfontstr.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixfontstr.h,v 1.2 2005/10/14 15:17:18 tsi Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -27,7 +27,7 @@ #include "servermd.h" #include "dixfont.h" -#include "fontstruct.h" +#include #include "closure.h" #define NEED_REPLIES #include "X11/Xproto.h" /* for xQueryFontReply */ Index: xc/programs/Xserver/include/dixstruct.h diff -u xc/programs/Xserver/include/dixstruct.h:3.20 xc/programs/Xserver/include/dixstruct.h:3.21 --- xc/programs/Xserver/include/dixstruct.h:3.20 Mon Nov 3 00:11:59 2003 +++ xc/programs/Xserver/include/dixstruct.h Sun Mar 27 21:51:08 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.20 2003/11/03 05:11:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/dixstruct.h,v 3.21 2005/03/28 02:51:08 dawes Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +21,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ #ifndef DIXSTRUCT_H #define DIXSTRUCT_H @@ -160,10 +159,7 @@ typedef struct _WorkQueue { struct _WorkQueue *next; - Bool (*function) ( - ClientPtr /* pClient */, - pointer /* closure */ -); + WorkQueueProcPtr function; ClientPtr client; pointer closure; } WorkQueueRec; Index: xc/programs/Xserver/include/extension.h diff -u xc/programs/Xserver/include/extension.h:1.6 xc/programs/Xserver/include/extension.h:1.7 --- xc/programs/Xserver/include/extension.h:1.6 Sun Apr 27 17:31:04 2003 +++ xc/programs/Xserver/include/extension.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: extension.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.7 2006/01/09 15:00:33 dawes Exp $ */ #ifndef EXTENSION_H #define EXTENSION_H Index: xc/programs/Xserver/include/extnsionst.h diff -u xc/programs/Xserver/include/extnsionst.h:3.9 xc/programs/Xserver/include/extnsionst.h:3.10 --- xc/programs/Xserver/include/extnsionst.h:3.9 Tue Jul 15 21:38:52 2003 +++ xc/programs/Xserver/include/extnsionst.h Fri May 13 22:00:04 2005 @@ -1,4 +1,3 @@ -/* $Xorg: extnsionst.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.9 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.10 2005/05/14 02:00:04 dawes Exp $ */ #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H @@ -55,6 +54,10 @@ #include "extension.h" #include "gc.h" +#define INITARGS void + +typedef void (*InitExtension)(INITARGS); + typedef struct _ExtensionEntry { int index; void (* CloseDown)( /* called at server shutdown */ Index: xc/programs/Xserver/include/gc.h diff -u xc/programs/Xserver/include/gc.h:1.6 xc/programs/Xserver/include/gc.h:1.7 --- xc/programs/Xserver/include/gc.h:1.6 Sun Apr 27 17:31:04 2003 +++ xc/programs/Xserver/include/gc.h Fri Oct 14 11:17:18 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/gc.h,v 1.7 2005/10/14 15:17:18 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,13 +45,12 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: gc.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef GC_H #define GC_H #include "X11/X.h" /* for GContext, Mask */ -#include "Xdefs.h" /* for Bool */ +#include /* for Bool */ #include "X11/Xproto.h" #include "screenint.h" /* for ScreenPtr */ #include "pixmap.h" /* for DrawablePtr */ Index: xc/programs/Xserver/include/gcstruct.h diff -u xc/programs/Xserver/include/gcstruct.h:1.8 xc/programs/Xserver/include/gcstruct.h:1.9 --- xc/programs/Xserver/include/gcstruct.h:1.8 Tue Jul 15 21:38:52 2003 +++ xc/programs/Xserver/include/gcstruct.h Fri Oct 14 11:17:18 2005 @@ -1,4 +1,4 @@ -/* $Xorg: gcstruct.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.9 2005/10/14 15:17:18 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,9 +46,6 @@ ******************************************************************/ - -/* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.8 2003/07/16 01:38:52 dawes Exp $ */ - #ifndef GCSTRUCT_H #define GCSTRUCT_H @@ -58,7 +55,7 @@ #include "region.h" #include "pixmap.h" #include "screenint.h" -#include "Xprotostr.h" +#include /* * functions which modify the state of the GC Index: xc/programs/Xserver/include/input.h diff -u xc/programs/Xserver/include/input.h:3.8 xc/programs/Xserver/include/input.h:3.9 --- xc/programs/Xserver/include/input.h:3.8 Sun Apr 27 17:31:04 2003 +++ xc/programs/Xserver/include/input.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: input.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/input.h,v 3.9 2006/01/09 15:00:33 dawes Exp $ */ #ifndef INPUT_H #define INPUT_H Index: xc/programs/Xserver/include/inputstr.h diff -u xc/programs/Xserver/include/inputstr.h:1.6 xc/programs/Xserver/include/inputstr.h:1.7 --- xc/programs/Xserver/include/inputstr.h:1.6 Sun Apr 27 17:31:04 2003 +++ xc/programs/Xserver/include/inputstr.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.7 2006/01/09 15:00:33 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -46,8 +46,6 @@ ********************************************************/ -/* $Xorg: inputstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ - #ifndef INPUTSTRUCT_H #define INPUTSTRUCT_H Index: xc/programs/Xserver/include/misc.h diff -u xc/programs/Xserver/include/misc.h:3.31 xc/programs/Xserver/include/misc.h:3.32 --- xc/programs/Xserver/include/misc.h:3.31 Sat Jul 17 16:41:00 2004 +++ xc/programs/Xserver/include/misc.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.31 2004/07/17 20:41:00 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/include/misc.h,v 3.32 2006/01/09 15:00:33 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -66,7 +66,7 @@ OF THIS SOFTWARE. ******************************************************************/ -/* $Xorg: misc.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */ + #ifndef MISC_H #define MISC_H 1 /* Index: xc/programs/Xserver/include/miscstruct.h diff -u xc/programs/Xserver/include/miscstruct.h:3.5 xc/programs/Xserver/include/miscstruct.h:3.6 --- xc/programs/Xserver/include/miscstruct.h:3.5 Tue Jul 15 21:38:52 2003 +++ xc/programs/Xserver/include/miscstruct.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: miscstruct.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.5 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.6 2006/01/09 15:00:33 dawes Exp $ */ #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 Index: xc/programs/Xserver/include/opaque.h diff -u xc/programs/Xserver/include/opaque.h:1.14 xc/programs/Xserver/include/opaque.h:1.15 --- xc/programs/Xserver/include/opaque.h:1.14 Mon Sep 8 23:20:41 2003 +++ xc/programs/Xserver/include/opaque.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: opaque.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.14 2003/09/09 03:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.15 2006/01/09 15:00:33 dawes Exp $ */ #ifndef OPAQUE_H #define OPAQUE_H Index: xc/programs/Xserver/include/os.h diff -u xc/programs/Xserver/include/os.h:3.63 xc/programs/Xserver/include/os.h:3.68 --- xc/programs/Xserver/include/os.h:3.63 Wed Feb 2 21:01:14 2005 +++ xc/programs/Xserver/include/os.h Thu Mar 16 16:44:00 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/os.h,v 3.63 2005/02/03 02:01:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/os.h,v 3.68 2006/03/16 21:44:00 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,7 +47,7 @@ ******************************************************************/ /* - * Copyright (c) 1996-2005 by The XFree86 Project, Inc. + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -99,7 +99,7 @@ #include "misc.h" #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size)) #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr)) -#include "Xalloca.h" +#include #ifndef IN_MODULE #include #else @@ -279,9 +279,16 @@ extern void FreeDPMSTimers(void); #endif -extern SIGVAL AutoResetServer(int /*sig*/); +#ifdef __GNUC__ +#define NORET __attribute__((noreturn)) +#else +#define NORET /**/ +#endif +extern SIGVAL AutoResetServer(int /*sig*/); extern SIGVAL GiveUp(int /*sig*/); +extern SIGVAL AbortServer(int /*sig*/) NORET; + extern void UseMsg(void); @@ -336,6 +343,8 @@ extern void OsInit(void); extern void OsCleanup(Bool); +extern void OsPrepareShutdown(Bool); +extern void OsPrepareRestart(void); extern void OsVendorFatalError(void); @@ -599,8 +608,8 @@ extern int vsnprintf(char *str, size_t size, const char *format, va_list ap); #endif #if defined(NEED_STRLCAT) -extern size_t strlcat(char *dst, const char *src, size_t size); -extern size_t strlcpy(char *dst, const char *src, size_t size); +#include "strlcat.h" +#include "strlcpy.h" #endif #endif @@ -612,5 +621,7 @@ #if defined(printf_is_xf86printf) && !defined(printf) #define printf xf86printf #endif +extern int getArgc(void); +extern const char *getArgv(int i); #endif /* OS_H */ Index: xc/programs/Xserver/include/pixmap.h diff -u xc/programs/Xserver/include/pixmap.h:1.4 xc/programs/Xserver/include/pixmap.h:1.5 --- xc/programs/Xserver/include/pixmap.h:1.4 Mon Nov 3 00:36:35 2003 +++ xc/programs/Xserver/include/pixmap.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pixmap.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/pixmap.h,v 1.5 2006/01/09 15:00:33 dawes Exp $ */ #ifndef PIXMAP_H #define PIXMAP_H Index: xc/programs/Xserver/include/pixmapstr.h diff -u xc/programs/Xserver/include/pixmapstr.h:1.3 xc/programs/Xserver/include/pixmapstr.h:1.4 --- xc/programs/Xserver/include/pixmapstr.h:1.3 Tue Jul 15 21:38:52 2003 +++ xc/programs/Xserver/include/pixmapstr.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pixmapstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.3 2003/07/16 01:38:52 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/pixmapstr.h,v 1.4 2006/01/09 15:00:33 dawes Exp $ */ #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H Index: xc/programs/Xserver/include/property.h diff -u xc/programs/Xserver/include/property.h:1.4 xc/programs/Xserver/include/property.h:1.5 --- xc/programs/Xserver/include/property.h:1.4 Sun Apr 27 17:31:04 2003 +++ xc/programs/Xserver/include/property.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: property.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/property.h,v 1.4 2003/04/27 21:31:04 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/property.h,v 1.5 2006/01/09 15:00:33 dawes Exp $ */ #ifndef PROPERTY_H #define PROPERTY_H Index: xc/programs/Xserver/include/propertyst.h diff -u xc/programs/Xserver/include/propertyst.h:3.3 xc/programs/Xserver/include/propertyst.h:3.4 --- xc/programs/Xserver/include/propertyst.h:3.3 Fri Dec 14 14:59:55 2001 +++ xc/programs/Xserver/include/propertyst.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: propertyst.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.3 2001/12/14 19:59:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.4 2006/01/09 15:00:33 dawes Exp $ */ #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H Index: xc/programs/Xserver/include/region.h diff -u xc/programs/Xserver/include/region.h:1.2 xc/programs/Xserver/include/region.h:1.3 --- xc/programs/Xserver/include/region.h:1.2 Fri Dec 14 14:59:55 2001 +++ xc/programs/Xserver/include/region.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: region.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/include/region.h,v 1.3 2006/01/09 15:00:33 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/programs/Xserver/include/regionstr.h diff -u xc/programs/Xserver/include/regionstr.h:1.14 xc/programs/Xserver/include/regionstr.h:1.15 --- xc/programs/Xserver/include/regionstr.h:1.14 Fri Sep 3 14:39:12 2004 +++ xc/programs/Xserver/include/regionstr.h Mon Jan 9 10:00:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.14 2004/09/03 18:39:12 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.15 2006/01/09 15:00:33 dawes Exp $ */ #ifndef REGIONSTRUCT_H #define REGIONSTRUCT_H Index: xc/programs/Xserver/include/resource.h diff -u xc/programs/Xserver/include/resource.h:1.12 xc/programs/Xserver/include/resource.h:1.14 --- xc/programs/Xserver/include/resource.h:1.12 Sun Apr 27 17:31:05 2003 +++ xc/programs/Xserver/include/resource.h Sun Feb 19 10:51:31 2006 @@ -1,4 +1,4 @@ -/* $Xorg: resource.h,v 1.5 2001/02/09 02:05:15 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.14 2006/02/19 15:51:31 tsi Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/resource.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ #ifndef RESOURCE_H #define RESOURCE_H 1 @@ -113,11 +112,8 @@ #define CLIENT_ID(id) ((int)(CLIENT_BITS(id) >> CLIENTOFFSET)) #define SERVER_BIT (Mask)0x40000000 /* use illegal bit */ -#ifdef INVALID -#undef INVALID /* needed on HP/UX */ -#endif - /* Invalid resource id */ +#undef INVALID #define INVALID (0) #define BAD_RESOURCE 0xe0000000 @@ -214,7 +210,8 @@ FindComplexResType func, pointer cdata); -/* These are the access modes that can be passed in the last parameter +/* + * These are the access modes that can be passed in the last parameter * to SecurityLookupIDByType/Class. The Security extension doesn't * currently make much use of these; they're mainly provided as an * example of what you might need for discretionary access control. @@ -227,8 +224,6 @@ #define SecurityWriteAccess (1<<1) /* changing the object */ #define SecurityDestroyAccess (1<<2) /* destroying the object */ -#ifdef XCSECURITY - extern pointer SecurityLookupIDByType( ClientPtr /*client*/, XID /*id*/, @@ -241,16 +236,6 @@ RESTYPE /*classes*/, Mask /*access_mode*/); -#else /* not XCSECURITY */ - -#define SecurityLookupIDByType(client, id, rtype, access_mode) \ - LookupIDByType(id, rtype) - -#define SecurityLookupIDByClass(client, id, classes, access_mode) \ - LookupIDByClass(id, classes) - -#endif /* XCSECURITY */ - extern void GetXIDRange( int /*client*/, Bool /*server*/, @@ -265,10 +250,9 @@ extern RESTYPE lastResourceType; extern RESTYPE TypeMask; -#ifdef XResExtension +#ifdef RES extern Atom *ResourceNames; void RegisterResourceName(RESTYPE type, char* name); #endif #endif /* RESOURCE_H */ - Index: xc/programs/Xserver/include/rgb.h diff -u xc/programs/Xserver/include/rgb.h:1.2 xc/programs/Xserver/include/rgb.h:1.3 --- xc/programs/Xserver/include/rgb.h:1.2 Fri Dec 14 14:59:56 2001 +++ xc/programs/Xserver/include/rgb.h Mon Jan 9 10:00:34 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/Xserver/include/rgb.h,v 1.3 2006/01/09 15:00:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -44,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: rgb.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ #ifndef RGB_H #define RGB_H Index: xc/programs/Xserver/include/screenint.h diff -u xc/programs/Xserver/include/screenint.h:1.6 xc/programs/Xserver/include/screenint.h:1.8 --- xc/programs/Xserver/include/screenint.h:1.6 Sun Apr 27 17:31:05 2003 +++ xc/programs/Xserver/include/screenint.h Fri Apr 1 09:27:02 2005 @@ -1,4 +1,3 @@ -/* $Xorg: screenint.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.6 2003/04/27 21:31:05 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.8 2005/04/01 14:27:02 tsi Exp $ */ #ifndef SCREENINT_H #define SCREENINT_H @@ -78,14 +77,16 @@ int /* index */, unsigned /* amount */); +typedef Bool (*ScrnInitProcPtr)( + int /* index */, + ScreenPtr /* pScreen */, + int /* argc */, + char ** /* argv */); + extern int AddScreen( - Bool (* /*pfnInit*/)( - int /*index*/, - ScreenPtr /*pScreen*/, - int /*argc*/, - char ** /*argv*/), - int /*argc*/, - char** /*argv*/); + ScrnInitProcPtr /* pfnInit */, + int /* argc */, + char** /* argv */); #ifdef PIXPRIV Index: xc/programs/Xserver/include/scrnintstr.h diff -u xc/programs/Xserver/include/scrnintstr.h:1.13 xc/programs/Xserver/include/scrnintstr.h:1.14 --- xc/programs/Xserver/include/scrnintstr.h:1.13 Tue Jul 15 21:38:53 2003 +++ xc/programs/Xserver/include/scrnintstr.h Mon Jan 9 10:00:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: scrnintstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.13 2003/07/16 01:38:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.14 2006/01/09 15:00:34 dawes Exp $ */ #ifndef SCREENINTSTRUCT_H #define SCREENINTSTRUCT_H Index: xc/programs/Xserver/include/selection.h diff -u xc/programs/Xserver/include/selection.h:1.2 xc/programs/Xserver/include/selection.h:1.3 --- xc/programs/Xserver/include/selection.h:1.2 Fri Dec 14 14:59:56 2001 +++ xc/programs/Xserver/include/selection.h Mon Jan 9 10:00:34 2006 @@ -1,4 +1,4 @@ -/* $Xorg: selection.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/include/selection.h,v 1.3 2006/01/09 15:00:34 dawes Exp $ */ #ifndef SELECTION_H #define SELECTION_H 1 Index: xc/programs/Xserver/include/servermd.h diff -u xc/programs/Xserver/include/servermd.h:3.58 xc/programs/Xserver/include/servermd.h:3.60 --- xc/programs/Xserver/include/servermd.h:3.58 Sun Mar 21 06:27:06 2004 +++ xc/programs/Xserver/include/servermd.h Tue Jun 28 21:14:12 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.58 2004/03/21 11:27:06 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/include/servermd.h,v 3.60 2005/06/29 01:14:12 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,13 +45,13 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ #ifndef SERVERMD_H #define SERVERMD_H 1 /* * Machine dependent values: + * * GLYPHPADBYTES should be chosen with consideration for the space-time * trade-off. Padding to 0 bytes means that there is no wasted space * in the font bitmaps (both on disk and in memory), but that access of @@ -111,10 +111,12 @@ * define uses unaligned reads for 8-bit BitBLT instead of doing * aligned reads and combining the results with shifts and * logical-ors. Currently defined for 68020 and vax. + * * PLENTIFUL_REGISTERS - * For machines with > 20 registers. Currently used for * unrolling the text painting code a bit more. Currently * defined for MIPS. + * * SHARED_IDCACHE - * For non-Harvard RISC machines, those which share the same * CPU memory bus for instructions and data. This unrolls some @@ -134,26 +136,17 @@ #ifdef __arm32__ -#define IMAGE_BYTE_ORDER LSBFirst +# define IMAGE_BYTE_ORDER LSBFirst +# define BITMAP_BIT_ORDER LSBFirst -# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) -# define BITMAP_BIT_ORDER MSBFirst -# else -# define BITMAP_BIT_ORDER LSBFirst -# endif - -# if defined(XF86MONOVGA) || defined(XF86VGA16) -# define BITMAP_SCANLINE_UNIT 8 -# endif - -#define GLYPHPADBYTES 4 -#define GETLEFTBITS_ALIGNMENT 1 -#define LARGE_INSTRUCTION_CACHE -#define AVOID_MEMORY_READ +# define GLYPHPADBYTES 4 +# define GETLEFTBITS_ALIGNMENT 1 +# define LARGE_INSTRUCTION_CACHE +# define AVOID_MEMORY_READ #endif /* __arm32__ */ -#if defined (hpux) +#if defined(hpux) #define IMAGE_BYTE_ORDER MSBFirst #define BITMAP_BIT_ORDER MSBFirst @@ -317,16 +310,7 @@ #if defined(__alpha) || defined(__alpha__) || defined(__alphaCross) # define IMAGE_BYTE_ORDER LSBFirst /* Values for the Alpha only */ - -# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) -# define BITMAP_BIT_ORDER MSBFirst -# else -# define BITMAP_BIT_ORDER LSBFirst -# endif - -# if defined(XF86MONOVGA) || defined(XF86VGA16) -# define BITMAP_SCANLINE_UNIT 8 -# endif +# define BITMAP_BIT_ORDER LSBFirst # define GLYPHPADBYTES 4 # define GETLEFTBITS_ALIGNMENT 1 @@ -370,16 +354,7 @@ #if defined(__ia64__) || defined(ia64) # define IMAGE_BYTE_ORDER LSBFirst - -# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) -# define BITMAP_BIT_ORDER MSBFirst -# else -# define BITMAP_BIT_ORDER LSBFirst -# endif - -# if defined(XF86MONOVGA) || defined(XF86VGA16) -# define BITMAP_SCANLINE_UNIT 8 -# endif +# define BITMAP_BIT_ORDER LSBFirst # define GLYPHPADBYTES 4 # define GETLEFTBITS_ALIGNMENT 1 @@ -389,18 +364,9 @@ #endif /* ia64 */ -#if defined(__AMD64__) || defined(AMD64) || defined(__amd64__) +#if defined(__amd64__) || defined(__x86_64__) # define IMAGE_BYTE_ORDER LSBFirst - -# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) -# define BITMAP_BIT_ORDER MSBFirst -# else -# define BITMAP_BIT_ORDER LSBFirst -# endif - -# if defined(XF86MONOVGA) || defined(XF86VGA16) -# define BITMAP_SCANLINE_UNIT 8 -# endif +# define BITMAP_BIT_ORDER LSBFirst # define GLYPHPADBYTES 4 # define GETLEFTBITS_ALIGNMENT 1 @@ -408,7 +374,7 @@ # define FAST_CONSTANT_OFFSET_MODE /* ???? */ # define FAST_UNALIGNED_READS -#endif /* AMD64 */ +#endif /* __amd64__ || __x86_64__ */ #ifdef stellar @@ -453,17 +419,7 @@ #endif #ifndef BITMAP_BIT_ORDER -# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) -# define BITMAP_BIT_ORDER MSBFirst -# else -# define BITMAP_BIT_ORDER LSBFirst -# endif -#endif - -#ifndef BITMAP_SCANLINE_UNIT -# if defined(XF86MONOVGA) || defined(XF86VGA16) -# define BITMAP_SCANLINE_UNIT 8 -# endif +#define BITMAP_BIT_ORDER LSBFirst #endif #ifndef GLYPHPADBYTES @@ -520,9 +476,19 @@ #define IMAGE_BUFSIZE (64*1024) #endif +#if defined(XF86VGA16) || defined(XF86MONO) +# undef BITMAP_BIT_ORDER /* Always override this */ +# define BITMAP_BIT_ORDER MSBFirst +#endif + +#ifdef XF86VGA16 +# undef BITMAP_SCANLINE_UNIT /* Always override */ +# define BITMAP_SCANLINE_UNIT 8 +#endif + /* pad scanline to a longword */ #ifndef BITMAP_SCANLINE_UNIT -#define BITMAP_SCANLINE_UNIT 32 +# define BITMAP_SCANLINE_UNIT 32 #endif #ifndef BITMAP_SCANLINE_PAD Index: xc/programs/Xserver/include/site.h diff -u xc/programs/Xserver/include/site.h:1.9 xc/programs/Xserver/include/site.h:1.10 --- xc/programs/Xserver/include/site.h:1.9 Mon Sep 8 23:20:41 2003 +++ xc/programs/Xserver/include/site.h Tue Jul 5 20:02:35 2005 @@ -1,4 +1,3 @@ -/* $Xorg: site.h,v 1.6 2001/02/09 02:05:16 xorgcvs Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group @@ -45,41 +44,10 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/include/site.h,v 1.9 2003/09/09 03:20:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/site.h,v 1.10 2005/07/06 00:02:35 dawes Exp $ */ #ifndef SITE_H #define SITE_H -/* - * The vendor string identifies the vendor responsible for the - * server executable. - */ -#ifndef VENDOR_STRING -#define VENDOR_STRING "The X.Org Group" -#endif - -/* - * The vendor release number identifies, for the purpose of submitting - * traceable bug reports, the release number of software produced - * by the vendor. - */ -#ifndef VENDOR_RELEASE -#define VENDOR_RELEASE 6600 -#endif - -/* - * The following constants are provided solely as a last line of defense. The - * normal build ALWAYS overrides them using a special rule given in - * server/dix/Imakefile. If you want to change either of these constants, - * you should set the DefaultFontPath or DefaultRGBDatabase configuration - * parameters. - * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE! - */ -#ifndef COMPILEDDEFAULTFONTPATH -#define COMPILEDDEFAULTFONTPATH "/usr/lib/X11/fonts/misc/" -#endif -#ifndef RGB_DB -#define RGB_DB "/usr/lib/X11/rgb" -#endif /* * The following constants contain default values for all of the variables Index: xc/programs/Xserver/include/validate.h diff -u xc/programs/Xserver/include/validate.h:1.5 xc/programs/Xserver/include/validate.h:1.6 --- xc/programs/Xserver/include/validate.h:1.5 Fri Dec 14 14:59:56 2001 +++ xc/programs/Xserver/include/validate.h Mon Jan 9 10:00:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: validate.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -24,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/include/validate.h,v 1.6 2006/01/09 15:00:34 dawes Exp $ */ #ifndef VALIDATE_H #define VALIDATE_H Index: xc/programs/Xserver/include/window.h diff -u xc/programs/Xserver/include/window.h:1.6 xc/programs/Xserver/include/window.h:1.7 --- xc/programs/Xserver/include/window.h:1.6 Mon Nov 3 00:36:35 2003 +++ xc/programs/Xserver/include/window.h Mon Jan 9 10:00:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: window.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/window.h,v 1.6 2003/11/03 05:36:35 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/include/window.h,v 1.7 2006/01/09 15:00:34 dawes Exp $ */ #ifndef WINDOW_H #define WINDOW_H Index: xc/programs/Xserver/include/windowstr.h diff -u xc/programs/Xserver/include/windowstr.h:1.7 xc/programs/Xserver/include/windowstr.h:1.9 --- xc/programs/Xserver/include/windowstr.h:1.7 Sun Apr 27 17:31:05 2003 +++ xc/programs/Xserver/include/windowstr.h Sun Feb 19 10:51:31 2006 @@ -1,4 +1,4 @@ -/* $Xorg: windowstr.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.9 2006/02/19 15:51:31 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.7 2003/04/27 21:31:05 herrb Exp $ */ #ifndef WINDOWSTRUCT_H #define WINDOWSTRUCT_H @@ -130,12 +129,17 @@ unsigned viewable:1; /* realized && InputOutput */ unsigned dontPropagate:3;/* index into DontPropagateMasks */ unsigned forcedBS:1; /* system-supplied backingStore */ -#ifdef NEED_DBE_BUF_BITS + +#if defined(DBE) && defined(NEED_DBE_BUF_BITS) + #define DBE_FRONT_BUFFER 1 #define DBE_BACK_BUFFER 0 + unsigned dstBuffer:1; /* destination buffer for rendering */ unsigned srcBuffer:1; /* source buffer for rendering */ -#endif + +#endif /* NEED_DBE_BUF_BITS */ + DevUnion *devPrivates; } WindowRec; Index: xc/programs/Xserver/iplan2p2/Imakefile diff -u xc/programs/Xserver/iplan2p2/Imakefile:3.0 xc/programs/Xserver/iplan2p2/Imakefile:3.1 --- xc/programs/Xserver/iplan2p2/Imakefile:3.0 Sat Aug 17 21:54:28 1996 +++ xc/programs/Xserver/iplan2p2/Imakefile Mon Jan 9 10:00:35 2006 @@ -1,5 +1,5 @@ -XCOMM $XFree86: xc/programs/Xserver/iplan2p2/Imakefile,v 3.0 1996/08/18 01:54:28 dawes Exp $ -XCOMM $XConsortium: Imakefile,v 1.1 91/12/28 13:32:27 rws Exp $ +XCOMM $XFree86: xc/programs/Xserver/iplan2p2/Imakefile,v 3.1 2006/01/09 15:00:35 dawes Exp $ + #define IPlanes 2 #define LinkDirectory ../iplan2p4 Index: xc/programs/Xserver/iplan2p4/Imakefile diff -u xc/programs/Xserver/iplan2p4/Imakefile:3.5 xc/programs/Xserver/iplan2p4/Imakefile:3.7 --- xc/programs/Xserver/iplan2p4/Imakefile:3.5 Fri May 31 14:46:05 2002 +++ xc/programs/Xserver/iplan2p4/Imakefile Mon Jan 9 10:00:35 2006 @@ -1,5 +1,5 @@ -XCOMM $XFree86: xc/programs/Xserver/iplan2p4/Imakefile,v 3.5 2002/05/31 18:46:05 dawes Exp $ -XCOMM $XConsortium: Imakefile,v 5.41 93/09/06 18:37:23 rws Exp $ +XCOMM $XFree86: xc/programs/Xserver/iplan2p4/Imakefile,v 3.7 2006/01/09 15:00:35 dawes Exp $ + #include #ifndef IPlanes @@ -34,8 +34,7 @@ iplbitblt.o iplbltC.o iplbltX.o iplbltO.o iplbltG.o \ iplply1rctC.o iplply1rctG.o iplpack.o - INCLUDES = -I. -I../cfb -I../mfb -I../mi -I../include -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) $(EXTRAINCLUDES) + INCLUDES = -I../cfb -I../mfb -I../mi -I../include $(EXTRAINCLUDES) LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln \ ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln DEFINES = -DINTER_PLANES=IPlanes Index: xc/programs/Xserver/iplan2p4/ipl.h diff -u xc/programs/Xserver/iplan2p4/ipl.h:3.6 xc/programs/Xserver/iplan2p4/ipl.h:3.8 --- xc/programs/Xserver/iplan2p4/ipl.h:3.6 Mon Nov 17 17:20:43 2003 +++ xc/programs/Xserver/iplan2p4/ipl.h Mon Jan 9 10:00:35 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.6 2003/11/17 22:20:43 dawes Exp $ */ -/* $XConsortium: ipl.h,v 5.37 94/04/17 20:28:38 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipl.h,v 3.8 2006/01/09 15:00:35 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +31,7 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "pixmap.h" #include "region.h" #include "gc.h" Index: xc/programs/Xserver/iplan2p4/iplallpriv.c diff -u xc/programs/Xserver/iplan2p4/iplallpriv.c:3.0 xc/programs/Xserver/iplan2p4/iplallpriv.c:3.2 --- xc/programs/Xserver/iplan2p4/iplallpriv.c:3.0 Sat Aug 17 21:54:33 1996 +++ xc/programs/Xserver/iplan2p4/iplallpriv.c Mon Jan 9 10:00:35 2006 @@ -1,6 +1,5 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplallpriv.c,v 3.0 1996/08/18 01:54:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplallpriv.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /* - * $XConsortium: iplallpriv.c,v 1.5 94/04/17 20:28:42 dpw Exp $ * Copyright (c) 1991 X Consortium @@ -31,8 +30,8 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/iplan2p4/iplbitblt.c diff -u xc/programs/Xserver/iplan2p4/iplbitblt.c:3.2 xc/programs/Xserver/iplan2p4/iplbitblt.c:3.4 --- xc/programs/Xserver/iplan2p4/iplbitblt.c:3.2 Mon Nov 10 13:22:45 2003 +++ xc/programs/Xserver/iplan2p4/iplbitblt.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.2 2003/11/10 18:22:45 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbitblt.c,v 3.4 2006/01/09 15:00:35 dawes Exp $ */ /* * ipl copy area */ @@ -31,14 +31,13 @@ Author: Keith Packard */ -/* $XConsortium: iplbitblt.c,v 5.51 94/05/27 11:00:56 dpw Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/iplan2p4/iplblt.c diff -u xc/programs/Xserver/iplan2p4/iplblt.c:3.0 xc/programs/Xserver/iplan2p4/iplblt.c:3.2 --- xc/programs/Xserver/iplan2p4/iplblt.c:3.0 Sat Aug 17 21:54:35 1996 +++ xc/programs/Xserver/iplan2p4/iplblt.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplblt.c,v 3.0 1996/08/18 01:54:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplblt.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /* * ipl copy area */ @@ -31,14 +31,13 @@ Author: Keith Packard */ -/* $XConsortium: iplblt.c,v 1.13 94/04/17 20:28:44 dpw Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/iplan2p4/iplbres.c diff -u xc/programs/Xserver/iplan2p4/iplbres.c:3.0 xc/programs/Xserver/iplan2p4/iplbres.c:3.2 --- xc/programs/Xserver/iplan2p4/iplbres.c:3.0 Sat Aug 17 21:54:36 1996 +++ xc/programs/Xserver/iplan2p4/iplbres.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbres.c,v 3.0 1996/08/18 01:54:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbres.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: iplbres.c,v 1.15 94/04/17 20:28:45 dpw Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "misc.h" #include "ipl.h" #include "servermd.h" Index: xc/programs/Xserver/iplan2p4/iplbresd.c diff -u xc/programs/Xserver/iplan2p4/iplbresd.c:3.0 xc/programs/Xserver/iplan2p4/iplbresd.c:3.2 --- xc/programs/Xserver/iplan2p4/iplbresd.c:3.0 Sat Aug 17 21:54:38 1996 +++ xc/programs/Xserver/iplan2p4/iplbresd.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbresd.c,v 3.0 1996/08/18 01:54:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbresd.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: iplbresd.c,v 1.16 94/04/17 20:28:45 dpw Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "misc.h" #include "ipl.h" #include "miline.h" Index: xc/programs/Xserver/iplan2p4/iplbstore.c diff -u xc/programs/Xserver/iplan2p4/iplbstore.c:3.0 xc/programs/Xserver/iplan2p4/iplbstore.c:3.2 --- xc/programs/Xserver/iplan2p4/iplbstore.c:3.0 Sat Aug 17 21:54:39 1996 +++ xc/programs/Xserver/iplan2p4/iplbstore.c Mon Jan 9 10:00:35 2006 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplbstore.c,v 3.0 1996/08/18 01:54:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplbstore.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ -/*- +/* * iplbstore.c -- * Functions required by the backing-store implementation in MI. * @@ -16,23 +16,19 @@ * * */ -#ifndef lint -static char rcsid[] = -"$XConsortium: iplbstore.c,v 5.8 93/12/13 17:21:51 dpw Exp $ SPRITE (Berkeley)"; -#endif /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ #include "ipl.h" -#include "X.h" +#include #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" -/*- +/* *----------------------------------------------------------------------- * iplSaveAreas -- * Function called by miSaveAreas to actually fetch the areas to be @@ -93,7 +89,7 @@ DEALLOCATE_LOCAL (pPtsInit); } -/*- +/* *----------------------------------------------------------------------- * iplRestoreAreas -- * Function called by miRestoreAreas to actually fetch the areas to be Index: xc/programs/Xserver/iplan2p4/iplcmap.c diff -u xc/programs/Xserver/iplan2p4/iplcmap.c:3.1 xc/programs/Xserver/iplan2p4/iplcmap.c:3.3 --- xc/programs/Xserver/iplan2p4/iplcmap.c:3.1 Sun Nov 22 05:37:41 1998 +++ xc/programs/Xserver/iplan2p4/iplcmap.c Mon Jan 9 10:00:35 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.1 1998/11/22 10:37:41 dawes Exp $ */ -/* $XConsortium: iplcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplcmap.c,v 3.3 2006/01/09 15:00:35 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,8 +31,8 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" Index: xc/programs/Xserver/iplan2p4/iplfillarc.c diff -u xc/programs/Xserver/iplan2p4/iplfillarc.c:3.0 xc/programs/Xserver/iplan2p4/iplfillarc.c:3.2 --- xc/programs/Xserver/iplan2p4/iplfillarc.c:3.0 Sat Aug 17 21:54:41 1996 +++ xc/programs/Xserver/iplan2p4/iplfillarc.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillarc.c,v 3.0 1996/08/18 01:54:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillarc.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -26,13 +26,11 @@ ********************************************************/ -/* $XConsortium: iplfillarc.c,v 5.15 94/04/17 20:28:47 dpw Exp $ */ - /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "miscstruct.h" #include "gcstruct.h" #include "pixmapstr.h" Index: xc/programs/Xserver/iplan2p4/iplfillrct.c diff -u xc/programs/Xserver/iplan2p4/iplfillrct.c:3.1 xc/programs/Xserver/iplan2p4/iplfillrct.c:3.3 --- xc/programs/Xserver/iplan2p4/iplfillrct.c:3.1 Fri Mar 20 16:08:08 1998 +++ xc/programs/Xserver/iplan2p4/iplfillrct.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillrct.c,v 3.3 2006/01/09 15:00:35 dawes Exp $ */ /* * Fill rectangles. */ @@ -29,13 +29,11 @@ in this Software without prior written authorization from the X Consortium. */ -/* $XConsortium: iplfillrct.c,v 5.18 94/04/17 20:28:47 dpw Exp $ */ - /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "gcstruct.h" #include "window.h" Index: xc/programs/Xserver/iplan2p4/iplfillsp.c diff -u xc/programs/Xserver/iplan2p4/iplfillsp.c:3.0 xc/programs/Xserver/iplan2p4/iplfillsp.c:3.2 --- xc/programs/Xserver/iplan2p4/iplfillsp.c:3.0 Sat Aug 17 21:54:43 1996 +++ xc/programs/Xserver/iplan2p4/iplfillsp.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillsp.c,v 3.0 1996/08/18 01:54:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplfillsp.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -76,13 +76,11 @@ ******************************************************************/ -/* $XConsortium: iplfillsp.c,v 5.24 94/04/17 20:28:48 dpw Exp $ */ - /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "gcstruct.h" #include "window.h" Index: xc/programs/Xserver/iplan2p4/iplgc.c diff -u xc/programs/Xserver/iplan2p4/iplgc.c:3.1 xc/programs/Xserver/iplan2p4/iplgc.c:3.3 --- xc/programs/Xserver/iplan2p4/iplgc.c:3.1 Fri Mar 20 16:08:08 1998 +++ xc/programs/Xserver/iplan2p4/iplgc.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplgc.c,v 3.3 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -47,16 +47,14 @@ ******************************************************************/ -/* $XConsortium: iplgc.c,v 5.62 94/04/17 20:28:49 dpw Exp $ */ - /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ipl.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/iplan2p4/iplgetsp.c diff -u xc/programs/Xserver/iplan2p4/iplgetsp.c:3.0 xc/programs/Xserver/iplan2p4/iplgetsp.c:3.2 --- xc/programs/Xserver/iplan2p4/iplgetsp.c:3.0 Sat Aug 17 21:54:47 1996 +++ xc/programs/Xserver/iplan2p4/iplgetsp.c Mon Jan 9 10:00:35 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplgetsp.c,v 3.0 1996/08/18 01:54:47 dawes Exp $ */ -/* $XConsortium: iplgetsp.c,v 5.14 94/04/17 20:28:50 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplgetsp.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -51,8 +50,8 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "misc.h" Index: xc/programs/Xserver/iplan2p4/iplhrzvert.c diff -u xc/programs/Xserver/iplan2p4/iplhrzvert.c:3.0 xc/programs/Xserver/iplan2p4/iplhrzvert.c:3.2 --- xc/programs/Xserver/iplan2p4/iplhrzvert.c:3.0 Sat Aug 17 21:54:48 1996 +++ xc/programs/Xserver/iplan2p4/iplhrzvert.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplhrzvert.c,v 3.0 1996/08/18 01:54:48 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplhrzvert.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: iplhrzvert.c,v 1.8 94/04/17 20:28:51 dpw Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "gc.h" #include "window.h" Index: xc/programs/Xserver/iplan2p4/iplimage.c diff -u xc/programs/Xserver/iplan2p4/iplimage.c:3.0 xc/programs/Xserver/iplan2p4/iplimage.c:3.2 --- xc/programs/Xserver/iplan2p4/iplimage.c:3.0 Sat Aug 17 21:54:49 1996 +++ xc/programs/Xserver/iplan2p4/iplimage.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplimage.c,v 3.0 1996/08/18 01:54:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplimage.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: iplimage.c,v 1.18 94/04/17 20:28:52 dpw Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/iplan2p4/iplline.c diff -u xc/programs/Xserver/iplan2p4/iplline.c:3.1 xc/programs/Xserver/iplan2p4/iplline.c:3.3 --- xc/programs/Xserver/iplan2p4/iplline.c:3.1 Fri Mar 20 16:08:08 1998 +++ xc/programs/Xserver/iplan2p4/iplline.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.1 1998/03/20 21:08:08 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplline.c,v 3.3 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,12 +46,11 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: iplline.c,v 1.23 94/04/17 20:28:53 dpw Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/iplan2p4/iplmap.h diff -u xc/programs/Xserver/iplan2p4/iplmap.h:3.2 xc/programs/Xserver/iplan2p4/iplmap.h:3.3 --- xc/programs/Xserver/iplan2p4/iplmap.h:3.2 Wed Jul 25 11:05:09 2001 +++ xc/programs/Xserver/iplan2p4/iplmap.h Mon Jan 9 10:00:35 2006 @@ -1,6 +1,5 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.2 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmap.h,v 3.3 2006/01/09 15:00:35 dawes Exp $ */ /* - * $XConsortium: iplmap.h,v 1.9 94/04/17 20:28:54 dpw Exp $ * Copyright (c) 1991 X Consortium Index: xc/programs/Xserver/iplan2p4/iplmergerop.h diff -u xc/programs/Xserver/iplan2p4/iplmergerop.h:3.1 xc/programs/Xserver/iplan2p4/iplmergerop.h:3.2 --- xc/programs/Xserver/iplan2p4/iplmergerop.h:3.1 Wed Jul 25 11:05:09 2001 +++ xc/programs/Xserver/iplan2p4/iplmergerop.h Fri Oct 14 11:17:18 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.1 2001/07/25 15:05:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.2 2005/10/14 15:17:18 tsi Exp $ */ #ifndef _IPLANMERGEROP_H_ #define _IPLANMERGEROP_H_ @@ -18,7 +18,7 @@ */ #ifndef GXcopy -#include "X.h" +#include #endif typedef struct _mergeRopBits { Index: xc/programs/Xserver/iplan2p4/iplpixmap.c diff -u xc/programs/Xserver/iplan2p4/iplpixmap.c:3.1 xc/programs/Xserver/iplan2p4/iplpixmap.c:3.4 --- xc/programs/Xserver/iplan2p4/iplpixmap.c:3.1 Mon Dec 17 15:00:46 2001 +++ xc/programs/Xserver/iplan2p4/iplpixmap.c Mon Jan 9 10:00:35 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.1 2001/12/17 20:00:46 dawes Exp $ */ -/* $XConsortium: iplpixmap.c,v 5.14 94/04/17 20:28:56 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpixmap.c,v 3.4 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -56,7 +55,7 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "Xmd.h" +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" @@ -76,8 +75,12 @@ PixmapPtr pPixmap; int datasize; int paddedWidth; - int ipad=INTER_PLANES*2 - 1; + int ipad; + if ((width > MAXSHORT) || (height > MAXSHORT)) + return NullPixmap; + + ipad = INTER_PLANES*2 - 1; paddedWidth = PixmapBytePad(width, depth); paddedWidth = (paddedWidth + ipad) & ~ipad; datasize = height * paddedWidth; Index: xc/programs/Xserver/iplan2p4/iplply1rct.c diff -u xc/programs/Xserver/iplan2p4/iplply1rct.c:3.1 xc/programs/Xserver/iplan2p4/iplply1rct.c:3.3 --- xc/programs/Xserver/iplan2p4/iplply1rct.c:3.1 Fri Mar 20 16:08:09 1998 +++ xc/programs/Xserver/iplan2p4/iplply1rct.c Mon Jan 9 10:00:35 2006 @@ -1,6 +1,5 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplply1rct.c,v 3.3 2006/01/09 15:00:35 dawes Exp $ */ /* - * $XConsortium: iplply1rct.c,v 1.14 94/04/17 20:28:56 dpw Exp $ * Copyright (c) 1990 X Consortium @@ -31,7 +30,7 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/iplan2p4/iplpntwin.c diff -u xc/programs/Xserver/iplan2p4/iplpntwin.c:3.0 xc/programs/Xserver/iplan2p4/iplpntwin.c:3.2 --- xc/programs/Xserver/iplan2p4/iplpntwin.c:3.0 Sat Aug 17 21:55:01 1996 +++ xc/programs/Xserver/iplan2p4/iplpntwin.c Mon Jan 9 10:00:35 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpntwin.c,v 3.0 1996/08/18 01:55:01 dawes Exp $ */ -/* $XConsortium: iplpntwin.c,v 5.18 94/04/17 20:28:57 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpntwin.c,v 3.2 2006/01/09 15:00:35 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -51,7 +50,7 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" Index: xc/programs/Xserver/iplan2p4/iplpolypnt.c diff -u xc/programs/Xserver/iplan2p4/iplpolypnt.c:3.1 xc/programs/Xserver/iplan2p4/iplpolypnt.c:3.3 --- xc/programs/Xserver/iplan2p4/iplpolypnt.c:3.1 Fri Mar 20 16:08:09 1998 +++ xc/programs/Xserver/iplan2p4/iplpolypnt.c Mon Jan 9 10:00:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplpolypnt.c,v 3.3 2006/01/09 15:00:35 dawes Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -26,12 +26,10 @@ ********************************************************/ -/* $XConsortium: iplpolypnt.c,v 5.17 94/04/17 20:28:57 dpw Exp $ */ - /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/iplan2p4/iplrrop.c diff -u xc/programs/Xserver/iplan2p4/iplrrop.c:3.0 xc/programs/Xserver/iplan2p4/iplrrop.c:3.2 --- xc/programs/Xserver/iplan2p4/iplrrop.c:3.0 Sat Aug 17 21:55:03 1996 +++ xc/programs/Xserver/iplan2p4/iplrrop.c Mon Jan 9 10:00:36 2006 @@ -1,6 +1,5 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.c,v 3.0 1996/08/18 01:55:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplrrop.c,v 3.2 2006/01/09 15:00:36 dawes Exp $ */ /* - * $XConsortium: iplrrop.c,v 1.8 94/04/17 20:28:59 dpw Exp $ * Copyright (c) 1989 X Consortium @@ -33,9 +32,9 @@ /* ipl reduced rasterop computations */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ipl.h" #include "iplmskbits.h" Index: xc/programs/Xserver/iplan2p4/iplscrinit.c diff -u xc/programs/Xserver/iplan2p4/iplscrinit.c:3.3 xc/programs/Xserver/iplan2p4/iplscrinit.c:3.5 --- xc/programs/Xserver/iplan2p4/iplscrinit.c:3.3 Sun Nov 22 05:37:41 1998 +++ xc/programs/Xserver/iplan2p4/iplscrinit.c Mon Jan 9 10:00:36 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.3 1998/11/22 10:37:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplscrinit.c,v 3.5 2006/01/09 15:00:36 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -27,13 +27,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XConsortium: iplscrinit.c,v 5.32 94/04/17 20:29:00 dpw Exp $ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" Index: xc/programs/Xserver/iplan2p4/iplsetsp.c diff -u xc/programs/Xserver/iplan2p4/iplsetsp.c:3.0 xc/programs/Xserver/iplan2p4/iplsetsp.c:3.2 --- xc/programs/Xserver/iplan2p4/iplsetsp.c:3.0 Sat Aug 17 21:55:07 1996 +++ xc/programs/Xserver/iplan2p4/iplsetsp.c Mon Jan 9 10:00:36 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplsetsp.c,v 3.0 1996/08/18 01:55:07 dawes Exp $ */ -/* $XConsortium: iplsetsp.c,v 5.10 94/04/17 20:29:01 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplsetsp.c,v 3.2 2006/01/09 15:00:36 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -51,8 +50,8 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "misc.h" Index: xc/programs/Xserver/iplan2p4/iplsolid.c diff -u xc/programs/Xserver/iplan2p4/iplsolid.c:3.1 xc/programs/Xserver/iplan2p4/iplsolid.c:3.3 --- xc/programs/Xserver/iplan2p4/iplsolid.c:3.1 Fri Mar 20 16:08:09 1998 +++ xc/programs/Xserver/iplan2p4/iplsolid.c Mon Jan 9 10:00:36 2006 @@ -1,6 +1,5 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplsolid.c,v 3.3 2006/01/09 15:00:36 dawes Exp $ */ /* - * $XConsortium: iplsolid.c,v 1.9 94/04/17 20:29:02 dpw Exp $ * Copyright (c) 1990 X Consortium @@ -31,8 +30,8 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "gcstruct.h" #include "window.h" Index: xc/programs/Xserver/iplan2p4/ipltegblt.c diff -u xc/programs/Xserver/iplan2p4/ipltegblt.c:3.0 xc/programs/Xserver/iplan2p4/ipltegblt.c:3.2 --- xc/programs/Xserver/iplan2p4/ipltegblt.c:3.0 Sat Aug 17 21:55:09 1996 +++ xc/programs/Xserver/iplan2p4/ipltegblt.c Mon Jan 9 10:00:36 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltegblt.c,v 3.0 1996/08/18 01:55:09 dawes Exp $ */ -/* $XConsortium: ipltegblt.c,v 5.9 94/04/17 20:29:03 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipltegblt.c,v 3.2 2006/01/09 15:00:36 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -51,11 +50,11 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "ipl.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" Index: xc/programs/Xserver/iplan2p4/ipltile32.c diff -u xc/programs/Xserver/iplan2p4/ipltile32.c:3.1 xc/programs/Xserver/iplan2p4/ipltile32.c:3.3 --- xc/programs/Xserver/iplan2p4/ipltile32.c:3.1 Fri Mar 20 16:08:09 1998 +++ xc/programs/Xserver/iplan2p4/ipltile32.c Mon Jan 9 10:00:36 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.1 1998/03/20 21:08:09 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipltile32.c,v 3.3 2006/01/09 15:00:36 dawes Exp $ */ /* * Fill 32 bit tiled rectangles. Used by both PolyFillRect and PaintWindow. * no depth dependencies. @@ -30,13 +30,11 @@ in this Software without prior written authorization from the X Consortium. */ -/* $XConsortium: ipltile32.c,v 1.8 94/04/17 20:29:05 dpw Exp $ */ - /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "gcstruct.h" #include "window.h" Index: xc/programs/Xserver/iplan2p4/ipltileodd.c diff -u xc/programs/Xserver/iplan2p4/ipltileodd.c:3.0 xc/programs/Xserver/iplan2p4/ipltileodd.c:3.2 --- xc/programs/Xserver/iplan2p4/ipltileodd.c:3.0 Sat Aug 17 21:55:11 1996 +++ xc/programs/Xserver/iplan2p4/ipltileodd.c Mon Jan 9 10:00:36 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/ipltileodd.c,v 3.0 1996/08/18 01:55:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/ipltileodd.c,v 3.2 2006/01/09 15:00:36 dawes Exp $ */ /* * Fill odd tiled rectangles and spans. * no depth dependencies. @@ -30,13 +30,11 @@ in this Software without prior written authorization from the X Consortium. */ -/* $XConsortium: ipltileodd.c,v 1.16 94/04/17 20:29:06 dpw Exp $ */ - /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "gcstruct.h" #include "window.h" Index: xc/programs/Xserver/iplan2p4/iplwindow.c diff -u xc/programs/Xserver/iplan2p4/iplwindow.c:3.1 xc/programs/Xserver/iplan2p4/iplwindow.c:3.3 --- xc/programs/Xserver/iplan2p4/iplwindow.c:3.1 Mon Nov 10 13:22:45 2003 +++ xc/programs/Xserver/iplan2p4/iplwindow.c Mon Jan 9 10:00:36 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.1 2003/11/10 18:22:45 tsi Exp $ */ -/* $XConsortium: iplwindow.c,v 5.22 94/04/17 20:29:07 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/iplan2p4/iplwindow.c,v 3.3 2006/01/09 15:00:36 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -51,7 +50,7 @@ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "ipl.h" Index: xc/programs/Xserver/iplan2p8/Imakefile diff -u xc/programs/Xserver/iplan2p8/Imakefile:3.0 xc/programs/Xserver/iplan2p8/Imakefile:3.1 --- xc/programs/Xserver/iplan2p8/Imakefile:3.0 Sat Aug 17 21:55:18 1996 +++ xc/programs/Xserver/iplan2p8/Imakefile Mon Jan 9 10:00:37 2006 @@ -1,5 +1,5 @@ -XCOMM $XFree86: xc/programs/Xserver/iplan2p8/Imakefile,v 3.0 1996/08/18 01:55:18 dawes Exp $ -XCOMM $XConsortium: Imakefile,v 1.1 91/12/28 13:32:27 rws Exp $ +XCOMM $XFree86: xc/programs/Xserver/iplan2p8/Imakefile,v 3.1 2006/01/09 15:00:37 dawes Exp $ + #define IPlanes 8 #define LinkDirectory ../iplan2p4 Index: xc/programs/Xserver/lbx/Imakefile diff -u xc/programs/Xserver/lbx/Imakefile:1.5 xc/programs/Xserver/lbx/Imakefile:1.7 --- xc/programs/Xserver/lbx/Imakefile:1.5 Sun Aug 31 08:58:58 2003 +++ xc/programs/Xserver/lbx/Imakefile Mon Jan 9 10:00:37 2006 @@ -1,7 +1,5 @@ -/* $Xorg: Imakefile,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ - * - * $NCDXorg: @(#)Imakefile,v 1.16 1994/11/18 20:32:34 lemke Exp $ - * +/* $XFree86: xc/programs/Xserver/lbx/Imakefile,v 1.7 2006/01/09 15:00:37 dawes Exp $ */ +/* * Copyright 1992 Network Computing Devices * * Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +21,6 @@ * * Author: Keith Packard, Network Computing Devices */ -/* $XFree86: xc/programs/Xserver/lbx/Imakefile,v 1.5 2003/08/31 12:58:58 tsi Exp $ */ #include @@ -36,7 +33,7 @@ -I$(FONTSRC)/include \ -I$(SERVERSRC)/include #else -INCLUDES = -I$(TOP)/include -I$(TOP)/include/fonts -I$(SERVERSRC)/include -I$(EXTINCSRC) -I../../../include/extensions +INCLUDES = -I$(SERVERSRC)/include #endif SRCS = \ Index: xc/programs/Xserver/lbx/lbxcmap.c diff -u xc/programs/Xserver/lbx/lbxcmap.c:1.10 xc/programs/Xserver/lbx/lbxcmap.c:1.11 --- xc/programs/Xserver/lbx/lbxcmap.c:1.10 Fri Dec 14 14:59:59 2001 +++ xc/programs/Xserver/lbx/lbxcmap.c Fri Oct 14 11:17:19 2005 @@ -1,5 +1,4 @@ -/* $Xorg: lbxcmap.c,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.11 2005/10/14 15:17:19 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -25,14 +24,13 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.10 2001/12/14 19:59:59 dawes Exp $ */ #include #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -41,9 +39,9 @@ #include "colormapst.h" #include "propertyst.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "lbxserve.h" -#include "Xfuncproto.h" +#include #include static int lbxScreenPrivIndex; /* lbx screen private index */ Index: xc/programs/Xserver/lbx/lbxdata.h diff -u xc/programs/Xserver/lbx/lbxdata.h:1.1.1.2 xc/programs/Xserver/lbx/lbxdata.h:1.2 --- xc/programs/Xserver/lbx/lbxdata.h:1.1.1.2 Tue Jan 16 17:44:10 2001 +++ xc/programs/Xserver/lbx/lbxdata.h Fri Oct 14 11:17:19 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxdata.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxdata.h,v 1.2 2005/10/14 15:17:19 tsi Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * @@ -25,10 +25,10 @@ #ifndef _LBXDATA_H_ #define _LBXDATA_H_ #define NEED_REPLIES -#include "X.h" -#include "Xproto.h" +#include +#include #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "dixfontstr.h" extern int lbx_font_private; Index: xc/programs/Xserver/lbx/lbxdix.c diff -u xc/programs/Xserver/lbx/lbxdix.c:1.8 xc/programs/Xserver/lbx/lbxdix.c:1.9 --- xc/programs/Xserver/lbx/lbxdix.c:1.8 Fri Dec 14 14:59:59 2001 +++ xc/programs/Xserver/lbx/lbxdix.c Fri Oct 14 11:17:19 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxdix.c,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.9 2005/10/14 15:17:19 tsi Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +46,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxdix.c,v 1.8 2001/12/14 19:59:59 dawes Exp $ */ /* various bits of DIX-level mangling */ @@ -54,8 +53,8 @@ #include #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -68,13 +67,13 @@ #include "windowstr.h" #include "propertyst.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "lbxserve.h" #include "lbxtags.h" #include "lbxdata.h" -#include "Xfuncproto.h" +#include #ifdef XAPPGROUP -#include "Xagsrv.h" +#include #endif #include "swaprep.h" Index: xc/programs/Xserver/lbx/lbxexts.c diff -u xc/programs/Xserver/lbx/lbxexts.c:1.4 xc/programs/Xserver/lbx/lbxexts.c:1.5 --- xc/programs/Xserver/lbx/lbxexts.c:1.4 Fri Feb 16 08:24:10 2001 +++ xc/programs/Xserver/lbx/lbxexts.c Fri Oct 14 11:17:19 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxexts.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.5 2005/10/14 15:17:19 tsi Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * @@ -21,20 +21,19 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.4 2001/02/16 13:24:10 eich Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "colormapst.h" #include "propertyst.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "lbxserve.h" #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include #endif typedef struct _lbxext { Index: xc/programs/Xserver/lbx/lbxgfx.c diff -u xc/programs/Xserver/lbx/lbxgfx.c:1.4 xc/programs/Xserver/lbx/lbxgfx.c:1.5 --- xc/programs/Xserver/lbx/lbxgfx.c:1.4 Thu Aug 23 10:46:57 2001 +++ xc/programs/Xserver/lbx/lbxgfx.c Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxgfx.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.5 2005/10/14 15:17:20 tsi Exp $ */ /* * Copyright 1993 Network Computing Devices, Inc. * @@ -21,7 +21,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxgfx.c,v 1.4 2001/08/23 14:46:57 alanh Exp $ */ /* various bits of DIX-level mangling */ @@ -29,8 +28,8 @@ #include #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -39,11 +38,11 @@ #include "windowstr.h" #include "scrnintstr.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "lbxserve.h" #include "lbxtags.h" -#include "Xfuncproto.h" -#include "lbximage.h" +#include +#include #include "lbxsrvopts.h" #define DrawableCache(client) (LbxClient(client)->drawableCache) Index: xc/programs/Xserver/lbx/lbxmain.c diff -u xc/programs/Xserver/lbx/lbxmain.c:1.13 xc/programs/Xserver/lbx/lbxmain.c:1.14 --- xc/programs/Xserver/lbx/lbxmain.c:1.13 Fri Dec 14 15:00:00 2001 +++ xc/programs/Xserver/lbx/lbxmain.c Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxmain.c,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.14 2005/10/14 15:17:20 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -45,14 +45,13 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.13 2001/12/14 20:00:00 dawes Exp $ */ #include #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -64,13 +63,13 @@ #include "extnsionst.h" #include "servermd.h" #define _XLBX_SERVER_ -#include "lbxstr.h" -#include "lbxdeltastr.h" +#include +#include #include "lbxserve.h" -#include "lbximage.h" +#include #include "lbxsrvopts.h" #include "lbxtags.h" -#include "Xfuncproto.h" +#include #include #ifndef Lynx #include Index: xc/programs/Xserver/lbx/lbxopts.c diff -u xc/programs/Xserver/lbx/lbxopts.c:1.6 xc/programs/Xserver/lbx/lbxopts.c:1.7 --- xc/programs/Xserver/lbx/lbxopts.c:1.6 Sat Oct 27 23:34:12 2001 +++ xc/programs/Xserver/lbx/lbxopts.c Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxopts.c,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.7 2005/10/14 15:17:20 tsi Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * @@ -21,23 +21,22 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.6 2001/10/28 03:34:12 tsi Exp $ */ #ifdef OPTDEBUG #include #endif -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "colormapst.h" #include "propertyst.h" #include "lbxserve.h" -#include "lbxstr.h" -#include "lbximage.h" -#include "lbxopts.h" +#include +#include +#include #include "lbxsrvopts.h" #ifndef NO_ZLIB -#include "lbxzlib.h" +#include #endif /* NO_ZLIB */ static int LbxProxyDeltaOpt ( LbxNegOptsPtr pno, unsigned char *popt, Index: xc/programs/Xserver/lbx/lbxprop.c diff -u xc/programs/Xserver/lbx/lbxprop.c:1.5 xc/programs/Xserver/lbx/lbxprop.c:1.6 --- xc/programs/Xserver/lbx/lbxprop.c:1.5 Fri Dec 14 15:00:00 2001 +++ xc/programs/Xserver/lbx/lbxprop.c Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxprop.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.6 2005/10/14 15:17:20 tsi Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -46,7 +46,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxprop.c,v 1.5 2001/12/14 20:00:00 dawes Exp $ */ /* various bits of DIX-level mangling */ @@ -54,8 +53,8 @@ #include #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -65,13 +64,13 @@ #include "colormapst.h" #include "windowstr.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "lbxserve.h" #include "lbxtags.h" -#include "Xfuncproto.h" +#include #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include #endif #include "swaprep.h" Index: xc/programs/Xserver/lbx/lbxserve.h diff -u xc/programs/Xserver/lbx/lbxserve.h:1.5 xc/programs/Xserver/lbx/lbxserve.h:1.6 --- xc/programs/Xserver/lbx/lbxserve.h:1.5 Fri Dec 14 15:00:00 2001 +++ xc/programs/Xserver/lbx/lbxserve.h Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxserve.h,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.6 2005/10/14 15:17:20 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -45,7 +45,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.5 2001/12/14 20:00:00 dawes Exp $ */ #ifndef _LBXSERVE_H_ @@ -54,9 +53,9 @@ #define _LBXSERVE_H_ #define _XLBX_SERVER_ -#include "lbxstr.h" -#include "lbxdeltastr.h" -#include "lbxopts.h" +#include +#include +#include #define MAX_LBX_CLIENTS MAXCLIENTS #define MAX_NUM_PROXIES (MAXCLIENTS >> 1) Index: xc/programs/Xserver/lbx/lbxsquish.c diff -u xc/programs/Xserver/lbx/lbxsquish.c:1.4 xc/programs/Xserver/lbx/lbxsquish.c:1.5 --- xc/programs/Xserver/lbx/lbxsquish.c:1.4 Fri Dec 14 15:00:01 2001 +++ xc/programs/Xserver/lbx/lbxsquish.c Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxsquish.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.5 2005/10/14 15:17:20 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -46,18 +46,18 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ + #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include +#include +#include #include "misc.h" #include "colormapst.h" #include "propertyst.h" #include "lbxserve.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include /* handles server-side protocol squishing */ Index: xc/programs/Xserver/lbx/lbxsrvopts.h diff -u xc/programs/Xserver/lbx/lbxsrvopts.h:1.3 xc/programs/Xserver/lbx/lbxsrvopts.h:1.4 --- xc/programs/Xserver/lbx/lbxsrvopts.h:1.3 Wed Jan 17 17:37:00 2001 +++ xc/programs/Xserver/lbx/lbxsrvopts.h Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxsrvopts.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.4 2005/10/14 15:17:20 tsi Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * @@ -21,12 +21,11 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #ifndef _LBX_SRVOPTS_H_ #define _LBX_SRVOPTS_H_ -#include "lbxopts.h" +#include typedef struct _LbxNegOpts { int nopts; Index: xc/programs/Xserver/lbx/lbxswap.c diff -u xc/programs/Xserver/lbx/lbxswap.c:1.4 xc/programs/Xserver/lbx/lbxswap.c:1.5 --- xc/programs/Xserver/lbx/lbxswap.c:1.4 Fri Dec 14 15:00:01 2001 +++ xc/programs/Xserver/lbx/lbxswap.c Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxswap.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.5 2005/10/14 15:17:20 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -45,14 +45,13 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ #include #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -62,9 +61,9 @@ #include "swaprep.h" #include "propertyst.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "lbxserve.h" -#include "Xfuncproto.h" +#include #include Index: xc/programs/Xserver/lbx/lbxtables.c diff -u xc/programs/Xserver/lbx/lbxtables.c:1.3 xc/programs/Xserver/lbx/lbxtables.c:1.4 --- xc/programs/Xserver/lbx/lbxtables.c:1.3 Wed Jan 17 17:37:00 2001 +++ xc/programs/Xserver/lbx/lbxtables.c Mon Jan 9 10:00:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lbxtables.c,v 1.3 2000/08/17 19:53:32 cpqbld Exp $ */ /* * Copyright 1993 Network Computing Devices, Inc. * @@ -21,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.4 2006/01/09 15:00:37 dawes Exp $ */ #include "dix.h" extern int ProcInitialConnection(ClientPtr client); Index: xc/programs/Xserver/lbx/lbxtags.c diff -u xc/programs/Xserver/lbx/lbxtags.c:1.4 xc/programs/Xserver/lbx/lbxtags.c:1.5 --- xc/programs/Xserver/lbx/lbxtags.c:1.4 Fri Dec 14 15:00:01 2001 +++ xc/programs/Xserver/lbx/lbxtags.c Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxtags.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.5 2005/10/14 15:17:20 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -46,9 +46,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ -#include "X.h" +#include #include "misc.h" #include "lbxdata.h" #include "resource.h" @@ -56,7 +55,7 @@ #include "propertyst.h" #include "lbxtags.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "propertyst.h" static RESTYPE TagResType; Index: xc/programs/Xserver/lbx/lbxtags.h diff -u xc/programs/Xserver/lbx/lbxtags.h:1.4 xc/programs/Xserver/lbx/lbxtags.h:1.5 --- xc/programs/Xserver/lbx/lbxtags.h:1.4 Fri Dec 14 15:00:01 2001 +++ xc/programs/Xserver/lbx/lbxtags.h Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbxtags.h,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.5 2005/10/14 15:17:20 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -46,7 +46,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.4 2001/12/14 20:00:01 dawes Exp $ */ #ifndef _LBXTAGS_H_ #define _LBXTAGS_H_ @@ -55,8 +54,8 @@ #include "os.h" #include "opaque.h" #include "resource.h" -#include "X.h" -#include "Xproto.h" +#include +#include typedef struct _tagdata { XID tid; Index: xc/programs/Xserver/lbx/lbxzerorep.c diff -u xc/programs/Xserver/lbx/lbxzerorep.c:1.4 xc/programs/Xserver/lbx/lbxzerorep.c:1.6 --- xc/programs/Xserver/lbx/lbxzerorep.c:1.4 Fri Dec 14 15:00:02 2001 +++ xc/programs/Xserver/lbx/lbxzerorep.c Fri Oct 14 11:17:20 2005 @@ -1,5 +1,3 @@ -/* $Xorg: lbxzerorep.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.4 2001/12/14 20:00:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/lbx/lbxzerorep.c,v 1.6 2005/10/14 15:17:20 tsi Exp $ */ /* * This module handles zeroing out unused pad bytes in core X replies. @@ -36,8 +34,9 @@ */ #define NEED_REPLIES -#include "X.h" +#include #include +#include "lbxserve.h" void ZeroReplyPadBytes (char *buf, Index: xc/programs/Xserver/lmfcfb/Imakefile diff -u xc/programs/Xserver/lmfcfb/Imakefile:1.4 xc/programs/Xserver/lmfcfb/Imakefile:1.5 --- xc/programs/Xserver/lmfcfb/Imakefile:1.4 Wed Jan 17 17:37:01 2001 +++ xc/programs/Xserver/lmfcfb/Imakefile Fri Oct 14 11:17:20 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:32 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/lmfcfb/Imakefile,v 1.4 2001/01/17 22:37:01 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/lmfcfb/Imakefile,v 1.5 2005/10/14 15:17:20 tsi Exp $ #include @@ -93,8 +88,7 @@ cfbbitblt.o cfbbltC.o cfbbltX.o cfbbltO.o cfbbltG.o \ cfbply1rctC.o cfbply1rctG.o $(PSZOBJS) $(STIPPLEOBJ) $(MFBOBJS) - INCLUDES = -I. -I../cfb -I../mfb -I../mi -I../include -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) + INCLUDES = -I../cfb -I../mfb -I../mi -I../include LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln \ ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln DEFINES = -DPSZ=PixelSize Index: xc/programs/Xserver/mfb/Imakefile diff -u xc/programs/Xserver/mfb/Imakefile:3.19 xc/programs/Xserver/mfb/Imakefile:3.20 --- xc/programs/Xserver/mfb/Imakefile:3.19 Mon May 31 20:17:07 2004 +++ xc/programs/Xserver/mfb/Imakefile Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/mfb/Imakefile,v 3.19 2004/06/01 00:17:07 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/mfb/Imakefile,v 3.20 2005/10/14 15:17:20 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -95,7 +95,7 @@ mfbplywhite.o mfbplyblack.o mfbplyinv.o $(XFMODOBJ) INCLUDES = -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I$(FONTINCSRC) $(XF86INCL) + $(XF86INCL) LINTDEFS = -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite \ -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite \ -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE -DOPEQ=MFB_OPEQ_WHITE Index: xc/programs/Xserver/mfb/fastblt.h diff -u xc/programs/Xserver/mfb/fastblt.h:1.5 xc/programs/Xserver/mfb/fastblt.h:1.6 --- xc/programs/Xserver/mfb/fastblt.h:1.5 Fri Dec 14 15:00:03 2001 +++ xc/programs/Xserver/mfb/fastblt.h Mon Jan 9 10:00:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: fastblt.h,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.5 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/fastblt.h,v 1.6 2006/01/09 15:00:37 dawes Exp $ */ /* * Fast bitblt macros for certain hardware. If your machine has an addressing Index: xc/programs/Xserver/mfb/maskbits.c diff -u xc/programs/Xserver/mfb/maskbits.c:1.6 xc/programs/Xserver/mfb/maskbits.c:1.7 --- xc/programs/Xserver/mfb/maskbits.c:1.6 Fri Dec 14 15:00:03 2001 +++ xc/programs/Xserver/mfb/maskbits.c Mon Jan 9 10:00:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: maskbits.c,v 1.4 2001/02/09 02:05:17 xorgcvs Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* @@ -48,7 +47,7 @@ SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.6 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.7 2006/01/09 15:00:37 dawes Exp $ */ #include "maskbits.h" #include "servermd.h" Index: xc/programs/Xserver/mfb/maskbits.h diff -u xc/programs/Xserver/mfb/maskbits.h:3.9 xc/programs/Xserver/mfb/maskbits.h:3.11 --- xc/programs/Xserver/mfb/maskbits.h:3.9 Tue Feb 18 16:30:00 2003 +++ xc/programs/Xserver/mfb/maskbits.h Fri Oct 14 11:17:20 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.9 2003/02/18 21:30:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/maskbits.h,v 3.11 2005/10/14 15:17:20 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.1, 1/24/89 */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -22,10 +22,9 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: maskbits.h,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" @@ -377,18 +376,18 @@ #define slo_putbits(src, x, w, pdst) \ { \ - register int n = (x)+(w)-PPW; \ + int n = (x)+(w)-PPW; \ \ if (n <= 0) \ { \ - register PixelType tmpmask; \ + PixelType tmpmask; \ maskpartialbits((x), (w), tmpmask); \ *(pdst) = (*(pdst) & ~tmpmask) | \ (SCRRIGHT(src, x) & tmpmask); \ } \ else \ { \ - register int d = PPW-(x); \ + int d = PPW-(x); \ *(pdst) = (*(pdst) & endtab[x]) | (SCRRIGHT((src), x)); \ (pdst)[1] = ((pdst)[1] & starttab[n]) | \ (SCRLEFT(src, d) & endtab[n]); \ @@ -424,15 +423,15 @@ #define u_putbitsrop(src, x, w, pdst, rop) \ {\ - register PixelType t1, t2; \ - register int n = (x)+(w)-PPW; \ + PixelType t1, t2; \ + int n = (x)+(w)-PPW; \ \ t1 = SCRRIGHT((src), (x)); \ DoRop(t2, rop, t1, *(pdst)); \ \ if (n <= 0) \ { \ - register PixelType tmpmask; \ + PixelType tmpmask; \ \ maskpartialbits((x), (w), tmpmask); \ *(pdst) = (*(pdst) & ~tmpmask) | (t2 & tmpmask); \ @@ -455,7 +454,7 @@ #if (BITMAP_BIT_ORDER == MSBFirst) #define putbitsrop(src, x, w, pdst, rop) \ { \ - register PixelType _tmp, _tmp2; \ + PixelType _tmp, _tmp2; \ FASTGETBITS(pdst, x, w, _tmp); \ _tmp2 = SCRRIGHT(src, PPW-(w)); \ DoRop(_tmp, rop, _tmp2, _tmp) \ @@ -463,7 +462,7 @@ } #define putbitsrrop(src, x, w, pdst, rop) \ { \ - register PixelType _tmp, _tmp2; \ + PixelType _tmp, _tmp2; \ \ FASTGETBITS(pdst, x, w, _tmp); \ _tmp2 = SCRRIGHT(src, PPW-(w)); \ @@ -474,14 +473,14 @@ #else #define putbitsrop(src, x, w, pdst, rop) \ { \ - register PixelType _tmp; \ + PixelType _tmp; \ FASTGETBITS(pdst, x, w, _tmp); \ DoRop(_tmp, rop, src, _tmp) \ FASTPUTBITS(_tmp, x, w, pdst); \ } #define putbitsrrop(src, x, w, pdst, rop) \ { \ - register PixelType _tmp; \ + PixelType _tmp; \ \ FASTGETBITS(pdst, x, w, _tmp); \ _tmp= DoRRop(rop, src, _tmp); \ @@ -498,15 +497,15 @@ #ifndef putbitsrrop #define putbitsrrop(src, x, w, pdst, rop) \ {\ - register PixelType t1, t2; \ - register int n = (x)+(w)-PPW; \ + PixelType t1, t2; \ + int n = (x)+(w)-PPW; \ \ t1 = SCRRIGHT((src), (x)); \ t2 = DoRRop(rop, t1, *(pdst)); \ \ if (n <= 0) \ { \ - register PixelType tmpmask; \ + PixelType tmpmask; \ \ maskpartialbits((x), (w), tmpmask); \ *(pdst) = (*(pdst) & ~tmpmask) | (t2 & tmpmask); \ @@ -572,14 +571,14 @@ #define getandputbits(psrc, srcbit, dstbit, width, pdst) \ { \ - register PixelType _tmpbits; \ + PixelType _tmpbits; \ FASTGETBITS(psrc, srcbit, width, _tmpbits); \ u_FASTPUT(_tmpbits, dstbit, width, pdst); \ } #define getandputrop(psrc, srcbit, dstbit, width, pdst, rop) \ { \ - register PixelType _tmpsrc, _tmpdst; \ + PixelType _tmpsrc, _tmpdst; \ FASTGETBITS(pdst, dstbit, width, _tmpdst); \ FASTGETBITS(psrc, srcbit, width, _tmpsrc); \ DoRop(_tmpdst, rop, _tmpsrc, _tmpdst); \ @@ -588,7 +587,7 @@ #define getandputrrop(psrc, srcbit, dstbit, width, pdst, rop) \ { \ - register PixelType _tmpsrc, _tmpdst; \ + PixelType _tmpsrc, _tmpdst; \ FASTGETBITS(pdst, dstbit, width, _tmpdst); \ FASTGETBITS(psrc, srcbit, width, _tmpsrc); \ _tmpdst = DoRRop(rop, _tmpsrc, _tmpdst); \ @@ -616,21 +615,21 @@ #define getandputbits(psrc, srcbit, dstbit, width, pdst) \ { \ - register PixelType _tmpbits; \ + PixelType _tmpbits; \ getbits(psrc, srcbit, width, _tmpbits); \ putbits(_tmpbits, dstbit, width, pdst); \ } #define getandputrop(psrc, srcbit, dstbit, width, pdst, rop) \ { \ - register PixelType _tmpbits; \ + PixelType _tmpbits; \ getbits(psrc, srcbit, width, _tmpbits) \ putbitsrop(_tmpbits, dstbit, width, pdst, rop) \ } #define getandputrrop(psrc, srcbit, dstbit, width, pdst, rop) \ { \ - register PixelType _tmpbits; \ + PixelType _tmpbits; \ getbits(psrc, srcbit, width, _tmpbits) \ putbitsrrop(_tmpbits, dstbit, width, pdst, rop) \ } @@ -638,8 +637,8 @@ #define getandputbits0(psrc, sbindex, width, pdst) \ { /* unroll the whole damn thing to see how it * behaves */ \ - register int _flag = PPW - (sbindex); \ - register PixelType _src; \ + int _flag = PPW - (sbindex); \ + PixelType _src; \ \ _src = SCRLEFT (*(psrc), (sbindex)); \ if ((width) > _flag) \ @@ -651,8 +650,8 @@ #define getandputrop0(psrc, sbindex, width, pdst, rop) \ { \ - register int _flag = PPW - (sbindex); \ - register PixelType _src; \ + int _flag = PPW - (sbindex); \ + PixelType _src; \ \ _src = SCRLEFT (*(psrc), (sbindex)); \ if ((width) > _flag) \ @@ -665,7 +664,7 @@ #define getandputrrop0(psrc, sbindex, width, pdst, rop) \ { \ int _flag = PPW - (sbindex); \ - register PixelType _src; \ + PixelType _src; \ \ _src = SCRLEFT (*(psrc), (sbindex)); \ if ((width) > _flag) \ Index: xc/programs/Xserver/mfb/mergerop.h diff -u xc/programs/Xserver/mfb/mergerop.h:3.14 xc/programs/Xserver/mfb/mergerop.h:3.16 --- xc/programs/Xserver/mfb/mergerop.h:3.14 Fri Dec 14 15:00:03 2001 +++ xc/programs/Xserver/mfb/mergerop.h Fri Oct 14 11:17:20 2005 @@ -1,5 +1,4 @@ /* - * $Xorg: mergerop.h,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,13 +24,13 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.14 2001/12/14 20:00:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.16 2005/10/14 15:17:20 tsi Exp $ */ #ifndef _MERGEROP_H_ #define _MERGEROP_H_ #ifndef GXcopy -#include "X.h" +#include #endif typedef struct _mergeRopBits { @@ -68,8 +67,8 @@ #if PSZ == 24 #if (BITMAP_BIT_ORDER == MSBFirst) #define InitializeMergeRop24(alu,pm) {\ - register int i; \ - register MfbBits _pm = (pm) & 0xFFFFFF; \ + int i; \ + MfbBits _pm = (pm) & 0xFFFFFF; \ mergeRopPtr _bits = &mergeRopBits[alu]; \ MfbBits _bits_ca1 = _bits->ca1; \ MfbBits _bits_cx1 = _bits->cx1; \ @@ -86,8 +85,8 @@ } #else /*(BITMAP_BIT_ORDER == LSBFirst)*/ #define InitializeMergeRop24(alu,pm) {\ - register int i; \ - register MfbBits _pm = (pm) & cfbmask[0]; \ + int i; \ + MfbBits _pm = (pm) & cfbmask[0]; \ mergeRopPtr _bits = &mergeRopBits[alu]; \ MfbBits _bits_ca1 = _bits->ca1 & cfbmask[0]; \ MfbBits _bits_cx1 = _bits->cx1 & cfbmask[0]; \ @@ -128,7 +127,7 @@ (((dst) & (((src) & _ca1u[i]) ^ _cx1u[i])) ^ (((src) & _ca2u[i]) ^ _cx2u[i])) #define DoMaskMergeRop24(src, dst, mask, index) {\ - register int idx = ((index) & 3)<< 1; \ + int idx = ((index) & 3)<< 1; \ MfbBits _src0 = (src);\ MfbBits _src1 = (_src0 & _ca1) ^ _cx1; \ MfbBits _src2 = (_src0 & _ca2) ^ _cx2; \ @@ -150,7 +149,7 @@ (((dst) & ((((src) & _ca1u[(i)]) ^ _cx1u[(i)]) | ~(mask))) ^ ((((src) & _ca2u[(i)]) ^ _cx2u[(i)]) & (mask))) #define DoMergeRop24(src,dst,index) {\ - register int idx = ((index) & 3)<< 1; \ + int idx = ((index) & 3)<< 1; \ MfbBits _src0 = (src);\ MfbBits _src1 = (_src0 & _ca1) ^ _cx1; \ MfbBits _src2 = (_src0 & _ca2) ^ _cx2; \ @@ -168,7 +167,7 @@ #define DoPrebuiltMergeRop(dst) (((dst) & _cca) ^ _ccx) #define DoPrebuiltMergeRop24(dst,index) { \ - register int idx = ((index) & 3)<< 1; \ + int idx = ((index) & 3)<< 1; \ *(dst) = (((*(dst)) & cfbrmask[idx]) | ((((*(dst)) & cfbmask[idx]) &\ (( _cca < +#include #include "regionstr.h" #include "gcstruct.h" @@ -96,11 +96,8 @@ #ifndef LOWMEMFTPT void -mfbDoBitblt (pSrc, pDst, alu, prgnDst, pptSrc) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; +mfbDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst, + DDXPointPtr pptSrc) { switch (alu) { @@ -123,14 +120,9 @@ } RegionPtr -mfbCopyArea(pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty) -register DrawablePtr pSrcDrawable; -register DrawablePtr pDstDrawable; -register GC *pGC; -int srcx, srcy; -int width, height; -int dstx, dsty; +mfbCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GC *pGC, int srcx, int srcy, int width, int height, + int dstx, int dsty) { RegionPtr prgnSrcClip = NULL; /* may be a new region, or just a copy */ Bool freeSrcClip = FALSE; @@ -138,11 +130,11 @@ RegionPtr prgnExposed; RegionRec rgnDst; DDXPointPtr pptSrc; - register DDXPointPtr ppt; - register BoxPtr pbox; + DDXPointPtr ppt; + BoxPtr pbox; int i; - register int dx; - register int dy; + int dx; + int dy; xRectangle origSource; DDXPointRec origDest; int numRects; @@ -399,19 +391,7 @@ static int copyPlaneScreenIndex = -1; Bool -mfbRegisterCopyPlaneProc (pScreen, proc) - ScreenPtr pScreen; - RegionPtr (*proc)( - DrawablePtr /* pSrcDrawable */, - DrawablePtr /* pDstDrawable */, - GCPtr /* pGC */, - int /* srcx */, - int /* srcy */, - int /* width */, - int /* height */, - int /* dstx */, - int /* dsty */, - unsigned long /* bitPlane */); +mfbRegisterCopyPlaneProc(ScreenPtr pScreen, mfbCopyPlaneProcPtr proc) { if (copyPlaneGeneration != serverGeneration) { @@ -440,14 +420,9 @@ #ifndef LOWMEMFTPT RegionPtr -mfbCopyPlane(pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty, plane) -DrawablePtr pSrcDrawable, pDstDrawable; -register GC *pGC; -int srcx, srcy; -int width, height; -int dstx, dsty; -unsigned long plane; +mfbCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GC *pGC, int srcx, int srcy, int width, int height, + int dstx, int dsty, unsigned long plane) { int alu; RegionPtr prgnExposed; Index: xc/programs/Xserver/mfb/mfbblt.c diff -u xc/programs/Xserver/mfb/mfbblt.c:3.4 xc/programs/Xserver/mfb/mfbblt.c:3.6 --- xc/programs/Xserver/mfb/mfbblt.c:3.4 Fri Dec 14 15:00:04 2001 +++ xc/programs/Xserver/mfb/mfbblt.c Fri Oct 14 11:17:21 2005 @@ -1,7 +1,7 @@ /* * mfb copy area */ -/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.4 2001/12/14 20:00:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbblt.c,v 3.6 2005/10/14 15:17:21 tsi Exp $ */ /* @@ -30,11 +30,10 @@ Author: Keith Packard */ -/* $Xorg: mfbblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" #include "gcstruct.h" #include "windowstr.h" @@ -46,11 +45,8 @@ #include "mergerop.h" void -MROP_NAME(mfbDoBitblt)(pSrc, pDst, alu, prgnDst, pptSrc) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; +MROP_NAME(mfbDoBitblt)(DrawablePtr pSrc, DrawablePtr pDst, int alu, + RegionPtr prgnDst, DDXPointPtr pptSrc) { PixelType *psrcBase, *pdstBase; /* start of src and dst bitmaps */ @@ -70,8 +66,8 @@ PixelType *psrcLine, *pdstLine; /* pointers to line with current src and dst */ - register PixelType *psrc;/* pointer to current src longword */ - register PixelType *pdst;/* pointer to current dst longword */ + PixelType *psrc;/* pointer to current src longword */ + PixelType *pdst;/* pointer to current dst longword */ MROP_DECLARE_REG() @@ -79,10 +75,10 @@ PixelType startmask, endmask; /* masks for writing ends of dst */ int nlMiddle; /* whole longwords in dst */ int xoffSrc, xoffDst; - register int leftShift, rightShift; - register PixelType bits; - register PixelType bits1; - register int nl; /* temp copy of nlMiddle */ + int leftShift, rightShift; + PixelType bits; + PixelType bits1; + int nl; /* temp copy of nlMiddle */ int careful; MROP_INITIALIZE(alu,0); Index: xc/programs/Xserver/mfb/mfbbres.c diff -u xc/programs/Xserver/mfb/mfbbres.c:1.5 xc/programs/Xserver/mfb/mfbbres.c:1.7 --- xc/programs/Xserver/mfb/mfbbres.c:1.5 Fri Dec 14 15:00:05 2001 +++ xc/programs/Xserver/mfb/mfbbres.c Fri Oct 14 11:17:21 2005 @@ -1,5 +1,5 @@ +/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.7 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ -/* $XFree86: xc/programs/Xserver/mfb/mfbbres.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,38 +46,26 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbbres.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" + +#include #include "misc.h" #include "mfb.h" #include "maskbits.h" #include "miline.h" /* Solid bresenham line */ -/* NOTES - e2 is used less often than e1, so it's not in a register -*/ void -mfbBresS(rop, addrlbase, nlwidth, signdx, signdy, axis, x1, y1, e, e1, e2, len) -int rop; /* a reduced rasterop */ -PixelType *addrlbase; /* pointer to base of bitmap */ -int nlwidth; /* width in longwords of bitmap */ -int signdx, signdy; /* signs of directions */ -int axis; /* major axis (Y_AXIS or X_AXIS) */ -int x1, y1; /* initial point */ -register int e; /* error accumulator */ -register int e1; /* bresenham increments */ -int e2; -int len; /* length of line */ +mfbBresS(int rop, PixelType *addrlbase, int nlwidth, int signdx, int signdy, + int axis, int x1, int y1, int e, int e1, int e2, int len) { - register int yinc; /* increment to next scanline, in bytes */ - register PixelType *addrl; /* bitmask 32-bit pointer */ - register PixelType bit; /* current bit being set/cleared/etc. */ + int yinc; /* increment to next scanline, in bytes */ + PixelType *addrl; /* bitmask 32-bit pointer */ + PixelType bit; /* current bit being set/cleared/etc. */ PixelType leftbit = mask[0]; /* leftmost bit to process in new word */ PixelType rightbit = mask[PPW-1]; /* rightmost bit to process in new word */ - register int e3 = e2-e1; + int e3 = e2-e1; PixelType tmp; /* point to longword containing first point */ Index: xc/programs/Xserver/mfb/mfbbresd.c diff -u xc/programs/Xserver/mfb/mfbbresd.c:1.5 xc/programs/Xserver/mfb/mfbbresd.c:1.7 --- xc/programs/Xserver/mfb/mfbbresd.c:1.5 Fri Dec 14 15:00:05 2001 +++ xc/programs/Xserver/mfb/mfbbresd.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.5 2001/12/14 20:00:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbresd.c,v 1.7 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbbresd.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" + +#include #include "misc.h" #include "mfb.h" #include "maskbits.h" @@ -65,30 +65,15 @@ } void -mfbBresD(fgrop, bgrop, - pdashIndex, pDash, numInDashList, pdashOffset, isDoubleDash, - addrlbase, nlwidth, - signdx, signdy, axis, x1, y1, e, e1, e2, len) -int fgrop, bgrop; -int *pdashIndex; /* current dash */ -unsigned char *pDash; /* dash list */ -int numInDashList; /* total length of dash list */ -int *pdashOffset; /* offset into current dash */ -int isDoubleDash; -PixelType *addrlbase; /* pointer to base of bitmap */ -int nlwidth; /* width in longwords of bitmap */ -int signdx, signdy; /* signs of directions */ -int axis; /* major axis (Y_AXIS or X_AXIS) */ -int x1, y1; /* initial point */ -register int e; /* error accumulator */ -register int e1; /* bresenham increments */ -int e2; -int len; /* length of line */ +mfbBresD(int fgrop, int bgrop, int *pdashIndex, unsigned char *pDash, + int numInDashList, int *pdashOffset, int isDoubleDash, + PixelType *addrlbase, int nlwidth, int signdx, int signdy, int axis, + int x1, int y1, int e, int e1, int e2, int len) { - register int yinc; /* increment to next scanline, in bytes */ - register PixelType *addrl; - register int e3 = e2-e1; - register MfbBits bit; + int yinc; /* increment to next scanline, in bytes */ + PixelType *addrl; + int e3 = e2-e1; + MfbBits bit; PixelType leftbit = mask[0]; /* leftmost bit to process in new word */ PixelType rightbit = mask[PPW-1]; /* rightmost bit to process in new word */ int dashIndex; Index: xc/programs/Xserver/mfb/mfbbstore.c diff -u xc/programs/Xserver/mfb/mfbbstore.c:1.2 xc/programs/Xserver/mfb/mfbbstore.c:1.4 --- xc/programs/Xserver/mfb/mfbbstore.c:1.2 Fri Dec 14 15:00:05 2001 +++ xc/programs/Xserver/mfb/mfbbstore.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $Xorg: mfbbstore.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbbstore.c,v 1.4 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* @@ -29,14 +29,14 @@ */ #include "mfb.h" -#include "X.h" +#include #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" -/*- +/* *----------------------------------------------------------------------- * mfbSaveAreas -- * Function called by miSaveAreas to actually fetch the areas to be @@ -57,17 +57,13 @@ *----------------------------------------------------------------------- */ void -mfbSaveAreas(pPixmap, prgnSave, xorg, yorg, pWin) - PixmapPtr pPixmap; /* Backing pixmap */ - RegionPtr prgnSave; /* Region to save (pixmap-relative) */ - int xorg; /* X origin of region */ - int yorg; /* Y origin of region */ - WindowPtr pWin; +mfbSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, + WindowPtr pWin) { - register DDXPointPtr pPt; + DDXPointPtr pPt; DDXPointPtr pPtsInit; - register BoxPtr pBox; - register int numRects; + BoxPtr pBox; + int numRects; numRects = REGION_NUM_RECTS(prgnSave); pPtsInit = (DDXPointPtr)ALLOCATE_LOCAL(numRects * sizeof(DDXPointRec)); @@ -93,7 +89,7 @@ DEALLOCATE_LOCAL(pPtsInit); } -/*- +/* *----------------------------------------------------------------------- * mfbRestoreAreas -- * Function called by miRestoreAreas to actually fetch the areas to be @@ -114,17 +110,13 @@ *----------------------------------------------------------------------- */ void -mfbRestoreAreas(pPixmap, prgnRestore, xorg, yorg, pWin) - PixmapPtr pPixmap; /* Backing pixmap */ - RegionPtr prgnRestore; /* Region to restore (screen-relative)*/ - int xorg; /* X origin of window */ - int yorg; /* Y origin of window */ - WindowPtr pWin; +mfbRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, int yorg, + WindowPtr pWin) { - register DDXPointPtr pPt; + DDXPointPtr pPt; DDXPointPtr pPtsInit; - register BoxPtr pBox; - register int numRects; + BoxPtr pBox; + int numRects; numRects = REGION_NUM_RECTS(prgnRestore); pPtsInit = (DDXPointPtr)ALLOCATE_LOCAL(numRects*sizeof(DDXPointRec)); Index: xc/programs/Xserver/mfb/mfbclip.c diff -u xc/programs/Xserver/mfb/mfbclip.c:1.6 xc/programs/Xserver/mfb/mfbclip.c:1.8 --- xc/programs/Xserver/mfb/mfbclip.c:1.6 Tue Jul 15 21:38:55 2003 +++ xc/programs/Xserver/mfb/mfbclip.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbclip.c,v 1.8 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbclip.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" + +#include #include "regionstr.h" #include "pixmapstr.h" #include "scrnintstr.h" @@ -89,19 +89,18 @@ * at the same X coordinates. */ RegionPtr -mfbPixmapToRegion(pPix) - PixmapPtr pPix; +mfbPixmapToRegion(PixmapPtr pPix) { - register RegionPtr pReg; - register PixelType *pw, w; - register int ib; + RegionPtr pReg; + PixelType *pw, w; + int ib; int width, h, base, rx1 = 0, crects; PixelType *pwLineEnd; int irectPrevStart, irectLineStart; - register BoxPtr prectO, prectN; + BoxPtr prectO, prectN; BoxPtr FirstRect, rects, prectLineStart; Bool fInBox, fSame; - register PixelType mask0 = mask[0]; + PixelType mask0 = mask[0]; PixelType *pwLine; int nWidth; Index: xc/programs/Xserver/mfb/mfbcmap.c diff -u xc/programs/Xserver/mfb/mfbcmap.c:1.8 xc/programs/Xserver/mfb/mfbcmap.c:1.10 --- xc/programs/Xserver/mfb/mfbcmap.c:1.8 Tue Feb 18 16:30:01 2003 +++ xc/programs/Xserver/mfb/mfbcmap.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.8 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbcmap.c,v 1.10 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbcmap.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" + +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" @@ -68,35 +68,28 @@ */ int -mfbListInstalledColormaps(pScreen, pmaps) - ScreenPtr pScreen; - Colormap *pmaps; +mfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) { return miListInstalledColormaps(pScreen, pmaps); } void -mfbInstallColormap(pmap) - ColormapPtr pmap; +mfbInstallColormap(ColormapPtr pmap) { miInstallColormap(pmap); } void -mfbUninstallColormap(pmap) - ColormapPtr pmap; +mfbUninstallColormap(ColormapPtr pmap) { miUninstallColormap(pmap); } /*ARGSUSED*/ void -mfbResolveColor (pred, pgreen, pblue, pVisual) - unsigned short *pred; - unsigned short *pgreen; - unsigned short *pblue; - VisualPtr pVisual; +mfbResolveColor(unsigned short *pred, unsigned short *pgreen, + unsigned short *pblue, VisualPtr pVisual) { /* * Gets intensity from RGB. If intensity is >= half, pick white, else @@ -109,8 +102,7 @@ } Bool -mfbCreateColormap(pMap) - ColormapPtr pMap; +mfbCreateColormap(ColormapPtr pMap) { ScreenPtr pScreen; unsigned short red0, green0, blue0; @@ -146,15 +138,13 @@ /*ARGSUSED*/ void -mfbDestroyColormap (pMap) - ColormapPtr pMap; +mfbDestroyColormap(ColormapPtr pMap) { return; } Bool -mfbCreateDefColormap (pScreen) - ScreenPtr pScreen; +mfbCreateDefColormap(ScreenPtr pScreen) { return miCreateDefColormap(pScreen); } Index: xc/programs/Xserver/mfb/mfbfillarc.c diff -u xc/programs/Xserver/mfb/mfbfillarc.c:1.6 xc/programs/Xserver/mfb/mfbfillarc.c:1.8 --- xc/programs/Xserver/mfb/mfbfillarc.c:1.6 Tue Jul 15 21:38:55 2003 +++ xc/programs/Xserver/mfb/mfbfillarc.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.6 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillarc.c,v 1.8 2005/10/14 15:17:21 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,10 +25,8 @@ ********************************************************/ -/* $Xorg: mfbfillarc.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ - -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -39,20 +37,17 @@ #include "mi.h" static void -mfbFillEllipseSolid( - DrawablePtr pDraw, - xArc *arc, - register int rop) +mfbFillEllipseSolid(DrawablePtr pDraw, xArc *arc, int rop) { int x, y, e; int yk, xk, ym, xm, dx, dy, xorg, yorg; - register int slw; + int slw; miFillArcRec info; PixelType *addrlt, *addrlb; - register PixelType *addrl; - register int n; + PixelType *addrl; + int n; int nlwidth; - register int xpos; + int xpos; PixelType startmask, endmask; int nlmiddle; @@ -220,16 +215,12 @@ } static void -mfbFillArcSliceSolidCopy( - DrawablePtr pDraw, - GCPtr pGC, - xArc *arc, - register int rop) +mfbFillArcSliceSolidCopy(DrawablePtr pDraw, GCPtr pGC, xArc *arc, int rop) { - register PixelType *addrl; - register int n; + PixelType *addrl; + int n; int yk, xk, ym, xm, dx, dy, xorg, yorg, slw; - register int x, y, e; + int x, y, e; miFillArcRec info; miArcSliceRec slice; int xl, xr, xc; @@ -271,15 +262,11 @@ } void -mfbPolyFillArcSolid(pDraw, pGC, narcs, parcs) - register DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +mfbPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { mfbPrivGC *priv; - register xArc *arc; - register int i; + xArc *arc; + int i; BoxRec box; int x2, y2; RegionPtr cclip; Index: xc/programs/Xserver/mfb/mfbfillrct.c diff -u xc/programs/Xserver/mfb/mfbfillrct.c:1.6 xc/programs/Xserver/mfb/mfbfillrct.c:1.8 --- xc/programs/Xserver/mfb/mfbfillrct.c:1.6 Tue Feb 18 16:30:01 2003 +++ xc/programs/Xserver/mfb/mfbfillrct.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.6 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillrct.c,v 1.8 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,9 +46,9 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbfillrct.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" + +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -70,16 +70,13 @@ #define NUM_STACK_RECTS 1024 void -mfbPolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +mfbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, + xRectangle *prectInit) { xRectangle *prect; RegionPtr prgnClip; - register BoxPtr pbox; - register BoxPtr pboxClipped; + BoxPtr pbox; + BoxPtr pboxClipped; BoxPtr pboxClippedBase; BoxPtr pextent; BoxRec stackRects[NUM_STACK_RECTS]; Index: xc/programs/Xserver/mfb/mfbfillsp.c diff -u xc/programs/Xserver/mfb/mfbfillsp.c:1.9 xc/programs/Xserver/mfb/mfbfillsp.c:1.11 --- xc/programs/Xserver/mfb/mfbfillsp.c:1.9 Fri Dec 14 15:00:06 2001 +++ xc/programs/Xserver/mfb/mfbfillsp.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.9 2001/12/14 20:00:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbfillsp.c,v 1.11 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,9 +46,9 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbfillsp.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" + +#include +#include #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" @@ -84,24 +84,19 @@ void -mfbBlackSolidFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbBlackSolidFS(DrawablePtr pDrawable, GCPtr pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl;/* pointer to current longword in bitmap */ - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + PixelType *addrl;/* pointer to current longword in bitmap */ + int nlmiddle; + PixelType startmask; + PixelType endmask; int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; @@ -156,24 +151,19 @@ void -mfbWhiteSolidFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbWhiteSolidFS(DrawablePtr pDrawable, GCPtr pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl;/* pointer to current longword in bitmap */ - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + PixelType *addrl;/* pointer to current longword in bitmap */ + int nlmiddle; + PixelType startmask; + PixelType endmask; int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; @@ -228,24 +218,19 @@ void -mfbInvertSolidFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbInvertSolidFS(DrawablePtr pDrawable, GCPtr pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl;/* pointer to current longword in bitmap */ - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + PixelType *addrl;/* pointer to current longword in bitmap */ + int nlmiddle; + PixelType startmask; + PixelType endmask; int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; @@ -299,25 +284,20 @@ void -mfbWhiteStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbWhiteStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl;/* pointer to current longword in bitmap */ - register PixelType src; - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + PixelType *addrl;/* pointer to current longword in bitmap */ + PixelType src; + int nlmiddle; + PixelType startmask; + PixelType endmask; PixmapPtr pStipple; PixelType *psrc; int tileHeight; @@ -376,25 +356,20 @@ void -mfbBlackStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbBlackStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl; /* pointer to current longword in bitmap */ - register PixelType src; - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + PixelType *addrl; /* pointer to current longword in bitmap */ + PixelType src; + int nlmiddle; + PixelType startmask; + PixelType endmask; PixmapPtr pStipple; PixelType *psrc; int tileHeight; @@ -453,25 +428,20 @@ void -mfbInvertStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbInvertStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl; /* pointer to current longword in bitmap */ - register PixelType src; - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + PixelType *addrl; /* pointer to current longword in bitmap */ + PixelType src; + int nlmiddle; + PixelType startmask; + PixelType endmask; PixmapPtr pStipple; PixelType *psrc; int tileHeight; @@ -569,25 +539,20 @@ void -mfbTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbTileFS(DrawablePtr pDrawable, GC *pGC, int nInit, DDXPointPtr pptInit, + int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl; /* pointer to current longword in bitmap */ - register PixelType src; - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + PixelType *addrl; /* pointer to current longword in bitmap */ + PixelType src; + int nlmiddle; + PixelType startmask; + PixelType endmask; PixmapPtr pTile; PixelType *psrc; int tileHeight; @@ -669,7 +634,7 @@ break; default: { - register DeclareMergeRop (); + DeclareMergeRop (); InitializeMergeRop(rop,~0); while (n--) @@ -713,25 +678,20 @@ /* Fill spans with tiles that aren't PPW bits wide */ void -mfbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbUnnaturalTileFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { int iline; /* first line of tile to use */ /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *pdst;/* pointer to current word in bitmap */ - register PixelType *psrc;/* pointer to current word in tile */ - register int nlMiddle; - register int rop, nstart; + PixelType *pdst;/* pointer to current word in bitmap */ + PixelType *psrc;/* pointer to current word in tile */ + int nlMiddle; + int rop, nstart; PixelType startmask; PixmapPtr pTile; /* pointer to tile we want to fill with */ int w, width, x, xSrc, ySrc, srcStartOver, nend; @@ -878,25 +838,20 @@ /* Fill spans with stipples that aren't PPW bits wide */ void -mfbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +mfbUnnaturalStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ int iline; /* first line of tile to use */ PixelType *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register PixelType *pdst; /* pointer to current word in bitmap */ - register PixelType *psrc; /* pointer to current word in tile */ - register int nlMiddle; - register int rop, nstart; + PixelType *pdst; /* pointer to current word in bitmap */ + PixelType *psrc; /* pointer to current word in tile */ + int nlMiddle; + int rop, nstart; PixelType startmask; PixmapPtr pTile; /* pointer to tile we want to fill with */ int w, width, x, xSrc, ySrc, srcStartOver, nend; Index: xc/programs/Xserver/mfb/mfbfont.c diff -u xc/programs/Xserver/mfb/mfbfont.c:1.2 xc/programs/Xserver/mfb/mfbfont.c:1.4 --- xc/programs/Xserver/mfb/mfbfont.c:1.2 Fri Dec 14 15:00:07 2001 +++ xc/programs/Xserver/mfb/mfbfont.c Fri Oct 14 11:17:21 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/Xserver/mfb/mfbfont.c,v 1.4 2005/10/14 15:17:21 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,29 +45,25 @@ SOFTWARE. */ -/* $Xorg: mfbfont.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" + +#include +#include +#include #include "mfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "scrnintstr.h" /*ARGSUSED*/ Bool -mfbRealizeFont( pscr, pFont) - ScreenPtr pscr; - FontPtr pFont; +mfbRealizeFont(ScreenPtr pscr, FontPtr pFont) { return (TRUE); } /*ARGSUSED*/ Bool -mfbUnrealizeFont( pscr, pFont) - ScreenPtr pscr; - FontPtr pFont; +mfbUnrealizeFont(ScreenPtr pscr, FontPtr pFont) { return (TRUE); } Index: xc/programs/Xserver/mfb/mfbgc.c diff -u xc/programs/Xserver/mfb/mfbgc.c:1.10 xc/programs/Xserver/mfb/mfbgc.c:1.12 --- xc/programs/Xserver/mfb/mfbgc.c:1.10 Tue Jul 15 23:35:16 2003 +++ xc/programs/Xserver/mfb/mfbgc.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.10 2003/07/16 03:35:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgc.c,v 1.12 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,13 +45,13 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbgc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" + +#include +#include +#include #include "mfb.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" @@ -682,8 +682,7 @@ #define numberCommonOps (sizeof (mfbCommonOps) / sizeof (mfbCommonOps[0])) static GCOps * -matchCommon ( - GCPtr pGC) +matchCommon(GCPtr pGC) { int i; struct commonOps *cop; @@ -719,8 +718,7 @@ Bool -mfbCreateGC(pGC) - register GCPtr pGC; +mfbCreateGC(GCPtr pGC) { mfbPrivGC *pPriv; @@ -750,38 +748,22 @@ /* some noop functions */ static void -mfbPolyGlyphBltNoop( - DrawablePtr pDrawable, - GCPtr pGC, - int x, - int y, - unsigned int nglyph, - CharInfoPtr * ppci, - pointer pglyphBase) +mfbPolyGlyphBltNoop(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { /* this is a no-op function */ } static void -mfbNoopFS( - DrawablePtr pDrawable, - GCPtr pGC, - int nInit, - DDXPointPtr pptInit, - int * pwidthInit, - int fSorted) +mfbNoopFS(DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, + int *pwidthInit, int fSorted) { /* this is a no-op function */ } static void -mfbFillPolyNoop( - DrawablePtr pDrawable, - GCPtr pGC, - int shape, - int mode, - int count, - DDXPointPtr ptsIn) +mfbFillPolyNoop(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, + int count, DDXPointPtr ptsIn) { /* this is a no-op function */ } @@ -799,12 +781,9 @@ /*ARGSUSED*/ void -mfbValidateGC(pGC, changes, pDrawable) - register GCPtr pGC; - unsigned long changes; - DrawablePtr pDrawable; +mfbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { - register mfbPrivGCPtr devPriv; + mfbPrivGCPtr devPriv; int mask; /* stateChanges */ int index; /* used for stepping through bitfields */ int xrot, yrot; /* rotations for tile and stipple pattern */ @@ -1455,9 +1434,7 @@ }; int -mfbReduceRop(alu, src) - register int alu; - register Pixel src; +mfbReduceRop(int alu, Pixel src) { int rop = 0; if ((src & 1) == 0) /* src is black */ Index: xc/programs/Xserver/mfb/mfbgetsp.c diff -u xc/programs/Xserver/mfb/mfbgetsp.c:1.4 xc/programs/Xserver/mfb/mfbgetsp.c:1.6 --- xc/programs/Xserver/mfb/mfbgetsp.c:1.4 Tue Feb 18 16:30:01 2003 +++ xc/programs/Xserver/mfb/mfbgetsp.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbgetsp.c,v 1.6 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,9 +46,9 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbgetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" + +#include +#include #include "misc.h" #include "region.h" @@ -69,23 +69,18 @@ */ /*ARGSUSED*/ void -mfbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pchardstStart) - DrawablePtr pDrawable; /* drawable from which to get bits */ - int wMax; /* largest value of all *pwidths */ - register DDXPointPtr ppt; /* points to start copying from */ - int *pwidth; /* list of number of bits to copy */ - int nspans; /* number of scanlines to copy */ - char *pchardstStart; /* where to put the bits */ +mfbGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, + int nspans, char *pchardstStart) { PixelType *pdstStart = (PixelType *)(pointer)pchardstStart; - register PixelType *pdst; /* where to put the bits */ - register PixelType *psrc; /* where to get the bits */ - register PixelType tmpSrc; /* scratch buffer for bits */ + PixelType *pdst; /* where to put the bits */ + PixelType *psrc; /* where to get the bits */ + PixelType tmpSrc; /* scratch buffer for bits */ PixelType *psrcBase; /* start of src bitmap */ int widthSrc; /* width of pixmap in bytes */ - register DDXPointPtr pptLast; /* one past last point to get */ + DDXPointPtr pptLast; /* one past last point to get */ int xEnd; /* last pixel to copy from */ - register int nstart; + int nstart; int nend = 0; int srcStartOver; PixelType startmask, endmask; Index: xc/programs/Xserver/mfb/mfbhrzvert.c diff -u xc/programs/Xserver/mfb/mfbhrzvert.c:1.5 xc/programs/Xserver/mfb/mfbhrzvert.c:1.7 --- xc/programs/Xserver/mfb/mfbhrzvert.c:1.5 Fri Dec 14 15:00:08 2001 +++ xc/programs/Xserver/mfb/mfbhrzvert.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.5 2001/12/14 20:00:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbhrzvert.c,v 1.7 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,8 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbhrzvert.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" + +#include #include "gc.h" #include "window.h" @@ -61,17 +61,11 @@ abs(len) > 1 */ void -mfbHorzS(rop, addrl, nlwidth, x1, y1, len) -int rop; /* a reduced rasterop */ -register PixelType *addrl; /* pointer to base of bitmap */ -register int nlwidth; /* width in longwords of bitmap */ -int x1; /* initial point */ -int y1; -int len; /* length of line */ +mfbHorzS(int rop, PixelType *addrl, int nlwidth, int x1, int y1, int len) { - register PixelType startmask; - register PixelType endmask; - register int nlmiddle; + PixelType startmask; + PixelType endmask; + int nlmiddle; /* force the line to go left to right @@ -140,14 +134,9 @@ */ void -mfbVertS(rop, addrl, nlwidth, x1, y1, len) -int rop; /* a reduced rasterop */ -register PixelType *addrl; /* pointer to base of bitmap */ -register int nlwidth; /* width in longwords of bitmap */ -int x1, y1; /* initial point */ -register int len; /* length of line */ +mfbVertS(int rop, PixelType *addrl, int nlwidth, int x1, int y1, int len) { - register PixelType bitmask; + PixelType bitmask; addrl = mfbScanline(addrl, x1, y1, nlwidth); Index: xc/programs/Xserver/mfb/mfbimage.c diff -u xc/programs/Xserver/mfb/mfbimage.c:1.6 xc/programs/Xserver/mfb/mfbimage.c:1.8 --- xc/programs/Xserver/mfb/mfbimage.c:1.6 Fri Dec 14 15:00:08 2001 +++ xc/programs/Xserver/mfb/mfbimage.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.6 2001/12/14 20:00:08 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimage.c,v 1.8 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,9 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbimage.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "pixmapstr.h" @@ -56,7 +55,7 @@ #include "mfb.h" #include "mi.h" -#include "Xmd.h" +#include #include "maskbits.h" @@ -86,13 +85,8 @@ /*ARGSUSED*/ void -mfbPutImage(dst, pGC, depth, x, y, w, h, leftPad, format, pImage) - DrawablePtr dst; - GCPtr pGC; - int depth, x, y, w, h; - int leftPad; - int format; - char *pImage; +mfbPutImage(DrawablePtr dst, GCPtr pGC, int depth, int x, int y, int w, int h, + int leftPad, int format, char *pImage) { PixmapPtr pPixmap; @@ -133,12 +127,8 @@ */ /*ARGSUSED*/ void -mfbGetImage( pDrawable, sx, sy, w, h, format, planeMask, pdstLine) - DrawablePtr pDrawable; - int sx, sy, w, h; - unsigned int format; - unsigned long planeMask; - char *pdstLine; +mfbGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, + unsigned int format, unsigned long planeMask, char *pdstLine) { BoxRec box; DDXPointRec ptSrc; Index: xc/programs/Xserver/mfb/mfbimggblt.c diff -u xc/programs/Xserver/mfb/mfbimggblt.c:3.6 xc/programs/Xserver/mfb/mfbimggblt.c:3.8 --- xc/programs/Xserver/mfb/mfbimggblt.c:3.6 Mon Nov 3 00:11:59 2003 +++ xc/programs/Xserver/mfb/mfbimggblt.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.6 2003/11/03 05:11:59 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbimggblt.c,v 3.8 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,12 +46,12 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbimggblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" + +#include +#include +#include #include "mfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -97,13 +97,8 @@ */ void -MFBIMAGEGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +MFBIMAGEGLYPHBLT(DrawablePtr pDrawable, GC *pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { ExtentInfoRec info; /* used by QueryGlyphExtents() */ BoxRec bbox; /* string's bounding box */ @@ -122,23 +117,23 @@ int xchar; /* xorigin of char (mod 32) */ /* these are used for placing the glyph */ - register int xoff; /* x offset of left edge of glyph (mod 32) */ - register PixelType *pdst; + int xoff; /* x offset of left edge of glyph (mod 32) */ + PixelType *pdst; /* pointer to current longword in dst */ int w; /* width of glyph in bits */ int h; /* height of glyph */ int widthGlyph; /* width of glyph, in bytes */ - register unsigned char *pglyph; + unsigned char *pglyph; /* pointer to current row of glyph */ /* used for putting down glyph */ - register PixelType tmpSrc; + PixelType tmpSrc; /* for getting bits from glyph */ - register PixelType startmask; - register PixelType endmask; + PixelType startmask; + PixelType endmask; - register int nFirst;/* bits of glyph in current longword */ + int nFirst;/* bits of glyph in current longword */ mfbPrivGC *pPrivGC; mfbFillAreaProcPtr oldFillArea; /* we might temporarily usurp this Index: xc/programs/Xserver/mfb/mfbline.c diff -u xc/programs/Xserver/mfb/mfbline.c:1.7 xc/programs/Xserver/mfb/mfbline.c:1.9 --- xc/programs/Xserver/mfb/mfbline.c:1.7 Fri Dec 14 15:00:09 2001 +++ xc/programs/Xserver/mfb/mfbline.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.7 2001/12/14 20:00:09 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbline.c,v 1.9 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbline.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" + +#include #include "gcstruct.h" #include "windowstr.h" @@ -90,26 +90,18 @@ void #ifdef POLYSEGMENT -mfbSegmentSS (pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - register xSegment *pSeg; +mfbSegmentSS(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) #else -mfbLineSS (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +mfbLineSS(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) #endif { int nboxInit; - register int nbox; + int nbox; BoxPtr pboxInit; - register BoxPtr pbox; + BoxPtr pbox; #ifndef POLYSEGMENT - register DDXPointPtr ppt; /* pointer to list of translated points */ + DDXPointPtr ppt; /* pointer to list of translated points */ #endif unsigned int oc1; /* outcode of point 1 */ @@ -133,8 +125,8 @@ unsigned int bias = miGetZeroLineBias(pDrawable->pScreen); /* a bunch of temporaries */ - register int y1, y2; - register int x1, x2; + int y1, y2; + int x1, x2; RegionPtr cclip; int alu; @@ -188,7 +180,7 @@ */ if (y1 > y2) { - register int tmp; + int tmp; tmp = y2; y2 = y1 + 1; @@ -242,7 +234,7 @@ */ if (x1 > x2) { - register int tmp; + int tmp; tmp = x2; x2 = x1 + 1; @@ -468,30 +460,22 @@ void #ifdef POLYSEGMENT -mfbSegmentSD (pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - register GCPtr pGC; - int nseg; - register xSegment *pSeg; +mfbSegmentSD(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) #else -mfbLineSD( pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - register GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +mfbLineSD(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) #endif { int nboxInit; - register int nbox; + int nbox; BoxPtr pboxInit; - register BoxPtr pbox; + BoxPtr pbox; #ifndef POLYSEGMENT - register DDXPointPtr ppt; /* pointer to list of translated points */ + DDXPointPtr ppt; /* pointer to list of translated points */ #endif - register unsigned int oc1; /* outcode of point 1 */ - register unsigned int oc2; /* outcode of point 2 */ + unsigned int oc1; /* outcode of point 1 */ + unsigned int oc2; /* outcode of point 2 */ PixelType *addrl; /* address of destination pixmap */ int nlwidth; /* width in longwords of destination pixmap */ Index: xc/programs/Xserver/mfb/mfbmisc.c diff -u xc/programs/Xserver/mfb/mfbmisc.c:1.2 xc/programs/Xserver/mfb/mfbmisc.c:1.4 --- xc/programs/Xserver/mfb/mfbmisc.c:1.2 Fri Dec 14 15:00:09 2001 +++ xc/programs/Xserver/mfb/mfbmisc.c Fri Oct 14 11:17:21 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/Xserver/mfb/mfbmisc.c,v 1.4 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -44,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbmisc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" + +#include #include "misc.h" #include "cursor.h" #include "scrnintstr.h" @@ -54,11 +55,8 @@ /*ARGSUSED*/ void -mfbQueryBestSize(class, pwidth, pheight, pScreen) -int class; -unsigned short *pwidth; -unsigned short *pheight; -ScreenPtr pScreen; +mfbQueryBestSize(int class, unsigned short *pwidth, unsigned short *pheight, + ScreenPtr pScreen) { unsigned width, test; Index: xc/programs/Xserver/mfb/mfbpixmap.c diff -u xc/programs/Xserver/mfb/mfbpixmap.c:1.2 xc/programs/Xserver/mfb/mfbpixmap.c:1.5 --- xc/programs/Xserver/mfb/mfbpixmap.c:1.2 Fri Dec 14 15:00:10 2001 +++ xc/programs/Xserver/mfb/mfbpixmap.c Fri Oct 14 11:17:21 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/Xserver/mfb/mfbpixmap.c,v 1.5 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -44,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpixmap.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* pixmap management written by drewry, september 1986 @@ -52,7 +52,7 @@ on a monchrome device, a pixmap is a bitmap. */ -#include "Xmd.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "maskbits.h" @@ -65,18 +65,15 @@ #ifndef LOWMEMFTPT PixmapPtr -mfbCreatePixmap (pScreen, width, height, depth) - ScreenPtr pScreen; - int width; - int height; - int depth; +mfbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth) { PixmapPtr pPixmap; int datasize; int paddedWidth; - if (depth != 1) + if ((depth != 1) || (width > MAXSHORT) || (height > MAXSHORT)) return NullPixmap; + paddedWidth = BitmapBytePad(width); datasize = height * paddedWidth; pPixmap = AllocatePixmap(pScreen, datasize); @@ -107,8 +104,7 @@ #endif /* ifndef LOWMEMFTPT */ Bool -mfbDestroyPixmap(pPixmap) - PixmapPtr pPixmap; +mfbDestroyPixmap(PixmapPtr pPixmap) { if(--pPixmap->refcnt) return TRUE; @@ -118,10 +114,9 @@ PixmapPtr -mfbCopyPixmap(pSrc) - register PixmapPtr pSrc; +mfbCopyPixmap(PixmapPtr pSrc) { - register PixmapPtr pDst; + PixmapPtr pDst; int size; ScreenPtr pScreen; @@ -148,15 +143,14 @@ left shift and or in original as many times as needed */ void -mfbPadPixmap(pPixmap) - PixmapPtr pPixmap; +mfbPadPixmap(PixmapPtr pPixmap) { - register int width = pPixmap->drawable.width; - register int h; - register PixelType mask; - register PixelType *p; - register PixelType bits; /* real pattern bits */ - register int i; + int width = pPixmap->drawable.width; + int h; + PixelType mask; + PixelType *p; + PixelType bits; /* real pattern bits */ + int i; int rep; /* repeat count for pattern */ if (width >= PPW) @@ -188,12 +182,10 @@ * left. */ void -mfbXRotatePixmap(pPix, rw) - PixmapPtr pPix; - register int rw; +mfbXRotatePixmap(PixmapPtr pPix, int rw) { - register PixelType *pw, *pwFinal; - register PixelType t; + PixelType *pw, *pwFinal; + PixelType t; if (pPix == NullPixmap) return; @@ -228,9 +220,7 @@ works on any width. */ void -mfbYRotatePixmap(pPix, rh) - register PixmapPtr pPix; - int rh; +mfbYRotatePixmap(PixmapPtr pPix, int rh) { int nbyDown; /* bytes to move down to row 0; also offset of row rh */ @@ -261,11 +251,9 @@ } void -mfbCopyRotatePixmap(psrcPix, ppdstPix, xrot, yrot) - register PixmapPtr psrcPix, *ppdstPix; - int xrot, yrot; +mfbCopyRotatePixmap(PixmapPtr psrcPix, PixmapPtr *ppdstPix, int xrot, int yrot) { - register PixmapPtr pdstPix; + PixmapPtr pdstPix; if ((pdstPix = *ppdstPix) && (pdstPix->devKind == psrcPix->devKind) && Index: xc/programs/Xserver/mfb/mfbply1rct.c diff -u xc/programs/Xserver/mfb/mfbply1rct.c:1.8 xc/programs/Xserver/mfb/mfbply1rct.c:1.10 --- xc/programs/Xserver/mfb/mfbply1rct.c:1.8 Sun Dec 8 23:10:57 2002 +++ xc/programs/Xserver/mfb/mfbply1rct.c Fri Oct 14 11:17:21 2005 @@ -1,5 +1,5 @@ +/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.10 2005/10/14 15:17:21 tsi Exp $ */ /* - * $Xorg: mfbply1rct.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -26,9 +26,8 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.8 2002/12/09 04:10:57 tsi Exp $ */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" @@ -59,19 +58,14 @@ #endif void -MFBFILLPOLY1RECT (pDrawable, pGC, shape, mode, count, ptsIn) - DrawablePtr pDrawable; - GCPtr pGC; - int shape; - int mode; - int count; - DDXPointPtr ptsIn; +MFBFILLPOLY1RECT(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, + int count, DDXPointPtr ptsIn) { int nlwidth; PixelType *addrl, *addr; int maxy; int origin; - register int vertex1, vertex2; + int vertex1, vertex2; int c; BoxPtr extents; int clip; Index: xc/programs/Xserver/mfb/mfbplygblt.c diff -u xc/programs/Xserver/mfb/mfbplygblt.c:3.5 xc/programs/Xserver/mfb/mfbplygblt.c:3.7 --- xc/programs/Xserver/mfb/mfbplygblt.c:3.5 Mon Nov 3 00:12:00 2003 +++ xc/programs/Xserver/mfb/mfbplygblt.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.5 2003/11/03 05:12:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbplygblt.c,v 3.7 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,13 +45,12 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbplygblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -88,10 +87,6 @@ swaps in the right routine after looking at the reduced ratserop in the private field of the GC. - the register allocations are provisional; in particualr startmask and -endmask might not be the right things. pglyph, xoff, pdst, and tmpSrc -are fairly obvious, though. - to avoid source proliferation, this file is compiled three times: MFBPOLYGLYPHBLT OPEQ @@ -101,13 +96,8 @@ */ void -MFBPOLYGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs (unused in R5) */ +MFBPOLYGLYPHBLT(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { ExtentInfoRec info; /* used by QueryGlyphExtents() */ BoxRec bbox; /* string's bounding box */ @@ -122,22 +112,22 @@ int xchar; /* xorigin of char (mod 32) */ /* these are used for placing the glyph */ - register int xoff; /* x offset of left edge of glyph (mod 32) */ - register PixelType *pdst; + int xoff; /* x offset of left edge of glyph (mod 32) */ + PixelType *pdst; /* pointer to current longword in dst */ int w; /* width of glyph in bits */ int h; /* height of glyph */ int widthGlyph; /* width of glyph, in bytes */ - register unsigned char *pglyph; + unsigned char *pglyph; /* pointer to current row of glyph */ /* used for putting down glyph */ - register PixelType tmpSrc; + PixelType tmpSrc; /* for getting bits from glyph */ - register PixelType startmask; - register PixelType endmask; - register int nFirst;/* bits of glyph in current longword */ + PixelType startmask; + PixelType endmask; + int nFirst;/* bits of glyph in current longword */ if (!(pGC->planemask & 1)) return; Index: xc/programs/Xserver/mfb/mfbpntarea.c diff -u xc/programs/Xserver/mfb/mfbpntarea.c:1.2 xc/programs/Xserver/mfb/mfbpntarea.c:1.4 --- xc/programs/Xserver/mfb/mfbpntarea.c:1.2 Fri Dec 14 15:00:11 2001 +++ xc/programs/Xserver/mfb/mfbpntarea.c Fri Oct 14 11:17:21 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/Xserver/mfb/mfbpntarea.c,v 1.4 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -45,8 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpntarea.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" + +#include #include "windowstr.h" #include "regionstr.h" @@ -81,21 +82,17 @@ /*ARGSUSED*/ void -MFBSOLIDFILLAREA(pDraw, nbox, pbox, alu, nop) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - int alu; - PixmapPtr nop; +MFBSOLIDFILLAREA(DrawablePtr pDraw, int nbox, BoxPtr pbox, int alu, + PixmapPtr nop) { int nlwidth; /* width in longwords of the drawable */ int w; /* width of current box */ - register int h; /* height of current box */ - register PixelType *p; /* pointer to bits we're writing */ - register int nlw; /* loop version of nlwMiddle */ - register PixelType startmask; - register PixelType endmask;/* masks for reggedy bits at either end of line */ - register int nlwExtra; + int h; /* height of current box */ + PixelType *p; /* pointer to bits we're writing */ + int nlw; /* loop version of nlwMiddle */ + PixelType startmask; + PixelType endmask;/* masks for reggedy bits at either end of line */ + int nlwExtra; /* to get from right of box to left of next span */ int nlwMiddle; /* number of longwords between sides of boxes */ PixelType *pbits; /* pointer to start of drawable */ @@ -185,28 +182,24 @@ /*ARGSUSED*/ void -MFBSTIPPLEFILLAREA(pDraw, nbox, pbox, alu, pstipple) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - int alu; - PixmapPtr pstipple; +MFBSTIPPLEFILLAREA(DrawablePtr pDraw, int nbox, BoxPtr pbox, int alu, + PixmapPtr pstipple) { - register PixelType *psrc; + PixelType *psrc; /* pointer to bits in tile, if needed */ int tileHeight; /* height of the tile */ - register PixelType srcpix; + PixelType srcpix; int nlwidth; /* width in longwords of the drawable */ int w; /* width of current box */ - register int nlw; /* loop version of nlwMiddle */ - register PixelType *p; /* pointer to bits we're writing */ - register int h; /* height of current box */ + int nlw; /* loop version of nlwMiddle */ + PixelType *p; /* pointer to bits we're writing */ + int h; /* height of current box */ PixelType startmask; PixelType endmask; /* masks for reggedy bits at either end of line */ int nlwMiddle; /* number of longwords between sides of boxes */ int nlwExtra; /* to get from right of box to left of next span */ - register int iy; /* index of current scanline in tile */ + int iy; /* index of current scanline in tile */ PixelType *pbits; /* pointer to start of drawable */ mfbGetPixelWidthAndPointer(pDraw, nlwidth, pbits); Index: xc/programs/Xserver/mfb/mfbpntwin.c diff -u xc/programs/Xserver/mfb/mfbpntwin.c:1.2 xc/programs/Xserver/mfb/mfbpntwin.c:1.4 --- xc/programs/Xserver/mfb/mfbpntwin.c:1.2 Fri Dec 14 15:00:11 2001 +++ xc/programs/Xserver/mfb/mfbpntwin.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $Xorg: mfbpntwin.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpntwin.c,v 1.4 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +47,7 @@ ******************************************************************/ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" @@ -59,12 +59,9 @@ #include "mi.h" void -mfbPaintWindow(pWin, pRegion, what) - WindowPtr pWin; - RegionPtr pRegion; - int what; +mfbPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what) { - register mfbPrivWin *pPrivWin; + mfbPrivWin *pPrivWin; pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr); Index: xc/programs/Xserver/mfb/mfbpolypnt.c diff -u xc/programs/Xserver/mfb/mfbpolypnt.c:1.5 xc/programs/Xserver/mfb/mfbpolypnt.c:1.7 --- xc/programs/Xserver/mfb/mfbpolypnt.c:1.5 Fri Dec 14 15:00:11 2001 +++ xc/programs/Xserver/mfb/mfbpolypnt.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.5 2001/12/14 20:00:11 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpolypnt.c,v 1.7 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,10 +46,9 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpolypnt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -61,26 +60,22 @@ #include "maskbits.h" void -mfbPolyPoint(pDrawable, pGC, mode, npt, pptInit) - register DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; - xPoint *pptInit; +mfbPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + xPoint *pptInit) { - register BoxPtr pbox; - register int nbox; + BoxPtr pbox; + int nbox; - register PixelType *addrl; + PixelType *addrl; int nlwidth; int nptTmp; - register xPoint *ppt; + xPoint *ppt; - register int x; - register int y; - register int rop; + int x; + int y; + int rop; mfbPrivGC *pGCPriv; if (!(pGC->planemask & 1)) Index: xc/programs/Xserver/mfb/mfbpushpxl.c diff -u xc/programs/Xserver/mfb/mfbpushpxl.c:1.7 xc/programs/Xserver/mfb/mfbpushpxl.c:1.9 --- xc/programs/Xserver/mfb/mfbpushpxl.c:1.7 Tue Feb 18 16:30:01 2003 +++ xc/programs/Xserver/mfb/mfbpushpxl.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbpushpxl.c,v 1.9 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,9 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbpushpxl.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" +#include #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" @@ -94,18 +93,15 @@ * has a zero bit or outside the area covered by the stencil. */ void -mfbSolidPP(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) - GCPtr pGC; - PixmapPtr pBitMap; - DrawablePtr pDrawable; - int dx, dy, xOrg, yOrg; +mfbSolidPP(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int dy, + int xOrg, int yOrg) { unsigned char alu; RegionRec rgnDst; DDXPointPtr pptSrc; BoxRec srcBox; - register DDXPointPtr ppt; - register BoxPtr pbox; + DDXPointPtr ppt; + BoxPtr pbox; int i; if (!(pGC->planemask & 1)) return; @@ -155,19 +151,16 @@ * has a zero bit or outside the area covered by the stencil. */ void -mfbPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) - GCPtr pGC; - PixmapPtr pBitMap; - DrawablePtr pDrawable; - int dx, dy, xOrg, yOrg; +mfbPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, + int dx, int dy, int xOrg, int yOrg) { int h, dxDivPPW, ibEnd; PixelType *pwLineStart; - register PixelType *pw, *pwEnd; - register PixelType mask; - register int ib; - register PixelType w; - register int ipt; /* index into above arrays */ + PixelType *pw, *pwEnd; + PixelType mask; + int ib; + PixelType w; + int ipt; /* index into above arrays */ Bool fInBox; DDXPointRec pt[NPT]; int width[NPT]; Index: xc/programs/Xserver/mfb/mfbscrclse.c diff -u xc/programs/Xserver/mfb/mfbscrclse.c:1.4 xc/programs/Xserver/mfb/mfbscrclse.c:1.5 --- xc/programs/Xserver/mfb/mfbscrclse.c:1.4 Tue Feb 18 16:30:01 2003 +++ xc/programs/Xserver/mfb/mfbscrclse.c Sun Mar 27 21:51:09 2005 @@ -1,4 +1,4 @@ -/* $Xorg: mfbscrclse.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.5 2005/03/28 02:51:09 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,16 +45,13 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.4 2003/02/18 21:30:01 tsi Exp $ */ #include "mfb.h" #include "scrnintstr.h" /*ARGSUSED*/ Bool -mfbCloseScreen(index, pScreen) - int index; - register ScreenPtr pScreen; +mfbCloseScreen(int index, ScreenPtr pScreen) { xfree(pScreen->devPrivate); return TRUE; Index: xc/programs/Xserver/mfb/mfbscrinit.c diff -u xc/programs/Xserver/mfb/mfbscrinit.c:3.9 xc/programs/Xserver/mfb/mfbscrinit.c:3.11 --- xc/programs/Xserver/mfb/mfbscrinit.c:3.9 Tue Feb 18 16:30:01 2003 +++ xc/programs/Xserver/mfb/mfbscrinit.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.9 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbscrinit.c,v 3.11 2005/10/14 15:17:21 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,11 +45,10 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbscrinit.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xproto.h" /* for xColorItem */ -#include "Xmd.h" +#include +#include /* for xColorItem */ +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" @@ -95,9 +94,7 @@ #endif /* ifndef LOWMEMFTPT */ Bool -mfbAllocatePrivates(pScreen, pWinIndex, pGCIndex) - ScreenPtr pScreen; - int *pWinIndex, *pGCIndex; +mfbAllocatePrivates(ScreenPtr pScreen, int *pWinIndex, int *pGCIndex) { if (mfbGeneration != serverGeneration) { @@ -125,12 +122,8 @@ /* dts * (inch/dot) * (25.4 mm / inch) = mm */ Bool -mfbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width) - register ScreenPtr pScreen; - pointer pbits; /* pointer to screen bitmap */ - int xsize, ysize; /* in pixels */ - int dpix, dpiy; /* dots per inch */ - int width; /* pixel width of frame buffer */ +mfbScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, int ysize, + int dpix, int dpiy, int width) { if (!mfbAllocatePrivates(pScreen, (int *)NULL, (int *)NULL)) return FALSE; @@ -171,8 +164,7 @@ #endif /* ifndef LOWMEMFTPT */ PixmapPtr -mfbGetWindowPixmap(pWin) - WindowPtr pWin; +mfbGetWindowPixmap(WindowPtr pWin) { #ifdef PIXMAP_PER_WINDOW return (PixmapPtr)(pWin->devPrivates[frameWindowPrivateIndex].ptr); @@ -184,9 +176,7 @@ } void -mfbSetWindowPixmap(pWin, pPix) - WindowPtr pWin; - PixmapPtr pPix; +mfbSetWindowPixmap(WindowPtr pWin, PixmapPtr pPix) { #ifdef PIXMAP_PER_WINDOW pWin->devPrivates[frameWindowPrivateIndex].ptr = (pointer)pPix; Index: xc/programs/Xserver/mfb/mfbsetsp.c diff -u xc/programs/Xserver/mfb/mfbsetsp.c:1.7 xc/programs/Xserver/mfb/mfbsetsp.c:1.9 --- xc/programs/Xserver/mfb/mfbsetsp.c:1.7 Tue Feb 18 16:30:01 2003 +++ xc/programs/Xserver/mfb/mfbsetsp.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.7 2003/02/18 21:30:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbsetsp.c,v 1.9 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,10 +46,9 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbsetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "regionstr.h" @@ -70,24 +69,26 @@ * boxes, we may not want to start grabbing bits at psrc but at some offset * further on.) */ +/* + int xOrigin; where this scanline starts + int xStart; first bit to use from scanline + int xEnd; last bit to use from scanline + 1 + int alu; raster op + PixelType *pdstBase; tart of the drawable + int widthDst; width of drawable in words +*/ + void -mfbSetScanline(y, xOrigin, xStart, xEnd, psrc, alu, pdstBase, widthDst) - int y; - int xOrigin; /* where this scanline starts */ - int xStart; /* first bit to use from scanline */ - int xEnd; /* last bit to use from scanline + 1 */ - register PixelType *psrc; - register int alu; /* raster op */ - PixelType *pdstBase; /* start of the drawable */ - int widthDst; /* width of drawable in words */ +mfbSetScanline(int y, int xOrigin, int xStart, int xEnd, PixelType *psrc, + int alu, PixelType *pdstBase, int widthDst) { int w; /* width of scanline in bits */ - register PixelType *pdst; /* where to put the bits */ - register PixelType tmpSrc; /* scratch buffer to collect bits in */ + PixelType *pdst; /* where to put the bits */ + PixelType tmpSrc; /* scratch buffer to collect bits in */ int dstBit; /* offset in bits from beginning of * word */ - register int nstart; /* number of bits from first partial */ - register int nend; /* " " last partial word */ + int nstart; /* number of bits from first partial */ + int nend; /* " " last partial word */ int offSrc; PixelType startmask, endmask; int nlMiddle, nl; @@ -150,20 +151,14 @@ * on a word boundary. */ void -mfbSetSpans(pDrawable, pGC, pcharsrc, ppt, pwidth, nspans, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - char *pcharsrc; - register DDXPointPtr ppt; - int *pwidth; - int nspans; - int fSorted; +mfbSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pcharsrc, DDXPointPtr ppt, + int *pwidth, int nspans, int fSorted) { PixelType *psrc = (PixelType *)(pointer)pcharsrc; PixelType *pdstBase; /* start of dst bitmap */ int widthDst; /* width of bitmap in words */ - register BoxPtr pbox, pboxLast, pboxTest; - register DDXPointPtr pptLast; + BoxPtr pbox, pboxLast, pboxTest; + DDXPointPtr pptLast; int alu; RegionPtr prgnDst; int xStart, xEnd; Index: xc/programs/Xserver/mfb/mfbtegblt.c diff -u xc/programs/Xserver/mfb/mfbtegblt.c:1.8 xc/programs/Xserver/mfb/mfbtegblt.c:1.10 --- xc/programs/Xserver/mfb/mfbtegblt.c:1.8 Fri Dec 14 15:00:12 2001 +++ xc/programs/Xserver/mfb/mfbtegblt.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $Xorg: mfbtegblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.10 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,11 @@ ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.8 2001/12/14 20:00:12 dawes Exp $ */ - -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -167,13 +165,8 @@ #endif void -MFBTEGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +MFBTEGLYPHBLT(DrawablePtr pDrawable, GC *pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { FontPtr pfont = pGC->font; int widthDst; @@ -181,24 +174,24 @@ of current glyph */ int h; /* height of glyph and char */ - register int xpos; /* current x */ + int xpos; /* current x */ int ypos; /* current y */ int widthGlyph; int hTmp; /* counter for height */ - register PixelType startmask, endmask; + PixelType startmask, endmask; int nfirst; /* used if glyphs spans a longword boundary */ BoxRec bbox; /* for clipping */ int widthGlyphs; - register PixelType *dst; - register PixelType c; - register int xoff1, xoff2, xoff3, xoff4; - register glyphPointer char1, char2, char3, char4; + PixelType *dst; + PixelType c; + int xoff1, xoff2, xoff3, xoff4; + glyphPointer char1, char2, char3, char4; #ifdef USE_LEFTBITS - register PixelType glyphMask; - register PixelType tmpSrc; - register int glyphBytes; + PixelType glyphMask; + PixelType tmpSrc; + int glyphBytes; #endif if (!(pGC->planemask & 1)) Index: xc/programs/Xserver/mfb/mfbtile.c diff -u xc/programs/Xserver/mfb/mfbtile.c:1.4 xc/programs/Xserver/mfb/mfbtile.c:1.6 --- xc/programs/Xserver/mfb/mfbtile.c:1.4 Tue Jul 15 21:38:55 2003 +++ xc/programs/Xserver/mfb/mfbtile.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.4 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbtile.c,v 1.6 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,8 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mfbtile.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ -#include "X.h" + +#include #include "windowstr.h" #include "regionstr.h" @@ -71,28 +71,24 @@ tile area with a PPW bit wide pixmap */ void -MROP_NAME(mfbTileAreaPPW)(pDraw, nbox, pbox, alu, ptile) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - int alu; - PixmapPtr ptile; +MROP_NAME(mfbTileAreaPPW)(DrawablePtr pDraw, int nbox, BoxPtr pbox, int alu, + PixmapPtr ptile) { - register PixelType *psrc; + PixelType *psrc; /* pointer to bits in tile, if needed */ int tileHeight; /* height of the tile */ - register PixelType srcpix; + PixelType srcpix; int nlwidth; /* width in longwords of the drawable */ int w; /* width of current box */ MROP_DECLARE_REG () - register int h; /* height of current box */ - register int nlw; /* loop version of nlwMiddle */ - register PixelType *p; /* pointer to bits we're writing */ + int h; /* height of current box */ + int nlw; /* loop version of nlwMiddle */ + PixelType *p; /* pointer to bits we're writing */ PixelType startmask; PixelType endmask; /* masks for reggedy bits at either end of line */ int nlwMiddle; /* number of longwords between sides of boxes */ int nlwExtra; /* to get from right of box to left of next span */ - register int iy; /* index of current scanline in tile */ + int iy; /* index of current scanline in tile */ PixelType *pbits; /* pointer to start of drawable */ mfbGetPixelWidthAndPointer(pDraw, nlwidth, pbits); @@ -213,12 +209,8 @@ #if (MROP) == 0 void -mfbTileAreaPPW (pDraw, nbox, pbox, alu, ptile) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - int alu; - PixmapPtr ptile; +mfbTileAreaPPW(DrawablePtr pDraw, int nbox, BoxPtr pbox, int alu, + PixmapPtr ptile) { void (*f)( DrawablePtr /*pDraw*/, Index: xc/programs/Xserver/mfb/mfbwindow.c diff -u xc/programs/Xserver/mfb/mfbwindow.c:1.4 xc/programs/Xserver/mfb/mfbwindow.c:1.6 --- xc/programs/Xserver/mfb/mfbwindow.c:1.4 Mon Nov 3 00:36:35 2003 +++ xc/programs/Xserver/mfb/mfbwindow.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $Xorg: mfbwindow.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbwindow.c,v 1.6 2005/10/14 15:17:21 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -46,9 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mfb/mfbwindow.c,v 1.4 2003/11/03 05:36:35 tsi Exp $ */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "mfb.h" @@ -57,10 +56,9 @@ #include "maskbits.h" Bool -mfbCreateWindow(pWin) - register WindowPtr pWin; +mfbCreateWindow(WindowPtr pWin) { - register mfbPrivWin *pPrivWin; + mfbPrivWin *pPrivWin; pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr); pPrivWin->pRotatedBorder = NullPixmap; @@ -74,10 +72,9 @@ /* This always returns true, because Xfree can't fail. It might be possible * on some devices for Destroy to fail */ Bool -mfbDestroyWindow(pWin) - WindowPtr pWin; +mfbDestroyWindow(WindowPtr pWin) { - register mfbPrivWin *pPrivWin; + mfbPrivWin *pPrivWin; pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr); @@ -89,8 +86,8 @@ } /*ARGSUSED*/ -Bool mfbMapWindow(pWindow) - WindowPtr pWindow; +Bool +mfbMapWindow(WindowPtr pWindow) { return (TRUE); } @@ -105,11 +102,9 @@ /*ARGSUSED*/ Bool -mfbPositionWindow(pWin, x, y) - register WindowPtr pWin; - int x, y; +mfbPositionWindow(WindowPtr pWin, int x, int y) { - register mfbPrivWin *pPrivWin; + mfbPrivWin *pPrivWin; int reset = 0; pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr); @@ -152,8 +147,7 @@ /*ARGSUSED*/ Bool -mfbUnmapWindow(pWindow) - WindowPtr pWindow; +mfbUnmapWindow(WindowPtr pWindow) { return (TRUE); } @@ -167,17 +161,14 @@ void -mfbCopyWindow(pWin, ptOldOrg, prgnSrc) - WindowPtr pWin; - DDXPointRec ptOldOrg; - RegionPtr prgnSrc; +mfbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { DDXPointPtr pptSrc; - register DDXPointPtr ppt; + DDXPointPtr ppt; RegionPtr prgnDst; - register BoxPtr pbox; - register int dx, dy; - register int i, nbox; + BoxPtr pbox; + int dx, dy; + int i, nbox; WindowPtr pwinRoot; pwinRoot = WindowTable[pWin->drawable.pScreen->myNum]; @@ -215,12 +206,10 @@ of it in devPrivate. */ Bool -mfbChangeWindowAttributes(pWin, mask) - register WindowPtr pWin; - register unsigned long mask; +mfbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) { - register unsigned long index; - register mfbPrivWin *pPrivWin; + unsigned long index; + mfbPrivWin *pPrivWin; WindowPtr pBgWin; pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr); Index: xc/programs/Xserver/mfb/mfbzerarc.c diff -u xc/programs/Xserver/mfb/mfbzerarc.c:3.8 xc/programs/Xserver/mfb/mfbzerarc.c:3.10 --- xc/programs/Xserver/mfb/mfbzerarc.c:3.8 Tue Jul 15 21:38:55 2003 +++ xc/programs/Xserver/mfb/mfbzerarc.c Fri Oct 14 11:17:21 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.8 2003/07/16 01:38:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mfb/mfbzerarc.c,v 3.10 2005/10/14 15:17:21 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,16 +25,14 @@ ********************************************************/ -/* $Xorg: mfbzerarc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ - /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" * by M. L. V. Pitteway * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -72,21 +70,18 @@ #define DoPix(bit,base,yoff,xoff) if (mask & bit) Pixelate(base,yoff,xoff); static void -mfbZeroArcSS( - DrawablePtr pDraw, - GCPtr pGC, - xArc *arc) +mfbZeroArcSS(DrawablePtr pDraw, GCPtr pGC, xArc *arc) { miZeroArcRec info; Bool do360; - register int x, y, a, b, d, mask; - register int k1, k3, dx, dy; + int x, y, a, b, d, mask; + int k1, k3, dx, dy; PixelType *addrl; PixelType *yorgl, *yorgol; PixelType pixel; int nlwidth, yoffset, dyoffset; PixelType pmask; - register PixelType *paddr; + PixelType *paddr; if (((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop == RROP_BLACK) @@ -206,14 +201,10 @@ } void -mfbZeroPolyArcSS(pDraw, pGC, narcs, parcs) - DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +mfbZeroPolyArcSS(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { - register xArc *arc; - register int i; + xArc *arc; + int i; BoxRec box; int x2, y2; RegionPtr cclip; Index: xc/programs/Xserver/mi/Imakefile diff -u xc/programs/Xserver/mi/Imakefile:3.35 xc/programs/Xserver/mi/Imakefile:3.37 --- xc/programs/Xserver/mi/Imakefile:3.35 Mon Apr 21 08:32:13 2003 +++ xc/programs/Xserver/mi/Imakefile Sun Feb 19 10:51:31 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:36 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.35 2003/04/21 12:32:13 sven Exp $ +XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.37 2006/02/19 15:51:31 tsi Exp $ #include @@ -41,18 +36,9 @@ mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \ micmap.o mioverlay.o -#ifdef XFree86Version -/* - * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o - * used by Xnest, Xvfb - */ -EXT_DEFINES = ExtensionDefines -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ - -UXFree86LOADER -#endif - -INCLUDES = -I. -I../include -I../../../include/fonts -I../render \ - -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext +INCLUDES = -I../include -I../render -I$(SERVERSRC)/Xext LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln +DEFINES = $(EXT_DEFINES) -UXFree86LOADER NormalLibraryObjectRule() NormalLibraryTarget(mi,$(OBJS)) @@ -63,10 +49,10 @@ NormalLibraryTarget(cbrt,cbrt.o) #endif -SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES)) -SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES)) +SpecialCObjectRule(miinitext,$(ICONFIGFILES),NullParameter) +SpecialCObjectRule(miscrinit,$(ICONFIGFILES),NullParameter) #ifdef ItsyCompilerBug -SpecialCObjectRule(mipolycon,$(_NOOP_),-O0) +SpecialCObjectRule(mipolycon,NullParameter,-O0) #endif #if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) SpecialCObjectRule(mizerclip,NullParameter,-O0) Index: xc/programs/Xserver/mi/cbrt.c diff -u xc/programs/Xserver/mi/cbrt.c:3.4 xc/programs/Xserver/mi/cbrt.c:3.5 --- xc/programs/Xserver/mi/cbrt.c:3.4 Fri Dec 14 15:00:19 2001 +++ xc/programs/Xserver/mi/cbrt.c Mon Jan 9 10:00:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cbrt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.4 2001/12/14 20:00:19 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/cbrt.c,v 3.5 2006/01/09 15:00:37 dawes Exp $ */ /* simple cbrt, in case your math library doesn't have a good one */ Index: xc/programs/Xserver/mi/mi.h diff -u xc/programs/Xserver/mi/mi.h:3.10 xc/programs/Xserver/mi/mi.h:3.11 --- xc/programs/Xserver/mi/mi.h:3.10 Fri Dec 14 15:00:19 2001 +++ xc/programs/Xserver/mi/mi.h Fri Oct 14 11:17:22 2005 @@ -1,4 +1,4 @@ -/* $Xorg: mi.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.11 2005/10/14 15:17:22 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.10 2001/12/14 20:00:19 dawes Exp $ */ #ifndef MI_H #define MI_H @@ -54,7 +53,7 @@ #include "validate.h" #include "window.h" #include "gc.h" -#include "font.h" +#include #include "input.h" #include "cursor.h" Index: xc/programs/Xserver/mi/miarc.c diff -u xc/programs/Xserver/mi/miarc.c:3.15 xc/programs/Xserver/mi/miarc.c:3.20 --- xc/programs/Xserver/mi/miarc.c:3.15 Sat Dec 6 13:46:28 2003 +++ xc/programs/Xserver/mi/miarc.c Sun Feb 19 19:14:38 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.20 2006/02/20 00:14:38 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: miarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ + /* Author: Keith Packard and Bob Scheifler */ /* Warning: this code is toxic, do not dally very long here. */ @@ -56,8 +56,8 @@ #include #undef _XOPEN_SOURCE #endif -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "misc.h" #include "gcstruct.h" #include "scrnintstr.h" @@ -66,13 +66,17 @@ #include "mifpoly.h" #include "mi.h" #include "mifillarc.h" -#include "Xfuncproto.h" +#include static double miDsin(double a); static double miDcos(double a); static double miDasin(double v); static double miDatan2(double dy, double dx); +#if !defined(__USE_XOPEN_EXTENDED) || !__USE_XOPEN_EXTENDED +#if !defined(sun) double cbrt(double); +#endif +#endif #ifdef ICEILTEMPDECL ICEILTEMPDECL @@ -106,12 +110,14 @@ #endif #ifdef USE_INLINE -inline static const int max (const int x, const int y) +inline static int +max(const int x, const int y) { return x>y? x:y; } -inline static const int min (const int x, const int y) +inline static int +min (const int x, const int y) { return xy? x:y; } static int -min (int x, int y) +min(int x, int y) { return xheight + pGC->lineWidth; n = (sizeof(int) * 2) * yorgu; @@ -1068,13 +1072,9 @@ */ void -miPolyArc(pDraw, pGC, narcs, parcs) - DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +miPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { - register int i; + int i; xArc *parc; int xMin, xMax, yMin, yMax; int pixmapWidth = 0, pixmapHeight = 0; @@ -1297,7 +1297,7 @@ } static double -angleBetween (SppPointRec center, SppPointRec point1, SppPointRec point2) +angleBetween(SppPointRec center, SppPointRec point1, SppPointRec point2) { double a1, a2, a; @@ -3136,9 +3136,9 @@ struct finalSpan * realAllocSpan () { - register struct finalSpanChunk *newChunk; - register struct finalSpan *span; - register int i; + struct finalSpanChunk *newChunk; + struct finalSpan *span; + int i; newChunk = (struct finalSpanChunk *) xalloc (sizeof (struct finalSpanChunk)); if (!newChunk) @@ -3176,12 +3176,12 @@ DrawablePtr pDrawable, GCPtr pGC) { - register struct finalSpan *span; - register DDXPointPtr xSpan; - register int *xWidth; - register int i; - register struct finalSpan **f; - register int spany; + struct finalSpan *span; + DDXPointPtr xSpan; + int *xWidth; + int i; + struct finalSpan **f; + int spany; DDXPointPtr xSpans; int *xWidths; @@ -3277,11 +3277,11 @@ static void newFinalSpan ( int y, - register int xmin, - register int xmax) + int xmin, + int xmax) { - register struct finalSpan *x; - register struct finalSpan **f; + struct finalSpan *x; + struct finalSpan **f; struct finalSpan *oldx; struct finalSpan *prev; Index: xc/programs/Xserver/mi/mibank.c diff -u xc/programs/Xserver/mi/mibank.c:1.17 xc/programs/Xserver/mi/mibank.c:1.18 --- xc/programs/Xserver/mi/mibank.c:1.17 Fri Dec 31 11:07:09 2004 +++ xc/programs/Xserver/mi/mibank.c Thu Jan 5 13:55:33 2006 @@ -1,5 +1,5 @@ /* - * Copyright 1997 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2006 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -44,7 +44,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.17 2004/12/31 16:07:09 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibank.c,v 1.18 2006/01/05 18:55:33 tsi Exp $ */ /* * This thing originated from an idea of Edwin Goei and his bank switching Index: xc/programs/Xserver/mi/mibank.h diff -u xc/programs/Xserver/mi/mibank.h:1.12 xc/programs/Xserver/mi/mibank.h:1.13 --- xc/programs/Xserver/mi/mibank.h:1.12 Fri Dec 31 11:07:09 2004 +++ xc/programs/Xserver/mi/mibank.h Thu Jan 5 13:55:33 2006 @@ -1,5 +1,5 @@ /* - * Copyright 1997 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + * Copyright 1997 through 2006 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.12 2004/12/31 16:07:09 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.13 2006/01/05 18:55:33 tsi Exp $ */ #ifndef __MIBANK_H__ #define __MIBANK_H__ 1 Index: xc/programs/Xserver/mi/mibitblt.c diff -u xc/programs/Xserver/mi/mibitblt.c:3.11 xc/programs/Xserver/mi/mibitblt.c:3.13 --- xc/programs/Xserver/mi/mibitblt.c:3.11 Fri Dec 14 15:00:20 2001 +++ xc/programs/Xserver/mi/mibitblt.c Fri Oct 14 11:17:22 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.11 2001/12/14 20:00:20 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibitblt.c,v 3.13 2005/10/14 15:17:22 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,11 +45,11 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mibitblt.c,v 1.5 2001/02/09 02:05:20 xorgcvs Exp $ */ + /* Author: Todd Newman (aided and abetted by Mr. Drewry) */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "misc.h" #include "gcstruct.h" @@ -58,7 +58,7 @@ #include "scrnintstr.h" #include "mi.h" #include "regionstr.h" -#include "Xmd.h" +#include #include "servermd.h" /* MICOPYAREA -- public entry for the CopyArea request @@ -68,14 +68,9 @@ * We let SetSpans worry about clipping to the destination. */ RegionPtr -miCopyArea(pSrcDrawable, pDstDrawable, - pGC, xIn, yIn, widthSrc, heightSrc, xOut, yOut) - register DrawablePtr pSrcDrawable; - register DrawablePtr pDstDrawable; - GCPtr pGC; - int xIn, yIn; - int widthSrc, heightSrc; - int xOut, yOut; +miCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GCPtr pGC, int xIn, int yIn, int widthSrc, int heightSrc, + int xOut, int yOut) { DDXPointPtr ppt, pptFirst; unsigned int *pwidthFirst, *pwidth, *pbits; @@ -395,12 +390,8 @@ * color so that the stipple never causes FillRect to draw them. */ void -miOpqStipDrawable(pDraw, pGC, prgnSrc, pbits, srcx, w, h, dstx, dsty) - DrawablePtr pDraw; - GCPtr pGC; - RegionPtr prgnSrc; - MiBits *pbits; - int srcx, w, h, dstx, dsty; +miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc, + MiBits *pbits, int srcx, int w, int h, int dstx, int dsty) { int oldfill, i; unsigned long oldfg; @@ -546,15 +537,9 @@ * Use the bitmap we've built up as a Stipple for the destination */ RegionPtr -miCopyPlane(pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty, bitPlane) - DrawablePtr pSrcDrawable; - DrawablePtr pDstDrawable; - GCPtr pGC; - int srcx, srcy; - int width, height; - int dstx, dsty; - unsigned long bitPlane; +miCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GCPtr pGC, int srcx, int srcy, int width, int height, + int dstx, int dsty, unsigned long bitPlane) { MiBits *ptile; BoxRec box; @@ -640,12 +625,8 @@ * get the single plane specified in planemask */ void -miGetImage(pDraw, sx, sy, w, h, format, planeMask, pDst) - DrawablePtr pDraw; - int sx, sy, w, h; - unsigned int format; - unsigned long planeMask; - char * pDst; +miGetImage(DrawablePtr pDraw, int sx, int sy, int w, int h, + unsigned int format, unsigned long planeMask, char *pDst) { unsigned char depth; int i, linelength, width, srcx, srcy; @@ -741,12 +722,8 @@ * This part is simple, just call SetSpans */ void -miPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage) - DrawablePtr pDraw; - GCPtr pGC; - int depth, x, y, w, h, leftPad; - int format; - char *pImage; +miPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, int w, int h, + int leftPad, int format, char *pImage) { DDXPointPtr pptFirst, ppt; int *pwidthFirst, *pwidth; Index: xc/programs/Xserver/mi/mibstore.c diff -u xc/programs/Xserver/mi/mibstore.c:1.11 xc/programs/Xserver/mi/mibstore.c:1.13 --- xc/programs/Xserver/mi/mibstore.c:1.11 Mon Nov 10 13:22:47 2003 +++ xc/programs/Xserver/mi/mibstore.c Fri Oct 14 11:17:22 2005 @@ -1,4 +1,3 @@ -/* $Xorg: mibstore.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -42,19 +41,19 @@ ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.11 2003/11/10 18:22:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.13 2005/10/14 15:17:22 tsi Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "misc.h" #include "regionstr.h" #include "scrnintstr.h" #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "dixstruct.h" /* For requestingClient */ #include "mi.h" @@ -68,7 +67,7 @@ */ /* #define BSEAGER */ -/*- +/* * NOTES ON USAGE: * * The functions in this file implement a machine-independent backing-store @@ -150,11 +149,11 @@ #define copyData(src,dst,n,morecopy) \ { \ - register short *srcCopy = (short *)(src); \ - register short *dstCopy = (short *)(dst); \ - register int i; \ - register int bsx = pBackingStore->x; \ - register int bsy = pBackingStore->y; \ + short *srcCopy = (short *)(src); \ + short *dstCopy = (short *)(dst); \ + int i; \ + int bsx = pBackingStore->x; \ + int bsy = pBackingStore->y; \ for (i = n; --i >= 0; ) \ { \ *dstCopy++ = *srcCopy++ - bsx; \ @@ -354,8 +353,7 @@ */ void -miInitializeBackingStore (pScreen) - ScreenPtr pScreen; +miInitializeBackingStore(ScreenPtr pScreen) { miBSScreenPtr pScreenPriv; @@ -415,9 +413,7 @@ */ static Bool -miBSCloseScreen (i, pScreen) - int i; - ScreenPtr pScreen; +miBSCloseScreen(int i, ScreenPtr pScreen) { miBSScreenPtr pScreenPriv; @@ -439,12 +435,8 @@ PixUnion pixunion, unsigned long planemask); static void -miBSGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine) - DrawablePtr pDrawable; - int sx, sy, w, h; - unsigned int format; - unsigned long planemask; - char *pdstLine; +miBSGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, + unsigned int format, unsigned long planemask, char *pdstLine) { ScreenPtr pScreen = pDrawable->pScreen; BoxRec bounds; @@ -618,13 +610,8 @@ } static void -miBSGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart) - DrawablePtr pDrawable; - int wMax; - DDXPointPtr ppt; - int *pwidth; - int nspans; - char *pdstStart; +miBSGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, + int nspans, char *pdstStart) { ScreenPtr pScreen = pDrawable->pScreen; BoxRec bounds; @@ -719,9 +706,7 @@ } static Bool -miBSChangeWindowAttributes (pWin, mask) - WindowPtr pWin; - unsigned long mask; +miBSChangeWindowAttributes(WindowPtr pWin, unsigned long mask) { ScreenPtr pScreen; Bool ret; @@ -751,8 +736,7 @@ */ static Bool -miBSCreateGC (pGC) - GCPtr pGC; +miBSCreateGC(GCPtr pGC) { ScreenPtr pScreen = pGC->pScreen; Bool ret; @@ -771,8 +755,7 @@ } static Bool -miBSDestroyWindow (pWin) - WindowPtr pWin; +miBSDestroyWindow(WindowPtr pWin) { ScreenPtr pScreen = pWin->drawable.pScreen; Bool ret; @@ -794,10 +777,8 @@ */ static void -miBSCheapValidateGC (pGC, stateChanges, pDrawable) - GCPtr pGC; - unsigned long stateChanges; - DrawablePtr pDrawable; +miBSCheapValidateGC(GCPtr pGC, unsigned long stateChanges, + DrawablePtr pDrawable) { CHEAP_FUNC_PROLOGUE (pGC); @@ -819,9 +800,7 @@ } static void -miBSCheapChangeGC (pGC, mask) - GCPtr pGC; - unsigned long mask; +miBSCheapChangeGC(GCPtr pGC, unsigned long mask) { CHEAP_FUNC_PROLOGUE (pGC); @@ -831,9 +810,7 @@ } static void -miBSCheapCopyGC (pGCSrc, mask, pGCDst) - GCPtr pGCSrc, pGCDst; - unsigned long mask; +miBSCheapCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) { CHEAP_FUNC_PROLOGUE (pGCDst); @@ -843,8 +820,7 @@ } static void -miBSCheapDestroyGC (pGC) - GCPtr pGC; +miBSCheapDestroyGC(GCPtr pGC) { CHEAP_FUNC_PROLOGUE (pGC); @@ -854,11 +830,7 @@ } static void -miBSCheapChangeClip (pGC, type, pvalue, nrects) - GCPtr pGC; - int type; - pointer pvalue; - int nrects; +miBSCheapChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) { CHEAP_FUNC_PROLOGUE (pGC); @@ -868,8 +840,7 @@ } static void -miBSCheapCopyClip(pgcDst, pgcSrc) - GCPtr pgcDst, pgcSrc; +miBSCheapCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { CHEAP_FUNC_PROLOGUE (pgcDst); @@ -879,8 +850,7 @@ } static void -miBSCheapDestroyClip(pGC) - GCPtr pGC; +miBSCheapDestroyClip(GCPtr pGC) { CHEAP_FUNC_PROLOGUE (pGC); @@ -894,8 +864,7 @@ */ static Bool -miBSCreateGCPrivate (pGC) - GCPtr pGC; +miBSCreateGCPrivate(GCPtr pGC) { miBSGCRec *pPriv; @@ -915,7 +884,7 @@ } static void -miBSDestroyGCPrivate (GCPtr pGC) +miBSDestroyGCPrivate(GCPtr pGC) { miBSGCRec *pPriv; @@ -935,7 +904,7 @@ * GC ops -- wrap each GC operation with our own function */ -/*- +/* *----------------------------------------------------------------------- * miBSFillSpans -- * Perform a FillSpans, routing output to backing-store as needed. @@ -948,13 +917,11 @@ *----------------------------------------------------------------------- */ static void -miBSFillSpans(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +miBSFillSpans(DrawablePtr pDrawable, GCPtr pGC, + int nInit, /* number of spans to fill */ + DDXPointPtr pptInit, /* pointer to list of start points */ + int *pwidthInit, /* pointer to list of n widths */ + int fSorted) { DDXPointPtr pptCopy, pptReset; int *pwidthCopy; @@ -997,7 +964,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSSetSpans -- * Perform a SetSpans, routing output to backing-store as needed. @@ -1010,14 +977,8 @@ *----------------------------------------------------------------------- */ static void -miBSSetSpans(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - char *psrc; - register DDXPointPtr ppt; - int *pwidth; - int nspans; - int fSorted; +miBSSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc, + DDXPointPtr ppt, int *pwidth, int nspans, int fSorted) { DDXPointPtr pptCopy, pptReset; int *pwidthCopy; @@ -1059,7 +1020,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPutImage -- * Perform a PutImage, routing output to backing-store as needed. @@ -1072,17 +1033,8 @@ *----------------------------------------------------------------------- */ static void -miBSPutImage(pDrawable, pGC, depth, x, y, w, h, leftPad, format, pBits) - DrawablePtr pDrawable; - GCPtr pGC; - int depth; - int x; - int y; - int w; - int h; - int leftPad; - int format; - char *pBits; +miBSPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, + int w, int h, int leftPad, int format, char *pBits) { SETUP_BACKING (pDrawable, pGC); @@ -1102,7 +1054,7 @@ typedef RegionPtr (* CopyPlaneProcPtr)(DrawablePtr, DrawablePtr, GCPtr, int, int, int, int, int, int, unsigned long bitPlane); -/*- +/* *----------------------------------------------------------------------- * miBSDoCopy -- * Perform a CopyArea or CopyPlane within a window that has backing @@ -1154,8 +1106,8 @@ } *boxes; /* Array of box/drawable pairs covering * source box. */ int *sequence; /* Sequence of boxes to move */ - register int i, j, k, l, y; - register BoxPtr pBox; + int i, j, k, l, y; + BoxPtr pBox; int dx, dy, nrects; Bool graphicsExposures; CopyPlaneProcPtr pixCopyProc; @@ -1465,7 +1417,7 @@ return (TRUE); } -/*- +/* *----------------------------------------------------------------------- * miBSCopyArea -- * Perform a CopyArea from the source to the destination, extracting @@ -1482,16 +1434,8 @@ *----------------------------------------------------------------------- */ static RegionPtr -miBSCopyArea (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty) - DrawablePtr pSrc; - DrawablePtr pDst; - GCPtr pGC; - int srcx; - int srcy; - int w; - int h; - int dstx; - int dsty; +miBSCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, + int srcx, int srcy, int w, int h, int dstx, int dsty) { BoxPtr pExtents; long dx, dy; @@ -1580,7 +1524,7 @@ return winExposed; } -/*- +/* *----------------------------------------------------------------------- * miBSCopyPlane -- * @@ -1592,17 +1536,9 @@ *----------------------------------------------------------------------- */ static RegionPtr -miBSCopyPlane (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty, plane) - DrawablePtr pSrc; - DrawablePtr pDst; - register GC *pGC; - int srcx, - srcy; - int w, - h; - int dstx, - dsty; - unsigned long plane; +miBSCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, + int srcx, int srcy, int w, int h, int dstx, int dsty, + unsigned long plane) { BoxPtr pExtents; long dx, dy; @@ -1694,7 +1630,7 @@ return winExposed; } -/*- +/* *----------------------------------------------------------------------- * miBSPolyPoint -- * Perform a PolyPoint, routing output to backing-store as needed. @@ -1707,12 +1643,8 @@ *----------------------------------------------------------------------- */ static void -miBSPolyPoint (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; - xPoint *pptInit; +miBSPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + xPoint *pptInit) { xPoint *pptCopy; SETUP_BACKING (pDrawable, pGC); @@ -1735,7 +1667,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPolyLines -- * Perform a Polylines, routing output to backing-store as needed. @@ -1747,12 +1679,8 @@ *----------------------------------------------------------------------- */ static void -miBSPolylines (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; - int npt; - DDXPointPtr pptInit; +miBSPolylines(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) { DDXPointPtr pptCopy; SETUP_BACKING (pDrawable, pGC); @@ -1773,7 +1701,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPolySegment -- * Perform a PolySegment, routing output to backing-store as needed. @@ -1786,11 +1714,7 @@ *----------------------------------------------------------------------- */ static void -miBSPolySegment(pDrawable, pGC, nseg, pSegs) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - xSegment *pSegs; +miBSPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs) { xSegment *pSegsCopy; @@ -1813,7 +1737,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPolyRectangle -- * Perform a PolyRectangle, routing output to backing-store as needed. @@ -1826,11 +1750,8 @@ *----------------------------------------------------------------------- */ static void -miBSPolyRectangle(pDrawable, pGC, nrects, pRects) - DrawablePtr pDrawable; - GCPtr pGC; - int nrects; - xRectangle *pRects; +miBSPolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nrects, + xRectangle *pRects) { xRectangle *pRectsCopy; SETUP_BACKING (pDrawable, pGC); @@ -1852,7 +1773,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPolyArc -- * Perform a PolyArc, routing output to backing-store as needed. @@ -1864,11 +1785,7 @@ *----------------------------------------------------------------------- */ static void -miBSPolyArc(pDrawable, pGC, narcs, parcs) - DrawablePtr pDrawable; - GCPtr pGC; - int narcs; - xArc *parcs; +miBSPolyArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs) { xArc *pArcsCopy; SETUP_BACKING (pDrawable, pGC); @@ -1890,7 +1807,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSFillPolygon -- * Perform a FillPolygon, routing output to backing-store as needed. @@ -1903,12 +1820,8 @@ *----------------------------------------------------------------------- */ static void -miBSFillPolygon(pDrawable, pGC, shape, mode, count, pPts) - DrawablePtr pDrawable; - register GCPtr pGC; - int shape, mode; - register int count; - DDXPointPtr pPts; +miBSFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, + int count, DDXPointPtr pPts) { DDXPointPtr pPtsCopy; SETUP_BACKING (pDrawable, pGC); @@ -1930,7 +1843,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPolyFillRect -- * Perform a PolyFillRect, routing output to backing-store as needed. @@ -1943,11 +1856,8 @@ *----------------------------------------------------------------------- */ static void -miBSPolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +miBSPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, + xRectangle *prectInit) { xRectangle *pRectCopy; SETUP_BACKING (pDrawable, pGC); @@ -1970,7 +1880,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPolyFillArc -- * Perform a PolyFillArc, routing output to backing-store as needed. @@ -1983,11 +1893,7 @@ *----------------------------------------------------------------------- */ static void -miBSPolyFillArc(pDrawable, pGC, narcs, parcs) - DrawablePtr pDrawable; - GCPtr pGC; - int narcs; - xArc *parcs; +miBSPolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs) { xArc *pArcsCopy; SETUP_BACKING (pDrawable, pGC); @@ -2008,7 +1914,7 @@ } -/*- +/* *----------------------------------------------------------------------- * miBSPolyText8 -- * Perform a PolyText8, routing output to backing-store as needed. @@ -2020,12 +1926,8 @@ *----------------------------------------------------------------------- */ static int -miBSPolyText8(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - char *chars; +miBSPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + char *chars) { int result; SETUP_BACKING (pDrawable, pGC); @@ -2041,7 +1943,7 @@ return result; } -/*- +/* *----------------------------------------------------------------------- * miBSPolyText16 -- * Perform a PolyText16, routing output to backing-store as needed. @@ -2053,12 +1955,8 @@ *----------------------------------------------------------------------- */ static int -miBSPolyText16(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miBSPolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + unsigned short *chars) { int result; SETUP_BACKING (pDrawable, pGC); @@ -2075,7 +1973,7 @@ return result; } -/*- +/* *----------------------------------------------------------------------- * miBSImageText8 -- * Perform a ImageText8, routing output to backing-store as needed. @@ -2087,12 +1985,8 @@ *----------------------------------------------------------------------- */ static void -miBSImageText8(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - char *chars; +miBSImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + char *chars) { SETUP_BACKING (pDrawable, pGC); PROLOGUE(pGC); @@ -2105,7 +1999,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSImageText16 -- * Perform a ImageText16, routing output to backing-store as needed. @@ -2117,12 +2011,8 @@ *----------------------------------------------------------------------- */ static void -miBSImageText16(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miBSImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + unsigned short *chars) { SETUP_BACKING (pDrawable, pGC); PROLOGUE(pGC); @@ -2135,7 +2025,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSImageGlyphBlt -- * Perform a ImageGlyphBlt, routing output to backing-store as needed. @@ -2147,13 +2037,8 @@ *----------------------------------------------------------------------- */ static void -miBSImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +miBSImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { SETUP_BACKING (pDrawable, pGC); PROLOGUE(pGC); @@ -2167,7 +2052,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPolyGlyphBlt -- * Perform a PolyGlyphBlt, routing output to backing-store as needed. @@ -2179,13 +2064,8 @@ *----------------------------------------------------------------------- */ static void -miBSPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +miBSPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { SETUP_BACKING (pDrawable, pGC); PROLOGUE(pGC); @@ -2198,7 +2078,7 @@ EPILOGUE (pGC); } -/*- +/* *----------------------------------------------------------------------- * miBSPushPixels -- * Perform a PushPixels, routing output to backing-store as needed. @@ -2210,11 +2090,8 @@ *----------------------------------------------------------------------- */ static void -miBSPushPixels(pGC, pBitMap, pDst, w, h, x, y) - GCPtr pGC; - PixmapPtr pBitMap; - DrawablePtr pDst; - int w, h, x, y; +miBSPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, + int w, int h, int x, int y) { SETUP_BACKING (pDst, pGC); PROLOGUE(pGC); @@ -2232,7 +2109,7 @@ } #ifdef NEED_LINEHELPER -/*- +/* *----------------------------------------------------------------------- * miBSLineHelper -- * @@ -2249,7 +2126,7 @@ } #endif -/*- +/* *----------------------------------------------------------------------- * miBSClearBackingStore -- * Clear the given area of the backing pixmap with the background of @@ -2268,13 +2145,8 @@ *----------------------------------------------------------------------- */ static RegionPtr -miBSClearBackingStore(pWin, x, y, w, h, generateExposures) - WindowPtr pWin; - int x; - int y; - int w; - int h; - Bool generateExposures; +miBSClearBackingStore(WindowPtr pWin, int x, int y, int w, int h, + Bool generateExposures) { RegionPtr pRgn; int i; @@ -2436,9 +2308,7 @@ } static void -miBSClearBackingRegion (pWin, pRgn) - WindowPtr pWin; - RegionPtr pRgn; +miBSClearBackingRegion(WindowPtr pWin, RegionPtr pRgn) { BoxPtr pBox; int i; @@ -2462,14 +2332,9 @@ */ static void -miBSFillVirtualBits (pDrawable, pGC, pRgn, x, y, state, pixunion, planeMask) - DrawablePtr pDrawable; - GCPtr pGC; - RegionPtr pRgn; - int x, y; - int state; - PixUnion pixunion; - unsigned long planeMask; +miBSFillVirtualBits(DrawablePtr pDrawable, GCPtr pGC, RegionPtr pRgn, + int x, int y, int state, PixUnion pixunion, + unsigned long planeMask) { int i; BITS32 gcmask; @@ -2556,7 +2421,7 @@ DEALLOCATE_LOCAL (pRect); } -/*- +/* *----------------------------------------------------------------------- * miBSAllocate -- * Create and install backing store info for a window @@ -2565,11 +2430,10 @@ */ static void -miBSAllocate(pWin) - WindowPtr pWin; +miBSAllocate(WindowPtr pWin) { - register miBSWindowPtr pBackingStore; - register ScreenPtr pScreen; + miBSWindowPtr pBackingStore; + ScreenPtr pScreen; if (pWin->drawable.pScreen->backingStoreSupport == NotUseful) return; @@ -2651,7 +2515,7 @@ } } -/*- +/* *----------------------------------------------------------------------- * miBSFree -- * Destroy and free all the stuff associated with the backing-store @@ -2666,11 +2530,10 @@ *----------------------------------------------------------------------- */ static void -miBSFree(pWin) - WindowPtr pWin; +miBSFree(WindowPtr pWin) { miBSWindowPtr pBackingStore; - register ScreenPtr pScreen; + ScreenPtr pScreen; pScreen = pWin->drawable.pScreen; @@ -2686,7 +2549,7 @@ } } -/*- +/* *----------------------------------------------------------------------- * miResizeBackingStore -- * Alter the size of the backing pixmap as necessary when the @@ -2795,7 +2658,7 @@ } } -/*- +/* *----------------------------------------------------------------------- * miBSSaveDoomedAreas -- * Saved the areas of the given window that are about to be @@ -2813,10 +2676,7 @@ *----------------------------------------------------------------------- */ static void -miBSSaveDoomedAreas(pWin, pObscured, dx, dy) - register WindowPtr pWin; - RegionPtr pObscured; - int dx, dy; +miBSSaveDoomedAreas(WindowPtr pWin, RegionPtr pObscured, int dx, int dy) { miBSWindowPtr pBackingStore; ScreenPtr pScreen; @@ -2895,7 +2755,7 @@ } } -/*- +/* *----------------------------------------------------------------------- * miBSRestoreAreas -- * Restore areas from backing-store that are no longer obscured. @@ -2920,15 +2780,13 @@ *----------------------------------------------------------------------- */ static RegionPtr -miBSRestoreAreas(pWin, prgnExposed) - register WindowPtr pWin; - RegionPtr prgnExposed; +miBSRestoreAreas(WindowPtr pWin, RegionPtr prgnExposed) { PixmapPtr pBackingPixmap; miBSWindowPtr pBackingStore; RegionPtr prgnSaved; RegionPtr prgnRestored; - register ScreenPtr pScreen; + ScreenPtr pScreen; RegionPtr exposures = prgnExposed; pScreen = pWin->drawable.pScreen; @@ -3051,7 +2909,7 @@ } -/*- +/* *----------------------------------------------------------------------- * miBSTranslateBackingStore -- * Shift the backing-store in the given direction. Called when bit @@ -3111,18 +2969,18 @@ */ static RegionPtr -miBSTranslateBackingStore(pWin, windx, windy, oldClip, oldx, oldy) - WindowPtr pWin; - int windx; /* bit translation distance in window */ - int windy; - RegionPtr oldClip; /* Region being copied */ - int oldx; /* old window position */ - int oldy; -{ - register miBSWindowPtr pBackingStore; - register RegionPtr pSavedRegion; - register RegionPtr newSaved, doomed; - register ScreenPtr pScreen; +miBSTranslateBackingStore( + WindowPtr pWin, + int windx, /* bit translation distance in window */ + int windy, + RegionPtr oldClip, /* Region being copied */ + int oldx, /* old window position */ + int oldy) +{ + miBSWindowPtr pBackingStore; + RegionPtr pSavedRegion; + RegionPtr newSaved, doomed; + ScreenPtr pScreen; BoxRec extents; int scrdx; /* bit translation distance on screen */ int scrdy; @@ -3292,10 +3150,7 @@ */ static void -miBSDrawGuarantee (pWin, pGC, guarantee) - WindowPtr pWin; - GCPtr pGC; - int guarantee; +miBSDrawGuarantee(WindowPtr pWin, GCPtr pGC, int guarantee) { miBSGCPtr pPriv; @@ -3330,7 +3185,7 @@ GCClipMask|GCSubwindowMode| \ GCTileStipXOrigin|GCTileStipYOrigin) -/*- +/* *----------------------------------------------------------------------- * miBSValidateGC -- * Wrapper around output-library's ValidateGC routine @@ -3354,10 +3209,7 @@ */ static void -miBSValidateGC (pGC, stateChanges, pDrawable) - GCPtr pGC; - unsigned long stateChanges; - DrawablePtr pDrawable; +miBSValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable) { GCPtr pBackingGC; miBSWindowPtr pWindowPriv = NULL; @@ -3569,9 +3421,7 @@ } static void -miBSChangeGC (pGC, mask) - GCPtr pGC; - unsigned long mask; +miBSChangeGC(GCPtr pGC, unsigned long mask) { miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr; @@ -3583,9 +3433,7 @@ } static void -miBSCopyGC (pGCSrc, mask, pGCDst) - GCPtr pGCSrc, pGCDst; - unsigned long mask; +miBSCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) { miBSGCPtr pPriv = (miBSGCPtr) (pGCDst)->devPrivates[miBSGCIndex].ptr; @@ -3597,8 +3445,7 @@ } static void -miBSDestroyGC (pGC) - GCPtr pGC; +miBSDestroyGC(GCPtr pGC) { miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr; @@ -3615,11 +3462,7 @@ } static void -miBSChangeClip(pGC, type, pvalue, nrects) - GCPtr pGC; - int type; - pointer pvalue; - int nrects; +miBSChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) { miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr; @@ -3631,8 +3474,7 @@ } static void -miBSCopyClip(pgcDst, pgcSrc) - GCPtr pgcDst, pgcSrc; +miBSCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { miBSGCPtr pPriv = (miBSGCPtr) (pgcDst)->devPrivates[miBSGCIndex].ptr; @@ -3644,8 +3486,7 @@ } static void -miBSDestroyClip(pGC) - GCPtr pGC; +miBSDestroyClip(GCPtr pGC) { miBSGCPtr pPriv = (miBSGCPtr) (pGC)->devPrivates[miBSGCIndex].ptr; @@ -3657,8 +3498,7 @@ } static void -miDestroyBSPixmap (pWin) - WindowPtr pWin; +miDestroyBSPixmap(WindowPtr pWin) { miBSWindowPtr pBackingStore; ScreenPtr pScreen; @@ -3678,8 +3518,7 @@ } static void -miTileVirtualBS (pWin) - WindowPtr pWin; +miTileVirtualBS(WindowPtr pWin) { miBSWindowPtr pBackingStore; @@ -3710,9 +3549,7 @@ #endif static void -miCreateBSPixmap (pWin, pExtents) - WindowPtr pWin; - BoxPtr pExtents; +miCreateBSPixmap(WindowPtr pWin, BoxPtr pExtents) { miBSWindowPtr pBackingStore; ScreenPtr pScreen; @@ -3809,7 +3646,7 @@ } } -/*- +/* *----------------------------------------------------------------------- * miBSExposeCopy -- * Handle the restoration of areas exposed by graphics operations. @@ -3824,22 +3661,17 @@ *----------------------------------------------------------------------- */ static void -miBSExposeCopy (pSrc, pDst, pGC, prgnExposed, srcx, srcy, dstx, dsty, plane) - WindowPtr pSrc; - DrawablePtr pDst; - GCPtr pGC; - RegionPtr prgnExposed; - int srcx, srcy; - int dstx, dsty; - unsigned long plane; +miBSExposeCopy(WindowPtr pSrc, DrawablePtr pDst, GCPtr pGC, + RegionPtr prgnExposed, int srcx, int srcy, int dstx, int dsty, + unsigned long plane) { RegionRec tempRgn; miBSWindowPtr pBackingStore; CopyPlaneProcPtr copyProc; GCPtr pScratchGC; - register BoxPtr pBox; - register int i; - register int dx, dy; + BoxPtr pBox; + int i; + int dx, dy; BITS32 gcMask; if (!REGION_NOTEMPTY(pGC->pScreen, prgnExposed)) Index: xc/programs/Xserver/mi/mibstore.h diff -u xc/programs/Xserver/mi/mibstore.h:1.5 xc/programs/Xserver/mi/mibstore.h:1.6 --- xc/programs/Xserver/mi/mibstore.h:1.5 Mon Aug 6 16:51:18 2001 +++ xc/programs/Xserver/mi/mibstore.h Mon Jan 9 10:00:37 2006 @@ -12,11 +12,10 @@ * software for any purpose. It is provided "as is" without * express or implied warranty. * - * "$Xorg: mibstore.h,v 1.3 2000/08/17 19:53:37 cpqbld Exp $ */ -/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.5 2001/08/06 20:51:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.6 2006/01/09 15:00:37 dawes Exp $ */ #ifndef _MIBSTORE_H #define _MIBSTORE_H Index: xc/programs/Xserver/mi/mibstorest.h diff -u xc/programs/Xserver/mi/mibstorest.h:1.5 xc/programs/Xserver/mi/mibstorest.h:1.6 --- xc/programs/Xserver/mi/mibstorest.h:1.5 Fri Dec 14 15:00:21 2001 +++ xc/programs/Xserver/mi/mibstorest.h Mon Jan 9 10:00:37 2006 @@ -4,8 +4,6 @@ * internal structure definitions for mi backing store */ -/* $Xorg: mibstorest.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -31,7 +29,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.5 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.6 2006/01/09 15:00:37 dawes Exp $ */ #include "mibstore.h" #include "regionstr.h" Index: xc/programs/Xserver/mi/miclipn.c diff -u xc/programs/Xserver/mi/miclipn.c:1.4 xc/programs/Xserver/mi/miclipn.c:1.5 --- xc/programs/Xserver/mi/miclipn.c:1.4 Fri Dec 14 15:00:21 2001 +++ xc/programs/Xserver/mi/miclipn.c Fri Oct 14 11:17:22 2005 @@ -1,4 +1,4 @@ -/* $Xorg: miclipn.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.5 2005/10/14 15:17:22 tsi Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,9 +26,8 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.4 2001/12/14 20:00:21 dawes Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "scrnintstr.h" #include "mi.h" Index: xc/programs/Xserver/mi/micmap.c diff -u xc/programs/Xserver/mi/micmap.c:1.12 xc/programs/Xserver/mi/micmap.c:1.14 --- xc/programs/Xserver/mi/micmap.c:1.12 Wed Jun 30 16:21:46 2004 +++ xc/programs/Xserver/mi/micmap.c Fri Oct 14 11:17:22 2005 @@ -1,4 +1,3 @@ -/* $XConsortium: cfbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -27,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.12 2004/06/30 20:21:46 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micmap.c,v 1.14 2005/10/14 15:17:22 tsi Exp $ */ /* * This is based on cfbcmap.c. The functions here are useful independently @@ -36,8 +35,8 @@ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" @@ -122,8 +121,8 @@ Bool miInitializeColormap(ColormapPtr pmap) { - register unsigned i; - register VisualPtr pVisual; + unsigned i; + VisualPtr pVisual; unsigned lim, maxent, shift; pVisual = pmap->pVisual; @@ -208,13 +207,13 @@ miExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs, xColorItem *outdefs) { - register int red, green, blue; + int red, green, blue; int maxred, maxgreen, maxblue; int stepred, stepgreen, stepblue; VisualPtr pVisual; - register int pixel; - register int nresult; - register int i; + int pixel; + int nresult; + int i; pVisual = pmap->pVisual; Index: xc/programs/Xserver/mi/micoord.h diff -u xc/programs/Xserver/mi/micoord.h:1.9 xc/programs/Xserver/mi/micoord.h:1.10 --- xc/programs/Xserver/mi/micoord.h:1.9 Sun Mar 21 06:27:06 2004 +++ xc/programs/Xserver/mi/micoord.h Tue Jun 28 21:14:12 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/mi/micoord.h,v 1.9 2004/03/21 11:27:06 herrb Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micoord.h,v 1.10 2005/06/29 01:14:12 dawes Exp $ */ /* - * Copyright (C) 2000 The XFree86 Project, Inc. + * Copyright (C) 2000, 2005 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -70,7 +70,7 @@ defined(__i386__) || defined(i386) || \ defined(__ia64__) || defined(ia64) || \ defined(__s390x__) || defined(__s390__) || \ - defined(__AMD64__) || defined(AMD64) || defined(__amd64__) + defined(__amd64__) || defined(__x86_64__) #define GetHighWord(x) (((int) (x)) >> 16) #else #define GetHighWord(x) (((int) (x)) / 65536) Index: xc/programs/Xserver/mi/micursor.c diff -u xc/programs/Xserver/mi/micursor.c:1.3 xc/programs/Xserver/mi/micursor.c:1.4 --- xc/programs/Xserver/mi/micursor.c:1.3 Fri Dec 14 15:00:21 2001 +++ xc/programs/Xserver/mi/micursor.c Sun Mar 27 21:51:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.3 2001/12/14 20:00:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/micursor.c,v 1.4 2005/03/28 02:51:10 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: micursor.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ + #include "scrnintstr.h" #include "cursor.h" #include "misc.h" @@ -54,10 +54,7 @@ extern Bool Must_have_memory; void -miRecolorCursor( pScr, pCurs, displayed) - ScreenPtr pScr; - CursorPtr pCurs; - Bool displayed; +miRecolorCursor(ScreenPtr pScr, CursorPtr pCurs, Bool displayed) { /* * This is guaranteed to correct any color-dependent state which may have Index: xc/programs/Xserver/mi/midash.c diff -u xc/programs/Xserver/mi/midash.c:1.5 xc/programs/Xserver/mi/midash.c:1.6 --- xc/programs/Xserver/mi/midash.c:1.5 Tue Jul 15 21:38:56 2003 +++ xc/programs/Xserver/mi/midash.c Sun Mar 27 21:51:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.5 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midash.c,v 1.6 2005/03/28 02:51:10 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: midash.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ + #include "regionstr.h" #include "mistruct.h" #include "mifpoly.h" @@ -80,13 +80,8 @@ */ miDashPtr -miDashLine(npt, ppt, nDash, pDash, offset, pnseg) -int npt; -DDXPointPtr ppt; -unsigned int nDash; -unsigned char *pDash; -unsigned int offset; -int *pnseg; +miDashLine(int npt, DDXPointPtr ppt, unsigned int nDash, unsigned char *pDash, + unsigned int offset, int *pnseg) { DDXPointRec pt1, pt2; int lenCur; /* npt used from this dash */ @@ -274,12 +269,12 @@ } void -miStepDash (dist, pDashIndex, pDash, numInDashList, pDashOffset) - int dist; /* distance to step */ - int *pDashIndex; /* current dash */ - unsigned char *pDash; /* dash list */ - int numInDashList; /* total length of dash list */ - int *pDashOffset; /* offset into current dash */ +miStepDash( + int dist, /* distance to step */ + int *pDashIndex, /* current dash */ + unsigned char *pDash, /* dash list */ + int numInDashList, /* total length of dash list */ + int *pDashOffset) /* offset into current dash */ { int dashIndex, dashOffset; int totallen; Index: xc/programs/Xserver/mi/midispcur.c diff -u xc/programs/Xserver/mi/midispcur.c:1.10 xc/programs/Xserver/mi/midispcur.c:1.12 --- xc/programs/Xserver/mi/midispcur.c:1.10 Thu Mar 6 00:52:58 2003 +++ xc/programs/Xserver/mi/midispcur.c Fri Oct 14 11:17:23 2005 @@ -4,8 +4,6 @@ * machine independent cursor display routines */ -/* $Xorg: midispcur.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -30,10 +28,10 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.10 2003/03/06 05:52:58 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.12 2005/10/14 15:17:23 tsi Exp $ */ #define NEED_EVENTS -# include "X.h" +# include # include "misc.h" # include "input.h" # include "cursorstr.h" @@ -108,9 +106,7 @@ }; Bool -miDCInitialize (pScreen, screenFuncs) - ScreenPtr pScreen; - miPointerScreenFuncPtr screenFuncs; +miDCInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs) { miDCScreenPtr pScreenPriv; @@ -161,9 +157,7 @@ #define tossPict(pict) (pict ? FreePicture (pict, 0) : 0) static Bool -miDCCloseScreen (index, pScreen) - int index; - ScreenPtr pScreen; +miDCCloseScreen(int index, ScreenPtr pScreen) { miDCScreenPtr pScreenPriv; @@ -187,9 +181,7 @@ } static Bool -miDCRealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miDCRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) { if (pCursor->bits->refcnt <= 1) pCursor->bits->devPriv[pScreen->myNum] = (pointer)NULL; @@ -200,7 +192,7 @@ #define EnsurePicture(picture,draw,win) (picture || miDCMakePicture(&picture,draw,win)) static VisualPtr -miDCGetWindowVisual (WindowPtr pWin) +miDCGetWindowVisual(WindowPtr pWin) { ScreenPtr pScreen = pWin->drawable.pScreen; VisualID vid = wVisual (pWin); @@ -213,7 +205,7 @@ } static PicturePtr -miDCMakePicture (PicturePtr *ppPicture, DrawablePtr pDraw, WindowPtr pWin) +miDCMakePicture(PicturePtr *ppPicture, DrawablePtr pDraw, WindowPtr pWin) { ScreenPtr pScreen = pDraw->pScreen; VisualPtr pVisual; @@ -350,9 +342,7 @@ } static Bool -miDCUnrealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miDCUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) { miDCCursorPtr pPriv; @@ -454,11 +444,8 @@ static Bool -miDCPutUpCursor (pScreen, pCursor, x, y, source, mask) - ScreenPtr pScreen; - CursorPtr pCursor; - int x, y; - unsigned long source, mask; +miDCPutUpCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y, + unsigned long source, unsigned long mask) { miDCScreenPtr pScreenPriv; miDCCursorPtr pPriv; @@ -507,9 +494,7 @@ } static Bool -miDCSaveUnderCursor (pScreen, x, y, w, h) - ScreenPtr pScreen; - int x, y, w, h; +miDCSaveUnderCursor(ScreenPtr pScreen, int x, int y, int w, int h) { miDCScreenPtr pScreenPriv; PixmapPtr pSave; @@ -539,9 +524,7 @@ } static Bool -miDCRestoreUnderCursor (pScreen, x, y, w, h) - ScreenPtr pScreen; - int x, y, w, h; +miDCRestoreUnderCursor(ScreenPtr pScreen, int x, int y, int w, int h) { miDCScreenPtr pScreenPriv; PixmapPtr pSave; @@ -564,9 +547,7 @@ } static Bool -miDCChangeSave (pScreen, x, y, w, h, dx, dy) - ScreenPtr pScreen; - int x, y, w, h, dx, dy; +miDCChangeSave(ScreenPtr pScreen, int x, int y, int w, int h, int dx, int dy) { miDCScreenPtr pScreenPriv; PixmapPtr pSave; @@ -696,11 +677,9 @@ } static Bool -miDCMoveCursor (pScreen, pCursor, x, y, w, h, dx, dy, source, mask) - ScreenPtr pScreen; - CursorPtr pCursor; - int x, y, w, h, dx, dy; - unsigned long source, mask; +miDCMoveCursor(ScreenPtr pScreen, CursorPtr pCursor, + int x, int y, int w, int h, int dx, int dy, + unsigned long source, unsigned long mask) { miDCCursorPtr pPriv; miDCScreenPtr pScreenPriv; Index: xc/programs/Xserver/mi/mieq.c diff -u xc/programs/Xserver/mi/mieq.c:1.3 xc/programs/Xserver/mi/mieq.c:1.5 --- xc/programs/Xserver/mi/mieq.c:1.3 Fri Dec 14 15:00:22 2001 +++ xc/programs/Xserver/mi/mieq.c Fri Oct 14 11:17:23 2005 @@ -1,6 +1,4 @@ /* - * $Xorg: mieq.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ - * Copyright 1990, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -25,7 +23,7 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mieq.c,v 1.5 2005/10/14 15:17:23 tsi Exp $ */ /* * mieq.c @@ -35,9 +33,9 @@ */ # define NEED_EVENTS -# include "X.h" -# include "Xmd.h" -# include "Xproto.h" +# include +# include +# include # include "misc.h" # include "windowstr.h" # include "pixmapstr.h" @@ -65,8 +63,7 @@ static EventQueueRec miEventQueue; Bool -mieqInit (pKbd, pPtr) - DevicePtr pKbd, pPtr; +mieqInit(DevicePtr pKbd, DevicePtr pPtr) { miEventQueue.head = miEventQueue.tail = 0; miEventQueue.lastEventTime = GetTimeInMillis (); @@ -87,8 +84,7 @@ */ void -mieqEnqueue (e) - xEvent *e; +mieqEnqueue(xEvent *e) { HWEventQueueType oldtail, newtail; Bool isMotion; @@ -127,9 +123,7 @@ } void -mieqSwitchScreen (pScreen, fromDIX) - ScreenPtr pScreen; - Bool fromDIX; +mieqSwitchScreen(ScreenPtr pScreen, Bool fromDIX) { miEventQueue.pEnqueueScreen = pScreen; if (fromDIX) @@ -140,7 +134,7 @@ * Call this from ProcessInputEvents() */ -void mieqProcessInputEvents () +void mieqProcessInputEvents() { EventRec *e; int x, y; Index: xc/programs/Xserver/mi/miexpose.c diff -u xc/programs/Xserver/mi/miexpose.c:3.10 xc/programs/Xserver/mi/miexpose.c:3.13 --- xc/programs/Xserver/mi/miexpose.c:3.10 Mon Nov 10 13:22:49 2003 +++ xc/programs/Xserver/mi/miexpose.c Sun Feb 19 10:51:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.10 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miexpose.c,v 3.13 2006/02/19 15:51:31 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,12 +46,10 @@ ******************************************************************/ -/* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ - -#include "X.h" +#include #define NEED_EVENTS -#include "Xproto.h" -#include "Xprotostr.h" +#include +#include #include "misc.h" #include "regionstr.h" @@ -63,15 +61,10 @@ #include "dixstruct.h" #include "mi.h" -#include "Xmd.h" +#include #include "globals.h" -#ifdef PANORAMIX -#include "panoramiX.h" -#include "panoramiXsrv.h" -#endif - /* machine-independent graphics exposure code. any device that uses the region package can call this. @@ -99,17 +92,11 @@ */ RegionPtr -miHandleExposures(pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty, plane) - register DrawablePtr pSrcDrawable; - register DrawablePtr pDstDrawable; - GCPtr pGC; - int srcx, srcy; - int width, height; - int dstx, dsty; - unsigned long plane; +miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GCPtr pGC, int srcx, int srcy, int width, int height, + int dstx, int dsty, unsigned long plane) { - register ScreenPtr pscr; + ScreenPtr pscr; RegionPtr prgnSrcClip; /* drawable-relative source clip */ RegionRec rgnSrcRec; RegionPtr prgnDstClip; /* drawable-relative dest clip */ @@ -348,19 +335,15 @@ /* send GraphicsExpose events, or a NoExpose event, based on the region */ void -miSendGraphicsExpose (client, pRgn, drawable, major, minor) - ClientPtr client; - RegionPtr pRgn; - XID drawable; - int major; - int minor; +miSendGraphicsExpose(ClientPtr client, RegionPtr pRgn, XID drawable, + int major, int minor) { if (pRgn && !REGION_NIL(pRgn)) { xEvent *pEvent; - register xEvent *pe; - register BoxPtr pBox; - register int i; + xEvent *pe; + BoxPtr pBox; + int i; int numRects; numRects = REGION_NUM_RECTS(pRgn); @@ -399,15 +382,12 @@ void -miSendExposures(pWin, pRgn, dx, dy) - WindowPtr pWin; - RegionPtr pRgn; - register int dx, dy; +miSendExposures(WindowPtr pWin, RegionPtr pRgn, int dx, int dy) { - register BoxPtr pBox; + BoxPtr pBox; int numRects; - register xEvent *pEvent, *pe; - register int i; + xEvent *pEvent, *pe; + int i; pBox = REGION_RECTS(pRgn); numRects = REGION_NUM_RECTS(pRgn); @@ -425,46 +405,13 @@ pe->u.expose.count = i; } -#ifdef PANORAMIX - if(!noPanoramiXExtension) { - int scrnum = pWin->drawable.pScreen->myNum; - int x = 0, y = 0; - XID realWin = 0; - - if(!pWin->parent) { - x = panoramiXdataPtr[scrnum].x; - y = panoramiXdataPtr[scrnum].y; - pWin = WindowTable[0]; - realWin = pWin->drawable.id; - } else if (scrnum) { - PanoramiXRes *win; - win = PanoramiXFindIDByScrnum(XRT_WINDOW, - pWin->drawable.id, scrnum); - if(!win) { - DEALLOCATE_LOCAL(pEvent); - return; - } - realWin = win->info[0].id; - pWin = LookupIDByType(realWin, RT_WINDOW); - } - if(x || y || scrnum) - for (i = 0; i < numRects; i++) { - pEvent[i].u.expose.window = realWin; - pEvent[i].u.expose.x += x; - pEvent[i].u.expose.y += y; - } - } -#endif - DeliverEvents(pWin, pEvent, numRects, NullWindow); DEALLOCATE_LOCAL(pEvent); } void -miWindowExposures(pWin, prgn, other_exposed) - WindowPtr pWin; - register RegionPtr prgn, other_exposed; +miWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr other_exposed) { RegionPtr exposures = prgn; if (pWin->backStorage && prgn) @@ -599,10 +546,7 @@ void -miPaintWindow(pWin, prgn, what) -register WindowPtr pWin; -RegionPtr prgn; -int what; +miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) { int status; @@ -628,10 +572,10 @@ BoxRec box; WindowPtr pBgWin; GCPtr pGC; - register int i; - register BoxPtr pbox; - register ScreenPtr pScreen = pWin->drawable.pScreen; - register xRectangle *prect; + int i; + BoxPtr pbox; + ScreenPtr pScreen = pWin->drawable.pScreen; + xRectangle *prect; int numRects; gcmask = 0; @@ -853,9 +797,7 @@ * the GC. Useful when we have a scratch drawable and need to initialize * it. */ void -miClearDrawable(pDraw, pGC) - DrawablePtr pDraw; - GCPtr pGC; +miClearDrawable(DrawablePtr pDraw, GCPtr pGC) { XID fg = pGC->fgPixel; XID bg = pGC->bgPixel; Index: xc/programs/Xserver/mi/mifillarc.c diff -u xc/programs/Xserver/mi/mifillarc.c:3.8 xc/programs/Xserver/mi/mifillarc.c:3.10 --- xc/programs/Xserver/mi/mifillarc.c:3.8 Tue Jul 15 21:38:56 2003 +++ xc/programs/Xserver/mi/mifillarc.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.8 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.c,v 3.10 2005/10/14 15:17:23 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,11 +27,9 @@ ********************************************************/ -/* $Xorg: mifillarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ - #include -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -51,9 +49,7 @@ #define Dcos(d) cos((double)d*(M_PI/11520.0)) void -miFillArcSetup(arc, info) - register xArc *arc; - register miFillArcRec *info; +miFillArcSetup(xArc *arc, miFillArcRec *info) { info->y = arc->height >> 1; info->dy = arc->height & 1; @@ -106,9 +102,7 @@ } void -miFillArcDSetup(arc, info) - register xArc *arc; - register miFillArcDRec *info; +miFillArcDSetup(xArc *arc, miFillArcDRec *info) { /* h^2 * (2x - 2xorg)^2 = w^2 * h^2 - w^2 * (2y - 2yorg)^2 */ /* even: xorg = yorg = 0 odd: xorg = .5, yorg = -.5 */ @@ -139,13 +133,13 @@ static void miGetArcEdge( - register xArc *arc, - register miSliceEdgePtr edge, + xArc *arc, + miSliceEdgePtr edge, int k, Bool top, Bool left ) { - register int xady, y; + int xady, y; y = arc->height >> 1; if (!(arc->width & 1)) @@ -187,14 +181,8 @@ } void -miEllipseAngleToSlope (angle, width, height, dxp, dyp, d_dxp, d_dyp) - int angle; - int width; - int height; - int *dxp; - int *dyp; - double *d_dxp; - double *d_dyp; +miEllipseAngleToSlope(int angle, int width, int height, + int *dxp, int *dyp, double *d_dxp, double *d_dyp) { int dx, dy; double d_dx, d_dy, scale; @@ -269,13 +257,13 @@ static void miGetPieEdge( - register xArc *arc, - register int angle, - register miSliceEdgePtr edge, + xArc *arc, + int angle, + miSliceEdgePtr edge, Bool top, Bool left ) { - register int k; + int k; int dx, dy; miEllipseAngleToSlope (angle, arc->width, arc->height, &dx, &dy, 0, 0); @@ -313,12 +301,9 @@ } void -miFillArcSliceSetup(arc, slice, pGC) - register xArc *arc; - register miArcSliceRec *slice; - GCPtr pGC; +miFillArcSliceSetup(xArc *arc, miArcSliceRec *slice, GCPtr pGC) { - register int angle1, angle2; + int angle1, angle2; angle1 = arc->angle1; if (arc->angle2 < 0) @@ -548,14 +533,14 @@ GCPtr pGC, xArc *arc ) { - register int x, y, e; + int x, y, e; int yk, xk, ym, xm, dx, dy, xorg, yorg; int slw; miFillArcRec info; DDXPointPtr points; - register DDXPointPtr pts; + DDXPointPtr pts; int *widths; - register int *wids; + int *wids; points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * arc->height); if (!points) @@ -591,14 +576,14 @@ GCPtr pGC, xArc *arc ) { - register int x, y; + int x, y; int xorg, yorg, dx, dy, slw; double e, yk, xk, ym, xm; miFillArcDRec info; DDXPointPtr points; - register DDXPointPtr pts; + DDXPointPtr pts; int *widths; - register int *wids; + int *wids; points = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec) * arc->height); if (!points) @@ -657,14 +642,14 @@ xArc *arc ) { int yk, xk, ym, xm, dx, dy, xorg, yorg, slw; - register int x, y, e; + int x, y, e; miFillArcRec info; miArcSliceRec slice; int ya, xl, xr, xc; DDXPointPtr points; - register DDXPointPtr pts; + DDXPointPtr pts; int *widths; - register int *wids; + int *wids; miFillArcSetup(arc, &info); miFillArcSliceSetup(arc, &slice, pGC); @@ -719,16 +704,16 @@ GCPtr pGC, xArc *arc ) { - register int x, y; + int x, y; int dx, dy, xorg, yorg, slw; double e, yk, xk, ym, xm; miFillArcDRec info; miArcSliceRec slice; int ya, xl, xr, xc; DDXPointPtr points; - register DDXPointPtr pts; + DDXPointPtr pts; int *widths; - register int *wids; + int *wids; miFillArcDSetup(arc, &info); miFillArcSliceSetup(arc, &slice, pGC); @@ -782,14 +767,10 @@ * fill each arc as it comes. */ void -miPolyFillArc(pDraw, pGC, narcs, parcs) - DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { - register int i; - register xArc *arc; + int i; + xArc *arc; for(i = narcs, arc = parcs; --i >= 0; arc++) { Index: xc/programs/Xserver/mi/mifillarc.h diff -u xc/programs/Xserver/mi/mifillarc.h:3.7 xc/programs/Xserver/mi/mifillarc.h:3.8 --- xc/programs/Xserver/mi/mifillarc.h:3.7 Fri Dec 14 15:00:22 2001 +++ xc/programs/Xserver/mi/mifillarc.h Mon Jan 9 10:00:37 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.7 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillarc.h,v 3.8 2006/01/09 15:00:37 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,8 +25,6 @@ ********************************************************/ -/* $Xorg: mifillarc.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ - #ifndef __MIFILLARC_H__ #define __MIFILLARC_H__ Index: xc/programs/Xserver/mi/mifillrct.c diff -u xc/programs/Xserver/mi/mifillrct.c:1.3 xc/programs/Xserver/mi/mifillrct.c:1.5 --- xc/programs/Xserver/mi/mifillrct.c:1.3 Fri Dec 14 15:00:22 2001 +++ xc/programs/Xserver/mi/mifillrct.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.3 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifillrct.c,v 1.5 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,10 +45,9 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mifillrct.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmap.h" @@ -65,23 +64,20 @@ * clipping to the destination */ void -miPolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +miPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, + xRectangle *prectInit) { int i; - register int height; - register int width; - register xRectangle *prect; + int height; + int width; + xRectangle *prect; int xorg; - register int yorg; + int yorg; int maxheight; DDXPointPtr pptFirst; - register DDXPointPtr ppt; + DDXPointPtr ppt; int *pwFirst; - register int *pw; + int *pw; if (pGC->miTranslate) { Index: xc/programs/Xserver/mi/mifpoly.h diff -u xc/programs/Xserver/mi/mifpoly.h:1.4 xc/programs/Xserver/mi/mifpoly.h:1.5 --- xc/programs/Xserver/mi/mifpoly.h:1.4 Fri Dec 14 15:00:22 2001 +++ xc/programs/Xserver/mi/mifpoly.h Mon Jan 9 10:00:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mifpoly.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.4 2001/12/14 20:00:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.5 2006/01/09 15:00:37 dawes Exp $ */ #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ Index: xc/programs/Xserver/mi/mifpolycon.c diff -u xc/programs/Xserver/mi/mifpolycon.c:1.3 xc/programs/Xserver/mi/mifpolycon.c:1.5 --- xc/programs/Xserver/mi/mifpolycon.c:1.3 Fri Dec 14 15:00:23 2001 +++ xc/programs/Xserver/mi/mifpolycon.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.3 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mifpolycon.c,v 1.5 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,15 +45,15 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mifpolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ + #include -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" #include "mifpoly.h" -static int GetFPolyYBounds(register SppPointPtr pts, int n, double yFtrans, +static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans, int *by, int *ty); #ifdef ICEILTEMPDECL @@ -73,18 +73,20 @@ * interpolation involved because of the subpixel postioning. */ void -miFillSppPoly(dst, pgc, count, ptsIn, xTrans, yTrans, xFtrans, yFtrans) - DrawablePtr dst; - GCPtr pgc; - int count; /* number of points */ - SppPointPtr ptsIn; /* the points */ - int xTrans, yTrans; /* Translate each point by this */ - double xFtrans, yFtrans; /* translate before conversion - by this amount. This provides - a mechanism to match rounding - errors with any shape that must - meet the polygon exactly. - */ +miFillSppPoly( + DrawablePtr dst, + GCPtr pgc, + int count, /* number of points */ + SppPointPtr ptsIn, /* the points */ + int xTrans, + int yTrans, /* Translate each point by this */ + double xFtrans, + double yFtrans) /* translate before conversion + by this amount. This provides + a mechanism to match rounding + errors with any shape that must + meet the polygon exactly. + */ { double xl = 0.0, xr = 0.0, /* x vals of left and right edges */ ml = 0.0, /* left edge slope */ @@ -99,7 +101,7 @@ *width, *FirstWidth, /* output buffer */ *Marked; /* set if this vertex has been used */ - register int left, right, /* indices to first endpoints */ + int left, right, /* indices to first endpoints */ nextleft, nextright; /* indices to second endpoints */ DDXPointPtr ptsOut, @@ -249,13 +251,13 @@ static int GetFPolyYBounds( - register SppPointPtr pts, + SppPointPtr pts, int n, double yFtrans, int *by, int *ty) { - register SppPointPtr ptMin; + SppPointPtr ptMin; double ymin, ymax; SppPointPtr ptsStart = pts; Index: xc/programs/Xserver/mi/migc.c diff -u xc/programs/Xserver/mi/migc.c:1.9 xc/programs/Xserver/mi/migc.c:1.10 --- xc/programs/Xserver/mi/migc.c:1.9 Fri Dec 14 15:00:23 2001 +++ xc/programs/Xserver/mi/migc.c Sun Mar 27 21:51:10 2005 @@ -1,4 +1,3 @@ -/* $Xorg: migc.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -27,7 +26,7 @@ */ -/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.9 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.10 2005/03/28 02:51:10 dawes Exp $ */ #include "scrnintstr.h" #include "gcstruct.h" @@ -37,16 +36,13 @@ /* ARGSUSED */ void -miChangeGC(pGC, mask) - GCPtr pGC; - unsigned long mask; +miChangeGC(GCPtr pGC, unsigned long mask) { return; } void -miDestroyGC(pGC) - GCPtr pGC; +miDestroyGC(GCPtr pGC) { if (pGC->pRotatedPixmap) (*pGC->pScreen->DestroyPixmap) (pGC->pRotatedPixmap); @@ -60,8 +56,7 @@ */ GCOpsPtr -miCreateGCOps(prototype) - GCOpsPtr prototype; +miCreateGCOps(GCOpsPtr prototype) { GCOpsPtr ret; @@ -76,8 +71,7 @@ } void -miDestroyGCOps(ops) - GCOpsPtr ops; +miDestroyGCOps(GCOpsPtr ops) { if (ops->devPrivate.val) xfree(ops); @@ -85,8 +79,7 @@ void -miDestroyClip(pGC) - GCPtr pGC; +miDestroyClip(GCPtr pGC) { if (pGC->clientClipType == CT_NONE) return; @@ -107,11 +100,7 @@ } void -miChangeClip(pGC, type, pvalue, nrects) - GCPtr pGC; - int type; - pointer pvalue; - int nrects; +miChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) { (*pGC->funcs->DestroyClip) (pGC); if (type == CT_PIXMAP) @@ -138,8 +127,7 @@ } void -miCopyClip(pgcDst, pgcSrc) - GCPtr pgcDst, pgcSrc; +miCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { RegionPtr prgnNew; @@ -163,18 +151,13 @@ /* ARGSUSED */ void -miCopyGC(pGCSrc, changes, pGCDst) - GCPtr pGCSrc; - unsigned long changes; - GCPtr pGCDst; +miCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst) { return; } void -miComputeCompositeClip(pGC, pDrawable) - GCPtr pGC; - DrawablePtr pDrawable; +miComputeCompositeClip(GCPtr pGC, DrawablePtr pDrawable) { ScreenPtr pScreen; Index: xc/programs/Xserver/mi/miglblt.c diff -u xc/programs/Xserver/mi/miglblt.c:1.6 xc/programs/Xserver/mi/miglblt.c:1.8 --- xc/programs/Xserver/mi/miglblt.c:1.6 Fri Dec 14 15:00:23 2001 +++ xc/programs/Xserver/mi/miglblt.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.6 2001/12/14 20:00:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miglblt.c,v 1.8 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,13 +46,11 @@ ******************************************************************/ -/* $Xorg: miglblt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ - -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "misc.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -80,27 +78,22 @@ */ void -miPolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +miPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { int width, height; PixmapPtr pPixmap; int nbyLine; /* bytes per line of padded pixmap */ FontPtr pfont; GCPtr pGCtmp; - register int i; - register int j; + int i; + int j; unsigned char *pbits; /* buffer for PutImage */ - register unsigned char *pb; /* temp pointer into buffer */ - register CharInfoPtr pci; /* currect char info */ - register unsigned char *pglyph; /* pointer bits in glyph */ + unsigned char *pb; /* temp pointer into buffer */ + CharInfoPtr pci; /* currect char info */ + unsigned char *pglyph; /* pointer bits in glyph */ int gWidth, gHeight; /* width and height of glyph */ - register int nbyGlyphWidth; /* bytes per scanline of glyph */ + int nbyGlyphWidth; /* bytes per scanline of glyph */ int nbyPadGlyph; /* server padded line of glyph */ XID gcvals[3]; @@ -193,13 +186,8 @@ void -miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +miImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { ExtentInfoRec info; /* used by QueryGlyphExtents() */ XID gcvals[3]; Index: xc/programs/Xserver/mi/miinitext.c diff -u xc/programs/Xserver/mi/miinitext.c:3.69 xc/programs/Xserver/mi/miinitext.c:3.78 --- xc/programs/Xserver/mi/miinitext.c:3.69 Wed Jun 30 16:21:46 2004 +++ xc/programs/Xserver/mi/miinitext.c Sun Feb 19 10:51:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.69 2004/06/30 20:21:46 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.78 2006/02/19 15:51:31 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,22 +45,11 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: miinitext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "misc.h" -#include "extension.h" +#include "extnsionst.h" #include "micmap.h" -#ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */ -#undef PEXEXT -#endif - -#if defined(QNX4) /* sleaze for Watcom on QNX4 ... */ -#undef PEXEXT -#undef XIE -#undef GLXEXT -#endif - #ifdef PANORAMIX extern Bool noPanoramiXExtension; #endif @@ -73,89 +62,115 @@ extern Bool dmxNoRender; #endif -#ifndef XFree86LOADER -#define INITARGS void -typedef void (*InitExtension)(INITARGS); -#else /* XFree86Loader */ +#ifdef XFree86LOADER #include "loaderProcs.h" #endif #ifdef MITSHM #define _XSHM_SERVER_ -#include "shmstr.h" +#include #endif #ifdef XTEST #define _XTEST_SERVER_ -#include "XTest.h" +#include #endif #ifdef XKB -#include "XKB.h" +#include #endif #ifdef LBX #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #endif #ifdef XPRINT -#include "Print.h" +#undef _XP_PRINT_SERVER_ +#define _XP_PRINT_SERVER_ +#include #endif #ifdef XAPPGROUP #define _XAG_SERVER_ -#include "Xagstr.h" +#include #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "securstr.h" +#include #endif #ifdef PANORAMIX -#include "panoramiXproto.h" +#include #endif #ifdef XF86BIGFONT -#include "xf86bigfstr.h" +#include #endif + +#ifndef XFree86LOADER #ifdef RES -#include "XResproto.h" +#include +#endif +#ifdef XRECORD +#include "recordproc.h" +#endif +#ifdef DBE +#define DBE_EXT_INIT_ONLY +#include "dbeproc.h" +#endif #endif /* FIXME: this whole block of externs should be from the appropriate headers */ -#ifdef BEZIER -extern void BezierExtensionInit(INITARGS); +#ifdef MITSHM +extern void ShmExtensionInit(INITARGS); #endif #ifdef XTESTEXT1 extern void XTestExtension1Init(INITARGS); #endif +#ifdef PANORAMIX +extern void PanoramiXExtensionInit(INITARGS); +#endif +#ifdef XTEST +extern void XTestExtensionInit(INITARGS); +#endif +#ifdef XKB +extern void XkbExtensionInit(INITARGS); +#endif +#ifdef XINPUT +extern void XInputExtensionInit(INITARGS); +#endif +#ifdef LBX +extern void LbxExtensionInit(INITARGS); +#endif +#ifdef XAPPGROUP +extern void XagExtensionInit(INITARGS); +#endif +#ifdef XCSECURITY +extern void SecurityExtensionInit(INITARGS); +#endif +#ifdef XPRINT +extern void XpExtensionInit(INITARGS); +#endif +#ifdef XF86BIGFONT +extern void XFree86BigfontExtensionInit(INITARGS); +#endif +#ifdef RENDER +extern void RenderExtensionInit(INITARGS); +#endif +#ifdef RANDR +extern void RRExtensionInit(INITARGS); +#endif + +#ifndef XFree86LOADER #ifdef SHAPE extern void ShapeExtensionInit(INITARGS); #endif #ifdef EVI extern void EVIExtensionInit(INITARGS); #endif -#ifdef MITSHM -extern void ShmExtensionInit(INITARGS); -#endif -#ifdef PEXEXT -extern void PexExtensionInit(INITARGS); -#endif #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); #endif -#ifdef PANORAMIX -extern void PanoramiXExtensionInit(INITARGS); -#endif -#ifdef XINPUT -extern void XInputExtensionInit(INITARGS); -#endif -#ifdef XTEST -extern void XTestExtensionInit(INITARGS); -#endif #ifdef BIGREQS extern void BigReqExtensionInit(INITARGS); #endif #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); #endif -#ifdef XIDLE -extern void XIdleExtensionInit(INITARGS); -#endif #ifdef XTRAP extern void DEC_XTRAPInit(INITARGS); #endif @@ -164,41 +179,16 @@ #endif #ifdef XV extern void XvExtensionInit(INITARGS); -extern void XvMCExtensionInit(INITARGS); #endif -#ifdef XIE -extern void XieInit(INITARGS); +#ifdef XVMC +extern void XvMCExtensionInit(INITARGS); #endif #ifdef XSYNC extern void SyncExtensionInit(INITARGS); #endif -#ifdef XKB -extern void XkbExtensionInit(INITARGS); -#endif #ifdef XCMISC extern void XCMiscExtensionInit(INITARGS); #endif -#ifdef XRECORD -extern void RecordExtensionInit(INITARGS); -#endif -#ifdef LBX -extern void LbxExtensionInit(INITARGS); -#endif -#ifdef DBE -extern void DbeExtensionInit(INITARGS); -#endif -#ifdef XAPPGROUP -extern void XagExtensionInit(INITARGS); -#endif -#ifdef XCSECURITY -extern void SecurityExtensionInit(INITARGS); -#endif -#ifdef XPRINT -extern void XpExtensionInit(INITARGS); -#endif -#ifdef XF86BIGFONT -extern void XFree86BigfontExtensionInit(INITARGS); -#endif #ifdef XF86VIDMODE extern void XFree86VidModeExtensionInit(INITARGS); #endif @@ -232,12 +222,6 @@ #ifdef FONTCACHE extern void FontCacheExtensionInit(INITARGS); #endif -#ifdef RENDER -extern void RenderExtensionInit(INITARGS); -#endif -#ifdef RANDR -extern void RRExtensionInit(INITARGS); -#endif #ifdef RES extern void ResExtensionInit(INITARGS); #endif @@ -245,21 +229,12 @@ extern void DMXExtensionInit(INITARGS); #endif -#ifndef XFree86LOADER - /*ARGSUSED*/ void -InitExtensions(argc, argv) - int argc; - char *argv[]; +InitExtensions(int argc, char *argv[]) { #ifdef PANORAMIX -# if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX) if (!noPanoramiXExtension) PanoramiXExtensionInit(); -# endif -#endif -#ifdef BEZIER - BezierExtensionInit(); #endif #ifdef XTESTEXT1 if (!noTestExtensions) XTestExtension1Init(); @@ -273,13 +248,10 @@ #ifdef EVI EVIExtensionInit(); #endif -#ifdef PEXEXT - PexExtensionInit(); -#endif #ifdef MULTIBUFFER MultibufferExtensionInit(); #endif -#if defined(XINPUT) && !defined(NO_HW_ONLY_EXTS) +#ifdef XINPUT XInputExtensionInit(); #endif #ifdef XTEST @@ -291,26 +263,22 @@ #ifdef MITMISC MITMiscExtensionInit(); #endif -#ifdef XIDLE - XIdleExtensionInit(); -#endif #ifdef XTRAP if (!noTestExtensions) DEC_XTRAPInit(); #endif -#if defined(SCREENSAVER) && !defined(PRINT_ONLY_SERVER) +#ifdef SCREENSAVER ScreenSaverExtensionInit (); #endif #ifdef XV XvExtensionInit(); - XvMCExtensionInit(); #endif -#ifdef XIE - XieInit(); +#ifdef XVMC + XvMCExtensionInit(); #endif #ifdef XSYNC SyncExtensionInit(); #endif -#if defined(XKB) && !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS) +#ifdef XKB if (!noXkbExtension) XkbExtensionInit(); #endif #ifdef XCMISC @@ -337,7 +305,7 @@ #ifdef TOGCUP XcupExtensionInit(); #endif -#if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS) +#ifdef DPMSExtension DPMSExtensionInit(); #endif #ifdef FONTCACHE @@ -346,34 +314,28 @@ #ifdef XF86BIGFONT XFree86BigfontExtensionInit(); #endif -#if !defined(PRINT_ONLY_SERVER) && !defined(NO_HW_ONLY_EXTS) -#if defined(XF86VIDMODE) +#ifdef XF86VIDMODE XFree86VidModeExtensionInit(); #endif -#if defined(XF86MISC) +#ifdef XF86MISC XFree86MiscExtensionInit(); #endif -#if defined(XFreeXDGA) +#ifdef XFreeXDGA XFree86DGAExtensionInit(); #endif #ifdef XF86DRI XFree86DRIExtensionInit(); #endif -#endif #ifdef GLXEXT -#ifndef XPRINT /* we don't want Glx in the Xprint server */ #ifndef __DARWIN__ GlxExtensionInit(); #else DarwinGlxExtensionInit(); #endif #endif -#endif #ifdef DPSEXT -#ifndef XPRINT DPSExtensionInit(); #endif -#endif #ifdef RENDER #ifdef DMXSERVER if (!dmxNoRender) @@ -396,131 +358,147 @@ { miResetInitVisuals(); #ifdef GLXEXT -#ifndef XPRINT #ifndef __DARWIN__ GlxWrapInitVisuals(&miInitVisualsProc); #else DarwinGlxWrapInitVisuals(&miInitVisualsProc); #endif #endif -#endif } #else /* XFree86LOADER */ -#if 0 -/* FIXME:The names here must come from the headers. those with ?? are - not included in X11R6.3 sample implementation, so there's a problem... */ -/* XXX use the correct #ifdefs for symbols not present when an extension - is disabled */ -ExtensionModule extension[] = -{ - { NULL, "BEZIER", NULL, NULL }, /* ?? */ - { NULL, "XTEST1", &noTestExtensions, NULL }, /* ?? */ - { NULL, "SHAPE", NULL, NULL }, - { NULL, "MIT-SHM", NULL, NULL }, - { NULL, "X3D-PEX", NULL, NULL }, - { NULL, "Multi-Buffering", NULL, NULL }, - { NULL, "XInputExtension", NULL, NULL }, - { NULL, "XTEST", &noTestExtensions, NULL }, - { NULL, "BIG-REQUESTS", NULL, NULL }, - { NULL, "MIT-SUNDRY-NONSTANDARD", NULL, NULL }, - { NULL, "XIDLE", NULL, NULL }, /* ?? */ - { NULL, "XTRAP", &noTestExtensions, NULL }, /* ?? */ - { NULL, "MIT-SCREEN-SAVER", NULL, NULL }, - { NULL, "XVideo", NULL, NULL }, /* ?? */ - { NULL, "XIE", NULL, NULL }, - { NULL, "SYNC", NULL, NULL }, -#ifdef XKB - { NULL, "XKEYBOARD", &noXkbExtension, NULL }, -#else - { NULL, "NOXKEYBOARD", NULL, NULL }, -#endif - { NULL, "XC-MISC", NULL, NULL }, - { NULL, "RECORD", &noTestExtensions, NULL }, - { NULL, "LBX", NULL, NULL }, - { NULL, "DOUBLE-BUFFER", NULL, NULL }, - { NULL, "XC-APPGROUP", NULL, NULL }, - { NULL, "SECURITY", NULL, NULL }, - { NULL, "XpExtension", NULL, NULL }, - { NULL, "XFree86-VidModeExtension", NULL, NULL }, - { NULL, "XFree86-Misc", NULL, NULL }, - { NULL, "XFree86-DGA", NULL, NULL }, - { NULL, "DPMS", NULL, NULL }, - { NULL, "GLX", NULL, NULL }, - { NULL, "TOG-CUP", NULL, NULL }, - { NULL, "Extended-Visual-Information", NULL, NULL }, -#ifdef PANORAMIX - { NULL, "XINERAMA", &noPanoramiXExtension, NULL }, -#else - { NULL, "NOXINERAMA", NULL, NULL }, -#endif - { NULL, "XFree86-Bigfont", NULL, NULL }, - { NULL, "XFree86-DRI", NULL, NULL }, - { NULL, "Adobe-DPS-Extension", NULL, NULL }, - { NULL, "FontCache", NULL, NULL }, - { NULL, "RENDER", NULL, NULL }, - { NULL, "RANDR", NULL, NULL }, - { NULL, "X-Resource", NULL, NULL }, - { NULL, "DMX", NULL, NULL }, - { NULL, NULL, NULL, NULL } -}; -#endif /* List of built-in (statically linked) extensions */ static ExtensionModule staticExtensions[] = { -#ifdef BEZIER - { BezierExtensionInit, "BEZIER", NULL, NULL, NULL }, -#endif #ifdef XTESTEXT1 - { XTestExtension1Init, "XTEST1", &noTestExtensions, NULL, NULL }, + { + XTestExtension1Init, + "XTEST1", + &noTestExtensions, + NULL, + NULL + }, #endif #ifdef MITSHM - { ShmExtensionInit, SHMNAME, NULL, NULL, NULL }, + { + ShmExtensionInit, + SHMNAME, + NULL, + NULL, + NULL + }, #endif #ifdef XINPUT - { XInputExtensionInit, "XInputExtension", NULL, NULL, NULL }, + { + XInputExtensionInit, + "XInputExtension", + NULL, + NULL, + NULL + }, #endif #ifdef XTEST - { XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL }, -#endif -#ifdef XIDLE - { XIdleExtensionInit, "XIDLE", NULL, NULL, NULL }, + { + XTestExtensionInit, + XTestExtensionName, + &noTestExtensions, + NULL, + NULL + }, #endif #ifdef XKB - { XkbExtensionInit, XkbName, &noXkbExtension, NULL, NULL }, + { + XkbExtensionInit, + XkbName, + &noXkbExtension, + NULL, + NULL + }, #endif #ifdef LBX - { LbxExtensionInit, LBXNAME, NULL, NULL, NULL }, + { + LbxExtensionInit, + LBXNAME, + NULL, + NULL, + NULL + }, #endif #ifdef XAPPGROUP - { XagExtensionInit, XAGNAME, NULL, NULL, NULL }, + { + XagExtensionInit, + XAGNAME, + NULL, + NULL, + NULL + }, #endif #ifdef XCSECURITY - { SecurityExtensionInit, SECURITY_EXTENSION_NAME, NULL, NULL, NULL }, + { + SecurityExtensionInit, + SECURITY_EXTENSION_NAME, + NULL, + NULL, + NULL + }, #endif #ifdef XPRINT - { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL }, + { + XpExtensionInit, + XP_PRINTNAME, + NULL, + NULL, + NULL + }, #endif #ifdef PANORAMIX - { PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, NULL, NULL }, + { + PanoramiXExtensionInit, + PANORAMIX_PROTOCOL_NAME, + &noPanoramiXExtension, + NULL, + NULL + }, #endif #ifdef XF86BIGFONT - { XFree86BigfontExtensionInit, XF86BIGFONTNAME, NULL, NULL, NULL }, + { + XFree86BigfontExtensionInit, + XF86BIGFONTNAME, + NULL, + NULL, + NULL + }, #endif #ifdef RENDER - { RenderExtensionInit, "RENDER", NULL, NULL, NULL }, + { + RenderExtensionInit, + "RENDER", + NULL, + NULL, + NULL + }, #endif #ifdef RANDR - { RRExtensionInit, "RANDR", NULL, NULL, NULL }, -#endif - { NULL, NULL, NULL, NULL, NULL } + { + RRExtensionInit, + "RANDR", + NULL, + NULL, + NULL + }, +#endif + { + NULL, + NULL, + NULL, + NULL, + NULL + } }; /*ARGSUSED*/ void -InitExtensions(argc, argv) - int argc; - char *argv[]; +InitExtensions(int argc, char *argv[]) { int i; ExtensionModule *ext; Index: xc/programs/Xserver/mi/miline.h diff -u xc/programs/Xserver/mi/miline.h:1.7 xc/programs/Xserver/mi/miline.h:1.8 --- xc/programs/Xserver/mi/miline.h:1.7 Fri Dec 14 15:00:24 2001 +++ xc/programs/Xserver/mi/miline.h Sun Mar 27 21:51:10 2005 @@ -1,5 +1,3 @@ -/* $Xorg: miline.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.7 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.8 2005/03/28 02:51:10 dawes Exp $ */ #ifndef MILINE_H @@ -111,7 +109,7 @@ } #define SWAPINT(i, j) \ -{ register int _t = i; i = j; j = _t; } +{ int _t = i; i = j; j = _t; } #define SWAPPT(i, j) \ { DDXPointRec _t; _t = i; i = j; j = _t; } Index: xc/programs/Xserver/mi/mioverlay.c diff -u xc/programs/Xserver/mi/mioverlay.c:3.16 xc/programs/Xserver/mi/mioverlay.c:3.18 --- xc/programs/Xserver/mi/mioverlay.c:3.16 Mon Nov 10 13:22:49 2003 +++ xc/programs/Xserver/mi/mioverlay.c Fri Oct 14 11:17:23 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.16 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.18 2005/10/14 15:17:23 tsi Exp $ */ -#include "X.h" +#include #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" @@ -1016,7 +1016,7 @@ static void miOverlayWindowExposures( WindowPtr pWin, - register RegionPtr prgn, + RegionPtr prgn, RegionPtr other_exposed ){ RegionPtr exposures = prgn; @@ -1103,7 +1103,7 @@ WindowPtr pWin, pointer value ){ - register ScreenPtr pScreen; + ScreenPtr pScreen; miOverlayTwoRegions *pValid = (miOverlayTwoRegions*)value; miOverlayTreePtr pTree = MIOVERLAY_GET_WINDOW_TREE(pWin); @@ -1158,10 +1158,10 @@ DDXPointRec oldpt; RegionPtr oldRegion = NULL, oldRegion2 = NULL; WindowPtr pFirstChange; - register WindowPtr pChild; + WindowPtr pChild; RegionPtr gravitate[StaticGravity + 1]; RegionPtr gravitate2[StaticGravity + 1]; - register unsigned g; + unsigned g; int nx, ny; /* destination x,y */ int newx, newy; /* new inner window position */ RegionPtr pRegion = NULL; @@ -1666,7 +1666,7 @@ unsigned int width ){ int oldwidth; - register ScreenPtr pScreen; + ScreenPtr pScreen; Bool WasViewable = (Bool)(pWin->viewable); Bool HadBorder; #ifdef DO_SAVE_UNDERS Index: xc/programs/Xserver/mi/mipointer.c diff -u xc/programs/Xserver/mi/mipointer.c:3.10 xc/programs/Xserver/mi/mipointer.c:3.12 --- xc/programs/Xserver/mi/mipointer.c:3.10 Fri Dec 14 15:00:24 2001 +++ xc/programs/Xserver/mi/mipointer.c Fri Oct 14 11:17:23 2005 @@ -2,8 +2,6 @@ * mipointer.c */ -/* $Xorg: mipointer.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -28,12 +26,12 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.10 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.12 2005/10/14 15:17:23 tsi Exp $ */ # define NEED_EVENTS -# include "X.h" -# include "Xmd.h" -# include "Xproto.h" +# include +# include +# include # include "misc.h" # include "windowstr.h" # include "pixmapstr.h" @@ -68,11 +66,8 @@ static void miPointerMove(ScreenPtr pScreen, int x, int y, unsigned long time); Bool -miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate) - ScreenPtr pScreen; - miPointerSpriteFuncPtr spriteFuncs; - miPointerScreenFuncPtr screenFuncs; - Bool waitForUpdate; +miPointerInitialize(ScreenPtr pScreen, miPointerSpriteFuncPtr spriteFuncs, + miPointerScreenFuncPtr screenFuncs, Bool waitForUpdate) { miPointerScreenPtr pScreenPriv; @@ -130,9 +125,7 @@ } static Bool -miPointerCloseScreen (index, pScreen) - int index; - ScreenPtr pScreen; +miPointerCloseScreen(int index, ScreenPtr pScreen) { SetupScreen(pScreen); @@ -150,9 +143,7 @@ */ static Bool -miPointerRealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miPointerRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) { SetupScreen(pScreen); @@ -160,9 +151,7 @@ } static Bool -miPointerUnrealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miPointerUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) { SetupScreen(pScreen); @@ -170,9 +159,7 @@ } static Bool -miPointerDisplayCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miPointerDisplayCursor(ScreenPtr pScreen, CursorPtr pCursor) { miPointer.pCursor = pCursor; miPointer.pScreen = pScreen; @@ -181,9 +168,7 @@ } static void -miPointerConstrainCursor (pScreen, pBox) - ScreenPtr pScreen; - BoxPtr pBox; +miPointerConstrainCursor(ScreenPtr pScreen, BoxPtr pBox) { miPointer.limits = *pBox; miPointer.confined = PointerConfinedToScreen(); @@ -191,20 +176,15 @@ /*ARGSUSED*/ static void -miPointerPointerNonInterestBox (pScreen, pBox) - ScreenPtr pScreen; - BoxPtr pBox; +miPointerPointerNonInterestBox(ScreenPtr pScreen, BoxPtr pBox) { /* until DIX uses this, this will remain a stub */ } /*ARGSUSED*/ static void -miPointerCursorLimits(pScreen, pCursor, pHotBox, pTopLeftBox) - ScreenPtr pScreen; - CursorPtr pCursor; - BoxPtr pHotBox; - BoxPtr pTopLeftBox; +miPointerCursorLimits(ScreenPtr pScreen, CursorPtr pCursor, BoxPtr pHotBox, + BoxPtr pTopLeftBox) { *pTopLeftBox = *pHotBox; } @@ -212,10 +192,7 @@ static Bool GenerateEvent; static Bool -miPointerSetCursorPosition(pScreen, x, y, generateEvent) - ScreenPtr pScreen; - int x, y; - Bool generateEvent; +miPointerSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent) { SetupScreen (pScreen); @@ -230,9 +207,7 @@ /* Once signals are ignored, the WarpCursor function can call this */ void -miPointerWarpCursor (pScreen, x, y) - ScreenPtr pScreen; - int x, y; +miPointerWarpCursor(ScreenPtr pScreen, int x, int y) { SetupScreen (pScreen); @@ -271,11 +246,9 @@ } int -miPointerGetMotionEvents (pPtr, coords, start, stop, pScreen) - DeviceIntPtr pPtr; - xTimecoord *coords; - unsigned long start, stop; - ScreenPtr pScreen; +miPointerGetMotionEvents(DeviceIntPtr pPtr, xTimecoord *coords, + unsigned long start, unsigned long stop, + ScreenPtr pScreen) { int i; int count = 0; @@ -374,9 +347,7 @@ */ void -miPointerDeltaCursor (dx, dy, time) - int dx, dy; - unsigned long time; +miPointerDeltaCursor(int dx, int dy, unsigned long time) { miPointerAbsoluteCursor (miPointer.x + dx, miPointer.y + dy, time); } @@ -406,9 +377,7 @@ */ void -miPointerAbsoluteCursor (x, y, time) - int x, y; - unsigned long time; +miPointerAbsoluteCursor(int x, int y, unsigned long time) { miPointerScreenPtr pScreenPriv; ScreenPtr pScreen; @@ -453,8 +422,7 @@ } void -miPointerPosition (x, y) - int *x, *y; +miPointerPosition(int *x, int *y) { *x = miPointer.x; *y = miPointer.y; @@ -465,10 +433,7 @@ */ static void -miPointerMove (pScreen, x, y, time) - ScreenPtr pScreen; - int x, y; - unsigned long time; +miPointerMove(ScreenPtr pScreen, int x, int y, unsigned long time) { SetupScreen(pScreen); xEvent xE; @@ -519,9 +484,7 @@ } void -_miRegisterPointerDevice (pScreen, pDevice) - ScreenPtr pScreen; - DeviceIntPtr pDevice; +_miRegisterPointerDevice(ScreenPtr pScreen, DeviceIntPtr pDevice) { miPointer.pPointer = (DevicePtr)pDevice; } @@ -530,9 +493,7 @@ #ifdef miRegisterPointerDevice #undef miRegisterPointerDevice void -miRegisterPointerDevice (pScreen, pDevice) - ScreenPtr pScreen; - DevicePtr pDevice; +miRegisterPointerDevice(ScreenPtr pScreen, DevicePtr pDevice) { miPointer.pPointer = pDevice; } Index: xc/programs/Xserver/mi/mipointer.h diff -u xc/programs/Xserver/mi/mipointer.h:3.9 xc/programs/Xserver/mi/mipointer.h:3.10 --- xc/programs/Xserver/mi/mipointer.h:3.9 Fri Dec 14 15:00:24 2001 +++ xc/programs/Xserver/mi/mipointer.h Mon Jan 9 10:00:37 2006 @@ -3,8 +3,6 @@ * */ -/* $Xorg: mipointer.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -29,7 +27,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.9 2001/12/14 20:00:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.10 2006/01/09 15:00:37 dawes Exp $ */ #ifndef MIPOINTER_H #define MIPOINTER_H Index: xc/programs/Xserver/mi/mipointrst.h diff -u xc/programs/Xserver/mi/mipointrst.h:1.4 xc/programs/Xserver/mi/mipointrst.h:1.5 --- xc/programs/Xserver/mi/mipointrst.h:1.4 Fri Dec 14 15:00:25 2001 +++ xc/programs/Xserver/mi/mipointrst.h Mon Jan 9 10:00:37 2006 @@ -3,8 +3,6 @@ * */ -/* $Xorg: mipointrst.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -29,7 +27,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.4 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.5 2006/01/09 15:00:37 dawes Exp $ */ #include "mipointer.h" #include "scrnintstr.h" Index: xc/programs/Xserver/mi/mipoly.c diff -u xc/programs/Xserver/mi/mipoly.c:1.3 xc/programs/Xserver/mi/mipoly.c:1.5 --- xc/programs/Xserver/mi/mipoly.c:1.3 Tue Jul 15 21:38:56 2003 +++ xc/programs/Xserver/mi/mipoly.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipoly.c,v 1.3 2003/07/16 01:38:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipoly.c,v 1.5 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mipoly.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ + /* * mipoly.c * @@ -56,7 +56,7 @@ * to the appropriate routine to actually scan convert the * polygon. */ -#include "X.h" +#include #include "windowstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -65,16 +65,12 @@ void -miFillPolygon(dst, pgc, shape, mode, count, pPts) - DrawablePtr dst; - register GCPtr pgc; - int shape, mode; - register int count; - DDXPointPtr pPts; +miFillPolygon(DrawablePtr dst, GCPtr pgc, int shape, int mode, int count, + DDXPointPtr pPts) { int i; - register int xorg, yorg; - register DDXPointPtr ppt; + int xorg, yorg; + DDXPointPtr ppt; if (count == 0) return; Index: xc/programs/Xserver/mi/mipoly.h diff -u xc/programs/Xserver/mi/mipoly.h:1.3 xc/programs/Xserver/mi/mipoly.h:1.4 --- xc/programs/Xserver/mi/mipoly.h:1.3 Fri Dec 14 15:00:25 2001 +++ xc/programs/Xserver/mi/mipoly.h Mon Jan 9 10:00:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mipoly.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipoly.h,v 1.4 2006/01/09 15:00:37 dawes Exp $ */ /* Index: xc/programs/Xserver/mi/mipolycon.c diff -u xc/programs/Xserver/mi/mipolycon.c:1.4 xc/programs/Xserver/mi/mipolycon.c:1.5 --- xc/programs/Xserver/mi/mipolycon.c:1.4 Fri Dec 14 15:00:25 2001 +++ xc/programs/Xserver/mi/mipolycon.c Sun Mar 27 21:51:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.4 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolycon.c,v 1.5 2005/03/28 02:51:11 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mipolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ #include "gcstruct.h" #include "pixmap.h" @@ -70,15 +69,11 @@ * this code. */ Bool -miFillConvexPoly(dst, pgc, count, ptsIn) - DrawablePtr dst; - GCPtr pgc; - int count; /* number of points */ - DDXPointPtr ptsIn; /* the points */ +miFillConvexPoly(DrawablePtr dst, GCPtr pgc, int count, DDXPointPtr ptsIn) { - register int xl = 0, xr = 0; /* x vals of left and right edges */ - register int dl = 0, dr = 0; /* decision variables */ - register int ml = 0, m1l = 0;/* left edge slope and slope+1 */ + int xl = 0, xr = 0; /* x vals of left and right edges */ + int dl = 0, dr = 0; /* decision variables */ + int ml = 0, m1l = 0;/* left edge slope and slope+1 */ int mr = 0, m1r = 0; /* right edge slope and slope+1 */ int incr1l = 0, incr2l = 0; /* left edge error increments */ int incr1r = 0, incr2r = 0; /* right edge error increments */ @@ -219,7 +214,7 @@ static int getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty) { - register DDXPointPtr ptMin; + DDXPointPtr ptMin; int ymin, ymax; DDXPointPtr ptsStart = pts; Index: xc/programs/Xserver/mi/mipolygen.c diff -u xc/programs/Xserver/mi/mipolygen.c:1.3 xc/programs/Xserver/mi/mipolygen.c:1.5 --- xc/programs/Xserver/mi/mipolygen.c:1.3 Fri Dec 14 15:00:25 2001 +++ xc/programs/Xserver/mi/mipolygen.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolygen.c,v 1.5 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mipolygen.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" + +#include #include "gcstruct.h" #include "miscanfill.h" #include "mipoly.h" @@ -64,18 +64,14 @@ */ Bool -miFillGeneralPoly(dst, pgc, count, ptsIn) - DrawablePtr dst; - GCPtr pgc; - int count; /* number of points */ - DDXPointPtr ptsIn; /* the points */ +miFillGeneralPoly(DrawablePtr dst, GCPtr pgc, int count, DDXPointPtr ptsIn) { - register EdgeTableEntry *pAET; /* the Active Edge Table */ - register int y; /* the current scanline */ - register int nPts = 0; /* number of pts in buffer */ - register EdgeTableEntry *pWETE; /* Winding Edge Table */ - register ScanLineList *pSLL; /* Current ScanLineList */ - register DDXPointPtr ptsOut; /* ptr to output buffers */ + EdgeTableEntry *pAET; /* the Active Edge Table */ + int y; /* the current scanline */ + int nPts = 0; /* number of pts in buffer */ + EdgeTableEntry *pWETE; /* Winding Edge Table */ + ScanLineList *pSLL; /* Current ScanLineList */ + DDXPointPtr ptsOut; /* ptr to output buffers */ int *width; DDXPointRec FirstPoint[NUMPTSTOBUFFER]; /* the output buffers */ int FirstWidth[NUMPTSTOBUFFER]; Index: xc/programs/Xserver/mi/mipolypnt.c diff -u xc/programs/Xserver/mi/mipolypnt.c:1.3 xc/programs/Xserver/mi/mipolypnt.c:1.5 --- xc/programs/Xserver/mi/mipolypnt.c:1.3 Fri Dec 14 15:00:25 2001 +++ xc/programs/Xserver/mi/mipolypnt.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.3 2001/12/14 20:00:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolypnt.c,v 1.5 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,21 +45,17 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mipolypnt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" + +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" #include "mi.h" void -miPolyPoint(pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; - xPoint *pptInit; +miPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + xPoint *pptInit) { int xorg; @@ -68,7 +64,7 @@ XID fsOld, fsNew; int *pwidthInit, *pwidth; int i; - register xPoint *ppt; + xPoint *ppt; /* make pointlist origin relative */ if (mode == CoordModePrevious) Index: xc/programs/Xserver/mi/mipolyrect.c diff -u xc/programs/Xserver/mi/mipolyrect.c:1.4 xc/programs/Xserver/mi/mipolyrect.c:1.6 --- xc/programs/Xserver/mi/mipolyrect.c:1.4 Tue Jul 15 21:38:57 2003 +++ xc/programs/Xserver/mi/mipolyrect.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyrect.c,v 1.6 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,20 +45,16 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyrect.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" + +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmap.h" #include "mi.h" void -miPolyRectangle(pDraw, pGC, nrects, pRects) - DrawablePtr pDraw; - GCPtr pGC; - int nrects; - xRectangle *pRects; +miPolyRectangle(DrawablePtr pDraw, GCPtr pGC, int nrects, xRectangle *pRects) { int i; xRectangle *pR = pRects; Index: xc/programs/Xserver/mi/mipolyseg.c diff -u xc/programs/Xserver/mi/mipolyseg.c:1.4 xc/programs/Xserver/mi/mipolyseg.c:1.6 --- xc/programs/Xserver/mi/mipolyseg.c:1.4 Tue Jul 15 21:38:57 2003 +++ xc/programs/Xserver/mi/mipolyseg.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.4 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyseg.c,v 1.6 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,9 +45,9 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyseg.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" -#include "Xprotostr.h" + +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmap.h" @@ -65,11 +65,7 @@ void -miPolySegment(pDraw, pGC, nseg, pSegs) - DrawablePtr pDraw; - GCPtr pGC; - int nseg; - xSegment *pSegs; +miPolySegment(DrawablePtr pDraw, GCPtr pGC, int nseg, xSegment *pSegs) { int i; Index: xc/programs/Xserver/mi/mipolytext.c diff -u xc/programs/Xserver/mi/mipolytext.c:1.3 xc/programs/Xserver/mi/mipolytext.c:1.5 --- xc/programs/Xserver/mi/mipolytext.c:1.3 Fri Dec 14 15:00:26 2001 +++ xc/programs/Xserver/mi/mipolytext.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolytext.c,v 1.5 2005/10/14 15:17:23 tsi Exp $ */ /******************************************************************* Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ************************************************************************/ -/* $Xorg: mipolytext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ + /* * mipolytext.c - text routines * @@ -55,23 +55,18 @@ * Date: Thu Feb 5 1987 */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "misc.h" #include "gcstruct.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "mi.h" int -miPolyText(pDraw, pGC, x, y, count, chars, fontEncoding) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - char *chars; - FontEncoding fontEncoding; +miPolyText(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, + char *chars, FontEncoding fontEncoding) { unsigned long n, i; int w; @@ -89,12 +84,7 @@ int -miPolyText8(pDraw, pGC, x, y, count, chars) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - char *chars; +miPolyText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, char *chars) { unsigned long n, i; int w; @@ -112,12 +102,8 @@ int -miPolyText16(pDraw, pGC, x, y, count, chars) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miPolyText16(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, + unsigned short *chars) { unsigned long n, i; int w; @@ -136,13 +122,8 @@ int -miImageText(pDraw, pGC, x, y, count, chars, fontEncoding) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - char *chars; - FontEncoding fontEncoding; +miImageText(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, + char *chars, FontEncoding fontEncoding) { unsigned long n, i; FontPtr font = pGC->font; @@ -160,12 +141,8 @@ void -miImageText8(pDraw, pGC, x, y, count, chars) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - char *chars; +miImageText8(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, + char *chars) { unsigned long n; FontPtr font = pGC->font; @@ -179,12 +156,8 @@ void -miImageText16(pDraw, pGC, x, y, count, chars) - DrawablePtr pDraw; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y, int count, + unsigned short *chars) { unsigned long n; FontPtr font = pGC->font; Index: xc/programs/Xserver/mi/mipolyutil.c diff -u xc/programs/Xserver/mi/mipolyutil.c:1.10 xc/programs/Xserver/mi/mipolyutil.c:1.11 --- xc/programs/Xserver/mi/mipolyutil.c:1.10 Tue Jul 15 21:38:57 2003 +++ xc/programs/Xserver/mi/mipolyutil.c Sun Mar 27 21:51:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipolyutil.c,v 1.11 2005/03/28 02:51:11 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mipolyutil.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ + #include "regionstr.h" #include "gc.h" #include "miscanfill.h" @@ -72,15 +72,11 @@ * */ Bool -miInsertEdgeInET(ET, ETE, scanline, SLLBlock, iSLLBlock) - EdgeTable *ET; - EdgeTableEntry *ETE; - int scanline; - ScanLineListBlock **SLLBlock; - int *iSLLBlock; +miInsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, int scanline, + ScanLineListBlock **SLLBlock, int *iSLLBlock) { - register EdgeTableEntry *start, *prev; - register ScanLineList *pSLL, *pPrevSLL; + EdgeTableEntry *start, *prev; + ScanLineList *pSLL, *pPrevSLL; ScanLineListBlock *tmpSLLBlock; /* @@ -163,16 +159,12 @@ */ Bool -miCreateETandAET(count, pts, ET, AET, pETEs, pSLLBlock) - register int count; - register DDXPointPtr pts; - EdgeTable *ET; - EdgeTableEntry *AET; - register EdgeTableEntry *pETEs; - ScanLineListBlock *pSLLBlock; +miCreateETandAET(int count, DDXPointPtr pts, EdgeTable *ET, + EdgeTableEntry *AET, EdgeTableEntry *pETEs, + ScanLineListBlock *pSLLBlock) { - register DDXPointPtr top, bottom; - register DDXPointPtr PrevPt, CurrPt; + DDXPointPtr top, bottom; + DDXPointPtr PrevPt, CurrPt; int iSLLBlock = 0; int dy; @@ -259,11 +251,10 @@ */ void -miloadAET(AET, ETEs) - register EdgeTableEntry *AET, *ETEs; +miloadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs) { - register EdgeTableEntry *pPrevAET; - register EdgeTableEntry *tmp; + EdgeTableEntry *pPrevAET; + EdgeTableEntry *tmp; pPrevAET = AET; AET = AET->next; @@ -307,12 +298,11 @@ * */ void -micomputeWAET(AET) - register EdgeTableEntry *AET; +micomputeWAET(EdgeTableEntry *AET) { - register EdgeTableEntry *pWETE; - register int inside = 1; - register int isInside = 0; + EdgeTableEntry *pWETE; + int inside = 1; + int isInside = 0; AET->nextWETE = (EdgeTableEntry *)NULL; pWETE = AET; @@ -346,13 +336,12 @@ */ int -miInsertionSort(AET) - register EdgeTableEntry *AET; +miInsertionSort(EdgeTableEntry *AET) { - register EdgeTableEntry *pETEchase; - register EdgeTableEntry *pETEinsert; - register EdgeTableEntry *pETEchaseBackTMP; - register int changed = 0; + EdgeTableEntry *pETEchase; + EdgeTableEntry *pETEinsert; + EdgeTableEntry *pETEchaseBackTMP; + int changed = 0; AET = AET->next; while (AET) @@ -383,10 +372,9 @@ * Clean up our act. */ void -miFreeStorage(pSLLBlock) - register ScanLineListBlock *pSLLBlock; +miFreeStorage(ScanLineListBlock *pSLLBlock) { - register ScanLineListBlock *tmpSLLBlock; + ScanLineListBlock *tmpSLLBlock; while (pSLLBlock) { Index: xc/programs/Xserver/mi/mipushpxl.c diff -u xc/programs/Xserver/mi/mipushpxl.c:3.13 xc/programs/Xserver/mi/mipushpxl.c:3.15 --- xc/programs/Xserver/mi/mipushpxl.c:3.13 Tue Jul 15 21:38:57 2003 +++ xc/programs/Xserver/mi/mipushpxl.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.13 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.15 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ -#include "X.h" + +#include #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" @@ -76,18 +76,15 @@ * in the server, we need to rename one of them */ void -miPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) - GCPtr pGC; - PixmapPtr pBitMap; - DrawablePtr pDrawable; - int dx, dy, xOrg, yOrg; +miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, + int dx, int dy, int xOrg, int yOrg) { int h, dxDivPPW, ibEnd; MiBits *pwLineStart; - register MiBits *pw, *pwEnd; - register MiBits msk; - register int ib, w; - register int ipt; /* index into above arrays */ + MiBits *pw, *pwEnd; + MiBits msk; + int ib, w; + int ipt; /* index into above arrays */ Bool fInBox; DDXPointRec pt[NPT], ptThisLine; int width[NPT]; Index: xc/programs/Xserver/mi/miregion.c diff -u xc/programs/Xserver/mi/miregion.c:1.10 xc/programs/Xserver/mi/miregion.c:1.12 --- xc/programs/Xserver/mi/miregion.c:1.10 Tue Jul 15 21:38:57 2003 +++ xc/programs/Xserver/mi/miregion.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.10 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miregion.c,v 1.12 2005/10/14 15:17:23 tsi Exp $ */ /*********************************************************** Copyright 1987, 1988, 1989, 1998 The Open Group @@ -46,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: miregion.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* The panoramix components contained the following notice */ /**************************************************************** @@ -71,7 +70,7 @@ *****************************************************************/ #include "regionstr.h" -#include "Xprotostr.h" +#include #include "gc.h" #include "mi.h" #include "mispans.h" @@ -216,11 +215,10 @@ #ifdef DEBUG int -miPrintRegion(rgn) - RegionPtr rgn; +miPrintRegion(RegionPtr rgn) { int num, size; - register int i; + int i; BoxPtr rects; num = REGION_NUM_RECTS(rgn); @@ -238,9 +236,7 @@ #endif /* DEBUG */ Bool -miRegionEqual(reg1, reg2) - RegionPtr reg1; - RegionPtr reg2; +miRegionEqual(RegionPtr reg1, RegionPtr reg2) { int i, num; BoxPtr rects1, rects2; @@ -266,10 +262,9 @@ #ifdef DEBUG Bool -miValidRegion(reg) - RegionPtr reg; +miValidRegion(RegionPtr reg) { - register int i, numRects; + int i, numRects; if ((reg->extents.x1 > reg->extents.x2) || (reg->extents.y1 > reg->extents.y2)) @@ -283,7 +278,7 @@ return (!reg->data); else { - register BoxPtr pboxP, pboxN; + BoxPtr pboxP, pboxN; BoxRec box; pboxP = REGION_RECTS(reg); @@ -321,11 +316,9 @@ *****************************************************************/ RegionPtr -miRegionCreate(rect, size) - BoxPtr rect; - int size; +miRegionCreate(BoxPtr rect, int size) { - register RegionPtr pReg; + RegionPtr pReg; pReg = (RegionPtr)xalloc(sizeof(RegionRec)); if (!pReg) @@ -355,10 +348,7 @@ *****************************************************************/ void -miRegionInit(pReg, rect, size) - RegionPtr pReg; - BoxPtr rect; - int size; +miRegionInit(RegionPtr pReg, BoxPtr rect, int size) { if (rect) { @@ -379,8 +369,7 @@ } void -miRegionDestroy(pReg) - RegionPtr pReg; +miRegionDestroy(RegionPtr pReg) { good(pReg); xfreeData(pReg); @@ -389,16 +378,14 @@ } void -miRegionUninit(pReg) - RegionPtr pReg; +miRegionUninit(RegionPtr pReg) { good(pReg); xfreeData(pReg); } Bool -miRegionBreak (pReg) - RegionPtr pReg; +miRegionBreak(RegionPtr pReg) { xfreeData (pReg); pReg->extents = miEmptyBox; @@ -408,7 +395,7 @@ Bool miRectAlloc( - register RegionPtr pRgn, + RegionPtr pRgn, int n) { RegDataPtr data; @@ -448,9 +435,7 @@ } Bool -miRegionCopy(dst, src) - register RegionPtr dst; - register RegionPtr src; +miRegionCopy(RegionPtr dst, RegionPtr src) { good(dst); good(src); @@ -482,7 +467,7 @@ * Generic Region Operator *====================================================================*/ -/*- +/* *----------------------------------------------------------------------- * miCoalesce -- * Attempt to merge the boxes in the current band with those in the @@ -502,14 +487,14 @@ */ INLINE static int miCoalesce ( - register RegionPtr pReg, /* Region to coalesce */ + RegionPtr pReg, /* Region to coalesce */ int prevStart, /* Index of start of previous band */ int curStart) /* Index of start of current band */ { - register BoxPtr pPrevBox; /* Current box in previous band */ - register BoxPtr pCurBox; /* Current box in current band */ - register int numRects; /* Number rectangles in both bands */ - register int y2; /* Bottom of current band */ + BoxPtr pPrevBox; /* Current box in previous band */ + BoxPtr pCurBox; /* Current box in current band */ + int numRects; /* Number rectangles in both bands */ + int y2; /* Bottom of current band */ /* * Figure out how many rectangles are in the band. */ @@ -567,7 +552,7 @@ prevBand = curBand; \ } -/*- +/* *----------------------------------------------------------------------- * miAppendNonO -- * Handle a non-overlapping band for the union and subtract operations. @@ -586,14 +571,14 @@ INLINE static Bool miAppendNonO ( - register RegionPtr pReg, - register BoxPtr r, - BoxPtr rEnd, - register int y1, - register int y2) + RegionPtr pReg, + BoxPtr r, + BoxPtr rEnd, + int y1, + int y2) { - register BoxPtr pNextRect; - register int newRects; + BoxPtr pNextRect; + int newRects; newRects = rEnd - r; @@ -633,7 +618,7 @@ } \ } -/*- +/* *----------------------------------------------------------------------- * miRegionOp -- * Apply an operation to two regions. Called by miUnion, miInverse, @@ -685,8 +670,8 @@ /* in region 2 ? */ Bool *pOverlap) { - register BoxPtr r1; /* Pointer into first region */ - register BoxPtr r2; /* Pointer into 2d region */ + BoxPtr r1; /* Pointer into first region */ + BoxPtr r2; /* Pointer into 2d region */ BoxPtr r1End; /* End of 1st region */ BoxPtr r2End; /* End of 2d region */ short ybot; /* Bottom of intersection */ @@ -696,12 +681,12 @@ * previous band in newReg */ int curBand; /* Index of start of current * band in newReg */ - register BoxPtr r1BandEnd; /* End of current band in r1 */ - register BoxPtr r2BandEnd; /* End of current band in r2 */ + BoxPtr r1BandEnd; /* End of current band in r1 */ + BoxPtr r2BandEnd; /* End of current band in r2 */ short top; /* Top of non-overlapping band */ short bot; /* Bottom of non-overlapping band*/ - register int r1y1; /* Temps for r1->y1 and r2->y1 */ - register int r2y1; + int r1y1; /* Temps for r1->y1 and r2->y1 */ + int r2y1; int newSize; int numRects; @@ -892,7 +877,7 @@ return TRUE; } -/*- +/* *----------------------------------------------------------------------- * miSetExtents -- * Reset the extents of a region to what they should be. Called by @@ -908,10 +893,9 @@ *----------------------------------------------------------------------- */ void -miSetExtents (pReg) - register RegionPtr pReg; +miSetExtents(RegionPtr pReg) { - register BoxPtr pBox, pBoxEnd; + BoxPtr pBox, pBoxEnd; if (!pReg->data) return; @@ -952,7 +936,7 @@ /*====================================================================== * Region Intersection *====================================================================*/ -/*- +/* *----------------------------------------------------------------------- * miIntersectO -- * Handle an overlapping band for miIntersect. @@ -968,18 +952,18 @@ /*ARGSUSED*/ static Bool miIntersectO ( - register RegionPtr pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - short y1, - short y2, - Bool *pOverlap) -{ - register int x1; - register int x2; - register BoxPtr pNextRect; + RegionPtr pReg, + BoxPtr r1, + BoxPtr r1End, + BoxPtr r2, + BoxPtr r2End, + short y1, + short y2, + Bool *pOverlap) +{ + int x1; + int x2; + BoxPtr pNextRect; pNextRect = REGION_TOP(pReg); @@ -1015,10 +999,10 @@ Bool -miIntersect(newReg, reg1, reg2) - register RegionPtr newReg; /* destination Region */ - register RegionPtr reg1; - register RegionPtr reg2; /* source regions */ +miIntersect( + RegionPtr newReg, /* destination Region */ + RegionPtr reg1, + RegionPtr reg2) /* source regions */ { good(reg1); good(reg2); @@ -1094,7 +1078,7 @@ * Region Union *====================================================================*/ -/*- +/* *----------------------------------------------------------------------- * miUnionO -- * Handle an overlapping band for the union operation. Picks the @@ -1111,18 +1095,18 @@ */ static Bool miUnionO ( - register RegionPtr pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - short y1, - short y2, - Bool *pOverlap) -{ - register BoxPtr pNextRect; - register int x1; /* left and right side of current union */ - register int x2; + RegionPtr pReg, + BoxPtr r1, + BoxPtr r1End, + BoxPtr r2, + BoxPtr r2End, + short y1, + short y2, + Bool *pOverlap) +{ + BoxPtr pNextRect; + int x1; /* left and right side of current union */ + int x2; assert (y1 < y2); assert(r1 != r1End && r2 != r2End); @@ -1170,10 +1154,10 @@ } Bool -miUnion(newReg, reg1, reg2) - RegionPtr newReg; /* destination Region */ - register RegionPtr reg1; - register RegionPtr reg2; /* source regions */ +miUnion( + RegionPtr newReg, /* destination Region */ + RegionPtr reg1, + RegionPtr reg2) /* source regions */ { Bool overlap; /* result ignored */ @@ -1251,7 +1235,7 @@ * Batch Rectangle Union *====================================================================*/ -/*- +/* *----------------------------------------------------------------------- * miRegionAppend -- * @@ -1269,9 +1253,7 @@ * */ Bool -miRegionAppend(dstrgn, rgn) - register RegionPtr dstrgn; - register RegionPtr rgn; +miRegionAppend(RegionPtr dstrgn, RegionPtr rgn) { int numRects, dnumRects, size; BoxPtr new, old; @@ -1301,7 +1283,7 @@ dstrgn->extents = rgn->extents; else if (dstrgn->extents.x2 > dstrgn->extents.x1) { - register BoxPtr first, last; + BoxPtr first, last; first = old; last = REGION_BOXPTR(dstrgn) + (dnumRects - 1); @@ -1365,13 +1347,13 @@ static void QuickSortRects( - register BoxRec rects[], - register int numRects) + BoxRec rects[], + int numRects) { - register int y1; - register int x1; - register int i, j; - register BoxPtr r; + int y1; + int x1; + int i, j; + BoxPtr r; /* Always called with numRects > 1 */ @@ -1422,7 +1404,7 @@ } while (numRects > 1); } -/*- +/* *----------------------------------------------------------------------- * miRegionValidate -- * @@ -1455,9 +1437,7 @@ */ Bool -miRegionValidate(badreg, pOverlap) - RegionPtr badreg; - Bool *pOverlap; +miRegionValidate(RegionPtr badreg, Bool *pOverlap) { /* Descriptor for regions under construction in Step 2. */ typedef struct { @@ -1466,18 +1446,18 @@ int curBand; } RegionInfo; - int numRects; /* Original numRects for badreg */ - RegionInfo *ri; /* Array of current regions */ - int numRI; /* Number of entries used in ri */ - int sizeRI; /* Number of entries available in ri */ - int i; /* Index into rects */ - register int j; /* Index into ri */ - register RegionInfo *rit; /* &ri[j] */ - register RegionPtr reg; /* ri[j].reg */ - register BoxPtr box; /* Current box in rects */ - register BoxPtr riBox; /* Last box in ri[j].reg */ - register RegionPtr hreg; /* ri[j_half].reg */ - Bool ret = TRUE; + int numRects; /* Original numRects for badreg */ + RegionInfo *ri; /* Array of current regions */ + int numRI; /* Number of entries used in ri */ + int sizeRI; /* Number of entries available in ri */ + int i; /* Index into rects */ + int j; /* Index into ri */ + RegionInfo *rit; /* &ri[j] */ + RegionPtr reg; /* ri[j].reg */ + BoxPtr box; /* Current box in rects */ + BoxPtr riBox; /* Last box in ri[j].reg */ + RegionPtr hreg; /* ri[j_half].reg */ + Bool ret = TRUE; *pOverlap = FALSE; if (!badreg->data) @@ -1646,16 +1626,13 @@ } RegionPtr -miRectsToRegion(nrects, prect, ctype) - int nrects; - register xRectangle *prect; - int ctype; -{ - register RegionPtr pRgn; - register RegDataPtr pData; - register BoxPtr pBox; - register int i; - int x1, y1, x2, y2; +miRectsToRegion(int nrects, xRectangle *prect, int ctype) +{ + RegionPtr pRgn; + RegDataPtr pData; + BoxPtr pBox; + int i; + int x1, y1, x2, y2; pRgn = miRegionCreate(NullBox, 0); if (REGION_NAR (pRgn)) @@ -1731,7 +1708,7 @@ *====================================================================*/ -/*- +/* *----------------------------------------------------------------------- * miSubtractO -- * Overlapping band subtraction. x1 is the left-most point not yet @@ -1748,17 +1725,17 @@ /*ARGSUSED*/ static Bool miSubtractO ( - register RegionPtr pReg, - register BoxPtr r1, - BoxPtr r1End, - register BoxPtr r2, - BoxPtr r2End, - register short y1, - short y2, - Bool *pOverlap) + RegionPtr pReg, + BoxPtr r1, + BoxPtr r1End, + BoxPtr r2, + BoxPtr r2End, + short y1, + short y2, + Bool *pOverlap) { - register BoxPtr pNextRect; - register int x1; + BoxPtr pNextRect; + int x1; x1 = r1->x1; @@ -1856,7 +1833,7 @@ return TRUE; } -/*- +/* *----------------------------------------------------------------------- * miSubtract -- * Subtract regS from regM and leave the result in regD. @@ -1871,10 +1848,7 @@ *----------------------------------------------------------------------- */ Bool -miSubtract(regD, regM, regS) - register RegionPtr regD; - register RegionPtr regM; - register RegionPtr regS; +miSubtract(RegionPtr regD, RegionPtr regM, RegionPtr regS) { Bool overlap; /* result ignored */ @@ -1920,7 +1894,7 @@ * Region Inversion *====================================================================*/ -/*- +/* *----------------------------------------------------------------------- * miInverse -- * Take a region and a box and return a region that is everything @@ -1936,10 +1910,10 @@ *----------------------------------------------------------------------- */ Bool -miInverse(newReg, reg1, invRect) - RegionPtr newReg; /* Destination region */ - RegionPtr reg1; /* Region to invert */ - BoxPtr invRect; /* Bounding box for inversion */ +miInverse( + RegionPtr newReg, /* Destination region */ + RegionPtr reg1, /* Region to invert */ + BoxPtr invRect) /* Bounding box for inversion */ { RegionRec invReg; /* Quick and dirty region made from the * bounding box */ @@ -1996,16 +1970,14 @@ */ int -miRectIn(region, prect) - register RegionPtr region; - register BoxPtr prect; -{ - register int x; - register int y; - register BoxPtr pbox; - register BoxPtr pboxEnd; - int partIn, partOut; - int numRects; +miRectIn(RegionPtr region, BoxPtr prect) +{ + int x; + int y; + BoxPtr pbox; + BoxPtr pboxEnd; + int partIn, partOut; + int numRects; good(region); numRects = REGION_NUM_RECTS(region); @@ -2092,14 +2064,11 @@ */ void -miTranslateRegion(pReg, x, y) - register RegionPtr pReg; - register int x; - register int y; +miTranslateRegion(RegionPtr pReg, int x, int y) { int x1, x2, y1, y2; - register int nbox; - register BoxPtr pbox; + int nbox; + BoxPtr pbox; good(pReg); pReg->extents.x1 = x1 = pReg->extents.x1 + x; @@ -2138,7 +2107,7 @@ pReg->extents.y2 = MAXSHORT; if (pReg->data && (nbox = pReg->data->numRects)) { - register BoxPtr pboxout; + BoxPtr pboxout; for (pboxout = pbox = REGION_BOXPTR(pReg); nbox--; pbox++) { @@ -2178,8 +2147,8 @@ Bool miRegionDataCopy( - register RegionPtr dst, - register RegionPtr src) + RegionPtr dst, + RegionPtr src) { good(dst); good(src); @@ -2206,9 +2175,7 @@ } void -miRegionReset(pReg, pBox) - RegionPtr pReg; - BoxPtr pBox; +miRegionReset(RegionPtr pReg, BoxPtr pBox) { good(pReg); assert(pBox->x1<=pBox->x2); @@ -2219,12 +2186,9 @@ } Bool -miPointInRegion(pReg, x, y, box) - register RegionPtr pReg; - register int x, y; - BoxPtr box; /* "return" value */ +miPointInRegion(RegionPtr pReg, int x, int y, BoxPtr box) { - register BoxPtr pbox, pboxEnd; + BoxPtr pbox, pboxEnd; int numRects; good(pReg); @@ -2253,8 +2217,7 @@ } Bool -miRegionNotEmpty(pReg) - RegionPtr pReg; +miRegionNotEmpty(RegionPtr pReg) { good(pReg); return(!REGION_NIL(pReg)); @@ -2268,8 +2231,7 @@ } void -miRegionEmpty(pReg) - RegionPtr pReg; +miRegionEmpty(RegionPtr pReg) { good(pReg); xfreeData(pReg); @@ -2279,8 +2241,7 @@ } BoxPtr -miRegionExtents(pReg) - RegionPtr pReg; +miRegionExtents(RegionPtr pReg) { good(pReg); return(&pReg->extents); @@ -2289,7 +2250,7 @@ #define ExchangeSpans(a, b) \ { \ DDXPointRec tpt; \ - register int tw; \ + int tw; \ \ tpt = spans[a]; spans[a] = spans[b]; spans[b] = tpt; \ tw = widths[a]; widths[a] = widths[b]; widths[b] = tw; \ @@ -2301,13 +2262,13 @@ */ static void QuickSortSpans( - register DDXPointRec spans[], - register int widths[], - register int numSpans) -{ - register int y; - register int i, j, m; - register DDXPointPtr r; + DDXPointRec spans[], + int widths[], + int numSpans) +{ + int y; + int i, j, m; + DDXPointPtr r; /* Always called with numSpans > 1 */ /* Sorts only by y, doesn't bother to sort by x */ @@ -2317,7 +2278,7 @@ if (numSpans < 9) { /* Do insertion sort */ - register int yprev; + int yprev; yprev = spans[0].y; i = 1; @@ -2406,18 +2367,18 @@ int miClipSpans( - RegionPtr prgnDst, - register DDXPointPtr ppt, - register int *pwidth, - int nspans, - register DDXPointPtr pptNew, - int *pwidthNew, - int fSorted) -{ - register DDXPointPtr pptLast; - int *pwidthNewStart; /* the vengeance of Xerox! */ - register int y, x1, x2; - register int numRects; + RegionPtr prgnDst, + DDXPointPtr ppt, + int *pwidth, + int nspans, + DDXPointPtr pptNew, + int *pwidthNew, + int fSorted) +{ + DDXPointPtr pptLast; + int *pwidthNewStart; /* the vengeance of Xerox! */ + int y, x1, x2; + int numRects; good(prgnDst); pptLast = ppt + nspans; @@ -2425,11 +2386,7 @@ if (!prgnDst->data) { - /* Do special fast code with clip boundaries in registers(?) */ - /* It doesn't pay much to make use of fSorted in this case, - so we lump everything together. */ - - register int clipx1, clipx2, clipy1, clipy2; + int clipx1, clipx2, clipy1, clipy2; clipx1 = prgnDst->extents.x1; clipy1 = prgnDst->extents.y1; @@ -2461,10 +2418,10 @@ else if ((numRects = prgnDst->data->numRects)) { /* Have to clip against many boxes */ - BoxPtr pboxBandStart, pboxBandEnd; - register BoxPtr pbox; - register BoxPtr pboxLast; - register int clipy1, clipy2; + BoxPtr pboxBandStart, pboxBandEnd; + BoxPtr pbox; + BoxPtr pboxLast; + int clipy1, clipy2; /* In this case, taking advantage of sorted spans gains more than the sorting costs. */ @@ -2487,7 +2444,7 @@ x2 = x1 + *pwidth; do { /* For each box in band */ - register int newx1, newx2; + int newx1, newx2; newx1 = x1; newx2 = x2; @@ -2522,13 +2479,12 @@ /* find the band in a region with the most rectangles */ int -miFindMaxBand(prgn) - RegionPtr prgn; +miFindMaxBand(RegionPtr prgn) { - register int nbox; - register BoxPtr pbox; - register int nThisBand; - register int nMaxBand = 0; + int nbox; + BoxPtr pbox; + int nThisBand; + int nMaxBand = 0; short yThisBand; good(prgn); Index: xc/programs/Xserver/mi/miscanfill.h diff -u xc/programs/Xserver/mi/miscanfill.h:1.2 xc/programs/Xserver/mi/miscanfill.h:1.3 --- xc/programs/Xserver/mi/miscanfill.h:1.2 Fri Dec 14 15:00:26 2001 +++ xc/programs/Xserver/mi/miscanfill.h Mon Jan 9 10:00:37 2006 @@ -1,4 +1,4 @@ -/* $Xorg: miscanfill.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miscanfill.h,v 1.3 2006/01/09 15:00:37 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/programs/Xserver/mi/miscrinit.c diff -u xc/programs/Xserver/mi/miscrinit.c:3.16 xc/programs/Xserver/mi/miscrinit.c:3.19 --- xc/programs/Xserver/mi/miscrinit.c:3.16 Wed Apr 23 17:51:53 2003 +++ xc/programs/Xserver/mi/miscrinit.c Sun Feb 19 10:51:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: miscrinit.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,9 +25,9 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.16 2003/04/23 21:51:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.19 2006/02/19 15:51:31 tsi Exp $ */ -#include "X.h" +#include #include "servermd.h" #include "misc.h" #include "mi.h" @@ -36,10 +35,6 @@ #include "pixmapstr.h" #include "dix.h" #include "miline.h" -#ifdef MITSHM -#define _XSHM_SERVER_ -#include "XShm.h" -#endif /* We use this structure to propogate some information from miScreenInit to * miCreateScreenResources. miScreenInit allocates the structure, fills it @@ -59,15 +54,8 @@ /* this plugs into pScreen->ModifyPixmapHeader */ Bool -miModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel, devKind, - pPixData) - PixmapPtr pPixmap; - int width; - int height; - int depth; - int bitsPerPixel; - int devKind; - pointer pPixData; +miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth, + int bitsPerPixel, int devKind, pointer pPixData) { if (!pPixmap) return FALSE; @@ -127,9 +115,7 @@ /*ARGSUSED*/ Bool -miCloseScreen (iScreen, pScreen) - int iScreen; - ScreenPtr pScreen; +miCloseScreen(int iScreen, ScreenPtr pScreen) { return ((*pScreen->DestroyPixmap)((PixmapPtr)pScreen->devPrivate)); } @@ -142,8 +128,7 @@ * screen pixmap here. */ Bool -miCreateScreenResources(pScreen) - ScreenPtr pScreen; +miCreateScreenResources(ScreenPtr pScreen) { miScreenInitParmsPtr pScrInitParms; pointer value; @@ -182,10 +167,7 @@ } Bool -miScreenDevPrivateInit(pScreen, width, pbits) - register ScreenPtr pScreen; - int width; - pointer pbits; +miScreenDevPrivateInit(ScreenPtr pScreen, int width, pointer pbits) { miScreenInitParmsPtr pScrInitParms; @@ -203,19 +185,18 @@ } Bool -miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width, - rootDepth, numDepths, depths, rootVisual, numVisuals, visuals) - register ScreenPtr pScreen; - pointer pbits; /* pointer to screen bits */ - int xsize, ysize; /* in pixels */ - int dpix, dpiy; /* dots per inch */ - int width; /* pixel width of frame buffer */ - int rootDepth; /* depth of root window */ - int numDepths; /* number of depths supported */ - DepthRec *depths; /* supported depths */ - VisualID rootVisual; /* root visual */ - int numVisuals; /* number of visuals supported */ - VisualRec *visuals; /* supported visuals */ +miScreenInit( + ScreenPtr pScreen, + pointer pbits, /* pointer to screen bits */ + int xsize, int ysize, /* in pixels */ + int dpix, int dpiy, /* dots per inch */ + int width, /* pixel width of frame buffer */ + int rootDepth, /* depth of root window */ + int numDepths, /* number of depths supported */ + DepthRec *depths, /* supported depths */ + VisualID rootVisual, /* root visual */ + int numVisuals, /* number of visuals supported */ + VisualRec *visuals) /* supported visuals */ { pScreen->width = xsize; pScreen->height = ysize; @@ -238,12 +219,7 @@ pScreen->numVisuals = numVisuals; pScreen->visuals = visuals; if (width) - { -#ifdef MITSHM - ShmRegisterFbFuncs(pScreen); -#endif pScreen->CloseScreen = miCloseScreen; - } /* else CloseScreen */ /* QueryBestSize, SaveScreen, GetImage, GetSpans */ pScreen->PointerNonInterestBox = (PointerNonInterestBoxProcPtr) 0; @@ -339,9 +315,7 @@ unsigned int miZeroLineGeneration = 0; void -miSetZeroLineBias(pScreen, bias) - ScreenPtr pScreen; - unsigned int bias; +miSetZeroLineBias(ScreenPtr pScreen, unsigned int bias) { if (miZeroLineGeneration != serverGeneration) { @@ -353,15 +327,13 @@ } PixmapPtr -miGetScreenPixmap(pScreen) - ScreenPtr pScreen; +miGetScreenPixmap(ScreenPtr pScreen) { return (PixmapPtr)(pScreen->devPrivate); } void -miSetScreenPixmap(pPix) - PixmapPtr pPix; +miSetScreenPixmap(PixmapPtr pPix) { if (pPix) pPix->drawable.pScreen->devPrivate = (pointer)pPix; Index: xc/programs/Xserver/mi/mispans.c diff -u xc/programs/Xserver/mi/mispans.c:3.4 xc/programs/Xserver/mi/mispans.c:3.5 --- xc/programs/Xserver/mi/mispans.c:3.4 Fri Dec 14 15:00:26 2001 +++ xc/programs/Xserver/mi/mispans.c Sun Mar 27 21:51:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.4 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.c,v 3.5 2005/03/28 02:51:11 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group @@ -46,8 +46,6 @@ ******************************************************************/ -/* $Xorg: mispans.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ - #include "misc.h" #include "pixmapstr.h" #include "gcstruct.h" @@ -63,8 +61,8 @@ */ -void miInitSpanGroup(spanGroup) - SpanGroup *spanGroup; +void +miInitSpanGroup(SpanGroup *spanGroup) { spanGroup->size = 0; spanGroup->count = 0; @@ -76,9 +74,8 @@ #define YMIN(spans) (spans->points[0].y) #define YMAX(spans) (spans->points[spans->count-1].y) -void miSubtractSpans (spanGroup, sub) - SpanGroup *spanGroup; - Spans *sub; +void +miSubtractSpans(SpanGroup *spanGroup, Spans *sub) { int i, subCount, spansCount; int ymin, ymax, xmin, xmax; @@ -181,13 +178,11 @@ } } -void miAppendSpans(spanGroup, otherGroup, spans) - SpanGroup *spanGroup; - SpanGroup *otherGroup; - Spans *spans; +void +miAppendSpans(SpanGroup *spanGroup, SpanGroup *otherGroup, Spans *spans) { - register int ymin, ymax; - register int spansCount; + int ymin, ymax; + int spansCount; spansCount = spans->count; if (spansCount > 0) { @@ -217,20 +212,21 @@ } } /* AppendSpans */ -void miFreeSpanGroup(spanGroup) - SpanGroup *spanGroup; +void +miFreeSpanGroup(SpanGroup *spanGroup) { if (spanGroup->group != NULL) xfree(spanGroup->group); } -static void QuickSortSpansX( - register DDXPointRec points[], - register int widths[], - register int numSpans ) +static void +QuickSortSpansX( + DDXPointRec points[], + int widths[], + int numSpans ) { - register int x; - register int i, j, m; - register DDXPointPtr r; + int x; + int i, j, m; + DDXPointPtr r; /* Always called with numSpans > 1 */ /* Sorts only by x, as all y should be the same */ @@ -238,7 +234,7 @@ #define ExchangeSpans(a, b) \ { \ DDXPointRec tpt; \ - register int tw; \ + int tw; \ \ tpt = points[a]; points[a] = points[b]; points[b] = tpt; \ tw = widths[a]; widths[a] = widths[b]; widths[b] = tw; \ @@ -247,7 +243,7 @@ do { if (numSpans < 9) { /* Do insertion sort */ - register int xprev; + int xprev; xprev = points[0].x; i = 1; @@ -310,15 +306,16 @@ } /* QuickSortSpans */ -static int UniquifySpansX( - Spans *spans, - register DDXPointRec *newPoints, - register int *newWidths ) +static int +UniquifySpansX( + Spans *spans, + DDXPointRec *newPoints, + int *newWidths ) { - register int newx1, newx2, oldpt, i, y; - register DDXPointRec *oldPoints; - register int *oldWidths; - int *startNewWidths; + int newx1, newx2, oldpt, i, y; + DDXPointRec *oldPoints; + int *oldWidths; + int *startNewWidths; /* Always called with numSpans > 1 */ /* Uniquify the spans, and stash them into newPoints and newWidths. Return the @@ -363,8 +360,7 @@ } /* UniquifySpansX */ void -miDisposeSpanGroup (spanGroup) - SpanGroup *spanGroup; +miDisposeSpanGroup(SpanGroup *spanGroup) { int i; Spans *spans; @@ -377,21 +373,19 @@ } } -void miFillUniqueSpanGroup(pDraw, pGC, spanGroup) - DrawablePtr pDraw; - GCPtr pGC; - SpanGroup *spanGroup; +void +miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup *spanGroup) { - register int i; - register Spans *spans; - register Spans *yspans; - register int *ysizes; - register int ymin, ylength; + int i; + Spans *spans; + Spans *yspans; + int *ysizes; + int ymin, ylength; /* Outgoing spans for one big call to FillSpans */ - register DDXPointPtr points; - register int *widths; - register int count; + DDXPointPtr points; + int *widths; + int count; if (spanGroup->count == 0) return; @@ -538,13 +532,11 @@ } -void miFillSpanGroup(pDraw, pGC, spanGroup) - DrawablePtr pDraw; - GCPtr pGC; - SpanGroup *spanGroup; +void +miFillSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup *spanGroup) { - register int i; - register Spans *spans; + int i; + Spans *spans; for (i = 0, spans = spanGroup->group; i != spanGroup->count; i++, spans++) { (*pGC->ops->FillSpans) Index: xc/programs/Xserver/mi/mispans.h diff -u xc/programs/Xserver/mi/mispans.h:1.3 xc/programs/Xserver/mi/mispans.h:1.4 --- xc/programs/Xserver/mi/mispans.h:1.3 Fri Dec 14 15:00:26 2001 +++ xc/programs/Xserver/mi/mispans.h Mon Jan 9 10:00:38 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.3 2001/12/14 20:00:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispans.h,v 1.4 2006/01/09 15:00:38 dawes Exp $ */ /*********************************************************** Copyright 1989, 1998 The Open Group @@ -46,8 +46,6 @@ ******************************************************************/ -/* $Xorg: mispans.h,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ - typedef struct { int count; /* number of spans */ DDXPointPtr points; /* pointer to list of start points */ Index: xc/programs/Xserver/mi/misprite.c diff -u xc/programs/Xserver/mi/misprite.c:3.11 xc/programs/Xserver/mi/misprite.c:3.13 --- xc/programs/Xserver/mi/misprite.c:3.11 Sun Dec 8 23:10:58 2002 +++ xc/programs/Xserver/mi/misprite.c Fri Oct 14 11:17:23 2005 @@ -4,8 +4,6 @@ * machine independent software sprite routines */ -/* $Xorg: misprite.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -30,16 +28,16 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.11 2002/12/09 04:10:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.13 2005/10/14 15:17:23 tsi Exp $ */ -# include "X.h" -# include "Xproto.h" +# include +# include # include "misc.h" # include "pixmapstr.h" # include "input.h" # include "mi.h" # include "cursorstr.h" -# include "font.h" +# include # include "scrnintstr.h" # include "colormapst.h" # include "windowstr.h" @@ -47,7 +45,7 @@ # include "mipointer.h" # include "mispritest.h" # include "dixfontstr.h" -# include "fontstruct.h" +# include #ifdef RENDER # include "mipict.h" #endif @@ -318,10 +316,8 @@ */ Bool -miSpriteInitialize (pScreen, cursorFuncs, screenFuncs) - ScreenPtr pScreen; - miSpriteCursorFuncPtr cursorFuncs; - miPointerScreenFuncPtr screenFuncs; +miSpriteInitialize(ScreenPtr pScreen, miSpriteCursorFuncPtr cursorFuncs, + miPointerScreenFuncPtr screenFuncs) { miSpriteScreenPtr pPriv; VisualPtr pVisual; @@ -431,9 +427,7 @@ */ static Bool -miSpriteCloseScreen (i, pScreen) - int i; - ScreenPtr pScreen; +miSpriteCloseScreen(int i, ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv; #ifdef RENDER @@ -471,12 +465,8 @@ } static void -miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine) - DrawablePtr pDrawable; - int sx, sy, w, h; - unsigned int format; - unsigned long planemask; - char *pdstLine; +miSpriteGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, + unsigned int format, unsigned long planemask, char *pdstLine) { ScreenPtr pScreen = pDrawable->pScreen; miSpriteScreenPtr pScreenPriv; @@ -499,13 +489,8 @@ } static void -miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart) - DrawablePtr pDrawable; - int wMax; - DDXPointPtr ppt; - int *pwidth; - int nspans; - char *pdstStart; +miSpriteGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, + int *pwidth, int nspans, char *pdstStart) { ScreenPtr pScreen = pDrawable->pScreen; miSpriteScreenPtr pScreenPriv; @@ -516,11 +501,10 @@ if (pDrawable->type == DRAWABLE_WINDOW && pScreenPriv->isUp) { - register DDXPointPtr pts; - register int *widths; - register int nPts; - register int xorg, - yorg; + DDXPointPtr pts; + int *widths; + int nPts; + int xorg, yorg; xorg = pDrawable->x; yorg = pDrawable->y; @@ -544,9 +528,8 @@ } static void -miSpriteSourceValidate (pDrawable, x, y, width, height) - DrawablePtr pDrawable; - int x, y, width, height; +miSpriteSourceValidate(DrawablePtr pDrawable, int x, int y, + int width, int height) { ScreenPtr pScreen = pDrawable->pScreen; miSpriteScreenPtr pScreenPriv; @@ -569,8 +552,7 @@ } static Bool -miSpriteCreateGC (pGC) - GCPtr pGC; +miSpriteCreateGC(GCPtr pGC) { ScreenPtr pScreen = pGC->pScreen; Bool ret; @@ -592,11 +574,8 @@ } static void -miSpriteBlockHandler (i, blockData, pTimeout, pReadmask) - int i; - pointer blockData; - pointer pTimeout; - pointer pReadmask; +miSpriteBlockHandler(int i, pointer blockData, pointer pTimeout, + pointer pReadmask) { ScreenPtr pScreen = screenInfo.screens[i]; miSpriteScreenPtr pPriv; @@ -614,8 +593,7 @@ } static void -miSpriteInstallColormap (pMap) - ColormapPtr pMap; +miSpriteInstallColormap(ColormapPtr pMap) { ScreenPtr pScreen = pMap->pScreen; miSpriteScreenPtr pPriv; @@ -638,10 +616,7 @@ } static void -miSpriteStoreColors (pMap, ndef, pdef) - ColormapPtr pMap; - int ndef; - xColorItem *pdef; +miSpriteStoreColors(ColormapPtr pMap, int ndef, xColorItem *pdef) { ScreenPtr pScreen = pMap->pScreen; miSpriteScreenPtr pPriv; @@ -714,7 +689,7 @@ } static void -miSpriteFindColors (ScreenPtr pScreen) +miSpriteFindColors(ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr; @@ -753,10 +728,7 @@ */ static void -miSpriteSaveDoomedAreas (pWin, pObscured, dx, dy) - WindowPtr pWin; - RegionPtr pObscured; - int dx, dy; +miSpriteSaveDoomedAreas(WindowPtr pWin, RegionPtr pObscured, int dx, int dy) { ScreenPtr pScreen; miSpriteScreenPtr pScreenPriv; @@ -788,9 +760,7 @@ } static RegionPtr -miSpriteRestoreAreas (pWin, prgnExposed) - WindowPtr pWin; - RegionPtr prgnExposed; +miSpriteRestoreAreas(WindowPtr pWin, RegionPtr prgnExposed) { ScreenPtr pScreen; miSpriteScreenPtr pScreenPriv; @@ -819,10 +789,7 @@ */ static void -miSpritePaintWindowBackground (pWin, pRegion, what) - WindowPtr pWin; - RegionPtr pRegion; - int what; +miSpritePaintWindowBackground(WindowPtr pWin, RegionPtr pRegion, int what) { ScreenPtr pScreen; miSpriteScreenPtr pScreenPriv; @@ -848,10 +815,7 @@ } static void -miSpritePaintWindowBorder (pWin, pRegion, what) - WindowPtr pWin; - RegionPtr pRegion; - int what; +miSpritePaintWindowBorder(WindowPtr pWin, RegionPtr pRegion, int what) { ScreenPtr pScreen; miSpriteScreenPtr pScreenPriv; @@ -877,10 +841,7 @@ } static void -miSpriteCopyWindow (pWin, ptOldOrg, pRegion) - WindowPtr pWin; - DDXPointRec ptOldOrg; - RegionPtr pRegion; +miSpriteCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr pRegion) { ScreenPtr pScreen; miSpriteScreenPtr pScreenPriv; @@ -917,11 +878,8 @@ } static void -miSpriteClearToBackground (pWin, x, y, w, h, generateExposures) - WindowPtr pWin; - int x,y; - int w,h; - Bool generateExposures; +miSpriteClearToBackground(WindowPtr pWin, int x, int y, int w, int h, + Bool generateExposures) { ScreenPtr pScreen; miSpriteScreenPtr pScreenPriv; @@ -955,10 +913,7 @@ */ static void -miSpriteValidateGC (pGC, changes, pDrawable) - GCPtr pGC; - unsigned long changes; - DrawablePtr pDrawable; +miSpriteValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { GC_FUNC_PROLOGUE (pGC); @@ -982,9 +937,7 @@ } static void -miSpriteChangeGC (pGC, mask) - GCPtr pGC; - unsigned long mask; +miSpriteChangeGC(GCPtr pGC, unsigned long mask) { GC_FUNC_PROLOGUE (pGC); @@ -994,9 +947,7 @@ } static void -miSpriteCopyGC (pGCSrc, mask, pGCDst) - GCPtr pGCSrc, pGCDst; - unsigned long mask; +miSpriteCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst) { GC_FUNC_PROLOGUE (pGCDst); @@ -1006,8 +957,7 @@ } static void -miSpriteDestroyGC (pGC) - GCPtr pGC; +miSpriteDestroyGC(GCPtr pGC) { GC_FUNC_PROLOGUE (pGC); @@ -1017,11 +967,7 @@ } static void -miSpriteChangeClip (pGC, type, pvalue, nrects) - GCPtr pGC; - int type; - pointer pvalue; - int nrects; +miSpriteChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects) { GC_FUNC_PROLOGUE (pGC); @@ -1031,8 +977,7 @@ } static void -miSpriteCopyClip(pgcDst, pgcSrc) - GCPtr pgcDst, pgcSrc; +miSpriteCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { GC_FUNC_PROLOGUE (pgcDst); @@ -1042,8 +987,7 @@ } static void -miSpriteDestroyClip(pGC) - GCPtr pGC; +miSpriteDestroyClip(GCPtr pGC) { GC_FUNC_PROLOGUE (pGC); @@ -1057,21 +1001,21 @@ */ static void -miSpriteFillSpans(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +miSpriteFillSpans( + DrawablePtr pDrawable, + GCPtr pGC, + int nInit, /* number of spans to fill */ + DDXPointPtr pptInit, /* pointer to list of start points */ + int *pwidthInit, /* pointer to list of n widths */ + int fSorted) { GC_SETUP(pDrawable, pGC); if (GC_CHECK((WindowPtr) pDrawable)) { - register DDXPointPtr pts; - register int *widths; - register int nPts; + DDXPointPtr pts; + int *widths; + int nPts; for (pts = pptInit, widths = pwidthInit, nPts = nInit; nPts--; @@ -1093,22 +1037,16 @@ } static void -miSpriteSetSpans(pDrawable, pGC, psrc, ppt, pwidth, nspans, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - char *psrc; - register DDXPointPtr ppt; - int *pwidth; - int nspans; - int fSorted; +miSpriteSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *psrc, DDXPointPtr ppt, + int *pwidth, int nspans, int fSorted) { GC_SETUP(pDrawable, pGC); if (GC_CHECK((WindowPtr) pDrawable)) { - register DDXPointPtr pts; - register int *widths; - register int nPts; + DDXPointPtr pts; + int *widths; + int nPts; for (pts = ppt, widths = pwidth, nPts = nspans; nPts--; @@ -1130,17 +1068,8 @@ } static void -miSpritePutImage(pDrawable, pGC, depth, x, y, w, h, leftPad, format, pBits) - DrawablePtr pDrawable; - GCPtr pGC; - int depth; - int x; - int y; - int w; - int h; - int leftPad; - int format; - char *pBits; +miSpritePutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, int x, int y, + int w, int h, int leftPad, int format, char *pBits) { GC_SETUP(pDrawable, pGC); @@ -1161,16 +1090,8 @@ } static RegionPtr -miSpriteCopyArea (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty) - DrawablePtr pSrc; - DrawablePtr pDst; - GCPtr pGC; - int srcx; - int srcy; - int w; - int h; - int dstx; - int dsty; +miSpriteCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, + int srcx, int srcy, int w, int h, int dstx, int dsty) { RegionPtr rgn; @@ -1196,17 +1117,9 @@ } static RegionPtr -miSpriteCopyPlane (pSrc, pDst, pGC, srcx, srcy, w, h, dstx, dsty, plane) - DrawablePtr pSrc; - DrawablePtr pDst; - register GCPtr pGC; - int srcx, - srcy; - int w, - h; - int dstx, - dsty; - unsigned long plane; +miSpriteCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, + int srcx, int srcy, int w, int h, int dstx, int dsty, + unsigned long plane) { RegionPtr rgn; @@ -1234,17 +1147,13 @@ } static void -miSpritePolyPoint (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; - xPoint *pptInit; +miSpritePolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + xPoint *pptInit) { xPoint t; int n; BoxRec cursor; - register xPoint *pts; + xPoint *pts; GC_SETUP (pDrawable, pGC); @@ -1293,15 +1202,11 @@ } static void -miSpritePolylines (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; - int npt; - DDXPointPtr pptInit; +miSpritePolylines(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) { BoxPtr cursor; - register DDXPointPtr pts; + DDXPointPtr pts; int n; int x, y, x1, y1, x2, y2; int lw; @@ -1368,14 +1273,10 @@ } static void -miSpritePolySegment(pDrawable, pGC, nseg, pSegs) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - xSegment *pSegs; +miSpritePolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSegs) { int n; - register xSegment *segs; + xSegment *segs; BoxPtr cursor; int x1, y1, x2, y2; int extra; @@ -1411,13 +1312,10 @@ } static void -miSpritePolyRectangle(pDrawable, pGC, nrects, pRects) - DrawablePtr pDrawable; - GCPtr pGC; - int nrects; - xRectangle *pRects; +miSpritePolyRectangle(DrawablePtr pDrawable, GCPtr pGC, int nrects, + xRectangle *pRects) { - register xRectangle *rects; + xRectangle *rects; BoxPtr cursor; int lw; int n; @@ -1454,16 +1352,12 @@ } static void -miSpritePolyArc(pDrawable, pGC, narcs, parcs) - DrawablePtr pDrawable; - register GCPtr pGC; - int narcs; - xArc *parcs; +miSpritePolyArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs) { BoxPtr cursor; int lw; int n; - register xArc *arcs; + xArc *arcs; GC_SETUP (pDrawable, pGC); @@ -1492,15 +1386,11 @@ } static void -miSpriteFillPolygon(pDrawable, pGC, shape, mode, count, pPts) - register DrawablePtr pDrawable; - register GCPtr pGC; - int shape, mode; - int count; - DDXPointPtr pPts; +miSpriteFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, + int count, DDXPointPtr pPts) { int x, y, minx, miny, maxx, maxy; - register DDXPointPtr pts; + DDXPointPtr pts; int n; GC_SETUP (pDrawable, pGC); @@ -1565,19 +1455,16 @@ } static void -miSpritePolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +miSpritePolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, + xRectangle *prectInit) { GC_SETUP(pDrawable, pGC); if (GC_CHECK((WindowPtr) pDrawable)) { - register int nRect; - register xRectangle *pRect; - register int xorg, yorg; + int nRect; + xRectangle *pRect; + int xorg, yorg; xorg = pDrawable->x; yorg = pDrawable->y; @@ -1598,19 +1485,15 @@ } static void -miSpritePolyFillArc(pDrawable, pGC, narcs, parcs) - DrawablePtr pDrawable; - GCPtr pGC; - int narcs; - xArc *parcs; +miSpritePolyFillArc(DrawablePtr pDrawable, GCPtr pGC, int narcs, xArc *parcs) { GC_SETUP(pDrawable, pGC); if (GC_CHECK((WindowPtr) pDrawable)) { - register int n; - BoxPtr cursor; - register xArc *arcs; + int n; + BoxPtr cursor; + xArc *arcs; cursor = &pScreenPriv->saved; @@ -1734,7 +1617,7 @@ BoxPtr cursorBox) { CharInfoPtr *charinfo; - register CharInfoPtr *info; + CharInfoPtr *info; unsigned long i; unsigned int n; int w; @@ -1802,12 +1685,8 @@ } static int -miSpritePolyText8(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - char *chars; +miSpritePolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + char *chars) { int ret; @@ -1826,12 +1705,8 @@ } static int -miSpritePolyText16(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miSpritePolyText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + unsigned short *chars) { int ret; @@ -1852,12 +1727,8 @@ } static void -miSpriteImageText8(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - char *chars; +miSpriteImageText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + char *chars) { GC_SETUP(pDrawable, pGC); @@ -1873,12 +1744,8 @@ } static void -miSpriteImageText16(pDrawable, pGC, x, y, count, chars) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - int count; - unsigned short *chars; +miSpriteImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count, + unsigned short *chars) { GC_SETUP(pDrawable, pGC); @@ -1896,13 +1763,9 @@ } static void -miSpriteImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +miSpriteImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, + pointer pglyphBase) { GC_SETUP(pDrawable, pGC); @@ -1919,13 +1782,8 @@ } static void -miSpritePolyGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +miSpritePolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { GC_SETUP (pDrawable, pGC); @@ -1942,11 +1800,8 @@ } static void -miSpritePushPixels(pGC, pBitMap, pDrawable, w, h, x, y) - GCPtr pGC; - PixmapPtr pBitMap; - DrawablePtr pDrawable; - int w, h, x, y; +miSpritePushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, + int w, int h, int x, int y) { GC_SETUP(pDrawable, pGC); @@ -2110,9 +1965,7 @@ #define SPRITE_PAD 8 static Bool -miSpriteRealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miSpriteRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) { miSpriteScreenPtr pScreenPriv; @@ -2123,9 +1976,7 @@ } static Bool -miSpriteUnrealizeCursor (pScreen, pCursor) - ScreenPtr pScreen; - CursorPtr pCursor; +miSpriteUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) { miSpriteScreenPtr pScreenPriv; @@ -2134,11 +1985,7 @@ } static void -miSpriteSetCursor (pScreen, pCursor, x, y) - ScreenPtr pScreen; - CursorPtr pCursor; - int x; - int y; +miSpriteSetCursor(ScreenPtr pScreen, CursorPtr pCursor, int x, int y) { miSpriteScreenPtr pScreenPriv; @@ -2230,9 +2077,7 @@ } static void -miSpriteMoveCursor (pScreen, x, y) - ScreenPtr pScreen; - int x, y; +miSpriteMoveCursor(ScreenPtr pScreen, int x, int y) { miSpriteScreenPtr pScreenPriv; @@ -2245,8 +2090,7 @@ */ static void -miSpriteRemoveCursor (pScreen) - ScreenPtr pScreen; +miSpriteRemoveCursor(ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv; @@ -2269,8 +2113,7 @@ */ static void -miSpriteRestoreCursor (pScreen) - ScreenPtr pScreen; +miSpriteRestoreCursor(ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv; int x, y; @@ -2301,8 +2144,7 @@ */ static void -miSpriteComputeSaved (pScreen) - ScreenPtr pScreen; +miSpriteComputeSaved(ScreenPtr pScreen) { miSpriteScreenPtr pScreenPriv; int x, y, w, h; Index: xc/programs/Xserver/mi/misprite.h diff -u xc/programs/Xserver/mi/misprite.h:1.3 xc/programs/Xserver/mi/misprite.h:1.4 --- xc/programs/Xserver/mi/misprite.h:1.3 Fri Dec 14 15:00:27 2001 +++ xc/programs/Xserver/mi/misprite.h Mon Jan 9 10:00:38 2006 @@ -6,8 +6,6 @@ * mi versions of these routines exist. */ -/* $Xorg: misprite.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -32,7 +30,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.3 2001/12/14 20:00:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/misprite.h,v 1.4 2006/01/09 15:00:38 dawes Exp $ */ typedef struct { Bool (*RealizeCursor)( Index: xc/programs/Xserver/mi/mispritest.h diff -u xc/programs/Xserver/mi/mispritest.h:1.5 xc/programs/Xserver/mi/mispritest.h:1.6 --- xc/programs/Xserver/mi/mispritest.h:1.5 Fri Dec 14 15:00:27 2001 +++ xc/programs/Xserver/mi/mispritest.h Mon Jan 9 10:00:38 2006 @@ -4,8 +4,6 @@ * mi sprite structures */ -/* $Xorg: mispritest.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -30,7 +28,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.5 2001/12/14 20:00:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.6 2006/01/09 15:00:38 dawes Exp $ */ # include "misprite.h" #ifdef RENDER Index: xc/programs/Xserver/mi/mistruct.h diff -u xc/programs/Xserver/mi/mistruct.h:1.3 xc/programs/Xserver/mi/mistruct.h:1.4 --- xc/programs/Xserver/mi/mistruct.h:1.3 Tue Jul 15 21:38:57 2003 +++ xc/programs/Xserver/mi/mistruct.h Mon Jan 9 10:00:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mistruct.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mistruct.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mistruct.h,v 1.4 2006/01/09 15:00:38 dawes Exp $ */ #ifndef MISTRUCT_H #define MISTRUCT_H Index: xc/programs/Xserver/mi/mivalidate.h diff -u xc/programs/Xserver/mi/mivalidate.h:1.3 xc/programs/Xserver/mi/mivalidate.h:1.4 --- xc/programs/Xserver/mi/mivalidate.h:1.3 Tue Jul 15 21:38:57 2003 +++ xc/programs/Xserver/mi/mivalidate.h Mon Jan 9 10:00:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mivalidate.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/mivalidate.h,v 1.3 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mivalidate.h,v 1.4 2006/01/09 15:00:38 dawes Exp $ */ #ifndef MIVALIDATE_H Index: xc/programs/Xserver/mi/mivaltree.c diff -u xc/programs/Xserver/mi/mivaltree.c:1.10 xc/programs/Xserver/mi/mivaltree.c:1.12 --- xc/programs/Xserver/mi/mivaltree.c:1.10 Mon Nov 10 13:22:49 2003 +++ xc/programs/Xserver/mi/mivaltree.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,3 @@ -/* $Xorg: mivaltree.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* * mivaltree.c -- * Functions for recalculating window clip lists. Main function @@ -73,7 +72,7 @@ * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mivaltree.c,v 1.12 2005/10/14 15:17:23 tsi Exp $ */ /* * Aug '86: Susan Angebranndt -- original code @@ -84,7 +83,7 @@ * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ -#include "X.h" +#include #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" @@ -99,17 +98,14 @@ * Compute the visibility of a shaped window */ int -miShapedWindowIn (pScreen, universe, bounding, rect, x, y) - ScreenPtr pScreen; - RegionPtr universe, bounding; - BoxPtr rect; - register int x, y; +miShapedWindowIn(ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding, + BoxPtr rect, int x, int y) { BoxRec box; - register BoxPtr boundBox; + BoxPtr boundBox; int nbox; Bool someIn, someOut; - register int t, x1, y1, x2, y2; + int t, x1, y1, x2, y2; nbox = REGION_NUM_RECTS (bounding); boundBox = REGION_RECTS (bounding); @@ -182,16 +178,16 @@ */ static void miComputeClips ( - register WindowPtr pParent, - register ScreenPtr pScreen, - register RegionPtr universe, - VTKind kind, - RegionPtr exposed ) /* for intermediate calculations */ + WindowPtr pParent, + ScreenPtr pScreen, + RegionPtr universe, + VTKind kind, + RegionPtr exposed ) /* for intermediate calculations */ { int dx, dy; RegionRec childUniverse; - register WindowPtr pChild; + WindowPtr pChild; int oldVis, newVis; BoxRec borderSize; RegionRec childUnion; @@ -502,11 +498,10 @@ } static void -miTreeObscured( - register WindowPtr pParent ) +miTreeObscured(WindowPtr pParent) { - register WindowPtr pChild; - register int oldVis; + WindowPtr pChild; + int oldVis; pChild = pParent; while (1) @@ -562,11 +557,11 @@ */ /*ARGSUSED*/ int -miValidateTree (pParent, pChild, kind) - WindowPtr pParent; /* Parent to validate */ - WindowPtr pChild; /* First child of pParent that was +miValidateTree( + WindowPtr pParent, /* Parent to validate */ + WindowPtr pChild, /* First child of pParent that was * affected */ - VTKind kind; /* What kind of configuration caused call */ + VTKind kind) /* What kind of configuration caused call */ { RegionRec totalClip; /* Total clipping region available to * the marked children. pParent's clipList @@ -577,8 +572,8 @@ RegionRec childUnion; /* the space covered by borderSize for * all marked children */ RegionRec exposed; /* For intermediate calculations */ - register ScreenPtr pScreen; - register WindowPtr pWin; + ScreenPtr pScreen; + WindowPtr pWin; Bool overlap; int viewvals; Bool forward; Index: xc/programs/Xserver/mi/miwideline.c diff -u xc/programs/Xserver/mi/miwideline.c:1.13 xc/programs/Xserver/mi/miwideline.c:1.15 --- xc/programs/Xserver/mi/miwideline.c:1.13 Tue Jul 15 21:38:57 2003 +++ xc/programs/Xserver/mi/miwideline.c Fri Oct 14 11:17:23 2005 @@ -1,4 +1,3 @@ -/* $Xorg: miwideline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.13 2003/07/16 01:38:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.c,v 1.15 2005/10/14 15:17:23 tsi Exp $ */ /* Author: Keith Packard, MIT X Consortium */ @@ -43,7 +42,7 @@ #include #undef _XOPEN_SOURCE #endif -#include "X.h" +#include #include "windowstr.h" #include "gcstruct.h" #include "regionstr.h" @@ -54,10 +53,9 @@ ICEILTEMPDECL #endif -static void miLineArc(DrawablePtr pDraw, register GCPtr pGC, +static void miLineArc(DrawablePtr pDraw, GCPtr pGC, unsigned long pixel, SpanDataPtr spanData, - register LineFacePtr leftFace, - register LineFacePtr rightFace, + LineFacePtr leftFace, LineFacePtr rightFace, double xorg, double yorg, Bool isInt); @@ -66,23 +64,17 @@ */ void -miFillPolyHelper (pDrawable, pGC, pixel, spanData, y, overall_height, - left, right, left_count, right_count) - DrawablePtr pDrawable; - GCPtr pGC; - unsigned long pixel; - SpanDataPtr spanData; - int y; /* start y coordinate */ - int overall_height; /* height of entire segment */ - PolyEdgePtr left, right; - int left_count, right_count; +miFillPolyHelper(DrawablePtr pDrawable, GCPtr pGC, unsigned long pixel, + SpanDataPtr spanData, int y, int overall_height, + PolyEdgePtr left, PolyEdgePtr right, + int left_count, int right_count) { - register int left_x = 0, left_e = 0; + int left_x = 0, left_e = 0; int left_stepx = 0; int left_signdx = 0; int left_dy = 0, left_dx = 0; - register int right_x = 0, right_e = 0; + int right_x = 0, right_e = 0; int right_stepx = 0; int right_signdx = 0; int right_dy = 0, right_dx = 0; @@ -90,9 +82,9 @@ int height = 0; int left_height = 0, right_height = 0; - register DDXPointPtr ppt; + DDXPointPtr ppt; DDXPointPtr pptInit = NULL; - register int *pwidth; + int *pwidth; int *pwidthInit = NULL; XID oldPixel; int xorg; @@ -200,8 +192,8 @@ int w, int h) { - register DDXPointPtr ppt; - register int *pwidth; + DDXPointPtr ppt; + int *pwidth; XID oldPixel; Spans spanRec; xRectangle rect; @@ -258,13 +250,8 @@ } /* static */ int -miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge) - double x0, y0; - double k; /* x0 * dy - y0 * dx */ - register int dx, dy; - int xi, yi; - int left; - register PolyEdgePtr edge; +miPolyBuildEdge(double x0, double y0, double k, int dx, int dy, int xi, int yi, + int left, PolyEdgePtr edge) { int x, y, e; int xady; @@ -317,23 +304,18 @@ #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr))) /* static */ int -miPolyBuildPoly (vertices, slopes, count, xi, yi, left, right, pnleft, pnright, h) - register PolyVertexPtr vertices; - register PolySlopePtr slopes; - int count; - int xi, yi; - PolyEdgePtr left, right; - int *pnleft, *pnright; - int *h; +miPolyBuildPoly(PolyVertexPtr vertices, PolySlopePtr slopes, int count, + int xi, int yi, PolyEdgePtr left, PolyEdgePtr right, + int *pnleft, int *pnright, int *h) { int top, bottom; double miny, maxy; - register int i; + int i; int j; int clockwise; int slopeoff; - register int s; - register int nright, nleft; + int s; + int nright, nleft; int y, lasty = 0, bottomy, topy = 0; /* find the top of the polygon */ @@ -467,8 +449,8 @@ GCPtr pGC, unsigned long pixel, SpanDataPtr spanData, - register LineFacePtr pLeft, - register LineFacePtr pRight) + LineFacePtr pLeft, + LineFacePtr pRight) { double mx = 0, my = 0; double denom = 0.0; @@ -620,9 +602,9 @@ DDXPointPtr points, int *widths) { - register DDXPointPtr tpts, bpts; - register int *twids, *bwids; - register int x, y, e, ex, slw; + DDXPointPtr tpts, bpts; + int *twids, *bwids; + int x, y, e, ex, slw; tpts = points; twids = widths; @@ -713,8 +695,8 @@ int edgey2, Bool edgeleft2) { - register DDXPointPtr pts; - register int *wids; + DDXPointPtr pts; + int *wids; double radius, x0, y0, el, er, yk, xlk, xrk, k; int xbase, ybase, y, boty, xl, xr, xcl, xcr; int ymin, ymax; @@ -870,10 +852,7 @@ } int -miRoundJoinFace (face, edge, leftEdge) - register LineFacePtr face; - register PolyEdgePtr edge; - Bool *leftEdge; +miRoundJoinFace(LineFacePtr face, PolyEdgePtr edge, Bool *leftEdge) { int y; int dx, dy; @@ -919,11 +898,9 @@ } void -miRoundJoinClip (pLeft, pRight, edge1, edge2, y1, y2, left1, left2) - register LineFacePtr pLeft, pRight; - PolyEdgePtr edge1, edge2; - int *y1, *y2; - Bool *left1, *left2; +miRoundJoinClip(LineFacePtr pLeft, LineFacePtr pRight, + PolyEdgePtr edge1, PolyEdgePtr edge2, int *y1, int *y2, + Bool *left1, Bool *left2) { double denom; @@ -944,14 +921,10 @@ } int -miRoundCapClip (face, isInt, edge, leftEdge) - register LineFacePtr face; - Bool isInt; - register PolyEdgePtr edge; - Bool *leftEdge; +miRoundCapClip(LineFacePtr face, Bool isInt, PolyEdgePtr edge, Bool *leftEdge) { int y; - register int dx, dy; + int dx, dy; double xa, ya, k; Bool left; @@ -996,11 +969,11 @@ static void miLineArc ( DrawablePtr pDraw, - register GCPtr pGC, + GCPtr pGC, unsigned long pixel, SpanDataPtr spanData, - register LineFacePtr leftFace, - register LineFacePtr rightFace, + LineFacePtr leftFace, + LineFacePtr rightFace, double xorg, double yorg, Bool isInt) @@ -1110,15 +1083,9 @@ } void -miLineProjectingCap (pDrawable, pGC, pixel, spanData, face, isLeft, xorg, yorg, isInt) - DrawablePtr pDrawable; - register GCPtr pGC; - unsigned long pixel; - SpanDataPtr spanData; - register LineFacePtr face; - Bool isLeft; - double xorg, yorg; - Bool isInt; +miLineProjectingCap(DrawablePtr pDrawable, GCPtr pGC, unsigned long pixel, + SpanDataPtr spanData, LineFacePtr face, Bool isLeft, + double xorg, double yorg, Bool isInt) { int xorgi = 0, yorgi = 0; int lw; @@ -1281,14 +1248,14 @@ GCPtr pGC, unsigned long pixel, SpanDataPtr spanData, - register int x1, - register int y1, - register int x2, - register int y2, + int x1, + int y1, + int x2, + int y2, Bool projectLeft, Bool projectRight, - register LineFacePtr leftFace, - register LineFacePtr rightFace) + LineFacePtr leftFace, + LineFacePtr rightFace) { double l, L, r; double xa, ya; @@ -1498,10 +1465,7 @@ } SpanDataPtr -miSetupSpanData (pGC, spanData, npt) - register GCPtr pGC; - SpanDataPtr spanData; - int npt; +miSetupSpanData(GCPtr pGC, SpanDataPtr spanData, int npt) { if ((npt < 3 && pGC->capStyle != CapRound) || miSpansEasyRop(pGC->alu)) return (SpanDataPtr) NULL; @@ -1512,10 +1476,7 @@ } void -miCleanupSpanData (pDrawable, pGC, spanData) - DrawablePtr pDrawable; - GCPtr pGC; - SpanDataPtr spanData; +miCleanupSpanData(DrawablePtr pDrawable, GCPtr pGC, SpanDataPtr spanData) { if (pGC->lineStyle == LineDoubleDash) { @@ -1541,12 +1502,8 @@ } void -miWideLine (pDrawable, pGC, mode, npt, pPts) - DrawablePtr pDrawable; - register GCPtr pGC; - int mode; - register int npt; - register DDXPointPtr pPts; +miWideLine(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pPts) { int x1, y1, x2, y2; SpanDataRec spanDataRec; @@ -1555,7 +1512,7 @@ Bool projectLeft, projectRight; LineFaceRec leftFace, rightFace, prevRightFace; LineFaceRec firstFace; - register int first; + int first; Bool somethingDrawn = FALSE; Bool selfJoin; @@ -1684,7 +1641,7 @@ static void miWideDashSegment ( DrawablePtr pDrawable, - register GCPtr pGC, + GCPtr pGC, SpanDataPtr spanData, int *pDashOffset, int *pDashIndex, @@ -2039,12 +1996,8 @@ } void -miWideDash (pDrawable, pGC, mode, npt, pPts) - DrawablePtr pDrawable; - register GCPtr pGC; - int mode; - register int npt; - register DDXPointPtr pPts; +miWideDash(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pPts) { int x1, y1, x2, y2; unsigned long pixel; @@ -2053,7 +2006,7 @@ LineFaceRec firstFace; int first; int dashIndex, dashOffset; - register int prevDashIndex; + int prevDashIndex; SpanDataRec spanDataRec; SpanDataPtr spanData; Bool somethingDrawn = FALSE; Index: xc/programs/Xserver/mi/miwideline.h diff -u xc/programs/Xserver/mi/miwideline.h:1.12 xc/programs/Xserver/mi/miwideline.h:1.13 --- xc/programs/Xserver/mi/miwideline.h:1.12 Fri Dec 14 15:00:28 2001 +++ xc/programs/Xserver/mi/miwideline.h Mon Jan 9 10:00:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: miwideline.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.12 2001/12/14 20:00:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwideline.h,v 1.13 2006/01/09 15:00:38 dawes Exp $ */ /* Author: Keith Packard, MIT X Consortium */ Index: xc/programs/Xserver/mi/miwindow.c diff -u xc/programs/Xserver/mi/miwindow.c:1.10 xc/programs/Xserver/mi/miwindow.c:1.12 --- xc/programs/Xserver/mi/miwindow.c:1.10 Mon Nov 10 13:22:49 2003 +++ xc/programs/Xserver/mi/miwindow.c Fri Oct 14 11:17:24 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.10 2003/11/10 18:22:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/miwindow.c,v 1.12 2005/10/14 15:17:24 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: miwindow.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ -#include "X.h" + +#include #include "regionstr.h" #include "region.h" #include "mi.h" @@ -56,11 +56,8 @@ #include "mivalidate.h" void -miClearToBackground(pWin, x, y, w, h, generateExposures) - WindowPtr pWin; - int x,y; - int w,h; - Bool generateExposures; +miClearToBackground(WindowPtr pWin, int x, int y, int w, int h, + Bool generateExposures) { BoxRec box; RegionRec reg; @@ -141,7 +138,7 @@ * The backing-store code must be written to allow for this */ -/*- +/* *----------------------------------------------------------------------- * miCheckSubSaveUnder -- * Check all the inferiors of a window for coverage by saveUnder @@ -158,12 +155,12 @@ */ static Bool miCheckSubSaveUnder( - register WindowPtr pParent, /* Parent to check */ + WindowPtr pParent, /* Parent to check */ WindowPtr pFirst, /* first reconfigured window */ RegionPtr pRegion) /* Initial area obscured by saveUnder */ { - register WindowPtr pChild; /* Current child */ - register ScreenPtr pScreen; /* Screen to use */ + WindowPtr pChild; /* Current child */ + ScreenPtr pScreen; /* Screen to use */ RegionRec SubRegion; /* Area of children obscured */ Bool res = FALSE; /* result */ Bool subInited=FALSE;/* SubRegion initialized */ @@ -248,7 +245,7 @@ } -/*- +/* *----------------------------------------------------------------------- * miChangeSaveUnder -- * Change the save-under state of a tree of windows. Called when @@ -265,13 +262,13 @@ *----------------------------------------------------------------------- */ Bool -miChangeSaveUnder(pWin, first) - register WindowPtr pWin; - WindowPtr first; /* First window to check. - * Used when pWin was restacked */ +miChangeSaveUnder( + WindowPtr pWin, + WindowPtr first) /* First window to check. + * Used when pWin was restacked */ { RegionRec rgn; /* Area obscured by saveUnder windows */ - register ScreenPtr pScreen; + ScreenPtr pScreen; Bool res; if (!deltaSaveUndersViewable && !numSaveUndersViewable) @@ -287,7 +284,7 @@ return res; } -/*- +/* *----------------------------------------------------------------------- * miPostChangeSaveUnder -- * Actually turn backing-store off for those windows that no longer @@ -303,11 +300,9 @@ *----------------------------------------------------------------------- */ void -miPostChangeSaveUnder(pWin, pFirst) - WindowPtr pWin; - WindowPtr pFirst; +miPostChangeSaveUnder(WindowPtr pWin, WindowPtr pFirst) { - register WindowPtr pParent, pChild; + WindowPtr pParent, pChild; ChangeWindowAttributesProcPtr ChangeWindowAttributes; if (!(pParent = pWin->parent)) @@ -339,10 +334,9 @@ } void -miMarkWindow(pWin) - register WindowPtr pWin; +miMarkWindow(WindowPtr pWin) { - register ValidatePtr val; + ValidatePtr val; if (pWin->valdata) return; @@ -355,13 +349,10 @@ } Bool -miMarkOverlappedWindows(pWin, pFirst, ppLayerWin) - WindowPtr pWin; - WindowPtr pFirst; - WindowPtr *ppLayerWin; +miMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst, WindowPtr *ppLayerWin) { - register BoxPtr box; - register WindowPtr pChild, pLast; + BoxPtr box; + WindowPtr pChild, pLast; Bool anyMarked = FALSE; MarkWindowProcPtr MarkWindow = pWin->drawable.pScreen->MarkWindow; ScreenPtr pScreen; @@ -444,11 +435,10 @@ * and then send any regions still exposed to the client *****/ void -miHandleValidateExposures(pWin) - WindowPtr pWin; +miHandleValidateExposures(WindowPtr pWin) { - register WindowPtr pChild; - register ValidatePtr val; + WindowPtr pChild; + ValidatePtr val; ScreenPtr pScreen; WindowExposuresProcPtr WindowExposures; @@ -484,11 +474,7 @@ } void -miMoveWindow(pWin, x, y, pNextSib, kind) - register WindowPtr pWin; - int x,y; - WindowPtr pNextSib; - VTKind kind; +miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind) { WindowPtr pParent; Bool WasViewable = (Bool)(pWin->viewable); @@ -496,7 +482,7 @@ RegionPtr oldRegion = NULL; DDXPointRec oldpt; Bool anyMarked = FALSE; - register ScreenPtr pScreen; + ScreenPtr pScreen; WindowPtr windowToValidate; #ifdef DO_SAVE_UNDERS Bool dosave = FALSE; @@ -574,10 +560,10 @@ static int miRecomputeExposures ( - register WindowPtr pWin, + WindowPtr pWin, pointer value) /* must conform to VisitWindowProcPtr */ { - register ScreenPtr pScreen; + ScreenPtr pScreen; RegionPtr pValid = (RegionPtr)value; if (pWin->valdata) @@ -601,11 +587,8 @@ } void -miSlideAndSizeWindow(pWin, x, y, w, h, pSib) - register WindowPtr pWin; - int x,y; - unsigned int w, h; - WindowPtr pSib; +miSlideAndSizeWindow(WindowPtr pWin, int x, int y, + unsigned int w, unsigned int h, WindowPtr pSib) { WindowPtr pParent; Bool WasViewable = (Bool)(pWin->viewable); @@ -618,11 +601,11 @@ DDXPointRec oldpt; RegionPtr oldRegion = NULL; Bool anyMarked = FALSE; - register ScreenPtr pScreen; - WindowPtr pFirstChange; - register WindowPtr pChild; + ScreenPtr pScreen; + WindowPtr pFirstChange; + WindowPtr pChild; RegionPtr gravitate[StaticGravity + 1]; - register unsigned g; + unsigned g; int nx, ny; /* destination x,y */ int newx, newy; /* new inner window position */ RegionPtr pRegion = NULL; @@ -957,8 +940,7 @@ } WindowPtr -miGetLayerWindow(pWin) - WindowPtr pWin; +miGetLayerWindow(WindowPtr pWin) { return pWin->firstChild; } @@ -972,11 +954,10 @@ */ void -miSetShape(pWin) - register WindowPtr pWin; +miSetShape(WindowPtr pWin) { Bool WasViewable = (Bool)(pWin->viewable); - register ScreenPtr pScreen = pWin->drawable.pScreen; + ScreenPtr pScreen = pWin->drawable.pScreen; Bool anyMarked = FALSE; RegionPtr pOldClip = NULL, bsExposed; #ifdef DO_SAVE_UNDERS @@ -1072,13 +1053,11 @@ /* Keeps the same inside(!) origin */ void -miChangeBorderWidth(pWin, width) - register WindowPtr pWin; - unsigned int width; +miChangeBorderWidth(WindowPtr pWin, unsigned int width) { int oldwidth; Bool anyMarked = FALSE; - register ScreenPtr pScreen; + ScreenPtr pScreen; Bool WasViewable = (Bool)(pWin->viewable); Bool HadBorder; #ifdef DO_SAVE_UNDERS @@ -1141,10 +1120,7 @@ } void -miMarkUnrealizedWindow(pChild, pWin, fromConfigure) - WindowPtr pChild; - WindowPtr pWin; - Bool fromConfigure; +miMarkUnrealizedWindow(WindowPtr pChild, WindowPtr pWin, Bool fromConfigure) { if ((pChild != pWin) || fromConfigure) { Index: xc/programs/Xserver/mi/mizerarc.c diff -u xc/programs/Xserver/mi/mizerarc.c:1.7 xc/programs/Xserver/mi/mizerarc.c:1.9 --- xc/programs/Xserver/mi/mizerarc.c:1.7 Tue Jul 15 21:38:59 2003 +++ xc/programs/Xserver/mi/mizerarc.c Fri Oct 14 11:17:24 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.7 2003/07/16 01:38:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.c,v 1.9 2005/10/14 15:17:24 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,8 +27,6 @@ ********************************************************/ -/* $Xorg: mizerarc.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ - /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" * by M. L. V. Pitteway @@ -36,8 +34,8 @@ */ #include -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -95,8 +93,8 @@ Bool miZeroArcSetup(arc, info, ok360) - register xArc *arc; - register miZeroArcRec *info; + xArc *arc; + miZeroArcRec *info; Bool ok360; { int l; @@ -402,11 +400,11 @@ DDXPointPtr miZeroArcPts(arc, pts) xArc *arc; - register DDXPointPtr pts; + DDXPointPtr pts; { miZeroArcRec info; - register int x, y, a, b, d, mask; - register int k1, k3, dx, dy; + int x, y, a, b, d, mask; + int k1, k3, dx, dy; Bool do360; do360 = miZeroArcSetup(arc, &info, TRUE); @@ -507,14 +505,14 @@ GCPtr pGC, xArc *arc, DashInfo *dinfo, - register DDXPointPtr points, + DDXPointPtr points, int maxPts, - register DDXPointPtr *evenPts, - register DDXPointPtr *oddPts ) + DDXPointPtr *evenPts, + DDXPointPtr *oddPts ) { miZeroArcRec info; - register int x, y, a, b, d, mask; - register int k1, k3, dx, dy; + int x, y, a, b, d, mask; + int k1, k3, dx, dy; int dashRemaining; DDXPointPtr arcPts[4]; DDXPointPtr startPts[5], endPts[5]; @@ -713,11 +711,11 @@ xArc *parcs; { int maxPts = 0; - register int n, maxw = 0; - register xArc *arc; - register int i; + int n, maxw = 0; + xArc *arc; + int i; DDXPointPtr points, pts, oddPts; - register DDXPointPtr pt; + DDXPointPtr pt; int numPts; Bool dospans; int *widths = NULL; Index: xc/programs/Xserver/mi/mizerarc.h diff -u xc/programs/Xserver/mi/mizerarc.h:1.3 xc/programs/Xserver/mi/mizerarc.h:1.4 --- xc/programs/Xserver/mi/mizerarc.h:1.3 Fri Dec 14 15:00:28 2001 +++ xc/programs/Xserver/mi/mizerarc.h Mon Jan 9 10:00:38 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.3 2001/12/14 20:00:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerarc.h,v 1.4 2006/01/09 15:00:38 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,8 +25,6 @@ ********************************************************/ -/* $Xorg: mizerarc.h,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ - typedef struct { int x; int y; Index: xc/programs/Xserver/mi/mizerclip.c diff -u xc/programs/Xserver/mi/mizerclip.c:1.3 xc/programs/Xserver/mi/mizerclip.c:1.5 --- xc/programs/Xserver/mi/mizerclip.c:1.3 Fri Dec 14 15:00:29 2001 +++ xc/programs/Xserver/mi/mizerclip.c Fri Oct 14 11:17:24 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.3 2001/12/14 20:00:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerclip.c,v 1.5 2005/10/14 15:17:24 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,7 @@ SOFTWARE. ******************************************************************/ -#include "X.h" +#include #include "misc.h" #include "scrnintstr.h" @@ -402,17 +402,11 @@ * */ int -miZeroClipLine(xmin, ymin, xmax, ymax, - new_x1, new_y1, new_x2, new_y2, - adx, ady, - pt1_clipped, pt2_clipped, octant, bias, oc1, oc2) - int xmin, ymin, xmax, ymax; - int *new_x1, *new_y1, *new_x2, *new_y2; - int *pt1_clipped, *pt2_clipped; - unsigned int adx, ady; - int octant; - unsigned int bias; - int oc1, oc2; +miZeroClipLine(int xmin, int ymin, int xmax, int ymax, + int *new_x1, int *new_y1, int *new_x2, int *new_y2, + unsigned int adx, unsigned int ady, + int *pt1_clipped, int *pt2_clipped, int octant, + unsigned int bias, int oc1, int oc2) { int swapped = 0; int clipDone = 0; Index: xc/programs/Xserver/mi/mizerline.c diff -u xc/programs/Xserver/mi/mizerline.c:3.7 xc/programs/Xserver/mi/mizerline.c:3.9 --- xc/programs/Xserver/mi/mizerline.c:3.7 Fri Dec 14 15:00:29 2001 +++ xc/programs/Xserver/mi/mizerline.c Fri Oct 14 11:17:24 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.7 2001/12/14 20:00:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/mi/mizerline.c,v 3.9 2005/10/14 15:17:24 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ -#include "X.h" + +#include #include "misc.h" #include "scrnintstr.h" @@ -96,12 +96,8 @@ } void -miZeroLine(pDraw, pGC, mode, npt, pptInit) - DrawablePtr pDraw; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +miZeroLine(DrawablePtr pDraw, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) { int Nspans, current_y = 0; DDXPointPtr ppt; @@ -362,12 +358,8 @@ } void -miZeroDashLine(dst, pgc, mode, nptInit, pptInit) -DrawablePtr dst; -GCPtr pgc; -int mode; -int nptInit; /* number of points in polyline */ -DDXPointRec *pptInit; /* points in the polyline */ +miZeroDashLine(DrawablePtr dst, GCPtr pgc, int mode, int nptInit, + DDXPointPtr pptInit) { /* XXX kludge until real zero-width dash code is written */ pgc->lineWidth = 1; Index: xc/programs/Xserver/miext/layer/Imakefile diff -u xc/programs/Xserver/miext/layer/Imakefile:1.6 xc/programs/Xserver/miext/layer/Imakefile:1.7 --- xc/programs/Xserver/miext/layer/Imakefile:1.6 Mon May 31 20:17:08 2004 +++ xc/programs/Xserver/miext/layer/Imakefile Fri Oct 14 11:17:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/miext/layer/Imakefile,v 1.6 2004/06/01 00:17:08 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/miext/layer/Imakefile,v 1.7 2005/10/14 15:17:24 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -73,9 +73,8 @@ layerwin.o \ $(XFMODOBJ) - INCLUDES = -I. -I../shadow -I../../mi -I../../fb -I../../include -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) -I$(XF86SRC)/common $(EXTRAINCLUDES) \ - -I../../render -I$(EXTINCSRC) + INCLUDES = -I../shadow -I../../mi -I../../fb -I../../include \ + -I$(XF86SRC)/common $(EXTRAINCLUDES) -I../../render LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \ ../../mi/llib-lmi.ln Index: xc/programs/Xserver/miext/layer/layerstr.h diff -u xc/programs/Xserver/miext/layer/layerstr.h:1.4 xc/programs/Xserver/miext/layer/layerstr.h:1.5 --- xc/programs/Xserver/miext/layer/layerstr.h:1.4 Fri Aug 22 15:27:32 2003 +++ xc/programs/Xserver/miext/layer/layerstr.h Fri Oct 14 11:17:25 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.4 2003/08/22 19:27:32 eich Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/layerstr.h,v 1.5 2005/10/14 15:17:25 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * @@ -25,12 +25,12 @@ #ifndef _LAYERSTR_H_ #define _LAYERSTR_H_ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" Index: xc/programs/Xserver/miext/layer/laymodule.c diff -u xc/programs/Xserver/miext/layer/laymodule.c:1.1 xc/programs/Xserver/miext/layer/laymodule.c:1.2 --- xc/programs/Xserver/miext/layer/laymodule.c:1.1 Fri Nov 8 17:19:55 2002 +++ xc/programs/Xserver/miext/layer/laymodule.c Fri Oct 14 11:17:25 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.1 2002/11/08 22:19:55 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.2 2005/10/14 15:17:25 tsi Exp $ * * Copyright © 2000 Keith Packard * @@ -25,12 +25,12 @@ #ifdef XFree86LOADER #include "xf86Module.h" -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" Index: xc/programs/Xserver/miext/rootless/Imakefile diff -u xc/programs/Xserver/miext/rootless/Imakefile:1.4 xc/programs/Xserver/miext/rootless/Imakefile:1.6 --- xc/programs/Xserver/miext/rootless/Imakefile:1.4 Thu Mar 18 02:07:11 2004 +++ xc/programs/Xserver/miext/rootless/Imakefile Fri Oct 14 11:17:25 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/miext/rootless/Imakefile,v 1.4 2004/03/18 07:07:11 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/miext/rootless/Imakefile,v 1.6 2005/10/14 15:17:25 tsi Exp $ #include @@ -20,6 +20,7 @@ #if RootlessAcceleration ACCELDIRS = accel +ACCELINCS = -I$(ACCELDIRS) #endif SRCS = rootlessCommon.c \ @@ -34,9 +35,8 @@ rootlessGC.o \ rootlessValTree.o -INCLUDES = -I. -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(SERVERSRC)/render \ - -I$(EXTINCSRC) -I$(ACCELDIRS) +INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/render $(ACCELINCS) NormalLibraryObjectRule() LibraryModuleTarget(rootless,$(OBJS),.) Index: xc/programs/Xserver/miext/rootless/README.txt diff -u xc/programs/Xserver/miext/rootless/README.txt:1.1 xc/programs/Xserver/miext/rootless/README.txt:1.2 --- xc/programs/Xserver/miext/rootless/README.txt:1.1 Tue Jul 13 19:32:38 2004 +++ xc/programs/Xserver/miext/rootless/README.txt Mon Mar 28 23:00:31 2005 @@ -401,3 +401,6 @@ (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects, int dx, int dy); + + +$XFree86: xc/programs/Xserver/miext/rootless/README.txt,v 1.2 2005/03/29 04:00:31 tsi Exp $ Index: xc/programs/Xserver/miext/rootless/rootless.h diff -u xc/programs/Xserver/miext/rootless/rootless.h:1.7 xc/programs/Xserver/miext/rootless/rootless.h:1.8 --- xc/programs/Xserver/miext/rootless/rootless.h:1.7 Thu Jul 1 21:30:33 2004 +++ xc/programs/Xserver/miext/rootless/rootless.h Sun Oct 16 14:06:07 2005 @@ -27,7 +27,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.7 2004/07/02 01:30:33 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.8 2005/10/16 18:06:07 tsi Exp $ */ #ifndef _ROOTLESS_H #define _ROOTLESS_H @@ -49,16 +49,16 @@ * Each top-level X window has one RootlessWindowRec associated with it. */ typedef struct _RootlessWindowRec { - // Position and size includes the window border - // Position is in per-screen coordinates + /* Position and size includes the window border */ + /* Position is in per-screen coordinates */ int x, y; unsigned int width, height; unsigned int borderWidth; - RootlessFrameID wid; // implementation specific frame id - WindowPtr win; // underlying X window + RootlessFrameID wid; /* implementation specific frame id */ + WindowPtr win; /* underlying X window */ - // Valid only when drawing (ie. is_drawing is set) + /* Valid only when drawing (ie. is_drawing is set) */ char *pixelData; int bytesPerRow; @@ -69,7 +69,7 @@ RegionRec damage; #endif - unsigned int is_drawing :1; // Currently drawing? + unsigned int is_drawing :1; /* Currently drawing? */ unsigned int is_reorder_pending :1; } RootlessWindowRec, *RootlessWindowPtr; @@ -90,7 +90,7 @@ /* Operations used by CompositePixels */ enum rl_composite_op_enum { RL_COMPOSITE_SRC = 0, - RL_COMPOSITE_OVER, + RL_COMPOSITE_OVER }; /* Data formats for depth field and composite functions */ @@ -99,7 +99,7 @@ RL_DEPTH_ARGB8888, RL_DEPTH_RGB555, RL_DEPTH_A8, /* for masks when compositing */ - RL_DEPTH_INDEX8, + RL_DEPTH_INDEX8 }; /* Macro to form the composite function for CompositePixels */ @@ -113,7 +113,7 @@ RL_GRAVITY_NORTH_WEST = 1, /* anchor to top-left corner */ RL_GRAVITY_NORTH_EAST = 2, /* anchor to top-right corner */ RL_GRAVITY_SOUTH_EAST = 3, /* anchor to bottom-right corner */ - RL_GRAVITY_SOUTH_WEST = 4, /* anchor to bottom-left corner */ + RL_GRAVITY_SOUTH_WEST = 4 /* anchor to bottom-left corner */ }; Index: xc/programs/Xserver/miext/rootless/rootlessCommon.c diff -u xc/programs/Xserver/miext/rootless/rootlessCommon.c:1.6 xc/programs/Xserver/miext/rootless/rootlessCommon.c:1.7 --- xc/programs/Xserver/miext/rootless/rootlessCommon.c:1.6 Thu Jul 1 21:30:33 2004 +++ xc/programs/Xserver/miext/rootless/rootlessCommon.c Sun Oct 16 14:06:07 2005 @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.6 2004/07/02 01:30:33 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.7 2005/10/16 18:06:07 tsi Exp $ */ #include "rootlessCommon.h" @@ -111,7 +111,7 @@ if (winRec == NULL) return; - // Make sure the window's top-level parent is prepared for drawing. + /* Make sure the window's top-level parent is prepared for drawing */ if (!winRec->is_drawing) { int bw = wBorderWidth(top); @@ -186,7 +186,7 @@ WindowPtr pTop; BoxPtr b1, b2; - RL_DEBUG_MSG("Damaged win 0x%x ", pWindow); + RL_DEBUG_MSG(("Damaged win 0x%x ", pWindow)); pTop = TopLevelParent(pWindow); if (pTop == NULL) @@ -268,8 +268,8 @@ int numBox = REGION_NUM_RECTS(pRegion); for (end = box+numBox; box < end; box++) { - RL_DEBUG_MSG("Damage rect: %i, %i, %i, %i\n", - box->x1, box->x2, box->y1, box->y2); + RL_DEBUG_MSG(("Damage rect: %i, %i, %i, %i\n", + box->x1, box->x2, box->y1, box->y2)); } } #endif @@ -337,11 +337,11 @@ RootlessStopDrawing(pWindow, FALSE); if (REGION_NOTEMPTY(pScreen, &winRec->damage)) { - RL_DEBUG_MSG("Redisplay Win 0x%x, %i x %i @ (%i, %i)\n", + RL_DEBUG_MSG(("Redisplay Win 0x%x, %i x %i @ (%i, %i)\n", pWindow, winRec->width, winRec->height, - winRec->x, winRec->y); + winRec->x, winRec->y)); - // move region to window local coords + /* Move region to window local coords */ REGION_TRANSLATE(pScreen, &winRec->damage, -winRec->x, -winRec->y); Index: xc/programs/Xserver/miext/rootless/rootlessCommon.h diff -u xc/programs/Xserver/miext/rootless/rootlessCommon.h:1.5 xc/programs/Xserver/miext/rootless/rootlessCommon.h:1.8 --- xc/programs/Xserver/miext/rootless/rootlessCommon.h:1.5 Thu Jul 1 21:30:33 2004 +++ xc/programs/Xserver/miext/rootless/rootlessCommon.h Wed Feb 22 09:49:06 2006 @@ -27,7 +27,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.5 2004/07/02 01:30:33 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.8 2006/02/22 14:49:06 tsi Exp $ */ #ifndef _ROOTLESSCOMMON_H #define _ROOTLESSCOMMON_H @@ -40,33 +40,41 @@ #endif -// Debug output, or not. +/* Debug output, or not */ #ifdef ROOTLESSDEBUG -#define RL_DEBUG_MSG ErrorF +#define RL_DEBUG_MSG(a) ErrorF a #else -#define RL_DEBUG_MSG(a, ...) +#define RL_DEBUG_MSG(a) #endif -// Global variables +/* Deal with inline */ +#if defined(__GNUC__) +#define inline __inline__ +#else +#define inline /* */ +#endif + + +/* Global variables */ extern int rootlessGCPrivateIndex; extern int rootlessScreenPrivateIndex; extern int rootlessWindowPrivateIndex; -// RootlessGCRec: private per-gc data +/* RootlessGCRec: private per-gc data */ typedef struct { GCFuncs *originalFuncs; GCOps *originalOps; } RootlessGCRec; -// RootlessScreenRec: per-screen private data +/* RootlessScreenRec: per-screen private data */ typedef struct _RootlessScreenRec { - // Rootless implementation functions + /* Rootless implementation functions */ RootlessFrameProcsPtr imp; - // Wrapped screen functions + /* Wrapped screen functions */ CreateScreenResourcesProcPtr CreateScreenResources; CloseScreenProcPtr CloseScreen; @@ -116,9 +124,11 @@ #undef MAX #define MAX(x,y) ((x) > (y) ? (x) : (y)) -// "Definition of the Porting Layer for the X11 Sample Server" says -// unwrap and rewrap of screen functions is unnecessary, but -// screen->CreateGC changes after a call to cfbCreateGC. +/* + * "Definition of the Porting Layer for the X11 Sample Server" says + * unwrap and rewrap of screen functions is unnecessary, but + * screen->CreateGC changes after a call to cfbCreateGC. + */ #define SCREEN_UNWRAP(screen, fn) \ screen->fn = SCREENREC(screen)->fn; @@ -128,26 +138,29 @@ screen->fn = Rootless##fn -// Accessors for screen and window privates +/* Accessors for screen and window privates */ +#define SCREENPRV(pScreen) \ + (pScreen)->devPrivates[rootlessScreenPrivateIndex].ptr #define SCREENREC(pScreen) \ - ((RootlessScreenRec *)(pScreen)->devPrivates[rootlessScreenPrivateIndex].ptr) + ((RootlessScreenRec *)(SCREENPRV(pScreen))) +#define WINPRV(pWin) \ + (pWin)->devPrivates[rootlessWindowPrivateIndex].ptr #define WINREC(pWin) \ - ((RootlessWindowRec *)(pWin)->devPrivates[rootlessWindowPrivateIndex].ptr) + ((RootlessWindowRec *)(WINPRV(pWin))) -// Call a rootless implementation function. -// Many rootless implementation functions are allowed to be NULL. -#define CallFrameProc(pScreen, proc, params) \ - if (SCREENREC(pScreen)->frameProcs.proc) { \ - RL_DEBUG_MSG("calling frame proc " #proc " "); \ - SCREENREC(pScreen)->frameProcs.proc params; \ +/* Call a rootless implementation function */ +/* Many rootless implementation functions are allowed to be NULL */ +#define CallFrameProc(pScreen, proc, params) \ + if (SCREENREC(pScreen)->frameProcs.proc) { \ + RL_DEBUG_MSG(("calling frame proc " #proc " ")); \ + SCREENREC(pScreen)->frameProcs.proc params; \ } -// BoxRec manipulators -// Copied from shadowfb +/* BoxRec manipulators, copied from shadowfb */ #define TRIM_BOX(box, pGC) { \ BoxPtr extents = &pGC->pCompositeClip->extents;\ @@ -173,12 +186,14 @@ (((box.x2 - box.x1) > 0) && ((box.y2 - box.y1) > 0)) -// HUGE_ROOT and NORMAL_ROOT -// We don't want to clip windows to the edge of the screen. -// HUGE_ROOT temporarily makes the root window really big. -// This is needed as a wrapper around any function that calls -// SetWinSize or SetBorderSize which clip a window against its -// parents, including the root. +/* + * HUGE_ROOT and NORMAL_ROOT + * We don't want to clip windows to the edge of the screen. + * HUGE_ROOT temporarily makes the root window really big. + * This is needed as a wrapper around any function that calls + * SetWinSize or SetBorderSize which clip a window against its + * parents, including the root. + */ extern RegionRec rootlessHugeRoot; @@ -200,12 +215,14 @@ } while (0) -// Returns TRUE if this window is a top-level window (i.e. child of the root) -// The root is not a top-level window. +/* + * Returns TRUE if this window is a top-level window (i.e. child of the root) + * The root is not a top-level window. + */ #define IsTopLevel(pWin) \ ((pWin) && (pWin)->parent && !(pWin)->parent->parent) -// Returns TRUE if this window is a root window +/* Returns TRUE if this window is a root window */ #define IsRoot(pWin) \ ((pWin) == WindowTable[(pWin)->drawable.pScreen->myNum]) @@ -223,7 +240,7 @@ ((int)(_x) * _pPix->drawable.bitsPerPixel/8 + \ (int)(_y) * _pPix->devKind); \ if (_pPix->drawable.bitsPerPixel != FB_UNIT) { \ - unsigned _diff = ((unsigned) _pPix->devPrivate.ptr) & \ + unsigned long _diff = ((unsigned long) _pPix->devPrivate.ptr) & \ (FB_UNIT / CHAR_BIT - 1); \ _pPix->devPrivate.ptr = (char *) (_pPix->devPrivate.ptr) - \ _diff; \ @@ -233,13 +250,17 @@ } -// Returns TRUE if this window is visible inside a frame -// (e.g. it is visible and has a top-level or root parent) +/* + * Returns TRUE if this window is visible inside a frame + * (e.g. it is visible and has a top-level or root parent) + */ Bool IsFramedWindow(WindowPtr pWin); -// Routines that cause regions to get redrawn. -// DamageRegion and DamageRect are in global coordinates. -// DamageBox is in window-local coordinates. +/* + * Routines that cause regions to get redrawn. + * DamageRegion and DamageRect are in global coordinates. + * DamageBox is in window-local coordinates. + */ void RootlessDamageRegion(WindowPtr pWindow, RegionPtr pRegion); void RootlessDamageRect(WindowPtr pWindow, int x, int y, int w, int h); void RootlessDamageBox(WindowPtr pWindow, BoxPtr pBox); @@ -248,10 +269,10 @@ void RootlessQueueRedisplay(ScreenPtr pScreen); -// Move a window to its proper location on the screen. +/* Move a window to its proper location on the screen */ void RootlessRepositionWindow(WindowPtr pWin); -// Move the window to it's correct place in the physical stacking order. +/* Move the window to it's correct place in the physical stacking order */ void RootlessReorderWindow(WindowPtr pWin); #endif /* _ROOTLESSCOMMON_H */ Index: xc/programs/Xserver/miext/rootless/rootlessConfig.h diff -u xc/programs/Xserver/miext/rootless/rootlessConfig.h:1.2 xc/programs/Xserver/miext/rootless/rootlessConfig.h:1.3 --- xc/programs/Xserver/miext/rootless/rootlessConfig.h:1.2 Thu Oct 23 20:33:14 2003 +++ xc/programs/Xserver/miext/rootless/rootlessConfig.h Wed Oct 12 15:54:27 2005 @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.2 2003/10/24 00:33:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.3 2005/10/12 19:54:27 tsi Exp $ */ #ifndef _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H @@ -40,11 +40,11 @@ # define ROOTLESS_RESIZE_GRAVITY TRUE # undef ROOTLESS_TRACK_DAMAGE +#endif /* __DARWIN__ */ + /* Bit mask for alpha channel with a particular number of bits per pixel. Note that we only care for 32bpp data. Mac OS X uses planar alpha for 16bpp. */ -# define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0) - -#endif /* __DARWIN__ */ +#define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0) #endif /* _ROOTLESSCONFIG_H */ Index: xc/programs/Xserver/miext/rootless/rootlessGC.c diff -u xc/programs/Xserver/miext/rootless/rootlessGC.c:1.2 xc/programs/Xserver/miext/rootless/rootlessGC.c:1.4 --- xc/programs/Xserver/miext/rootless/rootlessGC.c:1.2 Thu Oct 23 20:33:14 2003 +++ xc/programs/Xserver/miext/rootless/rootlessGC.c Sun Oct 16 14:06:07 2005 @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.2 2003/10/24 00:33:14 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.4 2005/10/16 18:06:07 tsi Exp $ */ #include "mi.h" #include "scrnintstr.h" @@ -45,12 +45,12 @@ #include "rootlessCommon.h" -#if ROOTLESS_ACCEL +#ifdef ROOTLESS_ACCEL #include "rlAccel.h" #endif -// GC functions +/* GC functions */ static void RootlessValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable); static void RootlessChangeGC(GCPtr pGC, unsigned long mask); @@ -71,7 +71,7 @@ RootlessCopyClip, }; -// GC operations +/* GC operations */ static void RootlessFillSpans(); static void RootlessSetSpans(); static void RootlessPutImage(); @@ -283,7 +283,7 @@ devPrivates[rootlessScreenPrivateIndex].ptr; result = s->CreateGC(pGC); -#if ROOTLESS_ACCEL +#ifdef ROOTLESS_ACCEL pGC->ops->FillSpans = rlFillSpans; pGC->ops->CopyArea = rlCopyArea; pGC->ops->PolyFillRect = rlPolyFillRect; @@ -291,7 +291,7 @@ #endif gcrec = (RootlessGCRec *) pGC->devPrivates[rootlessGCPrivateIndex].ptr; - gcrec->originalOps = NULL; // don't wrap ops yet + gcrec->originalOps = NULL; /* don't wrap ops yet */ gcrec->originalFuncs = pGC->funcs; pGC->funcs = &rootlessGCFuncs; @@ -308,8 +308,10 @@ * All the others just unwrap and call. */ -// GCFUNC_UNRAP assumes funcs have been wrapped and -// does not assume ops have been wrapped +/* + * GCFUNC_UNRAP assumes funcs have been wrapped and + * does not assume ops have been wrapped + */ #define GCFUNC_UNWRAP(pGC) \ RootlessGCRec *gcrec = (RootlessGCRec *) \ (pGC)->devPrivates[rootlessGCPrivateIndex].ptr; \ @@ -339,8 +341,10 @@ #ifdef ROOTLESS_PROTECT_ALPHA unsigned int depth = pDrawable->depth; - // We force a planemask so fb doesn't overwrite the alpha channel. - // Left to its own devices, fb will optimize away the planemask. + /* + * We force a planemask so fb doesn't overwrite the alpha channel. + * Left to its own devices, fb will optimize away the planemask. + */ pDrawable->depth = pDrawable->bitsPerPixel; pGC->planemask &= ~RootlessAlphaMask(pDrawable->bitsPerPixel); VALIDATE_GC(pGC, changes | GCPlaneMask, pDrawable); @@ -406,7 +410,7 @@ * However, much of this code is copied from shadowfb. */ -// assumes both funcs and ops are wrapped +/* assumes both funcs and ops are wrapped */ #define GCOP_UNWRAP(pGC) \ RootlessGCRec *gcrec = (RootlessGCRec *) \ (pGC)->devPrivates[rootlessGCPrivateIndex].ptr; \ @@ -437,7 +441,7 @@ GC_SAVE(pGC); GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("fill spans start "); + RL_DEBUG_MSG(("fill spans start ")); if (nInit <= 0) { pGC->ops->FillSpans(dst, pGC, nInit, pptInit, pwidthInit, sorted); @@ -483,7 +487,7 @@ GC_RESTORE(pGC, dst); GCOP_WRAP(pGC); - RL_DEBUG_MSG("fill spans end\n"); + RL_DEBUG_MSG(("fill spans end\n")); } static void @@ -493,7 +497,7 @@ { GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("set spans start "); + RL_DEBUG_MSG(("set spans start ")); if (nspans <= 0) { pGC->ops->SetSpans(dst, pGC, pSrc, pptInit, pwidthInit, @@ -532,7 +536,7 @@ RootlessDamageBox ((WindowPtr) dst, &box); } GCOP_WRAP(pGC); - RL_DEBUG_MSG("set spans end\n"); + RL_DEBUG_MSG(("set spans end\n")); } static void @@ -544,7 +548,7 @@ GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("put image start "); + RL_DEBUG_MSG(("put image start ")); RootlessStartDrawing((WindowPtr) dst); pGC->ops->PutImage(dst, pGC, depth, x,y,w,h, leftPad, format, pBits); @@ -559,7 +563,7 @@ RootlessDamageBox ((WindowPtr) dst, &box); GCOP_WRAP(pGC); - RL_DEBUG_MSG("put image end\n"); + RL_DEBUG_MSG(("put image end\n")); } /* changed area is *dest* rect */ @@ -577,7 +581,7 @@ if (GC_IS_ROOT(dst) || GC_IS_ROOT(pSrc)) return NULL; /* nothing exposed */ - RL_DEBUG_MSG("copy area start (src 0x%x, dst 0x%x)", pSrc, dst); + RL_DEBUG_MSG(("copy area start (src 0x%x, dst 0x%x)", pSrc, dst)); if (pSrc->type == DRAWABLE_WINDOW && IsFramedWindow((WindowPtr)pSrc)) { unsigned int bytes; @@ -609,7 +613,7 @@ GC_RESTORE(pGC, dst); GCOP_WRAP(pGC); - RL_DEBUG_MSG("copy area end\n"); + RL_DEBUG_MSG(("copy area end\n")); return result; } @@ -627,7 +631,7 @@ if (GC_IS_ROOT(dst) || GC_IS_ROOT(pSrc)) return NULL; /* nothing exposed */ - RL_DEBUG_MSG("copy plane start "); + RL_DEBUG_MSG(("copy plane start ")); if (pSrc->type == DRAWABLE_WINDOW && IsFramedWindow((WindowPtr)pSrc)) { RootlessStartDrawing((WindowPtr) pSrc); @@ -646,14 +650,16 @@ RootlessDamageBox ((WindowPtr) dst, &box); GCOP_WRAP(pGC); - RL_DEBUG_MSG("copy plane end\n"); + RL_DEBUG_MSG(("copy plane end\n")); return result; } -// Options for size of changed area: -// 0 = box per point -// 1 = big box around all points -// 2 = accumulate point in 20 pixel radius +/* + * Options for size of changed area: + * 0 = box per point + * 1 = big box around all points + * 2 = accumulate point in 20 pixel radius + */ #define ROOTLESS_CHANGED_AREA 1 #define abs(a) ((a) > 0 ? (a) : -(a)) @@ -663,14 +669,14 @@ { GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("polypoint start "); + RL_DEBUG_MSG(("polypoint start ")); RootlessStartDrawing((WindowPtr) dst); pGC->ops->PolyPoint(dst, pGC, mode, npt, pptInit); if (npt > 0) { #if ROOTLESS_CHANGED_AREA==0 - // box per point + /* box per point */ BoxRec box; while (npt) { @@ -688,7 +694,7 @@ } #elif ROOTLESS_CHANGED_AREA==1 - // one big box + /* one big box */ BoxRec box; box.x2 = box.x1 = pptInit->x; @@ -713,7 +719,7 @@ RootlessDamageBox ((WindowPtr) dst, &box); #elif ROOTLESS_CHANGED_AREA==2 - // clever(?) method: accumulate point in 20-pixel radius + /* clever(?) method: accumulate point in 20-pixel radius */ BoxRec box; int firstx, firsty; @@ -746,7 +752,7 @@ } GCOP_WRAP(pGC); - RL_DEBUG_MSG("polypoint end\n"); + RL_DEBUG_MSG(("polypoint end\n")); } #undef ROOTLESS_CHANGED_AREA @@ -757,7 +763,7 @@ { GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("poly lines start "); + RL_DEBUG_MSG(("poly lines start ")); RootlessStartDrawing((WindowPtr) dst); pGC->ops->Polylines(dst, pGC, mode, npt, pptInit); @@ -823,7 +829,7 @@ } GCOP_WRAP(pGC); - RL_DEBUG_MSG("poly lines end\n"); + RL_DEBUG_MSG(("poly lines end\n")); } /* changed area is box around each line segment */ @@ -832,7 +838,7 @@ { GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("poly segment start (win 0x%x)", dst); + RL_DEBUG_MSG(("poly segment start (win 0x%x)", dst)); RootlessStartDrawing((WindowPtr) dst); pGC->ops->PolySegment(dst, pGC, nseg, pSeg); @@ -894,7 +900,7 @@ } GCOP_WRAP(pGC); - RL_DEBUG_MSG("poly segment end\n"); + RL_DEBUG_MSG(("poly segment end\n")); } /* changed area is box around each line (not entire rects) */ @@ -903,7 +909,7 @@ { GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("poly rectangle start "); + RL_DEBUG_MSG(("poly rectangle start ")); RootlessStartDrawing((WindowPtr) dst); pGC->ops->PolyRectangle(dst, pGC, nRects, pRects); @@ -955,7 +961,7 @@ } GCOP_WRAP(pGC); - RL_DEBUG_MSG("poly rectangle end\n"); + RL_DEBUG_MSG(("poly rectangle end\n")); } @@ -964,7 +970,7 @@ { GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("poly arc start "); + RL_DEBUG_MSG(("poly arc start ")); RootlessStartDrawing((WindowPtr) dst); pGC->ops->PolyArc(dst, pGC, narcs, parcs); @@ -1008,7 +1014,7 @@ } GCOP_WRAP(pGC); - RL_DEBUG_MSG("poly arc end\n"); + RL_DEBUG_MSG(("poly arc end\n")); } @@ -1020,8 +1026,8 @@ GC_SAVE(pGC); GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("fill poly start (win 0x%x, fillStyle 0x%x)", dst, - pGC->fillStyle); + RL_DEBUG_MSG(("fill poly start (win 0x%x, fillStyle 0x%x)", dst, + pGC->fillStyle)); if (count <= 2) { pGC->ops->FillPolygon(dst, pGC, shape, mode, count, pptInit); @@ -1084,7 +1090,7 @@ GC_RESTORE(pGC, dst); GCOP_WRAP(pGC); - RL_DEBUG_MSG("fill poly end\n"); + RL_DEBUG_MSG(("fill poly end\n")); } /* changed area is the rects */ @@ -1094,8 +1100,8 @@ GC_SAVE(pGC); GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("fill rect start (win 0x%x, fillStyle 0x%x)", dst, - pGC->fillStyle); + RL_DEBUG_MSG(("fill rect start (win 0x%x, fillStyle 0x%x)", dst, + pGC->fillStyle)); if (nRectsInit <= 0) { pGC->ops->PolyFillRect(dst, pGC, nRectsInit, pRectsInit); @@ -1138,7 +1144,7 @@ GC_RESTORE(pGC, dst); GCOP_WRAP(pGC); - RL_DEBUG_MSG("fill rect end\n"); + RL_DEBUG_MSG(("fill rect end\n")); } @@ -1149,7 +1155,7 @@ GC_SAVE(pGC); GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("fill arc start "); + RL_DEBUG_MSG(("fill arc start ")); if (narcsInit > 0) { BoxRec box; @@ -1194,7 +1200,7 @@ GC_RESTORE(pGC, dst); GCOP_WRAP(pGC); - RL_DEBUG_MSG("fill arc end\n"); + RL_DEBUG_MSG(("fill arc end\n")); } @@ -1204,7 +1210,7 @@ GC_SAVE(pGC); GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("imagetext8 start "); + RL_DEBUG_MSG(("imagetext8 start ")); if (count > 0) { int top, bot, Min, Max; @@ -1246,20 +1252,20 @@ GC_RESTORE(pGC, dst); GCOP_WRAP(pGC); - RL_DEBUG_MSG("imagetext8 end\n"); + RL_DEBUG_MSG(("imagetext8 end\n")); } static int RootlessPolyText8(DrawablePtr dst, GCPtr pGC, int x, int y, int count, char *chars) { - int width; // the result, sorta + int width; /* the result, sorta */ GCOP_UNWRAP(pGC); if (GC_IS_ROOT(dst)) return 0; - RL_DEBUG_MSG("polytext8 start "); + RL_DEBUG_MSG(("polytext8 start ")); RootlessStartDrawing((WindowPtr) dst); width = pGC->ops->PolyText8(dst, pGC, x, y, count, chars); @@ -1286,7 +1292,7 @@ } GCOP_WRAP(pGC); - RL_DEBUG_MSG("polytext8 end\n"); + RL_DEBUG_MSG(("polytext8 end\n")); return (width + x); } @@ -1296,7 +1302,7 @@ GC_SAVE(pGC); GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("imagetext16 start "); + RL_DEBUG_MSG(("imagetext16 start ")); if (count > 0) { int top, bot, Min, Max; @@ -1338,20 +1344,20 @@ GC_RESTORE(pGC, dst); GCOP_WRAP(pGC); - RL_DEBUG_MSG("imagetext16 end\n"); + RL_DEBUG_MSG(("imagetext16 end\n")); } static int RootlessPolyText16(DrawablePtr dst, GCPtr pGC, int x, int y, int count, unsigned short *chars) { - int width; // the result, sorta + int width; /* the result, sorta */ GCOP_UNWRAP(pGC); if (GC_IS_ROOT(dst)) return 0; - RL_DEBUG_MSG("polytext16 start "); + RL_DEBUG_MSG(("polytext16 start ")); RootlessStartDrawing((WindowPtr) dst); width = pGC->ops->PolyText16(dst, pGC, x, y, count, chars); @@ -1378,7 +1384,7 @@ } GCOP_WRAP(pGC); - RL_DEBUG_MSG("polytext16 end\n"); + RL_DEBUG_MSG(("polytext16 end\n")); return width + x; } @@ -1389,7 +1395,7 @@ GC_SAVE(pGC); GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("imageglyph start "); + RL_DEBUG_MSG(("imageglyph start ")); if (nglyphInit > 0) { int top, bot, width = 0; @@ -1441,7 +1447,7 @@ GC_RESTORE(pGC, dst); GCOP_WRAP(pGC); - RL_DEBUG_MSG("imageglyph end\n"); + RL_DEBUG_MSG(("imageglyph end\n")); } static void RootlessPolyGlyphBlt(DrawablePtr dst, GCPtr pGC, @@ -1450,7 +1456,7 @@ { GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("polyglyph start "); + RL_DEBUG_MSG(("polyglyph start ")); RootlessStartDrawing((WindowPtr) dst); pGC->ops->PolyGlyphBlt(dst, pGC, x, y, nglyph, ppci, pglyphBase); @@ -1483,7 +1489,7 @@ } GCOP_WRAP(pGC); - RL_DEBUG_MSG("polyglyph end\n"); + RL_DEBUG_MSG(("polyglyph end\n")); } @@ -1496,7 +1502,7 @@ GCOP_UNWRAP(pGC); GC_SKIP_ROOT(dst); - RL_DEBUG_MSG("push pixels start "); + RL_DEBUG_MSG(("push pixels start ")); RootlessStartDrawing((WindowPtr) dst); pGC->ops->PushPixels(pGC, pBitMap, dst, dx, dy, xOrg, yOrg); @@ -1511,5 +1517,5 @@ RootlessDamageBox ((WindowPtr) dst, &box); GCOP_WRAP(pGC); - RL_DEBUG_MSG("push pixels end\n"); + RL_DEBUG_MSG(("push pixels end\n")); } Index: xc/programs/Xserver/miext/rootless/rootlessScreen.c diff -u xc/programs/Xserver/miext/rootless/rootlessScreen.c:1.3 xc/programs/Xserver/miext/rootless/rootlessScreen.c:1.4 --- xc/programs/Xserver/miext/rootless/rootlessScreen.c:1.3 Sun Jun 29 21:45:13 2003 +++ xc/programs/Xserver/miext/rootless/rootlessScreen.c Sun Oct 16 14:06:07 2005 @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.3 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.4 2005/10/16 18:06:07 tsi Exp $ */ #include "mi.h" @@ -57,7 +57,7 @@ VTKind kind); extern Bool RootlessCreateGC(GCPtr pGC); -// Initialize globals +/* Initialize globals */ int rootlessGCPrivateIndex = -1; int rootlessScreenPrivateIndex = -1; int rootlessWindowPrivateIndex = -1; @@ -144,7 +144,7 @@ s = SCREENREC(pScreen); - // fixme unwrap everything that was wrapped? + /* fixme unwrap everything that was wrapped? */ pScreen->CloseScreen = s->CloseScreen; if (s->pixmap_data != NULL) { @@ -169,11 +169,11 @@ int x0, y0, x1, y1; RootlessWindowRec *winRec; - // Many apps use GetImage to sync with the visible frame buffer - // FIXME: entire screen or just window or all screens? + /* Many apps use GetImage to sync with the visible frame buffer */ + /* FIXME: entire screen or just window or all screens? */ RootlessRedisplayScreen(pScreen); - // RedisplayScreen stops drawing, so we need to start it again + /* RedisplayScreen stops drawing, so we need to start it again */ RootlessStartDrawing((WindowPtr)pDrawable); /* Check that we have some place to read from. */ @@ -244,7 +244,7 @@ PictureScreenPtr ps = GetPictureScreen(pScreen); WindowPtr srcWin, dstWin, maskWin = NULL; - if (pMask) { // pMask can be NULL + if (pMask) { /* pMask can be NULL */ maskWin = (pMask->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pMask->pDrawable : NULL; } @@ -253,7 +253,7 @@ dstWin = (pDst->pDrawable->type == DRAWABLE_WINDOW) ? (WindowPtr)pDst->pDrawable : NULL; - // SCREEN_UNWRAP(ps, Composite); + /* SCREEN_UNWRAP(ps, Composite); */ ps->Composite = SCREENREC(pScreen)->Composite; if (srcWin && IsFramedWindow(srcWin)) @@ -272,7 +272,7 @@ } ps->Composite = RootlessComposite; - // SCREEN_WRAP(ps, Composite); + /* SCREEN_WRAP(ps, Composite); */ } @@ -296,11 +296,11 @@ if (srcWin && IsFramedWindow(srcWin)) RootlessStartDrawing(srcWin); if (dstWin && IsFramedWindow(dstWin)) RootlessStartDrawing(dstWin); - //SCREEN_UNWRAP(ps, Glyphs); + /* SCREEN_UNWRAP(ps, Glyphs); */ ps->Glyphs = SCREENREC(pScreen)->Glyphs; ps->Glyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs); ps->Glyphs = RootlessGlyphs; - //SCREEN_WRAP(ps, Glyphs); + /* SCREEN_WRAP(ps, Glyphs); */ if (dstWin && IsFramedWindow(dstWin)) { x = xSrc; @@ -354,7 +354,7 @@ } } -#endif // RENDER +#endif /* RENDER */ /* @@ -372,11 +372,11 @@ ScreenPtr pScreen = pParent->drawable.pScreen; SCREEN_UNWRAP(pScreen, ValidateTree); - RL_DEBUG_MSG("VALIDATETREE start "); + RL_DEBUG_MSG(("VALIDATETREE start ")); - // Use our custom version to validate from root + /* Use our custom version to validate from root */ if (IsRoot(pParent)) { - RL_DEBUG_MSG("custom "); + RL_DEBUG_MSG(("custom ")); result = RootlessMiValidateTree(pParent, pChild, kind); } else { HUGE_ROOT(pParent); @@ -385,7 +385,7 @@ } SCREEN_WRAP(pScreen, ValidateTree); - RL_DEBUG_MSG("VALIDATETREE end\n"); + RL_DEBUG_MSG(("VALIDATETREE end\n")); return result; } @@ -404,27 +404,29 @@ Bool result; ScreenPtr pScreen = pWin->drawable.pScreen; SCREEN_UNWRAP(pScreen, MarkOverlappedWindows); - RL_DEBUG_MSG("MARKOVERLAPPEDWINDOWS start "); + RL_DEBUG_MSG(("MARKOVERLAPPEDWINDOWS start ")); HUGE_ROOT(pWin); if (IsRoot(pWin)) { - // root - mark nothing - RL_DEBUG_MSG("is root not marking "); + /* root - mark nothing */ + RL_DEBUG_MSG(("is root not marking ")); result = FALSE; } else if (! IsTopLevel(pWin)) { - // not top-level window - mark normally + /* not top-level window - mark normally */ result = pScreen->MarkOverlappedWindows(pWin, pFirst, ppLayerWin); } else { - //top-level window - mark children ONLY - NO overlaps with sibs (?) - // This code copied from miMarkOverlappedWindows() + /* + * top-level window - mark children ONLY - NO overlaps with sibs (?) + * This code copied from miMarkOverlappedWindows() + */ register WindowPtr pChild; Bool anyMarked = FALSE; void (* MarkWindow)() = pScreen->MarkWindow; - RL_DEBUG_MSG("is top level! "); + RL_DEBUG_MSG(("is top level! ")); /* single layered systems are easy */ if (ppLayerWin) *ppLayerWin = pWin; @@ -461,7 +463,7 @@ } NORMAL_ROOT(pWin); SCREEN_WRAP(pScreen, MarkOverlappedWindows); - RL_DEBUG_MSG("MARKOVERLAPPEDWINDOWS end\n"); + RL_DEBUG_MSG(("MARKOVERLAPPEDWINDOWS end\n")); return result; } @@ -536,7 +538,7 @@ static void RootlessWakeupHandler(pointer data, int i, pointer LastSelectMask) { - // nothing here + /* nothing here */ } @@ -556,7 +558,7 @@ rootlessGeneration = serverGeneration; } - // no allocation needed for screen privates + /* no allocation needed for screen privates */ if (!AllocateGCPrivate(pScreen, rootlessGCPrivateIndex, sizeof(RootlessGCRec))) return FALSE; @@ -565,7 +567,7 @@ s = xalloc(sizeof(RootlessScreenRec)); if (! s) return FALSE; - SCREENREC(pScreen) = s; + SCREENPRV(pScreen) = s; s->pixmap_data = NULL; s->pixmap_data_size = 0; @@ -587,7 +589,7 @@ if (pScreen->a) { \ s->a = pScreen->a; \ } else { \ - RL_DEBUG_MSG("null screen fn " #a "\n"); \ + RL_DEBUG_MSG(("null screen fn " #a "\n")); \ s->a = NULL; \ } \ pScreen->a = Rootless##a @@ -620,7 +622,7 @@ #ifdef RENDER { - // Composite and Glyphs don't use normal screen wrapping + /* Composite and Glyphs don't use normal screen wrapping */ PictureScreenPtr ps = GetPictureScreen(pScreen); s->Composite = ps->Composite; ps->Composite = RootlessComposite; @@ -629,8 +631,8 @@ } #endif - // WRAP(ClearToBackground); fixme put this back? useful for shaped wins? - // WRAP(RestoreAreas); fixme put this back? + /* WRAP(ClearToBackground); fixme put this back? useful for shaped wins? */ + /* WRAP(RestoreAreas); fixme put this back? */ #undef WRAP } Index: xc/programs/Xserver/miext/rootless/rootlessValTree.c diff -u xc/programs/Xserver/miext/rootless/rootlessValTree.c:1.2 xc/programs/Xserver/miext/rootless/rootlessValTree.c:1.4 --- xc/programs/Xserver/miext/rootless/rootlessValTree.c:1.2 Mon Nov 10 13:22:50 2003 +++ xc/programs/Xserver/miext/rootless/rootlessValTree.c Sun Oct 16 14:06:07 2005 @@ -3,7 +3,7 @@ * * This file is very closely based on mivaltree.c. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.2 2003/11/10 18:22:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessValTree.c,v 1.4 2005/10/16 18:06:07 tsi Exp $ */ /* * mivaltree.c -- @@ -84,7 +84,7 @@ * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ -#include "X.h" +#include #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" @@ -568,8 +568,8 @@ and that top-level windows aren't clipped to the root window. */ /*ARGSUSED*/ -// fixme this is ugly -// Xprint/ValTree.c doesn't work, but maybe that method can? +/* fixme this is ugly */ +/* Xprint/ValTree.c doesn't work, but maybe that method can? */ int RootlessMiValidateTree (pRoot, pChild, kind) WindowPtr pRoot; /* Parent to validate */ @@ -593,7 +593,7 @@ if (REGION_BROKEN (pScreen, &pRoot->clipList) && !REGION_BROKEN (pScreen, &pRoot->borderClip)) { - // fixme this might not work, but hopefully doesn't happen anyway. + /* fixme this might not work, but hopefully doesn't happen anyway */ kind = VTBroken; REGION_EMPTY (pScreen, &pRoot->clipList); ErrorF("ValidateTree: BUSTED!\n"); Index: xc/programs/Xserver/miext/rootless/rootlessWindow.c diff -u xc/programs/Xserver/miext/rootless/rootlessWindow.c:1.12 xc/programs/Xserver/miext/rootless/rootlessWindow.c:1.13 --- xc/programs/Xserver/miext/rootless/rootlessWindow.c:1.12 Thu Jul 1 21:30:33 2004 +++ xc/programs/Xserver/miext/rootless/rootlessWindow.c Sun Oct 16 14:06:07 2005 @@ -28,7 +28,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.12 2004/07/02 01:30:33 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.13 2005/10/16 18:06:07 tsi Exp $ */ #include "rootlessCommon.h" #include "rootlessWindow.h" @@ -59,7 +59,7 @@ Bool result; RegionRec saveRoot; - WINREC(pWin) = NULL; + WINPRV(pWin) = NULL; SCREEN_UNWRAP(pWin->drawable.pScreen, CreateWindow); @@ -100,7 +100,7 @@ #endif xfree(winRec); - WINREC(pWin) = NULL; + WINPRV(pWin) = NULL; } @@ -158,7 +158,7 @@ RegionRec newShape; RegionPtr pShape; - // If the window is not yet framed, do nothing + /* If the window is not yet framed, do nothing */ if (winRec == NULL) return; @@ -170,14 +170,14 @@ pShape = RootlessGetShape(pWin, &newShape) ? &newShape : NULL; #ifdef ROOTLESSDEBUG - RL_DEBUG_MSG("reshaping..."); + RL_DEBUG_MSG(("reshaping...")); if (pShape != NULL) { - RL_DEBUG_MSG("numrects %d, extents %d %d %d %d ", + RL_DEBUG_MSG(("numrects %d, extents %d %d %d %d ", REGION_NUM_RECTS(&newShape), newShape.extents.x1, newShape.extents.y1, - newShape.extents.x2, newShape.extents.y2); + newShape.extents.x2, newShape.extents.y2)); } else { - RL_DEBUG_MSG("no shape "); + RL_DEBUG_MSG(("no shape ")); } #endif @@ -206,7 +206,7 @@ RootlessReshapeFrame(pWin); } -#endif // SHAPE +#endif /* SHAPE */ /* Disallow ParentRelative background on top-level windows @@ -220,21 +220,21 @@ Bool result; ScreenPtr pScreen = pWin->drawable.pScreen; - RL_DEBUG_MSG("change window attributes start "); + RL_DEBUG_MSG(("change window attributes start ")); SCREEN_UNWRAP(pScreen, ChangeWindowAttributes); result = pScreen->ChangeWindowAttributes(pWin, vmask); SCREEN_WRAP(pScreen, ChangeWindowAttributes); if (WINREC(pWin)) { - // disallow ParentRelative background state + /* disallow ParentRelative background state */ if (pWin->backgroundState == ParentRelative) { XID pixel = 0; ChangeWindowAttributes(pWin, CWBackPixel, &pixel, serverClient); } } - RL_DEBUG_MSG("change window attributes end\n"); + RL_DEBUG_MSG(("change window attributes end\n")); return result; } @@ -253,18 +253,18 @@ RootlessWindowRec *winRec = WINREC(pWin); Bool result; - RL_DEBUG_MSG("positionwindow start (win 0x%x @ %i, %i)\n", pWin, x, y); + RL_DEBUG_MSG(("positionwindow start (win 0x%x @ %i, %i)\n", pWin, x, y)); if (winRec) { if (winRec->is_drawing) { - // Reset frame's pixmap and move it to the new position. + /* Reset frame's pixmap and move it to the new position */ int bw = wBorderWidth(pWin); winRec->pixmap->devPrivate.ptr = winRec->pixelData; SetPixmapBaseToScreen(winRec->pixmap, x - bw, y - bw); #ifdef ROOTLESS_TRACK_DAMAGE - // Move damaged region to correspond to new window position + /* Move damaged region to correspond to new window position */ if (REGION_NOTEMPTY(pScreen, &winRec->damage)) { REGION_TRANSLATE(pScreen, &winRec->damage, x - bw - winRec->x, @@ -278,7 +278,7 @@ result = pScreen->PositionWindow(pWin, x, y); SCREEN_WRAP(pScreen, PositionWindow); - RL_DEBUG_MSG("positionwindow end\n"); + RL_DEBUG_MSG(("positionwindow end\n")); return result; } @@ -346,24 +346,24 @@ winRec->pixmap = NULL; winRec->wid = NULL; - WINREC(pWin) = winRec; + WINPRV(pWin) = winRec; #ifdef SHAPE - // Set the frame's shape if the window is shaped + /* Set the frame's shape if the window is shaped */ if (RootlessGetShape(pWin, &shape)) pShape = &shape; #endif - RL_DEBUG_MSG("creating frame "); + RL_DEBUG_MSG(("creating frame ")); if (!SCREENREC(pScreen)->imp->CreateFrame(winRec, pScreen, winRec->x + SCREEN_TO_GLOBAL_X, winRec->y + SCREEN_TO_GLOBAL_Y, pShape)) { - RL_DEBUG_MSG("implementation failed to create frame!\n"); + RL_DEBUG_MSG(("implementation failed to create frame!\n")); xfree(winRec); - WINREC(pWin) = NULL; + WINPRV(pWin) = NULL; return NULL; } @@ -388,7 +388,7 @@ RegionRec saveRoot; ScreenPtr pScreen = pWin->drawable.pScreen; - RL_DEBUG_MSG("realizewindow start (win 0x%x) ", pWin); + RL_DEBUG_MSG(("realizewindow start (win 0x%x) ", pWin)); if ((IsTopLevel(pWin) && pWin->drawable.class == InputOutput)) { RootlessWindowRec *winRec; @@ -399,10 +399,12 @@ winRec->is_reorder_pending = TRUE; - RL_DEBUG_MSG("Top level window "); + RL_DEBUG_MSG(("Top level window ")); - // Disallow ParentRelative background state on top-level windows. - // This might have been set before the window was mapped. + /* + * Disallow ParentRelative background state on top-level windows. + * This might have been set before the window was mapped. + */ if (pWin->backgroundState == ParentRelative) { XID pixel = 0; ChangeWindowAttributes(pWin, CWBackPixel, &pixel, serverClient); @@ -415,7 +417,7 @@ SCREEN_WRAP(pScreen, RealizeWindow); if (!IsRoot(pWin)) NORMAL_ROOT(pWin); - RL_DEBUG_MSG("realizewindow end\n"); + RL_DEBUG_MSG(("realizewindow end\n")); return result; } @@ -459,7 +461,7 @@ RootlessWindowRec *winRec = WINREC(pWin); Bool result; - RL_DEBUG_MSG("unrealizewindow start "); + RL_DEBUG_MSG(("unrealizewindow start ")); if (winRec) { RootlessStopDrawing(pWin, FALSE); @@ -473,7 +475,7 @@ result = pScreen->UnrealizeWindow(pWin); SCREEN_WRAP(pScreen, UnrealizeWindow); - RL_DEBUG_MSG("unrealizewindow end\n"); + RL_DEBUG_MSG(("unrealizewindow end\n")); return result; } @@ -531,9 +533,9 @@ RootlessWindowRec *winRec = WINREC(pWin); ScreenPtr pScreen = pWin->drawable.pScreen; - RL_DEBUG_MSG("restackwindow start "); + RL_DEBUG_MSG(("restackwindow start ")); if (winRec) - RL_DEBUG_MSG("restack top level \n"); + RL_DEBUG_MSG(("restack top level \n")); HUGE_ROOT(pWin); SCREEN_UNWRAP(pScreen, RestackWindow); @@ -548,7 +550,7 @@ RootlessReorderWindow(pWin); } - RL_DEBUG_MSG("restackwindow end\n"); + RL_DEBUG_MSG(("restackwindow end\n")); } @@ -556,7 +558,7 @@ * Specialized window copy procedures */ -// Globals needed during window resize and move. +/* Globals needed during window resize and move */ static pointer gResizeDeathBits = NULL; static int gResizeDeathCount = 0; static PixmapPtr gResizeDeathPix[2] = {NULL, NULL}; @@ -572,11 +574,11 @@ RootlessNoCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { - // some code expects the region to be translated + /* some code expects the region to be translated */ int dx = ptOldOrg.x - pWin->drawable.x; int dy = ptOldOrg.y - pWin->drawable.y; - RL_DEBUG_MSG("ROOTLESSNOCOPYWINDOW "); + RL_DEBUG_MSG(("ROOTLESSNOCOPYWINDOW ")); REGION_TRANSLATE(pWin->drawable.pScreen, prgnSrc, -dx, -dy); } @@ -597,7 +599,7 @@ RegionRec rgnDst; int dx, dy; - RL_DEBUG_MSG("resizecopywindowFB start (win 0x%x) ", pWin); + RL_DEBUG_MSG(("resizecopywindowFB start (win 0x%x) ", pWin)); /* Don't unwrap pScreen->CopyWindow. The bogus rewrap with RootlessCopyWindow causes a crash if @@ -647,7 +649,7 @@ fbValidateDrawable(&pWin->drawable); - RL_DEBUG_MSG("resizecopywindowFB end\n"); + RL_DEBUG_MSG(("resizecopywindowFB end\n")); } @@ -667,7 +669,7 @@ BoxPtr extents; int area; - RL_DEBUG_MSG("copywindowFB start (win 0x%x) ", pWin); + RL_DEBUG_MSG(("copywindowFB start (win 0x%x) ", pWin)); SCREEN_UNWRAP(pScreen, CopyWindow); @@ -691,13 +693,13 @@ top = TopLevelParent(pWin); if (top == NULL) { - RL_DEBUG_MSG("no parent\n"); + RL_DEBUG_MSG(("no parent\n")); return; } winRec = WINREC(top); if (winRec == NULL) { - RL_DEBUG_MSG("not framed\n"); + RL_DEBUG_MSG(("not framed\n")); return; } @@ -726,7 +728,7 @@ SCREEN_WRAP(pScreen, CopyWindow); - RL_DEBUG_MSG("copywindowFB end\n"); + RL_DEBUG_MSG(("copywindowFB end\n")); } @@ -736,7 +738,7 @@ enum { WIDTH_SMALLER = 1, - HEIGHT_SMALLER = 2, + HEIGHT_SMALLER = 2 }; @@ -802,10 +804,10 @@ rect.x2 = min(oldX2, newX2); rect.y2 = min(oldY2, newY2); - RL_DEBUG_MSG("RESIZE TOPLEVEL WINDOW with gravity %i ", gravity); - RL_DEBUG_MSG("%d %d %d %d %d %d %d %d %d %d\n", + RL_DEBUG_MSG(("RESIZE TOPLEVEL WINDOW with gravity %i ", gravity)); + RL_DEBUG_MSG(("%d %d %d %d %d %d %d %d %d %d\n", oldX, oldY, oldW, oldH, oldBW, - newX, newY, newW, newH, newBW); + newX, newY, newW, newH, newBW)); RootlessRedisplay(pWin); @@ -937,7 +939,10 @@ memcpy(gResizeDeathBits, winRec->pixelData, winRec->bytesPerRow * winRec->height); - gResizeDeathBounds[0] = (BoxRec) {oldX, oldY, oldX2, oldY2}; + gResizeDeathBounds[0].x1 = oldX; + gResizeDeathBounds[0].y1 = oldY; + gResizeDeathBounds[0].x2 = oldX2; + gResizeDeathBounds[0].y2 = oldY2; gResizeDeathPix[0] = GetScratchPixmapHeader(pScreen, winRec->width, winRec->height, @@ -974,7 +979,10 @@ window bits. */ if (need_window_source) { - gResizeDeathBounds[0] = (BoxRec) {oldX, oldY, oldX2, oldY2}; + gResizeDeathBounds[0].x1 = oldX; + gResizeDeathBounds[0].y1 = oldY; + gResizeDeathBounds[0].x2 = oldX2; + gResizeDeathBounds[0].y2 = oldY2; gResizeDeathPix[0] = GetScratchPixmapHeader(pScreen, oldW, oldH, winRec->win->drawable.depth, @@ -1009,8 +1017,8 @@ src = gResizeDeathPix[0]; dst = pScreen->GetWindowPixmap(pWin); - RL_DEBUG_MSG("Resize copy rect %d %d %d %d\n", - rect.x1, rect.y1, rect.x2, rect.y2); + RL_DEBUG_MSG(("Resize copy rect %d %d %d %d\n", + rect.x1, rect.y1, rect.x2, rect.y2)); /* rect is the intersection of the old location and new location */ if (BOX_NOT_EMPTY(rect) && src != NULL && dst != NULL) { @@ -1101,7 +1109,7 @@ Bool resize_after = FALSE; RegionRec saveRoot; - RL_DEBUG_MSG("movewindow start \n"); + RL_DEBUG_MSG(("movewindow start \n")); if (winRec) { if (kind == VTMove) { @@ -1110,7 +1118,7 @@ RootlessRedisplay(pWin); RootlessStartDrawing(pWin); } else { - RL_DEBUG_MSG("movewindow border resizing "); + RL_DEBUG_MSG(("movewindow border resizing ")); oldBW = winRec->borderWidth; oldX = winRec->x; @@ -1159,7 +1167,7 @@ } } - RL_DEBUG_MSG("movewindow end\n"); + RL_DEBUG_MSG(("movewindow end\n")); } @@ -1182,7 +1190,7 @@ Bool resize_after = FALSE; RegionRec saveRoot; - RL_DEBUG_MSG("resizewindow start (win 0x%x) ", pWin); + RL_DEBUG_MSG(("resizewindow start (win 0x%x) ", pWin)); if (winRec) { oldBW = winRec->borderWidth; @@ -1213,7 +1221,7 @@ newX, newY, newW, newH, newBW, resize_after); } - RL_DEBUG_MSG("resizewindow end\n"); + RL_DEBUG_MSG(("resizewindow end\n")); } @@ -1282,8 +1290,8 @@ /* Switch the frame record from one to the other. */ - WINREC(pWin) = NULL; - WINREC(pTopWin) = winRec; + WINPRV(pWin) = NULL; + WINPRV(pTopWin) = winRec; RootlessInitializeFrame(pTopWin, winRec); RootlessReshapeFrame(pTopWin); @@ -1324,10 +1332,10 @@ while (pWin->backgroundState == ParentRelative) { if (pWin == topWin) { - // disallow ParentRelative background state on top level + /* disallow ParentRelative background state on top level */ XID pixel = 0; ChangeWindowAttributes(pWin, CWBackPixel, &pixel, serverClient); - RL_DEBUG_MSG("Cleared ParentRelative on 0x%x.\n", pWin); + RL_DEBUG_MSG(("Cleared ParentRelative on 0x%x.\n", pWin)); break; } @@ -1348,15 +1356,17 @@ if (IsRoot(pWin)) return; - RL_DEBUG_MSG("paintwindowbackground start (win 0x%x, framed %i) ", - pWin, IsFramedWindow(pWin)); + RL_DEBUG_MSG(("paintwindowbackground start (win 0x%x, framed %i) ", + pWin, IsFramedWindow(pWin))); if (IsFramedWindow(pWin)) { RootlessStartDrawing(pWin); RootlessDamageRegion(pWin, pRegion); - // For ParentRelative windows, we have to make sure the window - // pixmap is set correctly all the way up the ancestor chain. + /* + * For ParentRelative windows, we have to make sure the window + * pixmap is set correctly all the way up the ancestor chain. + */ if (pWin->backgroundState == ParentRelative) { SetPixmapOfAncestors(pWin); } @@ -1366,7 +1376,7 @@ pScreen->PaintWindowBackground(pWin, pRegion, what); SCREEN_WRAP(pScreen, PaintWindowBackground); - RL_DEBUG_MSG("paintwindowbackground end\n"); + RL_DEBUG_MSG(("paintwindowbackground end\n")); } @@ -1376,15 +1386,17 @@ void RootlessPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion, int what) { - RL_DEBUG_MSG("paintwindowborder start (win 0x%x) ", pWin); + RL_DEBUG_MSG(("paintwindowborder start (win 0x%x) ", pWin)); if (IsFramedWindow(pWin)) { RootlessStartDrawing(pWin); RootlessDamageRegion(pWin, pRegion); - // For ParentRelative windows with tiled borders, we have to make - // sure the window pixmap is set correctly all the way up the - // ancestor chain. + /* + * For ParentRelative windows with tiled borders, we have to make + * sure the window pixmap is set correctly all the way up the + * ancestor chain. + */ if (!pWin->borderIsPixel && pWin->backgroundState == ParentRelative) { @@ -1396,7 +1408,7 @@ pWin->drawable.pScreen->PaintWindowBorder(pWin, pRegion, what); SCREEN_WRAP(pWin->drawable.pScreen, PaintWindowBorder); - RL_DEBUG_MSG("paintwindowborder end\n"); + RL_DEBUG_MSG(("paintwindowborder end\n")); } @@ -1412,7 +1424,7 @@ RegionRec saveRoot; Bool resize_after = FALSE; - RL_DEBUG_MSG("change border width "); + RL_DEBUG_MSG(("change border width ")); if (width != wBorderWidth(pWin)) { RootlessWindowRec *winRec = WINREC(pWin); @@ -1450,5 +1462,5 @@ } } - RL_DEBUG_MSG("change border width end\n"); + RL_DEBUG_MSG(("change border width end\n")); } Index: xc/programs/Xserver/miext/rootless/rootlessWindow.h diff -u xc/programs/Xserver/miext/rootless/rootlessWindow.h:1.2 xc/programs/Xserver/miext/rootless/rootlessWindow.h:1.3 --- xc/programs/Xserver/miext/rootless/rootlessWindow.h:1.2 Sun Jun 29 21:45:13 2003 +++ xc/programs/Xserver/miext/rootless/rootlessWindow.h Sun Oct 16 14:06:07 2005 @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.3 2005/10/16 18:06:07 tsi Exp $ */ #ifndef _ROOTLESSWINDOW_H #define _ROOTLESSWINDOW_H @@ -39,7 +39,7 @@ #ifdef SHAPE void RootlessSetShape(WindowPtr pWin); -#endif // SHAPE +#endif /* SHAPE */ Bool RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask); Bool RootlessPositionWindow(WindowPtr pWin, int x, int y); Index: xc/programs/Xserver/miext/rootless/accel/Imakefile diff -u xc/programs/Xserver/miext/rootless/accel/Imakefile:1.2 xc/programs/Xserver/miext/rootless/accel/Imakefile:1.3 --- xc/programs/Xserver/miext/rootless/accel/Imakefile:1.2 Thu Mar 18 02:07:11 2004 +++ xc/programs/Xserver/miext/rootless/accel/Imakefile Fri Oct 14 11:17:25 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/miext/rootless/accel/Imakefile,v 1.2 2004/03/18 07:07:11 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/miext/rootless/accel/Imakefile,v 1.3 2005/10/14 15:17:25 tsi Exp $ #include @@ -18,9 +18,8 @@ rlGlyph.o \ rlSolid.o -INCLUDES = -I. -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(SERVERSRC)/render \ - -I$(EXTINCSRC) -I$(SERVERSRC)/Xext -I.. +INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/render -I$(SERVERSRC)/Xext -I.. NormalLibraryObjectRule() LibraryModuleTarget(rlAccel,$(OBJS),.) Index: xc/programs/Xserver/miext/rootless/accel/rlGlyph.c diff -u xc/programs/Xserver/miext/rootless/accel/rlGlyph.c:1.1 xc/programs/Xserver/miext/rootless/accel/rlGlyph.c:1.2 --- xc/programs/Xserver/miext/rootless/accel/rlGlyph.c:1.1 Thu Oct 23 20:33:15 2003 +++ xc/programs/Xserver/miext/rootless/accel/rlGlyph.c Fri Oct 14 11:17:25 2005 @@ -22,10 +22,10 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlGlyph.c,v 1.1 2003/10/24 00:33:15 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/accel/rlGlyph.c,v 1.2 2005/10/14 15:17:25 tsi Exp $ */ #include "fb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "rlAccel.h" Index: xc/programs/Xserver/miext/rootless/safeAlpha/Imakefile diff -u xc/programs/Xserver/miext/rootless/safeAlpha/Imakefile:1.2 xc/programs/Xserver/miext/rootless/safeAlpha/Imakefile:1.3 --- xc/programs/Xserver/miext/rootless/safeAlpha/Imakefile:1.2 Thu Mar 18 02:07:13 2004 +++ xc/programs/Xserver/miext/rootless/safeAlpha/Imakefile Fri Oct 14 11:17:25 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/Imakefile,v 1.2 2004/03/18 07:07:13 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/Imakefile,v 1.3 2005/10/14 15:17:25 tsi Exp $ #include @@ -8,9 +8,8 @@ OBJS = safeAlphaPicture.o \ safeAlphaWindow.o - INCLUDES = -I. -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(SERVERSRC)/render \ - -I$(EXTINCSRC) -I$(SERVERSRC)/Xext -I.. + INCLUDES = -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/render -I$(SERVERSRC)/Xext -I.. NormalLibraryObjectRule() LibraryModuleTarget(safeAlpha,$(OBJS),.) Index: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c diff -u xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c:1.2 xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c:1.3 --- xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c:1.2 Sun Jan 18 20:22:48 2004 +++ xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c Sun Feb 19 10:51:31 2006 @@ -31,17 +31,12 @@ * * Copyright © 1998 Keith Packard */ -/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.2 2004/01/19 01:22:48 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c,v 1.3 2006/02/19 15:51:31 tsi Exp $ */ #include "fb.h" #include "safeAlpha.h" #include "rootlessCommon.h" -#ifdef PANORAMIX -#include "panoramiX.h" -#include "panoramiXsrv.h" -#endif - /* * SafeAlphaFillRegionTiled * Fill using a tile while leaving the alpha channel untouched. @@ -68,17 +63,6 @@ int yRot = pDrawable->y; FbBits planeMask; -#ifdef PANORAMIX - if(!noPanoramiXExtension) - { - int index = pDrawable->pScreen->myNum; - if(&WindowTable[index]->drawable == pDrawable) - { - xRot -= panoramiXdataPtr[index].x; - yRot -= panoramiXdataPtr[index].y; - } - } -#endif fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff); fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff); Index: xc/programs/Xserver/miext/shadow/Imakefile diff -u xc/programs/Xserver/miext/shadow/Imakefile:1.10 xc/programs/Xserver/miext/shadow/Imakefile:1.11 --- xc/programs/Xserver/miext/shadow/Imakefile:1.10 Wed Jun 2 18:43:05 2004 +++ xc/programs/Xserver/miext/shadow/Imakefile Fri Oct 14 11:17:25 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/miext/shadow/Imakefile,v 1.10 2004/06/02 22:43:05 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/miext/shadow/Imakefile,v 1.11 2005/10/14 15:17:25 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -97,9 +97,8 @@ shrot32pack_270.o INCLUDES = -I$(SERVERSRC)/miext/shadow -I$(SERVERSRC)/mi -I$(SERVERSRC)/fb \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) -I$(XF86SRC)/common $(EXTRAINCLUDES) \ - -I$(SERVERSRC)/render -I$(EXTINCSRC) + -I$(SERVERSRC)/include -I$(XF86SRC)/common $(EXTRAINCLUDES) \ + -I$(SERVERSRC)/render LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \ $(SERVERSRC)/mi/llib-lmi.ln Index: xc/programs/Xserver/miext/shadow/shadow.c diff -u xc/programs/Xserver/miext/shadow/shadow.c:1.15 xc/programs/Xserver/miext/shadow/shadow.c:1.16 --- xc/programs/Xserver/miext/shadow/shadow.c:1.15 Mon Nov 10 13:22:51 2003 +++ xc/programs/Xserver/miext/shadow/shadow.c Fri Oct 14 11:17:25 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.15 2003/11/10 18:22:51 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shadow.c,v 1.16 2005/10/14 15:17:25 tsi Exp $ * * Copyright © 2000 Keith Packard * @@ -23,12 +23,12 @@ */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" Index: xc/programs/Xserver/miext/shadow/shalloc.c diff -u xc/programs/Xserver/miext/shadow/shalloc.c:1.1 xc/programs/Xserver/miext/shadow/shalloc.c:1.2 --- xc/programs/Xserver/miext/shadow/shalloc.c:1.1 Thu Sep 7 19:12:15 2000 +++ xc/programs/Xserver/miext/shadow/shalloc.c Fri Oct 14 11:17:25 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shalloc.c,v 1.1 2000/09/07 23:12:15 keithp Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shalloc.c,v 1.2 2005/10/14 15:17:25 tsi Exp $ * * Copyright © 2000 Keith Packard * @@ -23,12 +23,12 @@ */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" Index: xc/programs/Xserver/miext/shadow/shpacked.c diff -u xc/programs/Xserver/miext/shadow/shpacked.c:1.5 xc/programs/Xserver/miext/shadow/shpacked.c:1.6 --- xc/programs/Xserver/miext/shadow/shpacked.c:1.5 Sat Oct 27 23:34:16 2001 +++ xc/programs/Xserver/miext/shadow/shpacked.c Fri Oct 14 11:17:25 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.5 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shpacked.c,v 1.6 2005/10/14 15:17:25 tsi Exp $ * * Copyright © 2000 Keith Packard * @@ -22,12 +22,12 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" Index: xc/programs/Xserver/miext/shadow/shplanar.c diff -u xc/programs/Xserver/miext/shadow/shplanar.c:1.4 xc/programs/Xserver/miext/shadow/shplanar.c:1.5 --- xc/programs/Xserver/miext/shadow/shplanar.c:1.4 Sat Oct 27 23:34:16 2001 +++ xc/programs/Xserver/miext/shadow/shplanar.c Fri Oct 14 11:17:25 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar.c,v 1.5 2005/10/14 15:17:25 tsi Exp $ * * Copyright © 2000 Keith Packard * @@ -22,12 +22,12 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" Index: xc/programs/Xserver/miext/shadow/shplanar8.c diff -u xc/programs/Xserver/miext/shadow/shplanar8.c:1.4 xc/programs/Xserver/miext/shadow/shplanar8.c:1.5 --- xc/programs/Xserver/miext/shadow/shplanar8.c:1.4 Sat Oct 27 23:34:16 2001 +++ xc/programs/Xserver/miext/shadow/shplanar8.c Fri Oct 14 11:17:25 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shplanar8.c,v 1.5 2005/10/14 15:17:25 tsi Exp $ * * Copyright © 2000 Keith Packard * @@ -22,12 +22,12 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" Index: xc/programs/Xserver/miext/shadow/shrotate.c diff -u xc/programs/Xserver/miext/shadow/shrotate.c:1.5 xc/programs/Xserver/miext/shadow/shrotate.c:1.8 --- xc/programs/Xserver/miext/shadow/shrotate.c:1.5 Wed Oct 9 13:00:11 2002 +++ xc/programs/Xserver/miext/shadow/shrotate.c Fri Oct 14 21:10:43 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.5 2002/10/09 17:00:11 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.8 2005/10/15 01:10:43 tsi Exp $ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * @@ -22,12 +22,12 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" @@ -45,6 +45,106 @@ #define TOP_TO_BOTTOM 2 #define BOTTOM_TO_TOP -2 + +static void +shadowUpdateRotatePackedSubRectangle(shadowBufPtr pBuf, + FbBits *shaLine, int shaFirstShift, + int shaStepOverX, int shaStepOverY, + int shaStepDownX, int shaStepDownY, + int shaBpp, FbBits shaMask, + ScreenPtr pScreen, + int scr_x1, int scr_y, + int scr_h, int scr_w, + int pixelsPerBits) +{ + FbBits *sha; + int shaShift; + int scr_x; + int w; + + /* + * Copy the bits, always write across the physical frame buffer + * to take advantage of write combining. + */ + while (scr_h--) + { + int p; + FbBits bits; + FbBits *win; + int i; + CARD32 winSize; + + sha = shaLine; + shaShift = shaFirstShift; + w = scr_w; + scr_x = scr_x1 * shaBpp >> FB_SHIFT; + + while (w) + { + /* + * Map some of this line + */ + win = (FbBits *) (*pBuf->window) (pScreen, + scr_y, + scr_x << 2, + SHADOW_WINDOW_WRITE, + &winSize, + pBuf->closure); + i = (winSize >> 2); + if (i > w) + i = w; + w -= i; + scr_x += i; + /* + * Copy the portion of the line mapped + */ + while (i--) + { + bits = 0; + p = pixelsPerBits; + /* + * Build one word of output from multiple inputs + */ + while (p--) + { + bits = FbScrLeft(bits, shaBpp); + bits |= FbScrRight (*sha, shaShift) & shaMask; + + shaShift -= shaStepOverX; + if (shaShift >= FB_UNIT) + { + shaShift -= FB_UNIT; + sha--; + } + else if (shaShift < 0) + { + shaShift += FB_UNIT; + sha++; + } + sha += shaStepOverY; + } + *win++ = bits; + } + } + scr_y++; + shaFirstShift -= shaStepDownX; + if (shaFirstShift >= FB_UNIT) + { + shaFirstShift -= FB_UNIT; + shaLine--; + } + else if (shaFirstShift < 0) + { + shaFirstShift += FB_UNIT; + shaLine++; + } + shaLine += shaStepDownY; + } +} + +#define BLOCKSIZE_HEIGHT 32 +#define BLOCKSIZE_WIDTH 32 + void shadowUpdateRotatePacked (ScreenPtr pScreen, shadowBufPtr pBuf) @@ -59,9 +159,8 @@ int shaXoff, shaYoff; int box_x1, box_x2, box_y1, box_y2; int sha_x1 = 0, sha_y1 = 0; - int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0, scr_w, scr_h; + int scr_x1 = 0, scr_x2 = 0, scr_y1 = 0, scr_y2 = 0; int scr_x, scr_y; - int w; int pixelsPerBits; int pixelsMask; FbStride shaStepOverY = 0, shaStepDownY = 0; @@ -208,8 +307,6 @@ sha_x1 = box_x1; break; } - scr_w = ((scr_x2 - scr_x1) * shaBpp) >> FB_SHIFT; - scr_h = scr_y2 - scr_y1; scr_y = scr_y1; /* shift amount for first pixel on screen */ @@ -221,86 +318,46 @@ ((sha_x1 * shaBpp) >> FB_SHIFT)); /* - * Copy the bits, always write across the physical frame buffer - * to take advantage of write combining. + * Copy in blocks of size BLOCKSIZE_WIDTH x BLOCKSIZE_HEIGHT + * to reduce the number of cache misses when rotating 90 or + * 270 degrees. */ - while (scr_h--) + for (scr_y = scr_y1; scr_y < scr_y2; scr_y += BLOCKSIZE_HEIGHT) { - int p; - FbBits bits; - FbBits *win; - int i; - CARD32 winSize; - sha = shaLine; shaShift = shaFirstShift; - w = scr_w; - scr_x = scr_x1 * shaBpp >> FB_SHIFT; - while (w) + for (scr_x = scr_x1; scr_x < scr_x2; scr_x += BLOCKSIZE_WIDTH) { - /* - * Map some of this line - */ - win = (FbBits *) (*pBuf->window) (pScreen, - scr_y, - scr_x << 2, - SHADOW_WINDOW_WRITE, - &winSize, - pBuf->closure); - i = (winSize >> 2); - if (i > w) - i = w; - w -= i; - scr_x += i; - /* - * Copy the portion of the line mapped - */ - while (i--) - { - bits = 0; - p = pixelsPerBits; - /* - * Build one word of output from multiple inputs - * - * Note that for 90/270 rotations, this will walk - * down the shadow hitting each scanline once. - * This is probably not very efficient. - */ - while (p--) - { - bits = FbScrLeft(bits, shaBpp); - bits |= FbScrRight (*sha, shaShift) & shaMask; + int h = BLOCKSIZE_HEIGHT; + int w = BLOCKSIZE_WIDTH; - shaShift -= shaStepOverX; - if (shaShift >= FB_UNIT) - { - shaShift -= FB_UNIT; - sha--; - } - else if (shaShift < 0) - { - shaShift += FB_UNIT; - sha++; - } - sha += shaStepOverY; - } - *win++ = bits; - } - } - scr_y++; - shaFirstShift -= shaStepDownX; - if (shaFirstShift >= FB_UNIT) - { - shaFirstShift -= FB_UNIT; - shaLine--; - } - else if (shaFirstShift < 0) - { - shaFirstShift += FB_UNIT; - shaLine++; + if (scr_y + h > scr_y2) + h = scr_y2 - scr_y; + if (scr_x + w > scr_x2) + w = scr_x2 - scr_x; + w = (w * shaBpp) >> FB_SHIFT; + + shadowUpdateRotatePackedSubRectangle + (pBuf, + sha, shaShift, + shaStepOverX, shaStepOverY, + shaStepDownX, shaStepDownY, + shaBpp, shaMask, + pScreen, + scr_x, scr_y, + h, w, + pixelsPerBits); + + shaShift -= BLOCKSIZE_WIDTH * shaStepOverX; + sha += BLOCKSIZE_WIDTH * shaStepOverY; + sha -= (shaShift >> FB_SHIFT); + shaShift &= FB_MASK; } - shaLine += shaStepDownY; + shaFirstShift -= BLOCKSIZE_HEIGHT * shaStepDownX; + shaLine += BLOCKSIZE_HEIGHT * shaStepDownY; + shaLine -= (shaFirstShift >> FB_SHIFT); + shaFirstShift &= FB_MASK; } } } Index: xc/programs/Xserver/miext/shadow/shrotpack.h diff -u xc/programs/Xserver/miext/shadow/shrotpack.h:1.4 xc/programs/Xserver/miext/shadow/shrotpack.h:1.5 --- xc/programs/Xserver/miext/shadow/shrotpack.h:1.4 Sat Oct 27 23:34:16 2001 +++ xc/programs/Xserver/miext/shadow/shrotpack.h Fri Oct 14 11:17:25 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.4 2001/10/28 03:34:16 tsi Exp $ + * $XFree86: xc/programs/Xserver/miext/shadow/shrotpack.h,v 1.5 2005/10/14 15:17:25 tsi Exp $ * * Copyright © 2000 Keith Packard * @@ -27,12 +27,12 @@ * orientations work. */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "mi.h" #include "regionstr.h" #include "globals.h" Index: xc/programs/Xserver/os/Imakefile diff -u xc/programs/Xserver/os/Imakefile:3.44 xc/programs/Xserver/os/Imakefile:3.47 --- xc/programs/Xserver/os/Imakefile:3.44 Wed Feb 2 21:01:14 2005 +++ xc/programs/Xserver/os/Imakefile Sun Feb 19 10:51:31 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.44 2005/02/03 02:01:14 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.47 2006/02/19 15:51:31 tsi Exp $ /* - * Copyright (c) 1996-2004 by The XFree86 Project, Inc. + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -46,13 +46,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - - -#if BuildSeparateTinyDIX && !BuildTinyDIX -#define IHaveSubdirs -SUBDIRS = tiny -#endif - #include /* @@ -117,7 +110,13 @@ LBX_OBJS = #endif -#if !defined(DDXOsColor) +#if BuiltinRGB +BUILTIN_RGB_SRC = builtinrgb.c +BUILTIN_RGB_OBJ = builtinrgb.o +RGB_DEFINES = -DBUILTIN_RGB +#endif + +#if !defined(DDXOsColor) || !DDXOsColor COLOR_SRCS=oscolor.c COLOR_OBJS=oscolor.o #endif @@ -147,11 +146,13 @@ BOOTSTRAPCFLAGS = SRCS = WaitFor.c access.c connection.c io.c $(COLOR_SRCS) \ + $(BUILTIN_RGB_SRC) \ osinit.c utils.c log.c auth.c mitauth.c secauth.c \ $(XDMAUTHSRCS) $(RPCSRCS) $(KRB5SRCS) xdmcp.c OtherSources \ transport.c $(SNPRINTF_SRCS) $(STRLCAT_SRCS) \ $(MALLOC_SRCS) $(LBX_SRCS) OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \ + $(BUILTIN_RGB_OBJ) \ osinit.o utils.o log.o auth.o mitauth.o secauth.o \ $(XDMAUTHOBJS) $(RPCOBJS) $(KRB5OBJS) xdmcp.o OtherObjects \ transport.o $(SNPRINTF_OBJS) $(STRLCAT_OBJS) \ @@ -166,9 +167,6 @@ #if UseMemLeak MEM_DEFINES = -DMEMBUG #endif -#if UseRgbTxt - RGB_DEFINES = -DUSE_RGB_TXT -#endif DBM_DEFINES = NdbmDefines ADM_DEFINES = -DADMPATH=\"$(ADMDIR)/X\%smsgs\" XDMCP_DEFINES = ServerXdmcpDefines @@ -179,8 +177,8 @@ PAM_DEFINES = -DUSE_PAM #endif -#if BuildTinyDIX -TINY_DEFINES = TinyDIXDefines +#ifndef LinkDefines +#define LinkDefines /**/ #endif #if !HasStrlcat @@ -189,13 +187,13 @@ DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) \ $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \ $(KRB5_DEFINES) $(RGB_DEFINES) $(GETPEEREID_DEFINES) \ - $(STRLCAT_DEFINES) $(RANDOM_DEFINES) $(TINY_DEFINES) \ - $(ASPRINTF_DEFINES) - INCLUDES = -I$(SERVERSRC)/os -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \ - -I$(TOP)/lib/Xau -I$(SERVERSRC)/lbx Krb5Includes - DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \ + $(STRLCAT_DEFINES) $(RANDOM_DEFINES) $(ASPRINTF_DEFINES) \ + $(EXT_DEFINES) LinkDefines + INCLUDES = -I$(SERVERSRC)/include -I$(SERVERSRC)/os \ + -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ + -I$(SERVERSRC)/lbx -I$(SERVERSRC)/Xprint \ + -I$(TOP)/lib/Xau Krb5Includes + DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) \ $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines LINTLIBS = ../dix/llib-ldix.ln @@ -226,12 +224,12 @@ SpecialCObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES)) LinkSourceFile(transport.c,$(TRANSCOMMSRC)) SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES)) -SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES) $(TINY_DEFINES)) -SpecialCObjectRule(io,$(ICONFIGFILES),$(EXT_DEFINES) $(TINY_DEFINES)) +SpecialCObjectRule(WaitFor,$(ICONFIGFILES),NullParameter) +SpecialCObjectRule(io,$(ICONFIGFILES),NullParameter) #if BuildLBX -SpecialCObjectRule(lbxio,$(ICONFIGFILES),$(EXT_DEFINES) $(TINY_DEFINES)) +SpecialCObjectRule(lbxio,$(ICONFIGFILES),NullParameter) #endif -SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(TINY_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES)) +SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES)) SpecialCObjectRule(xalloc,$(ICONFIGFILES),$(XALLOC_DEFINES)) #if defined(SparcArchitecture) && HasGcc && !HasGcc2 oscolor.o: oscolor.c $(ICONFIGFILES) @@ -254,12 +252,24 @@ LinkSourceFile(strlcpy.c,$(LIBSRC)/misc) #endif -DependTarget() +#if BuiltinRGB +#if HasPerl5 +RGBTXTSRCS = $(RGBSRC)/rgb.txt + +includes:: $(BUILTIN_RGB_SRC) + +$(BUILTIN_RGB_SRC): $(RGBTXTSRCS) rgbBuiltin.pl + RemoveFile($@) + RunPerlScript(rgbBuiltin.pl, < $(RGBTXTSRCS) > $@) -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) +clean:: + RemoveFile($(BUILTIN_RGB_SRC)) +#else +LinkFile($(BUILTIN_RGB_SRC),stdrgb.c) #endif +#endif + +DependTarget() #ifdef LinkDirectory LinkSourceFile(WaitFor.c,LinkDirectory) @@ -274,8 +284,10 @@ LinkSourceFile(mitauth.c,LinkDirectory) LinkSourceFile(oscolor.c,LinkDirectory) LinkSourceFile(osinit.c,LinkDirectory) +LinkSourceFile(rgbBuiltin.pl,LinkDirectory) LinkSourceFile(rpcauth.c,LinkDirectory) LinkSourceFile(secauth.c,LinkDirectory) +LinkSourceFile(stdrgb.c,LinkDirectory) LinkSourceFile(utils.c,LinkDirectory) LinkSourceFile(xalloc.c,LinkDirectory) LinkSourceFile(xdmauth.c,LinkDirectory) Index: xc/programs/Xserver/os/WaitFor.c diff -u xc/programs/Xserver/os/WaitFor.c:3.47 xc/programs/Xserver/os/WaitFor.c:3.50 --- xc/programs/Xserver/os/WaitFor.c:3.47 Wed Jun 23 15:40:17 2004 +++ xc/programs/Xserver/os/WaitFor.c Sun Feb 19 10:51:31 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.47 2004/06/23 19:40:17 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/WaitFor.c,v 3.50 2006/02/19 15:51:31 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,7 +47,7 @@ ******************************************************************/ /* - * Portions Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Portions Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -93,8 +93,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Xorg: WaitFor.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ - /***************************************************************** * OS Dependent input routines: * @@ -106,10 +104,10 @@ #ifdef WIN32 #include #endif -#include "Xos.h" /* for strings, fcntl, time */ +#include /* for strings, fcntl, time */ #include #include -#include "X.h" +#include #include "misc.h" #ifdef __UNIXOS2__ @@ -120,8 +118,13 @@ #include "dixstruct.h" #include "opaque.h" #ifdef DPMSExtension +#define DPMS_SERVER +#include #include "dpmsproc.h" #endif +#ifdef XTESTEXT1 +#include "xtest1dd.h" +#endif /* modifications by raphael */ int @@ -139,18 +142,6 @@ return i; } -#ifdef DPMSExtension -#define DPMS_SERVER -#include "dpms.h" -#endif - -#ifdef XTESTEXT1 -/* - * defined in xtestext1dd.c - */ -extern int playback_on; -#endif /* XTESTEXT1 */ - struct _OsTimerRec { OsTimerPtr next; CARD32 expires; @@ -222,31 +213,29 @@ } } #ifdef SMART_SCHEDULE + SmartScheduleIdle = TRUE; if (someReady) { XFD_COPYSET(&AllSockets, &LastSelectMask); XFD_UNSET(&LastSelectMask, &ClientsWithInput); } else - { #endif - wt = NULL; - if (timers) - { - now = GetTimeInMillis(); - timeout = timers->expires - now; - if (timeout < 0) - timeout = 0; - waittime.tv_sec = timeout / MILLI_PER_SECOND; - waittime.tv_usec = (timeout % MILLI_PER_SECOND) * - (1000000 / MILLI_PER_SECOND); - wt = &waittime; - } - XFD_COPYSET(&AllSockets, &LastSelectMask); -#ifdef SMART_SCHEDULE + { + wt = NULL; + if (timers) + { + now = GetTimeInMillis(); + timeout = timers->expires - now; + if (timeout < 0) + timeout = 0; + waittime.tv_sec = timeout / MILLI_PER_SECOND; + waittime.tv_usec = (timeout % MILLI_PER_SECOND) * + (1000000 / MILLI_PER_SECOND); + wt = &waittime; + } + XFD_COPYSET(&AllSockets, &LastSelectMask); } - SmartScheduleIdle = TRUE; -#endif BlockHandler((pointer)&wt, (pointer)&LastSelectMask); if (NewOutputPending) FlushAllOutput(); @@ -477,7 +466,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, OsTimerCallback func, pointer arg) { - register OsTimerPtr *prev; + OsTimerPtr *prev; CARD32 now = GetTimeInMillis(); if (!timer) Index: xc/programs/Xserver/os/access.c diff -u xc/programs/Xserver/os/access.c:3.58 xc/programs/Xserver/os/access.c:3.60 --- xc/programs/Xserver/os/access.c:3.58 Thu Dec 30 21:56:03 2004 +++ xc/programs/Xserver/os/access.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,3 @@ -/* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/access.c,v 3.58 2004/12/31 02:56:03 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/access.c,v 3.60 2005/10/14 15:17:26 tsi Exp $ */ #ifdef WIN32 #include @@ -55,8 +54,8 @@ #include #include #include -#include -#include +#include +#include #include "misc.h" #include "site.h" #include @@ -181,7 +180,7 @@ #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include #endif #ifndef PATH_MAX @@ -374,7 +373,7 @@ struct in_ifaddr ifaddr; struct strioctl str; unsigned char *addr; - register HOST *host; + HOST *host; int family, len; if ((fd = open ("/dev/ip", O_RDWR, 0 )) < 0) @@ -489,14 +488,14 @@ #if !defined(TCPCONN) && !defined(STREAMSCONN) && !defined(UNIXCONN) && !defined(MNX_TCPCONN) return; #else - register int n; + int n; int len; caddr_t addr; int family; - register HOST *host; + HOST *host; struct utsname name; - register struct hostent *hp; + struct hostent *hp; union { struct sockaddr sa; @@ -665,13 +664,13 @@ void * bufptr = buf; #ifdef USE_SIOCGLIFCONF struct lifconf ifc; - register struct lifreq *ifr; + struct lifreq *ifr; #ifdef SIOCGLIFNUM struct lifnum ifn; #endif #else struct ifconf ifc; - register struct ifreq *ifr; + struct ifreq *ifr; #endif #else struct ifaddrs * ifap, *ifr; @@ -679,7 +678,7 @@ int len; unsigned char * addr; int family; - register HOST *host; + HOST *host; #ifdef DNETCONN struct dn_naddr *dnaddr = getnodeadd(); @@ -1027,7 +1026,7 @@ { int family; pointer addr; - register HOST *host; + HOST *host; family = ConvertAddr(from, &len, (pointer *)&addr); if (family == -1 || family == FamilyLocal) @@ -1065,7 +1064,7 @@ void ResetHosts (char *display) { - register HOST *host; + HOST *host; char lhostname[120], ohostname[120]; char *hostname = ohostname; char fname[PATH_MAX + 1]; @@ -1243,7 +1242,7 @@ #ifdef XTHREADS_NEEDS_BYNAMEPARAMS _Xgethostbynameparams hparams; #endif - register struct hostent *hp; + struct hostent *hp; /* host name */ if ((family == FamilyInternet && @@ -1280,7 +1279,7 @@ int alen, family, notused; Xtransaddr *from = NULL; pointer addr; - register HOST *host; + HOST *host; #ifdef XCSECURITY /* untrusted clients can't change host access */ @@ -1454,7 +1453,7 @@ int len, int addingLocalHosts) { - register HOST *host; + HOST *host; for (host = validhosts; host; host = host->next) { @@ -1490,7 +1489,7 @@ pointer pAddr) { int len; - register HOST *host, **prev; + HOST *host, **prev; if (!AuthorizedClient(client)) return(BadAccess); @@ -1547,9 +1546,9 @@ BOOL *pEnabled) { int len; - register int n = 0; - register unsigned char *ptr; - register HOST *host; + int n = 0; + unsigned char *ptr; + HOST *host; int nHosts = 0; *pEnabled = AccessEnabled ? EnableAccess : DisableAccess; @@ -1637,12 +1636,12 @@ int InvalidHost ( - register struct sockaddr *saddr, + struct sockaddr *saddr, int len) { int family; pointer addr; - register HOST *selfhost, *host; + HOST *selfhost, *host; if (!AccessEnabled) /* just let them in */ return(0); @@ -1680,7 +1679,7 @@ static int ConvertAddr ( - register struct sockaddr *saddr, + struct sockaddr *saddr, int *len, pointer *addr) { Index: xc/programs/Xserver/os/auth.c diff -u xc/programs/Xserver/os/auth.c:1.14 xc/programs/Xserver/os/auth.c:1.15 --- xc/programs/Xserver/os/auth.c:1.14 Wed Aug 27 15:57:21 2003 +++ xc/programs/Xserver/os/auth.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,4 @@ -/* $Xorg: auth.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.15 2005/10/14 15:17:26 tsi Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/auth.c,v 1.14 2003/08/27 19:57:21 herrb Exp $ */ /* * authorization hooks for the server @@ -45,10 +44,10 @@ # include #ifdef XCSECURITY #define _SECURITY_SERVER -# include "extensions/security.h" +# include #endif #ifdef WIN32 -#include "Xw32defs.h" +#include #endif struct protocol { Index: xc/programs/Xserver/os/connection.c diff -u xc/programs/Xserver/os/connection.c:3.67 xc/programs/Xserver/os/connection.c:3.70 --- xc/programs/Xserver/os/connection.c:3.67 Wed Jun 23 15:40:17 2004 +++ xc/programs/Xserver/os/connection.c Mon Mar 6 11:06:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: connection.c,v 1.6 2001/02/09 02:05:23 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.67 2004/06/23 19:40:17 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/connection.c,v 3.70 2006/03/06 16:06:23 dawes Exp $ */ /***************************************************************** * Stuff to create connections --- OS dependent * @@ -66,8 +65,8 @@ #ifdef WIN32 #include #endif -#include "X.h" -#include "Xproto.h" +#include +#include #include #include #include @@ -141,11 +140,11 @@ #include "opaque.h" #include "dixstruct.h" #ifdef XAPPGROUP -#include "extensions/Xagsrv.h" +#include #endif #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include #endif #ifdef LBX #include "colormapst.h" @@ -352,7 +351,7 @@ OsSignal (SIGPIPE, SIG_IGN); OsSignal (SIGHUP, AutoResetServer); #endif - OsSignal (SIGINT, GiveUp); + OsSignal (SIGINT, AbortServer); OsSignal (SIGTERM, GiveUp); XFD_COPYSET (&WellKnownConnections, &AllSockets); ResetHosts(display); @@ -824,11 +823,11 @@ { fd_set readyconnections; /* set of listeners that are ready */ int curconn; /* fd of listener that's ready */ - register int newconn; /* fd of new client */ + int newconn; /* fd of new client */ CARD32 connect_time; - register int i; - register ClientPtr client; - register OsCommPtr oc; + int i; + ClientPtr client; + OsCommPtr oc; fd_set tmask; XFD_ANDSET (&tmask, (fd_set*)closure, &WellKnownConnections); Index: xc/programs/Xserver/os/hpsocket.c diff -u xc/programs/Xserver/os/hpsocket.c:1.2 xc/programs/Xserver/os/hpsocket.c:1.3 --- xc/programs/Xserver/os/hpsocket.c:1.2 Fri Dec 14 15:00:34 2001 +++ xc/programs/Xserver/os/hpsocket.c Sun Mar 27 21:51:12 2005 @@ -1,4 +1,4 @@ -/* $Xorg: hpsocket.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/os/hpsocket.c,v 1.3 2005/03/28 02:51:12 dawes Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -35,9 +35,7 @@ #include int -set_socket_option (socket_id, option) -int socket_id; -char option; +set_socket_option(int socket_id, char option) { int optlen = 1; char optval = 0x0; @@ -51,9 +49,7 @@ int -unset_socket_option (socket_id, option) -int socket_id; -char option; +unset_socket_option(int socket_id, char option) { int optlen = 1; char optval = 0x0; Index: xc/programs/Xserver/os/io.c diff -u xc/programs/Xserver/os/io.c:3.36 xc/programs/Xserver/os/io.c:3.38 --- xc/programs/Xserver/os/io.c:3.36 Mon Jun 7 20:21:47 2004 +++ xc/programs/Xserver/os/io.c Fri Oct 14 11:17:26 2005 @@ -45,7 +45,7 @@ ******************************************************************/ -/* $Xorg: io.c,v 1.6 2001/02/09 02:05:23 xorgcvs Exp $ */ + /***************************************************************** * i/o functions * @@ -53,7 +53,7 @@ * InsertFakeRequest, ResetCurrentRequest * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/os/io.c,v 3.36 2004/06/08 00:21:47 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/io.c,v 3.38 2005/10/14 15:17:26 tsi Exp $ */ #if 0 #define DEBUG_COMMUNICATION @@ -63,7 +63,7 @@ #endif #include #include -#include "Xmd.h" +#include #include #if !defined(__UNIXOS2__) && !defined(WIN32) #ifndef Lynx @@ -72,12 +72,12 @@ #include #endif #endif -#include "X.h" +#include #define NEED_REPLIES -#include "Xproto.h" +#include #include "os.h" #include "osdep.h" -#include "Xpoll.h" +#include #include "opaque.h" #include "dixstruct.h" #include "misc.h" @@ -117,7 +117,7 @@ lswaps((req)->length) : (req)->length) #ifdef BIGREQS -#include "bigreqstr.h" +#include #define get_big_req_len(req,cli) ((cli)->swapped ? \ lswapl(((xBigReq *)(req))->length) : \ @@ -217,7 +217,7 @@ int fd = oc->fd; unsigned int gotnow, needed; int result; - register xReq *request; + xReq *request; Bool need_header; #ifdef BIGREQS Bool move_header; @@ -233,7 +233,7 @@ { if (AvailableInput != oc) { - register ConnectionInputPtr aci = AvailableInput->input; + ConnectionInputPtr aci = AvailableInput->input; if (aci->size > BUFWATERMARK) { xfree(aci->buffer); @@ -601,9 +601,9 @@ ResetCurrentRequest(ClientPtr client) { OsCommPtr oc = (OsCommPtr)client->osPrivate; - register ConnectionInputPtr oci = oc->input; + ConnectionInputPtr oci = oc->input; int fd = oc->fd; - register xReq *request; + xReq *request; int gotnow, needed; #ifdef LBX LbxClientPtr lbxClient = LbxClient(client); @@ -686,7 +686,7 @@ ClientPtr client, /* client whose requests we're skipping */ Bool readmore) /* attempt to read more if next request isn't there? */ { - register ConnectionInputPtr oci = ((OsCommPtr)client->osPrivate)->input; + ConnectionInputPtr oci = ((OsCommPtr)client->osPrivate)->input; xReqPtr pnextreq; int needed, gotnow, reqlen; @@ -749,7 +749,7 @@ int numskipped) /* how many requests we're skipping */ { OsCommPtr oc = (OsCommPtr)client->osPrivate; - register ConnectionInputPtr oci = oc->input; + ConnectionInputPtr oci = oc->input; int reqlen; /* see if anyone wants to snoop the skipped requests */ @@ -807,10 +807,10 @@ void FlushAllOutput(void) { - register int index, base; - register fd_mask mask; /* raphael */ + int index, base; + fd_mask mask; /* raphael */ OsCommPtr oc; - register ClientPtr client; + ClientPtr client; Bool newoutput = NewOutputPending; #if defined(WIN32) fd_set newOutputPending; Index: xc/programs/Xserver/os/k5auth.c diff -u xc/programs/Xserver/os/k5auth.c:3.5 xc/programs/Xserver/os/k5auth.c:3.7 --- xc/programs/Xserver/os/k5auth.c:3.5 Fri Dec 14 15:00:34 2001 +++ xc/programs/Xserver/os/k5auth.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,3 @@ -/* $Xorg: k5auth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.5 2001/12/14 20:00:34 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/k5auth.c,v 3.7 2005/10/14 15:17:26 tsi Exp $ */ /* * Kerberos V5 authentication scheme @@ -50,14 +49,14 @@ #undef BITS32 #undef xfree #include -#include "X.h" +#include #include "os.h" #include "osdep.h" -#include "Xproto.h" -#include "Xfuncs.h" +#include +#include #include "dixstruct.h" #include -#include "Xauth.h" +#include extern int (*k5_Vector[256])(); extern int SendConnSetup(); @@ -74,11 +73,9 @@ * * extract session key from a credentials struct */ -krb5_error_code tgt_keyproc(keyprocarg, principal, vno, key) - krb5_pointer keyprocarg; - krb5_principal principal; - krb5_kvno vno; - krb5_keyblock **key; +krb5_error_code +tgt_keyproc(krb5_pointer keyprocarg, krb5_principal principal, krb5_kvno vno, + krb5_keyblock **key) { krb5_creds *creds = (krb5_creds *)keyprocarg; @@ -90,10 +87,8 @@ * * compare "encoded" principals */ -Bool k5_cmpenc(pname, plen, buf) - unsigned char *pname; - short plen; - krb5_data *buf; +Bool +k5_cmpenc(unsigned char *pname, short plen, krb5_data *buf) { return (plen == buf->length && memcmp(pname, buf->data, plen) == 0); @@ -123,11 +118,8 @@ * CARD16 length = total length * STRING8 princ = encoded principal of server */ -XID K5Check(data_length, data, client, reason) - unsigned short data_length; - char *data; - ClientPtr client; - char **reason; +XID +K5Check(unsigned short data_length, char *data, ClientPtr client, char **reason) { krb5_error_code retval; CARD16 tlen; @@ -136,7 +128,7 @@ krb5_creds *creds; char *outbuf, *cp; krb5_data princ; - register char n; + char n; xReq prefix; if (krb5_id == ~0L) @@ -269,12 +261,12 @@ * CARD16 length = total length * STRING8 data = the ap_rep */ -int k5_stage1(client) - register ClientPtr client; +int +k5_stage1(ClientPtr client) { long addrlen; krb5_error_code retval, retval2; - register char n; + char n; struct sockaddr cli_net_addr; xReq prefix; krb5_principal cprinc; @@ -556,8 +548,8 @@ * CARD8 data = ignored (for now) * CARD16 length = should be zero */ -int k5_stage3(client) - register ClientPtr client; +int +k5_stage3(ClientPtr client) { REQUEST(xReq); @@ -569,8 +561,8 @@ return(SendConnSetup(client, NULL)); /* success! */ } -k5_bad(client) - register ClientPtr client; +int +k5_bad(ClientPtr client) { if (((OsCommPtr)client->osPrivate)->authstate.srvcreds) krb5_free_creds((krb5_creds *)((OsCommPtr)client->osPrivate)->authstate.srvcreds); @@ -588,10 +580,8 @@ * * Now will also take a service name. */ -int K5Add(data_length, data, id) - unsigned short data_length; - char *data; - XID id; +int +K5Add(unsigned short data_length, char *data, XID id) { krb5_principal princ; krb5_error_code retval; @@ -728,7 +718,8 @@ * * Reset krb5_id, also nuke the current principal from the acl. */ -int K5Reset() +int +K5Reset() { krb5_principal princ; krb5_error_code retval; @@ -774,24 +765,20 @@ return 0; } -XID K5ToID(data_length, data) - unsigned short data_length; - char *data; +XID +K5ToID(unsigned short data_length, char *data) { return krb5_id; } -int K5FromID(id, data_lenp, datap) - XID id; - unsigned short *data_lenp; - char **datap; +int +K5FromID(XID id, unsigned short *data_lenp, char **datap) { return 0; } -int K5Remove(data_length, data) - unsigned short data_length; - char *data; +int +K5Remove(unsigned short data_length, char *data) { return 0; } Index: xc/programs/Xserver/os/lbxio.c diff -u xc/programs/Xserver/os/lbxio.c:3.19 xc/programs/Xserver/os/lbxio.c:3.20 --- xc/programs/Xserver/os/lbxio.c:3.19 Wed Jun 2 18:43:06 2004 +++ xc/programs/Xserver/os/lbxio.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.19 2004/06/02 22:43:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/lbxio.c,v 3.20 2005/10/14 15:17:26 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -98,7 +98,7 @@ #include #include -#include "Xmd.h" +#include #include #ifndef Lynx #include @@ -108,10 +108,10 @@ #else #include #endif -#include "X.h" -#include "Xproto.h" +#include +#include #include "os.h" -#include "Xpoll.h" +#include #include "osdep.h" #include "opaque.h" #include "dixstruct.h" Index: xc/programs/Xserver/os/log.c diff -u xc/programs/Xserver/os/log.c:1.12 xc/programs/Xserver/os/log.c:1.14 --- xc/programs/Xserver/os/log.c:1.12 Wed Mar 2 14:17:43 2005 +++ xc/programs/Xserver/os/log.c Mon Mar 6 11:06:23 2006 @@ -50,7 +50,7 @@ */ /* - * Copyright (c) 1997-2005 by The XFree86 Project, Inc. + * Copyright (c) 1997-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -96,9 +96,9 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/os/log.c,v 1.12 2005/03/02 19:17:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/log.c,v 1.14 2006/03/06 16:06:23 dawes Exp $ */ -#include "Xos.h" +#include #include #include #include @@ -403,21 +403,6 @@ va_end(ap); } -#ifdef __GNUC__ -void AbortServer(void) __attribute__((noreturn)); -#endif - -void -AbortServer(void) -{ - OsCleanup(TRUE); - AbortDDX(); - fflush(stderr); - if (CoreDump) - abort(); - exit (1); -} - #ifndef AUDIT_PREFIX #define AUDIT_PREFIX "AUDIT: %s: %ld %s: " #endif @@ -547,7 +532,7 @@ #endif if (!beenhere) { beenhere = TRUE; - AbortServer(); + AbortServer(0); } else abort(); /*NOTREACHED*/ Index: xc/programs/Xserver/os/mitauth.c diff -u xc/programs/Xserver/os/mitauth.c:1.5 xc/programs/Xserver/os/mitauth.c:1.6 --- xc/programs/Xserver/os/mitauth.c:1.5 Fri Dec 14 15:00:34 2001 +++ xc/programs/Xserver/os/mitauth.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,4 @@ -/* $Xorg: mitauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.6 2005/10/14 15:17:26 tsi Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,14 +26,13 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/mitauth.c,v 1.5 2001/12/14 20:00:34 dawes Exp $ */ /* * MIT-MAGIC-COOKIE-1 authorization scheme * Author: Keith Packard, MIT X Consortium */ -#include "X.h" +#include #include "os.h" #include "osdep.h" #include "dixstruct.h" Index: xc/programs/Xserver/os/oscolor.c diff -u xc/programs/Xserver/os/oscolor.c:3.11 xc/programs/Xserver/os/oscolor.c:3.15 --- xc/programs/Xserver/os/oscolor.c:3.11 Tue Sep 23 22:43:36 2003 +++ xc/programs/Xserver/os/oscolor.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.11 2003/09/24 02:43:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/oscolor.c,v 3.15 2005/10/14 15:17:26 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,236 +45,210 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: oscolor.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ - -#ifndef USE_RGB_TXT +/* + * Copyright © 1995-2005 by The XFree86 Project, Inc. + * All Rights Reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ -#ifdef NDBM -#include -#else -#ifdef SVR4 -#include -#else -#include -#endif -#endif -#include "rgb.h" +#include #include "os.h" #include "opaque.h" +#include "oscolor.h" +#include "dix.h" +#define XK_LATIN1 +#include -/* Note that we are assuming there is only one database for all the screens. */ - -#ifdef NDBM -DBM *rgb_dbm = (DBM *)NULL; -#else -int rgb_dbm = 0; -#endif - -extern void CopyISOLatin1Lowered( - unsigned char * /*dest*/, - unsigned char * /*source*/, - int /*length*/); - -int -OsInitColors(void) -{ - if (!rgb_dbm) - { -#ifdef NDBM - rgb_dbm = dbm_open(rgbPath, 0, 0); -#else - if (dbminit(rgbPath) == 0) - rgb_dbm = 1; -#endif - if (!rgb_dbm) { - ErrorF( "Couldn't open RGB_DB '%s'\n", rgbPath ); - return FALSE; - } - } - return TRUE; -} - -/*ARGSUSED*/ -int -OsLookupColor(int screen, char *name, unsigned int len, - unsigned short *pred, unsigned short *pgreen, unsigned short *pblue) -{ - datum dbent; - RGB rgb; - char buf[64]; - char *lowername; - - if(!rgb_dbm) - return(0); - - /* we use xalloc here so that we can compile with cc without alloca - * when otherwise using gcc */ - if (len < sizeof(buf)) - lowername = buf; - else if (!(lowername = (char *)xalloc(len + 1))) - return(0); - CopyISOLatin1Lowered ((unsigned char *) lowername, (unsigned char *) name, - (int)len); - - dbent.dptr = lowername; - dbent.dsize = len; -#ifdef NDBM - dbent = dbm_fetch(rgb_dbm, dbent); -#else - dbent = fetch (dbent); -#endif - - if (len >= sizeof(buf)) - xfree(lowername); - - if(dbent.dptr) - { - memmove((char *) &rgb, dbent.dptr, sizeof (RGB)); - *pred = rgb.red; - *pgreen = rgb.green; - *pblue = rgb.blue; - return (1); - } - return(0); -} - -#else /* USE_RGB_TXT */ - +static dbEntryPtr *colorTab = NULL; +static dbEntryPtr hashTab[HASHSIZE]; /* - * The dbm routines are a porting hassle. This implementation will do - * the same thing by reading the rgb.txt file directly, which is much - * more portable. + * Make a normalised copy of the colour name. Case is lowered, and space, + * '-' and '_' characters are removed. Colours are matched by comparing + * their normalised names. */ -#include -#include "os.h" -#include "opaque.h" - -#define HASHSIZE 511 +static void +stringCopy(char *dest, char *source, int length) +{ + int i; -typedef struct _dbEntry * dbEntryPtr; -typedef struct _dbEntry { - dbEntryPtr link; - unsigned short red; - unsigned short green; - unsigned short blue; - char name[1]; /* some compilers complain if [0] */ -} dbEntry; - - -extern void CopyISOLatin1Lowered( - unsigned char * /*dest*/, - unsigned char * /*source*/, - int /*length*/); + for (i = 0; i < length; i++) { + unsigned char c = (unsigned char)*source++; -static dbEntryPtr hashTab[HASHSIZE]; + if ((c >= XK_A) && (c <= XK_Z)) + *dest++ = (char)c + (XK_a - XK_A); + else if ((c >= XK_Agrave) && (c <= XK_Odiaeresis)) + *dest++ = (char)c + (XK_agrave - XK_Agrave); + else if ((c >= XK_Ooblique) && (c <= XK_Thorn)) + *dest++ = (char)c + (XK_oslash - XK_Ooblique); + else if ((c != XK_space) && (c != XK_minus) && (c != XK_underscore)) + *dest++ = (char)c; + } + *dest = '\0'; +} static dbEntryPtr lookup(char *name, int len, Bool create) { - unsigned int h = 0, g; - dbEntryPtr entry, *prev = NULL; - char *str = name; - - if (!(name = (char*)ALLOCATE_LOCAL(len +1))) return NULL; - CopyISOLatin1Lowered((unsigned char *)name, (unsigned char *)str, len); - name[len] = '\0'; - - for(str = name; *str; str++) { - h = (h << 4) + *str; - if ((g = h) & 0xf0000000) h ^= (g >> 24); - h &= g; - } - h %= HASHSIZE; - - if ( (entry = hashTab[h]) ) - { - for( ; entry; prev = (dbEntryPtr*)entry, entry = entry->link ) - if (! strcmp(name, entry->name) ) break; + unsigned int h = 0, g; + dbEntryPtr entry, *prev = NULL; + char *str = name; + + if (!colorTab) + return NULL; + + if (!(name = ALLOCATE_LOCAL(len + 1))) + return NULL; + stringCopy(name, str, len); + name[len] = '\0'; + + for (str = name; *str; str++) { + h = (h << 4) + *str; + if ((g = h) & 0xf0000000) + h ^= (g >> 24); + h &= g; } - else - prev = &(hashTab[h]); + h %= HASHSIZE; - if (!entry && create && (entry = (dbEntryPtr)xalloc(sizeof(dbEntry) +len))) - { - *prev = entry; - entry->link = NULL; - strcpy( entry->name, name ); + if ((entry = colorTab[h])) { + for (; entry; prev = &entry->link, entry = entry->link) { + if (!strcmp(name, entry->name)) + break; + } + } else + prev = &(colorTab[h]); + + if (!entry && create && (entry = xalloc(sizeof(dbEntry)))) { + *prev = entry; + entry->link = NULL; + entry->name = xstrdup(name); } - DEALLOCATE_LOCAL(name); + DEALLOCATE_LOCAL(name); - return entry; + return entry; } +#ifndef __UNIXOS2__ +#define RGB_SCANF_FMT "%d %d %d %[^\n]\n" +#else +#define RGB_SCANF_FMT "%d %d %d %[^\n\r]\n" +#endif +#define RGB_SCALE_FACTOR (65535 / 255) Bool OsInitColors(void) { - FILE *rgb; - char *path; - char line[BUFSIZ]; - char name[BUFSIZ]; - int red, green, blue, lineno = 0; - dbEntryPtr entry; + FILE *rgb; + char *path; + const char *fullpath; + char line[BUFSIZ]; + char name[BUFSIZ]; + int red, green, blue, lineno = 0; + dbEntryPtr entry; - static Bool was_here = FALSE; + if (serverGeneration != 1) + return TRUE; - if (!was_here) - { #ifndef __UNIXOS2__ - path = (char*)ALLOCATE_LOCAL(strlen(rgbPath) +5); - strcpy(path, rgbPath); - strcat(path, ".txt"); + fullpath = rgbPath; #else - char *tmp = (char*)__XOS2RedirRoot(rgbPath); - path = (char*)ALLOCATE_LOCAL(strlen(tmp) +5); - strcpy(path, tmp); - strcat(path, ".txt"); + fullpath = __XOS2RedirRoot(rgbPath); #endif - if (!(rgb = fopen(path, "r"))) - { - ErrorF( "Couldn't open RGB_DB '%s'\n", rgbPath ); - DEALLOCATE_LOCAL(path); - return FALSE; - } - - while(fgets(line, sizeof(line), rgb)) - { - lineno++; -#ifndef __UNIXOS2__ - if (sscanf(line,"%d %d %d %[^\n]\n", &red, &green, &blue, name) == 4) + xasprintf(&path, "%s.txt", fullpath); + if (!path) + return FALSE; + + if (!(rgb = fopen(path, "r"))) { +#ifdef BUILTIN_RGB + LogMessageVerb(X_WARNING, 0, + "Could not open RGB file \"%s\"; " + "will use built-in copy.\n", path); + xfree(path); + colorTab = builtinRGBhashTab; + return TRUE; #else - if (sscanf(line,"%d %d %d %[^\n\r]\n", &red, &green, &blue, name) == 4) + LogMessage(X_ERROR, "Could not open RGB_DB '%s'.\n", path); + xfree(path); + return FALSE; #endif - { - if (red >= 0 && red <= 0xff && - green >= 0 && green <= 0xff && - blue >= 0 && blue <= 0xff) - { - if ((entry = lookup(name, strlen(name), TRUE))) - { - entry->red = (red * 65535) / 255; - entry->green = (green * 65535) / 255; - entry->blue = (blue * 65535) / 255; - } + } + + colorTab = hashTab; + while (fgets(line, sizeof(line), rgb)) { + lineno++; + if (sscanf(line, RGB_SCANF_FMT, &red, &green, &blue, name) == 4) { + if (red >= 0 && red <= 0xff && + green >= 0 && green <= 0xff && + blue >= 0 && blue <= 0xff) { + if ((entry = lookup(name, strlen(name), TRUE))) { + entry->red = red * RGB_SCALE_FACTOR; + entry->green = green * RGB_SCALE_FACTOR; + entry->blue = blue * RGB_SCALE_FACTOR; } - else - ErrorF("Value out of range: %s:%d\n", path, lineno); + } else { + LogMessageVerb(X_WARNING, 0, + "OsInitColors: %s:%d: Bad rgb value: " + "(%d:%d:%d).\n", + path, lineno, red, green, blue); } - else if (*line && *line != '#' && *line != '!') - ErrorF("Syntax Error: %s:%d\n", path, lineno); + } else if (*line && *line != '#' && *line != '!') { + LogMessageVerb(X_WARNING, 0, + "OsInitColors: %s:%d: Syntax error:\n", + path, lineno); + LogMessageVerb(X_WARNING, 0, "\t\"%.*s\"\n", + (int)strlen(line) - 1, line); } - - fclose(rgb); - DEALLOCATE_LOCAL(path); - - was_here = TRUE; } - return TRUE; + fclose(rgb); + xfree(path); + + return TRUE; } @@ -283,17 +257,15 @@ OsLookupColor(int screen, char *name, unsigned int len, unsigned short *pred, unsigned short *pgreen, unsigned short *pblue) { - dbEntryPtr entry; + dbEntryPtr entry; - if ((entry = lookup(name, len, FALSE))) - { - *pred = entry->red; - *pgreen = entry->green; - *pblue = entry->blue; - return TRUE; + if ((entry = lookup(name, len, FALSE))) { + *pred = entry->red; + *pgreen = entry->green; + *pblue = entry->blue; + return TRUE; } - return FALSE; + return FALSE; } -#endif /* USE_RGB_TXT */ Index: xc/programs/Xserver/os/oscolor.h diff -u /dev/null xc/programs/Xserver/os/oscolor.h:1.2 --- /dev/null Tue May 9 21:58:12 2006 +++ xc/programs/Xserver/os/oscolor.h Tue Jul 5 12:37:58 2005 @@ -0,0 +1,62 @@ +/* $XFree86: xc/programs/Xserver/os/oscolor.h,v 1.2 2005/07/05 16:37:58 tsi Exp $ */ + +/* + * Copyright © 2005 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#define HASHSIZE 511 + +typedef struct _dbEntry * dbEntryPtr; +typedef struct _dbEntry { + dbEntryPtr link; + unsigned short red; + unsigned short green; + unsigned short blue; + const char * name; +} dbEntry; + +extern dbEntryPtr builtinRGBhashTab[HASHSIZE]; + Index: xc/programs/Xserver/os/osdep.h diff -u xc/programs/Xserver/os/osdep.h:3.20 xc/programs/Xserver/os/osdep.h:3.21 --- xc/programs/Xserver/os/osdep.h:3.20 Wed Jun 23 22:21:16 2004 +++ xc/programs/Xserver/os/osdep.h Mon Jan 9 10:00:38 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.20 2004/06/24 02:21:16 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/os/osdep.h,v 3.21 2006/01/09 15:00:38 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: osdep.h,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ #ifndef _OSDEP_H_ #define _OSDEP_H_ 1 Index: xc/programs/Xserver/os/osinit.c diff -u xc/programs/Xserver/os/osinit.c:3.32 xc/programs/Xserver/os/osinit.c:3.34 --- xc/programs/Xserver/os/osinit.c:3.32 Wed Jun 2 18:43:06 2004 +++ xc/programs/Xserver/os/osinit.c Thu Mar 16 16:44:00 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.32 2004/06/02 22:43:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/osinit.c,v 3.34 2006/03/16 21:44:00 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +46,7 @@ ******************************************************************/ /* - * Copyright (c) 1996-2004 by The XFree86 Project, Inc. + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -93,10 +93,11 @@ */ #include -#include "X.h" +#include +#include #include "os.h" #include "osdep.h" -#include "Xos.h" +#include #ifdef SMART_SCHEDULE #include "dixstruct.h" @@ -282,3 +283,22 @@ } #endif } + +/* Make sure that signals don't cause re-entry during screen close. */ +void +OsPrepareShutdown(Bool terminating) +{ + if (terminating) { + OsSignal(SIGINT, SIG_IGN); + } else { + OsSignal(SIGINT, GiveUp); + } +} + +/* Reset signal disposition before reset. */ +void +OsPrepareRestart() +{ + OsSignal(SIGINT, AbortServer); +} + Index: xc/programs/Xserver/os/rgbBuiltin.pl diff -u /dev/null xc/programs/Xserver/os/rgbBuiltin.pl:1.3 --- /dev/null Tue May 9 21:58:12 2006 +++ xc/programs/Xserver/os/rgbBuiltin.pl Tue Jun 21 23:42:13 2005 @@ -0,0 +1,190 @@ +#!/usr/bin/perl +# +# $XFree86: xc/programs/Xserver/os/rgbBuiltin.pl,v 1.3 2005/06/22 03:42:13 dawes Exp $ +# +# Read rgb.txt on stdin and write a hashed C source file to stdout. +# The hashing algorithm must match that in oscolor.c. +# +# +# Copyright © 2005 by The XFree86 Project, Inc. +# All rights reserved. +# +# 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: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions, and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution, and in the same place and form as other copyright, +# license and disclaimer information. +# +# 3. The end-user documentation included with the redistribution, +# if any, must include the following acknowledgment: "This product +# includes software developed by The XFree86 Project, Inc +# (http://www.xfree86.org/) and its contributors", in the same +# place and form as other third-party acknowledgments. Alternately, +# this acknowledgment may appear in the software itself, in the +# same form and location as other such third-party acknowledgments. +# +# 4. Except as contained in this notice, the name of The XFree86 +# Project, Inc 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 XFree86 Project, Inc. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Author: David Dawes +# + + +$HASHSIZE = 511; +$tmp = 1; + +sub hash { + my ($name) = @_; + @chars, $ch, $h; + + @chars = split(//, $name); + $h = 0; + for $ch (@chars) { + $h = (($h << 4) + ord($ch)) & 0xffffffff; + $g = $h; + if ($h & 0xf0000000) { + $h = ($h ^ ($g >> 24)); + } + if ($h != $g) { + $h = ($h & $g); + } + } + # Needed to workound a bug in some perl versions. + $h = int($h); + $h = $h % $HASHSIZE; + return $h; +} + +while(<>) { + $line = $_; + if ($line =~ /^[!#]/) { + next; + } + if ($line =~ /^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\S.*\S)\s*$/) { + $red = $1; + $green = $2; + $blue = $3; + $name = lc($4); + $hash = &hash($name); + $hashEntry{$name} = [ $red, $green, $blue ]; + push @{$hashTab[$hash]}, $name; + } +} + +$proj = "XFree86"; + +print "/* \$$proj\$ */ + +/* + * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT + * + * It is generated by rgbBuiltin.pl using data from the following file: + * + * ../../rgb/rgb.txt + * + * Copyright © 2005 by The XFree86 Project, Inc. + * All Rights Reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: \"This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors\", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include \"oscolor.h\" + +#define C 0x101\n\n"; + +for $i (0 .. $HASHSIZE - 1) { + if (defined($hashTab[$i])) { + $link = "NULL"; + $j = 0; + for $n (@{$hashTab[$i]}) { + print "static const char c${i}_${j}[] = \"$n\";\n"; + print "static dbEntry e${i}_$j = " . + "{$link, $hashEntry{$n}[0] * C," . + " $hashEntry{$n}[1] * C," . + " $hashEntry{$n}[2] * C," . + " c${i}_$j};\n"; + $link = "&e${i}_$j"; + $entrySize[$i] = $j; + $j++; + } + } +} +print "\n#undef C\n\n"; +print "dbEntryPtr builtinRGBhashTab[HASHSIZE] = {\n"; +for $i (0 .. $HASHSIZE - 1) { + if (defined($hashTab[$i])) { + print " &e${i}_$entrySize[$i],\n"; + } else { + print " NULL,\n"; + } +} +print "};\n"; + + Index: xc/programs/Xserver/os/rpcauth.c diff -u xc/programs/Xserver/os/rpcauth.c:3.8 xc/programs/Xserver/os/rpcauth.c:3.10 --- xc/programs/Xserver/os/rpcauth.c:3.8 Sun Apr 27 17:31:09 2003 +++ xc/programs/Xserver/os/rpcauth.c Sun Feb 19 19:14:38 2006 @@ -1,4 +1,4 @@ -/* $Xorg: rpcauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.10 2006/02/20 00:14:38 dawes Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/rpcauth.c,v 3.8 2003/04/27 21:31:09 herrb Exp $ */ /* * SUN-DES-1 authentication mechanism @@ -36,11 +35,12 @@ #ifdef SECURE_RPC -#include "X.h" -#include "Xauth.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" +#include "osdep.h" #include Index: xc/programs/Xserver/os/secauth.c diff -u xc/programs/Xserver/os/secauth.c:1.13 xc/programs/Xserver/os/secauth.c:1.14 --- xc/programs/Xserver/os/secauth.c:1.13 Thu Aug 5 16:37:42 2004 +++ xc/programs/Xserver/os/secauth.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,4 @@ -/* $Xorg: secauth.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.14 2005/10/14 15:17:26 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,9 +24,8 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.13 2004/08/05 20:37:42 tsi Exp $ */ -#include "X.h" +#include #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -34,7 +33,7 @@ #ifdef XCSECURITY #define _SECURITY_SERVER -#include "extensions/security.h" +#include static char InvalidPolicyReason[] = "invalid policy specification"; static char PolicyViolationReason[] = "policy violation"; Index: xc/programs/Xserver/os/stdrgb.c diff -u /dev/null xc/programs/Xserver/os/stdrgb.c:1.1 --- /dev/null Tue May 9 21:58:12 2006 +++ xc/programs/Xserver/os/stdrgb.c Tue Jun 21 23:28:51 2005 @@ -0,0 +1,1891 @@ +/* $XFree86: xc/programs/Xserver/os/stdrgb.c,v 1.1 2005/06/22 03:28:51 dawes Exp $ */ + +/* + * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT + * + * It is generated by rgbBuiltin.pl using data from the following file: + * + * ../../rgb/rgb.txt + * + * Copyright © 2005 by The XFree86 Project, Inc. + * All Rights Reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include +#include "oscolor.h" + +#define C 0x101 + +static const char c5_0[] = "pink"; +static dbEntry e5_0 = {NULL, 255 * C, 192 * C, 203 * C, c5_0}; +static const char c8_0[] = "cadetblue"; +static dbEntry e8_0 = {NULL, 95 * C, 158 * C, 160 * C, c8_0}; +static const char c14_0[] = "seashell"; +static dbEntry e14_0 = {NULL, 255 * C, 245 * C, 238 * C, c14_0}; +static const char c16_0[] = "cornflowerblue"; +static dbEntry e16_0 = {NULL, 100 * C, 149 * C, 237 * C, c16_0}; +static const char c19_0[] = "salmon1"; +static dbEntry e19_0 = {NULL, 255 * C, 140 * C, 105 * C, c19_0}; +static const char c21_0[] = "antiquewhite4"; +static dbEntry e21_0 = {NULL, 139 * C, 131 * C, 120 * C, c21_0}; +static const char c21_1[] = "salmon2"; +static dbEntry e21_1 = {&e21_0, 238 * C, 130 * C, 98 * C, c21_1}; +static const char c21_2[] = "salmon3"; +static dbEntry e21_2 = {&e21_1, 205 * C, 112 * C, 84 * C, c21_2}; +static const char c22_0[] = "antiquewhite1"; +static dbEntry e22_0 = {NULL, 255 * C, 239 * C, 219 * C, c22_0}; +static const char c23_0[] = "antiquewhite2"; +static dbEntry e23_0 = {NULL, 238 * C, 223 * C, 204 * C, c23_0}; +static const char c23_1[] = "salmon4"; +static dbEntry e23_1 = {&e23_0, 139 * C, 76 * C, 57 * C, c23_1}; +static const char c23_2[] = "darkblue"; +static dbEntry e23_2 = {&e23_1, 0 * C, 0 * C, 139 * C, c23_2}; +static const char c24_0[] = "antiquewhite3"; +static dbEntry e24_0 = {NULL, 205 * C, 192 * C, 176 * C, c24_0}; +static const char c26_0[] = "lawngreen"; +static dbEntry e26_0 = {NULL, 124 * C, 252 * C, 0 * C, c26_0}; +static const char c28_0[] = "lightsteelblue1"; +static dbEntry e28_0 = {NULL, 202 * C, 225 * C, 255 * C, c28_0}; +static const char c28_1[] = "yellow1"; +static dbEntry e28_1 = {&e28_0, 255 * C, 255 * C, 0 * C, c28_1}; +static const char c28_2[] = "yellow2"; +static dbEntry e28_2 = {&e28_1, 238 * C, 238 * C, 0 * C, c28_2}; +static const char c28_3[] = "yellow3"; +static dbEntry e28_3 = {&e28_2, 205 * C, 205 * C, 0 * C, c28_3}; +static const char c28_4[] = "yellow4"; +static dbEntry e28_4 = {&e28_3, 139 * C, 139 * C, 0 * C, c28_4}; +static const char c29_0[] = "lightsteelblue2"; +static dbEntry e29_0 = {NULL, 188 * C, 210 * C, 238 * C, c29_0}; +static const char c30_0[] = "lightsteelblue3"; +static dbEntry e30_0 = {NULL, 162 * C, 181 * C, 205 * C, c30_0}; +static const char c31_0[] = "lightsteelblue4"; +static dbEntry e31_0 = {NULL, 110 * C, 123 * C, 139 * C, c31_0}; +static const char c32_0[] = "gray0"; +static dbEntry e32_0 = {NULL, 0 * C, 0 * C, 0 * C, c32_0}; +static const char c33_0[] = "gray1"; +static dbEntry e33_0 = {NULL, 3 * C, 3 * C, 3 * C, c33_0}; +static const char c34_0[] = "grey0"; +static dbEntry e34_0 = {NULL, 0 * C, 0 * C, 0 * C, c34_0}; +static const char c34_1[] = "gray2"; +static dbEntry e34_1 = {&e34_0, 5 * C, 5 * C, 5 * C, c34_1}; +static const char c34_2[] = "gray100"; +static dbEntry e34_2 = {&e34_1, 255 * C, 255 * C, 255 * C, c34_2}; +static const char c35_0[] = "grey1"; +static dbEntry e35_0 = {NULL, 3 * C, 3 * C, 3 * C, c35_0}; +static const char c35_1[] = "gray3"; +static dbEntry e35_1 = {&e35_0, 8 * C, 8 * C, 8 * C, c35_1}; +static const char c35_2[] = "grey100"; +static dbEntry e35_2 = {&e35_1, 255 * C, 255 * C, 255 * C, c35_2}; +static const char c36_0[] = "grey2"; +static dbEntry e36_0 = {NULL, 5 * C, 5 * C, 5 * C, c36_0}; +static const char c36_1[] = "gray4"; +static dbEntry e36_1 = {&e36_0, 10 * C, 10 * C, 10 * C, c36_1}; +static const char c37_0[] = "grey3"; +static dbEntry e37_0 = {NULL, 8 * C, 8 * C, 8 * C, c37_0}; +static const char c37_1[] = "gray5"; +static dbEntry e37_1 = {&e37_0, 13 * C, 13 * C, 13 * C, c37_1}; +static const char c38_0[] = "thistle"; +static dbEntry e38_0 = {NULL, 216 * C, 191 * C, 216 * C, c38_0}; +static const char c38_1[] = "grey4"; +static dbEntry e38_1 = {&e38_0, 10 * C, 10 * C, 10 * C, c38_1}; +static const char c38_2[] = "gray6"; +static dbEntry e38_2 = {&e38_1, 15 * C, 15 * C, 15 * C, c38_2}; +static const char c39_0[] = "lightpink"; +static dbEntry e39_0 = {NULL, 255 * C, 182 * C, 193 * C, c39_0}; +static const char c39_1[] = "grey5"; +static dbEntry e39_1 = {&e39_0, 13 * C, 13 * C, 13 * C, c39_1}; +static const char c39_2[] = "gray7"; +static dbEntry e39_2 = {&e39_1, 18 * C, 18 * C, 18 * C, c39_2}; +static const char c40_0[] = "paleturquoise1"; +static dbEntry e40_0 = {NULL, 187 * C, 255 * C, 255 * C, c40_0}; +static const char c40_1[] = "grey6"; +static dbEntry e40_1 = {&e40_0, 15 * C, 15 * C, 15 * C, c40_1}; +static const char c40_2[] = "gray8"; +static dbEntry e40_2 = {&e40_1, 20 * C, 20 * C, 20 * C, c40_2}; +static const char c41_0[] = "paleturquoise2"; +static dbEntry e41_0 = {NULL, 174 * C, 238 * C, 238 * C, c41_0}; +static const char c41_1[] = "grey7"; +static dbEntry e41_1 = {&e41_0, 18 * C, 18 * C, 18 * C, c41_1}; +static const char c41_2[] = "gray9"; +static dbEntry e41_2 = {&e41_1, 23 * C, 23 * C, 23 * C, c41_2}; +static const char c42_0[] = "mintcream"; +static dbEntry e42_0 = {NULL, 245 * C, 255 * C, 250 * C, c42_0}; +static const char c42_1[] = "paleturquoise3"; +static dbEntry e42_1 = {&e42_0, 150 * C, 205 * C, 205 * C, c42_1}; +static const char c42_2[] = "green1"; +static dbEntry e42_2 = {&e42_1, 0 * C, 255 * C, 0 * C, c42_2}; +static const char c42_3[] = "magenta1"; +static dbEntry e42_3 = {&e42_2, 255 * C, 0 * C, 255 * C, c42_3}; +static const char c42_4[] = "magenta2"; +static dbEntry e42_4 = {&e42_3, 238 * C, 0 * C, 238 * C, c42_4}; +static const char c42_5[] = "magenta3"; +static dbEntry e42_5 = {&e42_4, 205 * C, 0 * C, 205 * C, c42_5}; +static const char c42_6[] = "magenta4"; +static dbEntry e42_6 = {&e42_5, 139 * C, 0 * C, 139 * C, c42_6}; +static const char c42_7[] = "grey8"; +static dbEntry e42_7 = {&e42_6, 20 * C, 20 * C, 20 * C, c42_7}; +static const char c43_0[] = "paleturquoise4"; +static dbEntry e43_0 = {NULL, 102 * C, 139 * C, 139 * C, c43_0}; +static const char c43_1[] = "green2"; +static dbEntry e43_1 = {&e43_0, 0 * C, 238 * C, 0 * C, c43_1}; +static const char c43_2[] = "grey9"; +static dbEntry e43_2 = {&e43_1, 23 * C, 23 * C, 23 * C, c43_2}; +static const char c44_0[] = "darkkhaki"; +static dbEntry e44_0 = {NULL, 189 * C, 183 * C, 107 * C, c44_0}; +static const char c44_1[] = "green3"; +static dbEntry e44_1 = {&e44_0, 0 * C, 205 * C, 0 * C, c44_1}; +static const char c45_0[] = "green4"; +static dbEntry e45_0 = {NULL, 0 * C, 139 * C, 0 * C, c45_0}; +static const char c47_0[] = "honeydew"; +static dbEntry e47_0 = {NULL, 240 * C, 255 * C, 240 * C, c47_0}; +static const char c47_1[] = "greenyellow"; +static dbEntry e47_1 = {&e47_0, 173 * C, 255 * C, 47 * C, c47_1}; +static const char c51_0[] = "yellowgreen"; +static dbEntry e51_0 = {NULL, 154 * C, 205 * C, 50 * C, c51_0}; +static const char c52_0[] = "darkslategrey"; +static dbEntry e52_0 = {NULL, 47 * C, 79 * C, 79 * C, c52_0}; +static const char c54_0[] = "mediumspringgreen"; +static dbEntry e54_0 = {NULL, 0 * C, 250 * C, 154 * C, c54_0}; +static const char c55_0[] = "deepskyblue"; +static dbEntry e55_0 = {NULL, 0 * C, 191 * C, 255 * C, c55_0}; +static const char c56_0[] = "lemonchiffon4"; +static dbEntry e56_0 = {NULL, 139 * C, 137 * C, 112 * C, c56_0}; +static const char c57_0[] = "lemonchiffon1"; +static dbEntry e57_0 = {NULL, 255 * C, 250 * C, 205 * C, c57_0}; +static const char c57_1[] = "blue1"; +static dbEntry e57_1 = {&e57_0, 0 * C, 0 * C, 255 * C, c57_1}; +static const char c58_0[] = "lemonchiffon2"; +static dbEntry e58_0 = {NULL, 238 * C, 233 * C, 191 * C, c58_0}; +static const char c58_1[] = "ivory1"; +static dbEntry e58_1 = {&e58_0, 255 * C, 255 * C, 240 * C, c58_1}; +static const char c58_2[] = "blue2"; +static dbEntry e58_2 = {&e58_1, 0 * C, 0 * C, 238 * C, c58_2}; +static const char c59_0[] = "olivedrab"; +static dbEntry e59_0 = {NULL, 107 * C, 142 * C, 35 * C, c59_0}; +static const char c59_1[] = "lemonchiffon3"; +static dbEntry e59_1 = {&e59_0, 205 * C, 201 * C, 165 * C, c59_1}; +static const char c59_2[] = "ivory2"; +static dbEntry e59_2 = {&e59_1, 238 * C, 238 * C, 224 * C, c59_2}; +static const char c59_3[] = "blue3"; +static dbEntry e59_3 = {&e59_2, 0 * C, 0 * C, 205 * C, c59_3}; +static const char c60_0[] = "ivory3"; +static dbEntry e60_0 = {NULL, 205 * C, 205 * C, 193 * C, c60_0}; +static const char c60_1[] = "blue4"; +static dbEntry e60_1 = {&e60_0, 0 * C, 0 * C, 139 * C, c60_1}; +static const char c61_0[] = "ivory4"; +static dbEntry e61_0 = {NULL, 139 * C, 139 * C, 131 * C, c61_0}; +static const char c62_0[] = "navyblue"; +static dbEntry e62_0 = {NULL, 0 * C, 0 * C, 128 * C, c62_0}; +static const char c62_1[] = "lightgoldenrodyellow"; +static dbEntry e62_1 = {&e62_0, 250 * C, 250 * C, 210 * C, c62_1}; +static const char c63_0[] = "grey"; +static dbEntry e63_0 = {NULL, 190 * C, 190 * C, 190 * C, c63_0}; +static const char c64_0[] = "springgreen1"; +static dbEntry e64_0 = {NULL, 0 * C, 255 * C, 127 * C, c64_0}; +static const char c65_0[] = "springgreen2"; +static dbEntry e65_0 = {NULL, 0 * C, 238 * C, 118 * C, c65_0}; +static const char c65_1[] = "gray10"; +static dbEntry e65_1 = {&e65_0, 26 * C, 26 * C, 26 * C, c65_1}; +static const char c66_0[] = "deepskyblue1"; +static dbEntry e66_0 = {NULL, 0 * C, 191 * C, 255 * C, c66_0}; +static const char c66_1[] = "springgreen3"; +static dbEntry e66_1 = {&e66_0, 0 * C, 205 * C, 102 * C, c66_1}; +static const char c66_2[] = "gray11"; +static dbEntry e66_2 = {&e66_1, 28 * C, 28 * C, 28 * C, c66_2}; +static const char c67_0[] = "deepskyblue2"; +static dbEntry e67_0 = {NULL, 0 * C, 178 * C, 238 * C, c67_0}; +static const char c67_1[] = "springgreen4"; +static dbEntry e67_1 = {&e67_0, 0 * C, 139 * C, 69 * C, c67_1}; +static const char c67_2[] = "gray12"; +static dbEntry e67_2 = {&e67_1, 31 * C, 31 * C, 31 * C, c67_2}; +static const char c68_0[] = "deepskyblue3"; +static dbEntry e68_0 = {NULL, 0 * C, 154 * C, 205 * C, c68_0}; +static const char c68_1[] = "gray13"; +static dbEntry e68_1 = {&e68_0, 33 * C, 33 * C, 33 * C, c68_1}; +static const char c69_0[] = "deepskyblue4"; +static dbEntry e69_0 = {NULL, 0 * C, 104 * C, 139 * C, c69_0}; +static const char c69_1[] = "gray14"; +static dbEntry e69_1 = {&e69_0, 36 * C, 36 * C, 36 * C, c69_1}; +static const char c70_0[] = "gray15"; +static dbEntry e70_0 = {NULL, 38 * C, 38 * C, 38 * C, c70_0}; +static const char c70_1[] = "lightgreen"; +static dbEntry e70_1 = {&e70_0, 144 * C, 238 * C, 144 * C, c70_1}; +static const char c71_0[] = "gray16"; +static dbEntry e71_0 = {NULL, 41 * C, 41 * C, 41 * C, c71_0}; +static const char c72_0[] = "gray17"; +static dbEntry e72_0 = {NULL, 43 * C, 43 * C, 43 * C, c72_0}; +static const char c73_0[] = "black"; +static dbEntry e73_0 = {NULL, 0 * C, 0 * C, 0 * C, c73_0}; +static const char c73_1[] = "gray18"; +static dbEntry e73_1 = {&e73_0, 46 * C, 46 * C, 46 * C, c73_1}; +static const char c74_0[] = "gray19"; +static dbEntry e74_0 = {NULL, 48 * C, 48 * C, 48 * C, c74_0}; +static const char c77_0[] = "peru"; +static dbEntry e77_0 = {NULL, 205 * C, 133 * C, 63 * C, c77_0}; +static const char c79_0[] = "beige"; +static dbEntry e79_0 = {NULL, 245 * C, 245 * C, 220 * C, c79_0}; +static const char c81_0[] = "gray20"; +static dbEntry e81_0 = {NULL, 51 * C, 51 * C, 51 * C, c81_0}; +static const char c82_0[] = "gray21"; +static dbEntry e82_0 = {NULL, 54 * C, 54 * C, 54 * C, c82_0}; +static const char c83_0[] = "gray22"; +static dbEntry e83_0 = {NULL, 56 * C, 56 * C, 56 * C, c83_0}; +static const char c84_0[] = "gray23"; +static dbEntry e84_0 = {NULL, 59 * C, 59 * C, 59 * C, c84_0}; +static const char c85_0[] = "gray24"; +static dbEntry e85_0 = {NULL, 61 * C, 61 * C, 61 * C, c85_0}; +static const char c86_0[] = "gray25"; +static dbEntry e86_0 = {NULL, 64 * C, 64 * C, 64 * C, c86_0}; +static const char c87_0[] = "gray26"; +static dbEntry e87_0 = {NULL, 66 * C, 66 * C, 66 * C, c87_0}; +static const char c88_0[] = "gray27"; +static dbEntry e88_0 = {NULL, 69 * C, 69 * C, 69 * C, c88_0}; +static const char c89_0[] = "gray28"; +static dbEntry e89_0 = {NULL, 71 * C, 71 * C, 71 * C, c89_0}; +static const char c90_0[] = "gray29"; +static dbEntry e90_0 = {NULL, 74 * C, 74 * C, 74 * C, c90_0}; +static const char c91_0[] = "lightskyblue"; +static dbEntry e91_0 = {NULL, 135 * C, 206 * C, 250 * C, c91_0}; +static const char c91_1[] = "seagreen"; +static dbEntry e91_1 = {&e91_0, 46 * C, 139 * C, 87 * C, c91_1}; +static const char c93_0[] = "linen"; +static dbEntry e93_0 = {NULL, 250 * C, 240 * C, 230 * C, c93_0}; +static const char c95_0[] = "salmon"; +static dbEntry e95_0 = {NULL, 250 * C, 128 * C, 114 * C, c95_0}; +static const char c97_0[] = "grey10"; +static dbEntry e97_0 = {NULL, 26 * C, 26 * C, 26 * C, c97_0}; +static const char c97_1[] = "gray30"; +static dbEntry e97_1 = {&e97_0, 77 * C, 77 * C, 77 * C, c97_1}; +static const char c98_0[] = "grey11"; +static dbEntry e98_0 = {NULL, 28 * C, 28 * C, 28 * C, c98_0}; +static const char c98_1[] = "gray31"; +static dbEntry e98_1 = {&e98_0, 79 * C, 79 * C, 79 * C, c98_1}; +static const char c99_0[] = "grey12"; +static dbEntry e99_0 = {NULL, 31 * C, 31 * C, 31 * C, c99_0}; +static const char c99_1[] = "gray32"; +static dbEntry e99_1 = {&e99_0, 82 * C, 82 * C, 82 * C, c99_1}; +static const char c100_0[] = "grey13"; +static dbEntry e100_0 = {NULL, 33 * C, 33 * C, 33 * C, c100_0}; +static const char c100_1[] = "gray33"; +static dbEntry e100_1 = {&e100_0, 84 * C, 84 * C, 84 * C, c100_1}; +static const char c100_2[] = "darkcyan"; +static dbEntry e100_2 = {&e100_1, 0 * C, 139 * C, 139 * C, c100_2}; +static const char c101_0[] = "grey14"; +static dbEntry e101_0 = {NULL, 36 * C, 36 * C, 36 * C, c101_0}; +static const char c101_1[] = "gray34"; +static dbEntry e101_1 = {&e101_0, 87 * C, 87 * C, 87 * C, c101_1}; +static const char c102_0[] = "grey15"; +static dbEntry e102_0 = {NULL, 38 * C, 38 * C, 38 * C, c102_0}; +static const char c102_1[] = "gray35"; +static dbEntry e102_1 = {&e102_0, 89 * C, 89 * C, 89 * C, c102_1}; +static const char c103_0[] = "grey16"; +static dbEntry e103_0 = {NULL, 41 * C, 41 * C, 41 * C, c103_0}; +static const char c103_1[] = "gray36"; +static dbEntry e103_1 = {&e103_0, 92 * C, 92 * C, 92 * C, c103_1}; +static const char c104_0[] = "grey17"; +static dbEntry e104_0 = {NULL, 43 * C, 43 * C, 43 * C, c104_0}; +static const char c104_1[] = "gray37"; +static dbEntry e104_1 = {&e104_0, 94 * C, 94 * C, 94 * C, c104_1}; +static const char c105_0[] = "grey18"; +static dbEntry e105_0 = {NULL, 46 * C, 46 * C, 46 * C, c105_0}; +static const char c105_1[] = "gray38"; +static dbEntry e105_1 = {&e105_0, 97 * C, 97 * C, 97 * C, c105_1}; +static const char c106_0[] = "steelblue4"; +static dbEntry e106_0 = {NULL, 54 * C, 100 * C, 139 * C, c106_0}; +static const char c106_1[] = "grey19"; +static dbEntry e106_1 = {&e106_0, 48 * C, 48 * C, 48 * C, c106_1}; +static const char c106_2[] = "gray39"; +static dbEntry e106_2 = {&e106_1, 99 * C, 99 * C, 99 * C, c106_2}; +static const char c107_0[] = "mediumblue"; +static dbEntry e107_0 = {NULL, 0 * C, 0 * C, 205 * C, c107_0}; +static const char c107_1[] = "steelblue1"; +static dbEntry e107_1 = {&e107_0, 99 * C, 184 * C, 255 * C, c107_1}; +static const char c108_0[] = "steelblue2"; +static dbEntry e108_0 = {NULL, 92 * C, 172 * C, 238 * C, c108_0}; +static const char c108_1[] = "firebrick1"; +static dbEntry e108_1 = {&e108_0, 255 * C, 48 * C, 48 * C, c108_1}; +static const char c108_2[] = "firebrick2"; +static dbEntry e108_2 = {&e108_1, 238 * C, 44 * C, 44 * C, c108_2}; +static const char c108_3[] = "firebrick3"; +static dbEntry e108_3 = {&e108_2, 205 * C, 38 * C, 38 * C, c108_3}; +static const char c109_0[] = "steelblue3"; +static dbEntry e109_0 = {NULL, 79 * C, 148 * C, 205 * C, c109_0}; +static const char c110_0[] = "lightcyan1"; +static dbEntry e110_0 = {NULL, 224 * C, 255 * C, 255 * C, c110_0}; +static const char c110_1[] = "lightcyan2"; +static dbEntry e110_1 = {&e110_0, 209 * C, 238 * C, 238 * C, c110_1}; +static const char c110_2[] = "lightcyan3"; +static dbEntry e110_2 = {&e110_1, 180 * C, 205 * C, 205 * C, c110_2}; +static const char c110_3[] = "lightcyan4"; +static dbEntry e110_3 = {&e110_2, 122 * C, 139 * C, 139 * C, c110_3}; +static const char c111_0[] = "brown1"; +static dbEntry e111_0 = {NULL, 255 * C, 64 * C, 64 * C, c111_0}; +static const char c112_0[] = "firebrick4"; +static dbEntry e112_0 = {NULL, 139 * C, 26 * C, 26 * C, c112_0}; +static const char c112_1[] = "brown2"; +static dbEntry e112_1 = {&e112_0, 238 * C, 59 * C, 59 * C, c112_1}; +static const char c112_2[] = "lightpink1"; +static dbEntry e112_2 = {&e112_1, 255 * C, 174 * C, 185 * C, c112_2}; +static const char c112_3[] = "lightpink2"; +static dbEntry e112_3 = {&e112_2, 238 * C, 162 * C, 173 * C, c112_3}; +static const char c112_4[] = "lightpink3"; +static dbEntry e112_4 = {&e112_3, 205 * C, 140 * C, 149 * C, c112_4}; +static const char c112_5[] = "lightpink4"; +static dbEntry e112_5 = {&e112_4, 139 * C, 95 * C, 101 * C, c112_5}; +static const char c113_0[] = "brown3"; +static dbEntry e113_0 = {NULL, 205 * C, 51 * C, 51 * C, c113_0}; +static const char c113_1[] = "grey20"; +static dbEntry e113_1 = {&e113_0, 51 * C, 51 * C, 51 * C, c113_1}; +static const char c113_2[] = "gray40"; +static dbEntry e113_2 = {&e113_1, 102 * C, 102 * C, 102 * C, c113_2}; +static const char c114_0[] = "brown4"; +static dbEntry e114_0 = {NULL, 139 * C, 35 * C, 35 * C, c114_0}; +static const char c114_1[] = "grey21"; +static dbEntry e114_1 = {&e114_0, 54 * C, 54 * C, 54 * C, c114_1}; +static const char c114_2[] = "gray41"; +static dbEntry e114_2 = {&e114_1, 105 * C, 105 * C, 105 * C, c114_2}; +static const char c115_0[] = "slategray"; +static dbEntry e115_0 = {NULL, 112 * C, 128 * C, 144 * C, c115_0}; +static const char c115_1[] = "lightskyblue1"; +static dbEntry e115_1 = {&e115_0, 176 * C, 226 * C, 255 * C, c115_1}; +static const char c115_2[] = "grey22"; +static dbEntry e115_2 = {&e115_1, 56 * C, 56 * C, 56 * C, c115_2}; +static const char c115_3[] = "gray42"; +static dbEntry e115_3 = {&e115_2, 107 * C, 107 * C, 107 * C, c115_3}; +static const char c116_0[] = "lightskyblue2"; +static dbEntry e116_0 = {NULL, 164 * C, 211 * C, 238 * C, c116_0}; +static const char c116_1[] = "grey23"; +static dbEntry e116_1 = {&e116_0, 59 * C, 59 * C, 59 * C, c116_1}; +static const char c116_2[] = "gray43"; +static dbEntry e116_2 = {&e116_1, 110 * C, 110 * C, 110 * C, c116_2}; +static const char c117_0[] = "lightskyblue3"; +static dbEntry e117_0 = {NULL, 141 * C, 182 * C, 205 * C, c117_0}; +static const char c117_1[] = "grey24"; +static dbEntry e117_1 = {&e117_0, 61 * C, 61 * C, 61 * C, c117_1}; +static const char c117_2[] = "gray44"; +static dbEntry e117_2 = {&e117_1, 112 * C, 112 * C, 112 * C, c117_2}; +static const char c118_0[] = "lightskyblue4"; +static dbEntry e118_0 = {NULL, 96 * C, 123 * C, 139 * C, c118_0}; +static const char c118_1[] = "grey25"; +static dbEntry e118_1 = {&e118_0, 64 * C, 64 * C, 64 * C, c118_1}; +static const char c118_2[] = "gray45"; +static dbEntry e118_2 = {&e118_1, 115 * C, 115 * C, 115 * C, c118_2}; +static const char c119_0[] = "grey26"; +static dbEntry e119_0 = {NULL, 66 * C, 66 * C, 66 * C, c119_0}; +static const char c119_1[] = "gray46"; +static dbEntry e119_1 = {&e119_0, 117 * C, 117 * C, 117 * C, c119_1}; +static const char c120_0[] = "maroon"; +static dbEntry e120_0 = {NULL, 176 * C, 48 * C, 96 * C, c120_0}; +static const char c120_1[] = "grey27"; +static dbEntry e120_1 = {&e120_0, 69 * C, 69 * C, 69 * C, c120_1}; +static const char c120_2[] = "gray47"; +static dbEntry e120_2 = {&e120_1, 120 * C, 120 * C, 120 * C, c120_2}; +static const char c121_0[] = "grey28"; +static dbEntry e121_0 = {NULL, 71 * C, 71 * C, 71 * C, c121_0}; +static const char c121_1[] = "gray48"; +static dbEntry e121_1 = {&e121_0, 122 * C, 122 * C, 122 * C, c121_1}; +static const char c122_0[] = "grey29"; +static dbEntry e122_0 = {NULL, 74 * C, 74 * C, 74 * C, c122_0}; +static const char c122_1[] = "gray49"; +static dbEntry e122_1 = {&e122_0, 125 * C, 125 * C, 125 * C, c122_1}; +static const char c124_0[] = "lightsalmon1"; +static dbEntry e124_0 = {NULL, 255 * C, 160 * C, 122 * C, c124_0}; +static const char c125_0[] = "lightsalmon2"; +static dbEntry e125_0 = {NULL, 238 * C, 149 * C, 114 * C, c125_0}; +static const char c125_1[] = "deeppink4"; +static dbEntry e125_1 = {&e125_0, 139 * C, 10 * C, 80 * C, c125_1}; +static const char c126_0[] = "lightsalmon3"; +static dbEntry e126_0 = {NULL, 205 * C, 129 * C, 98 * C, c126_0}; +static const char c126_1[] = "deeppink1"; +static dbEntry e126_1 = {&e126_0, 255 * C, 20 * C, 147 * C, c126_1}; +static const char c127_0[] = "peachpuff"; +static dbEntry e127_0 = {NULL, 255 * C, 218 * C, 185 * C, c127_0}; +static const char c127_1[] = "navy"; +static dbEntry e127_1 = {&e127_0, 0 * C, 0 * C, 128 * C, c127_1}; +static const char c127_2[] = "lightsalmon4"; +static dbEntry e127_2 = {&e127_1, 139 * C, 87 * C, 66 * C, c127_2}; +static const char c127_3[] = "deeppink2"; +static dbEntry e127_3 = {&e127_2, 238 * C, 18 * C, 137 * C, c127_3}; +static const char c128_0[] = "violetred"; +static dbEntry e128_0 = {NULL, 208 * C, 32 * C, 144 * C, c128_0}; +static const char c128_1[] = "deeppink3"; +static dbEntry e128_1 = {&e128_0, 205 * C, 16 * C, 118 * C, c128_1}; +static const char c129_0[] = "pink1"; +static dbEntry e129_0 = {NULL, 255 * C, 181 * C, 197 * C, c129_0}; +static const char c129_1[] = "grey30"; +static dbEntry e129_1 = {&e129_0, 77 * C, 77 * C, 77 * C, c129_1}; +static const char c129_2[] = "gray50"; +static dbEntry e129_2 = {&e129_1, 127 * C, 127 * C, 127 * C, c129_2}; +static const char c130_0[] = "pink2"; +static dbEntry e130_0 = {NULL, 238 * C, 169 * C, 184 * C, c130_0}; +static const char c130_1[] = "grey31"; +static dbEntry e130_1 = {&e130_0, 79 * C, 79 * C, 79 * C, c130_1}; +static const char c130_2[] = "gray51"; +static dbEntry e130_2 = {&e130_1, 130 * C, 130 * C, 130 * C, c130_2}; +static const char c131_0[] = "pink3"; +static dbEntry e131_0 = {NULL, 205 * C, 145 * C, 158 * C, c131_0}; +static const char c131_1[] = "grey32"; +static dbEntry e131_1 = {&e131_0, 82 * C, 82 * C, 82 * C, c131_1}; +static const char c131_2[] = "gray52"; +static dbEntry e131_2 = {&e131_1, 133 * C, 133 * C, 133 * C, c131_2}; +static const char c132_0[] = "darksalmon"; +static dbEntry e132_0 = {NULL, 233 * C, 150 * C, 122 * C, c132_0}; +static const char c132_1[] = "pink4"; +static dbEntry e132_1 = {&e132_0, 139 * C, 99 * C, 108 * C, c132_1}; +static const char c132_2[] = "grey33"; +static dbEntry e132_2 = {&e132_1, 84 * C, 84 * C, 84 * C, c132_2}; +static const char c132_3[] = "gray53"; +static dbEntry e132_3 = {&e132_2, 135 * C, 135 * C, 135 * C, c132_3}; +static const char c133_0[] = "grey34"; +static dbEntry e133_0 = {NULL, 87 * C, 87 * C, 87 * C, c133_0}; +static const char c133_1[] = "gray54"; +static dbEntry e133_1 = {&e133_0, 138 * C, 138 * C, 138 * C, c133_1}; +static const char c134_0[] = "grey35"; +static dbEntry e134_0 = {NULL, 89 * C, 89 * C, 89 * C, c134_0}; +static const char c134_1[] = "gray55"; +static dbEntry e134_1 = {&e134_0, 140 * C, 140 * C, 140 * C, c134_1}; +static const char c135_0[] = "lightseagreen"; +static dbEntry e135_0 = {NULL, 32 * C, 178 * C, 170 * C, c135_0}; +static const char c135_1[] = "grey36"; +static dbEntry e135_1 = {&e135_0, 92 * C, 92 * C, 92 * C, c135_1}; +static const char c135_2[] = "gray56"; +static dbEntry e135_2 = {&e135_1, 143 * C, 143 * C, 143 * C, c135_2}; +static const char c136_0[] = "grey37"; +static dbEntry e136_0 = {NULL, 94 * C, 94 * C, 94 * C, c136_0}; +static const char c136_1[] = "gray57"; +static dbEntry e136_1 = {&e136_0, 145 * C, 145 * C, 145 * C, c136_1}; +static const char c137_0[] = "grey38"; +static dbEntry e137_0 = {NULL, 97 * C, 97 * C, 97 * C, c137_0}; +static const char c137_1[] = "gray58"; +static dbEntry e137_1 = {&e137_0, 148 * C, 148 * C, 148 * C, c137_1}; +static const char c138_0[] = "goldenrod2"; +static dbEntry e138_0 = {NULL, 238 * C, 180 * C, 34 * C, c138_0}; +static const char c138_1[] = "grey39"; +static dbEntry e138_1 = {&e138_0, 99 * C, 99 * C, 99 * C, c138_1}; +static const char c138_2[] = "gray59"; +static dbEntry e138_2 = {&e138_1, 150 * C, 150 * C, 150 * C, c138_2}; +static const char c139_0[] = "chocolate"; +static dbEntry e139_0 = {NULL, 210 * C, 105 * C, 30 * C, c139_0}; +static const char c139_1[] = "goldenrod1"; +static dbEntry e139_1 = {&e139_0, 255 * C, 193 * C, 37 * C, c139_1}; +static const char c139_2[] = "goldenrod3"; +static dbEntry e139_2 = {&e139_1, 205 * C, 155 * C, 29 * C, c139_2}; +static const char c140_0[] = "lightyellow1"; +static dbEntry e140_0 = {NULL, 255 * C, 255 * C, 224 * C, c140_0}; +static const char c141_0[] = "lightyellow2"; +static dbEntry e141_0 = {NULL, 238 * C, 238 * C, 209 * C, c141_0}; +static const char c142_0[] = "lightyellow3"; +static dbEntry e142_0 = {NULL, 205 * C, 205 * C, 180 * C, c142_0}; +static const char c142_1[] = "goldenrod4"; +static dbEntry e142_1 = {&e142_0, 139 * C, 105 * C, 20 * C, c142_1}; +static const char c143_0[] = "lightyellow4"; +static dbEntry e143_0 = {NULL, 139 * C, 139 * C, 122 * C, c143_0}; +static const char c145_0[] = "lightslategray"; +static dbEntry e145_0 = {NULL, 119 * C, 136 * C, 153 * C, c145_0}; +static const char c145_1[] = "grey40"; +static dbEntry e145_1 = {&e145_0, 102 * C, 102 * C, 102 * C, c145_1}; +static const char c145_2[] = "gray60"; +static dbEntry e145_2 = {&e145_1, 153 * C, 153 * C, 153 * C, c145_2}; +static const char c146_0[] = "turquoise"; +static dbEntry e146_0 = {NULL, 64 * C, 224 * C, 208 * C, c146_0}; +static const char c146_1[] = "seagreen1"; +static dbEntry e146_1 = {&e146_0, 84 * C, 255 * C, 159 * C, c146_1}; +static const char c146_2[] = "seagreen2"; +static dbEntry e146_2 = {&e146_1, 78 * C, 238 * C, 148 * C, c146_2}; +static const char c146_3[] = "seagreen3"; +static dbEntry e146_3 = {&e146_2, 67 * C, 205 * C, 128 * C, c146_3}; +static const char c146_4[] = "seagreen4"; +static dbEntry e146_4 = {&e146_3, 46 * C, 139 * C, 87 * C, c146_4}; +static const char c146_5[] = "grey41"; +static dbEntry e146_5 = {&e146_4, 105 * C, 105 * C, 105 * C, c146_5}; +static const char c146_6[] = "gray61"; +static dbEntry e146_6 = {&e146_5, 156 * C, 156 * C, 156 * C, c146_6}; +static const char c147_0[] = "darkseagreen"; +static dbEntry e147_0 = {NULL, 143 * C, 188 * C, 143 * C, c147_0}; +static const char c147_1[] = "peachpuff1"; +static dbEntry e147_1 = {&e147_0, 255 * C, 218 * C, 185 * C, c147_1}; +static const char c147_2[] = "grey42"; +static dbEntry e147_2 = {&e147_1, 107 * C, 107 * C, 107 * C, c147_2}; +static const char c147_3[] = "gray62"; +static dbEntry e147_3 = {&e147_2, 158 * C, 158 * C, 158 * C, c147_3}; +static const char c148_0[] = "grey43"; +static dbEntry e148_0 = {NULL, 110 * C, 110 * C, 110 * C, c148_0}; +static const char c148_1[] = "gray63"; +static dbEntry e148_1 = {&e148_0, 161 * C, 161 * C, 161 * C, c148_1}; +static const char c149_0[] = "peachpuff2"; +static dbEntry e149_0 = {NULL, 238 * C, 203 * C, 173 * C, c149_0}; +static const char c149_1[] = "peachpuff3"; +static dbEntry e149_1 = {&e149_0, 205 * C, 175 * C, 149 * C, c149_1}; +static const char c149_2[] = "grey44"; +static dbEntry e149_2 = {&e149_1, 112 * C, 112 * C, 112 * C, c149_2}; +static const char c149_3[] = "gray64"; +static dbEntry e149_3 = {&e149_2, 163 * C, 163 * C, 163 * C, c149_3}; +static const char c150_0[] = "grey45"; +static dbEntry e150_0 = {NULL, 115 * C, 115 * C, 115 * C, c150_0}; +static const char c150_1[] = "gray65"; +static dbEntry e150_1 = {&e150_0, 166 * C, 166 * C, 166 * C, c150_1}; +static const char c151_0[] = "peachpuff4"; +static dbEntry e151_0 = {NULL, 139 * C, 119 * C, 101 * C, c151_0}; +static const char c151_1[] = "grey46"; +static dbEntry e151_1 = {&e151_0, 117 * C, 117 * C, 117 * C, c151_1}; +static const char c151_2[] = "gray66"; +static dbEntry e151_2 = {&e151_1, 168 * C, 168 * C, 168 * C, c151_2}; +static const char c152_0[] = "grey47"; +static dbEntry e152_0 = {NULL, 120 * C, 120 * C, 120 * C, c152_0}; +static const char c152_1[] = "gray67"; +static dbEntry e152_1 = {&e152_0, 171 * C, 171 * C, 171 * C, c152_1}; +static const char c153_0[] = "wheat"; +static dbEntry e153_0 = {NULL, 245 * C, 222 * C, 179 * C, c153_0}; +static const char c153_1[] = "grey48"; +static dbEntry e153_1 = {&e153_0, 122 * C, 122 * C, 122 * C, c153_1}; +static const char c153_2[] = "gray68"; +static dbEntry e153_2 = {&e153_1, 173 * C, 173 * C, 173 * C, c153_2}; +static const char c154_0[] = "mediumaquamarine"; +static dbEntry e154_0 = {NULL, 102 * C, 205 * C, 170 * C, c154_0}; +static const char c154_1[] = "grey49"; +static dbEntry e154_1 = {&e154_0, 125 * C, 125 * C, 125 * C, c154_1}; +static const char c154_2[] = "gray69"; +static dbEntry e154_2 = {&e154_1, 176 * C, 176 * C, 176 * C, c154_2}; +static const char c161_0[] = "grey50"; +static dbEntry e161_0 = {NULL, 127 * C, 127 * C, 127 * C, c161_0}; +static const char c161_1[] = "gray70"; +static dbEntry e161_1 = {&e161_0, 179 * C, 179 * C, 179 * C, c161_1}; +static const char c162_0[] = "floralwhite"; +static dbEntry e162_0 = {NULL, 255 * C, 250 * C, 240 * C, c162_0}; +static const char c162_1[] = "grey51"; +static dbEntry e162_1 = {&e162_0, 130 * C, 130 * C, 130 * C, c162_1}; +static const char c162_2[] = "gray71"; +static dbEntry e162_2 = {&e162_1, 181 * C, 181 * C, 181 * C, c162_2}; +static const char c163_0[] = "chartreuse"; +static dbEntry e163_0 = {NULL, 127 * C, 255 * C, 0 * C, c163_0}; +static const char c163_1[] = "grey52"; +static dbEntry e163_1 = {&e163_0, 133 * C, 133 * C, 133 * C, c163_1}; +static const char c163_2[] = "gray72"; +static dbEntry e163_2 = {&e163_1, 184 * C, 184 * C, 184 * C, c163_2}; +static const char c164_0[] = "grey53"; +static dbEntry e164_0 = {NULL, 135 * C, 135 * C, 135 * C, c164_0}; +static const char c164_1[] = "gray73"; +static dbEntry e164_1 = {&e164_0, 186 * C, 186 * C, 186 * C, c164_1}; +static const char c165_0[] = "grey54"; +static dbEntry e165_0 = {NULL, 138 * C, 138 * C, 138 * C, c165_0}; +static const char c165_1[] = "gray74"; +static dbEntry e165_1 = {&e165_0, 189 * C, 189 * C, 189 * C, c165_1}; +static const char c166_0[] = "grey55"; +static dbEntry e166_0 = {NULL, 140 * C, 140 * C, 140 * C, c166_0}; +static const char c166_1[] = "gray75"; +static dbEntry e166_1 = {&e166_0, 191 * C, 191 * C, 191 * C, c166_1}; +static const char c167_0[] = "grey56"; +static dbEntry e167_0 = {NULL, 143 * C, 143 * C, 143 * C, c167_0}; +static const char c167_1[] = "gray76"; +static dbEntry e167_1 = {&e167_0, 194 * C, 194 * C, 194 * C, c167_1}; +static const char c168_0[] = "mediumslateblue"; +static dbEntry e168_0 = {NULL, 123 * C, 104 * C, 238 * C, c168_0}; +static const char c168_1[] = "palevioletred"; +static dbEntry e168_1 = {&e168_0, 219 * C, 112 * C, 147 * C, c168_1}; +static const char c168_2[] = "grey57"; +static dbEntry e168_2 = {&e168_1, 145 * C, 145 * C, 145 * C, c168_2}; +static const char c168_3[] = "gray77"; +static dbEntry e168_3 = {&e168_2, 196 * C, 196 * C, 196 * C, c168_3}; +static const char c169_0[] = "darkorchid2"; +static dbEntry e169_0 = {NULL, 178 * C, 58 * C, 238 * C, c169_0}; +static const char c169_1[] = "darkorchid4"; +static dbEntry e169_1 = {&e169_0, 104 * C, 34 * C, 139 * C, c169_1}; +static const char c169_2[] = "grey58"; +static dbEntry e169_2 = {&e169_1, 148 * C, 148 * C, 148 * C, c169_2}; +static const char c169_3[] = "gray78"; +static dbEntry e169_3 = {&e169_2, 199 * C, 199 * C, 199 * C, c169_3}; +static const char c170_0[] = "darkorchid1"; +static dbEntry e170_0 = {NULL, 191 * C, 62 * C, 255 * C, c170_0}; +static const char c170_1[] = "darkorchid3"; +static dbEntry e170_1 = {&e170_0, 154 * C, 50 * C, 205 * C, c170_1}; +static const char c170_2[] = "grey59"; +static dbEntry e170_2 = {&e170_1, 150 * C, 150 * C, 150 * C, c170_2}; +static const char c170_3[] = "gray79"; +static dbEntry e170_3 = {&e170_2, 201 * C, 201 * C, 201 * C, c170_3}; +static const char c172_0[] = "mistyrose4"; +static dbEntry e172_0 = {NULL, 139 * C, 125 * C, 123 * C, c172_0}; +static const char c173_0[] = "mistyrose1"; +static dbEntry e173_0 = {NULL, 255 * C, 228 * C, 225 * C, c173_0}; +static const char c173_1[] = "dodgerblue4"; +static dbEntry e173_1 = {&e173_0, 16 * C, 78 * C, 139 * C, c173_1}; +static const char c174_0[] = "oldlace"; +static dbEntry e174_0 = {NULL, 253 * C, 245 * C, 230 * C, c174_0}; +static const char c174_1[] = "bisque"; +static dbEntry e174_1 = {&e174_0, 255 * C, 228 * C, 196 * C, c174_1}; +static const char c174_2[] = "mistyrose2"; +static dbEntry e174_2 = {&e174_1, 238 * C, 213 * C, 210 * C, c174_2}; +static const char c174_3[] = "dodgerblue1"; +static dbEntry e174_3 = {&e174_2, 30 * C, 144 * C, 255 * C, c174_3}; +static const char c174_4[] = "lightblue1"; +static dbEntry e174_4 = {&e174_3, 191 * C, 239 * C, 255 * C, c174_4}; +static const char c174_5[] = "lightblue2"; +static dbEntry e174_5 = {&e174_4, 178 * C, 223 * C, 238 * C, c174_5}; +static const char c174_6[] = "lightblue3"; +static dbEntry e174_6 = {&e174_5, 154 * C, 192 * C, 205 * C, c174_6}; +static const char c174_7[] = "lightblue4"; +static dbEntry e174_7 = {&e174_6, 104 * C, 131 * C, 139 * C, c174_7}; +static const char c175_0[] = "antiquewhite"; +static dbEntry e175_0 = {NULL, 250 * C, 235 * C, 215 * C, c175_0}; +static const char c175_1[] = "mistyrose3"; +static dbEntry e175_1 = {&e175_0, 205 * C, 183 * C, 181 * C, c175_1}; +static const char c175_2[] = "dodgerblue2"; +static dbEntry e175_2 = {&e175_1, 28 * C, 134 * C, 238 * C, c175_2}; +static const char c176_0[] = "dodgerblue3"; +static dbEntry e176_0 = {NULL, 24 * C, 116 * C, 205 * C, c176_0}; +static const char c177_0[] = "grey60"; +static dbEntry e177_0 = {NULL, 153 * C, 153 * C, 153 * C, c177_0}; +static const char c177_1[] = "gray80"; +static dbEntry e177_1 = {&e177_0, 204 * C, 204 * C, 204 * C, c177_1}; +static const char c178_0[] = "grey61"; +static dbEntry e178_0 = {NULL, 156 * C, 156 * C, 156 * C, c178_0}; +static const char c178_1[] = "gray81"; +static dbEntry e178_1 = {&e178_0, 207 * C, 207 * C, 207 * C, c178_1}; +static const char c179_0[] = "slategrey"; +static dbEntry e179_0 = {NULL, 112 * C, 128 * C, 144 * C, c179_0}; +static const char c179_1[] = "grey62"; +static dbEntry e179_1 = {&e179_0, 158 * C, 158 * C, 158 * C, c179_1}; +static const char c179_2[] = "gray82"; +static dbEntry e179_2 = {&e179_1, 209 * C, 209 * C, 209 * C, c179_2}; +static const char c180_0[] = "mediumorchid"; +static dbEntry e180_0 = {NULL, 186 * C, 85 * C, 211 * C, c180_0}; +static const char c180_1[] = "grey63"; +static dbEntry e180_1 = {&e180_0, 161 * C, 161 * C, 161 * C, c180_1}; +static const char c180_2[] = "gray83"; +static dbEntry e180_2 = {&e180_1, 212 * C, 212 * C, 212 * C, c180_2}; +static const char c181_0[] = "grey64"; +static dbEntry e181_0 = {NULL, 163 * C, 163 * C, 163 * C, c181_0}; +static const char c181_1[] = "gray84"; +static dbEntry e181_1 = {&e181_0, 214 * C, 214 * C, 214 * C, c181_1}; +static const char c182_0[] = "grey65"; +static dbEntry e182_0 = {NULL, 166 * C, 166 * C, 166 * C, c182_0}; +static const char c182_1[] = "gray85"; +static dbEntry e182_1 = {&e182_0, 217 * C, 217 * C, 217 * C, c182_1}; +static const char c183_0[] = "grey66"; +static dbEntry e183_0 = {NULL, 168 * C, 168 * C, 168 * C, c183_0}; +static const char c183_1[] = "gray86"; +static dbEntry e183_1 = {&e183_0, 219 * C, 219 * C, 219 * C, c183_1}; +static const char c184_0[] = "sienna1"; +static dbEntry e184_0 = {NULL, 255 * C, 130 * C, 71 * C, c184_0}; +static const char c184_1[] = "orangered4"; +static dbEntry e184_1 = {&e184_0, 139 * C, 37 * C, 0 * C, c184_1}; +static const char c184_2[] = "grey67"; +static dbEntry e184_2 = {&e184_1, 171 * C, 171 * C, 171 * C, c184_2}; +static const char c184_3[] = "gray87"; +static dbEntry e184_3 = {&e184_2, 222 * C, 222 * C, 222 * C, c184_3}; +static const char c185_0[] = "orangered1"; +static dbEntry e185_0 = {NULL, 255 * C, 69 * C, 0 * C, c185_0}; +static const char c185_1[] = "grey68"; +static dbEntry e185_1 = {&e185_0, 173 * C, 173 * C, 173 * C, c185_1}; +static const char c185_2[] = "gray88"; +static dbEntry e185_2 = {&e185_1, 224 * C, 224 * C, 224 * C, c185_2}; +static const char c186_0[] = "sienna2"; +static dbEntry e186_0 = {NULL, 238 * C, 121 * C, 66 * C, c186_0}; +static const char c186_1[] = "sienna3"; +static dbEntry e186_1 = {&e186_0, 205 * C, 104 * C, 57 * C, c186_1}; +static const char c186_2[] = "orangered2"; +static dbEntry e186_2 = {&e186_1, 238 * C, 64 * C, 0 * C, c186_2}; +static const char c186_3[] = "grey69"; +static dbEntry e186_3 = {&e186_2, 176 * C, 176 * C, 176 * C, c186_3}; +static const char c186_4[] = "gray89"; +static dbEntry e186_4 = {&e186_3, 227 * C, 227 * C, 227 * C, c186_4}; +static const char c187_0[] = "tan"; +static dbEntry e187_0 = {NULL, 210 * C, 180 * C, 140 * C, c187_0}; +static const char c187_1[] = "orangered3"; +static dbEntry e187_1 = {&e187_0, 205 * C, 55 * C, 0 * C, c187_1}; +static const char c188_0[] = "sienna4"; +static dbEntry e188_0 = {NULL, 139 * C, 71 * C, 38 * C, c188_0}; +static const char c193_0[] = "grey70"; +static dbEntry e193_0 = {NULL, 179 * C, 179 * C, 179 * C, c193_0}; +static const char c193_1[] = "gray90"; +static dbEntry e193_1 = {&e193_0, 229 * C, 229 * C, 229 * C, c193_1}; +static const char c194_0[] = "grey71"; +static dbEntry e194_0 = {NULL, 181 * C, 181 * C, 181 * C, c194_0}; +static const char c194_1[] = "gray91"; +static dbEntry e194_1 = {&e194_0, 232 * C, 232 * C, 232 * C, c194_1}; +static const char c195_0[] = "grey72"; +static dbEntry e195_0 = {NULL, 184 * C, 184 * C, 184 * C, c195_0}; +static const char c195_1[] = "gray92"; +static dbEntry e195_1 = {&e195_0, 235 * C, 235 * C, 235 * C, c195_1}; +static const char c196_0[] = "saddlebrown"; +static dbEntry e196_0 = {NULL, 139 * C, 69 * C, 19 * C, c196_0}; +static const char c196_1[] = "grey73"; +static dbEntry e196_1 = {&e196_0, 186 * C, 186 * C, 186 * C, c196_1}; +static const char c196_2[] = "gray93"; +static dbEntry e196_2 = {&e196_1, 237 * C, 237 * C, 237 * C, c196_2}; +static const char c197_0[] = "grey74"; +static dbEntry e197_0 = {NULL, 189 * C, 189 * C, 189 * C, c197_0}; +static const char c197_1[] = "gray94"; +static dbEntry e197_1 = {&e197_0, 240 * C, 240 * C, 240 * C, c197_1}; +static const char c198_0[] = "lightcoral"; +static dbEntry e198_0 = {NULL, 240 * C, 128 * C, 128 * C, c198_0}; +static const char c198_1[] = "grey75"; +static dbEntry e198_1 = {&e198_0, 191 * C, 191 * C, 191 * C, c198_1}; +static const char c198_2[] = "gray95"; +static dbEntry e198_2 = {&e198_1, 242 * C, 242 * C, 242 * C, c198_2}; +static const char c199_0[] = "burlywood"; +static dbEntry e199_0 = {NULL, 222 * C, 184 * C, 135 * C, c199_0}; +static const char c199_1[] = "grey76"; +static dbEntry e199_1 = {&e199_0, 194 * C, 194 * C, 194 * C, c199_1}; +static const char c199_2[] = "gray96"; +static dbEntry e199_2 = {&e199_1, 245 * C, 245 * C, 245 * C, c199_2}; +static const char c200_0[] = "darkorange2"; +static dbEntry e200_0 = {NULL, 238 * C, 118 * C, 0 * C, c200_0}; +static const char c200_1[] = "darkorange4"; +static dbEntry e200_1 = {&e200_0, 139 * C, 69 * C, 0 * C, c200_1}; +static const char c200_2[] = "grey77"; +static dbEntry e200_2 = {&e200_1, 196 * C, 196 * C, 196 * C, c200_2}; +static const char c200_3[] = "gray97"; +static dbEntry e200_3 = {&e200_2, 247 * C, 247 * C, 247 * C, c200_3}; +static const char c201_0[] = "darkorange1"; +static dbEntry e201_0 = {NULL, 255 * C, 127 * C, 0 * C, c201_0}; +static const char c201_1[] = "darkorange3"; +static dbEntry e201_1 = {&e201_0, 205 * C, 102 * C, 0 * C, c201_1}; +static const char c201_2[] = "grey78"; +static dbEntry e201_2 = {&e201_1, 199 * C, 199 * C, 199 * C, c201_2}; +static const char c201_3[] = "gray98"; +static dbEntry e201_3 = {&e201_2, 250 * C, 250 * C, 250 * C, c201_3}; +static const char c202_0[] = "khaki1"; +static dbEntry e202_0 = {NULL, 255 * C, 246 * C, 143 * C, c202_0}; +static const char c202_1[] = "grey79"; +static dbEntry e202_1 = {&e202_0, 201 * C, 201 * C, 201 * C, c202_1}; +static const char c202_2[] = "gray99"; +static dbEntry e202_2 = {&e202_1, 252 * C, 252 * C, 252 * C, c202_2}; +static const char c203_0[] = "khaki2"; +static dbEntry e203_0 = {NULL, 238 * C, 230 * C, 133 * C, c203_0}; +static const char c204_0[] = "khaki3"; +static dbEntry e204_0 = {NULL, 205 * C, 198 * C, 115 * C, c204_0}; +static const char c205_0[] = "khaki4"; +static dbEntry e205_0 = {NULL, 139 * C, 134 * C, 78 * C, c205_0}; +static const char c207_0[] = "darkgreen"; +static dbEntry e207_0 = {NULL, 0 * C, 100 * C, 0 * C, c207_0}; +static const char c207_1[] = "darkolivegreen"; +static dbEntry e207_1 = {&e207_0, 85 * C, 107 * C, 47 * C, c207_1}; +static const char c209_0[] = "lightslategrey"; +static dbEntry e209_0 = {NULL, 119 * C, 136 * C, 153 * C, c209_0}; +static const char c209_1[] = "grey80"; +static dbEntry e209_1 = {&e209_0, 204 * C, 204 * C, 204 * C, c209_1}; +static const char c210_0[] = "grey81"; +static dbEntry e210_0 = {NULL, 207 * C, 207 * C, 207 * C, c210_0}; +static const char c211_0[] = "grey82"; +static dbEntry e211_0 = {NULL, 209 * C, 209 * C, 209 * C, c211_0}; +static const char c212_0[] = "grey83"; +static dbEntry e212_0 = {NULL, 212 * C, 212 * C, 212 * C, c212_0}; +static const char c213_0[] = "grey84"; +static dbEntry e213_0 = {NULL, 214 * C, 214 * C, 214 * C, c213_0}; +static const char c214_0[] = "grey85"; +static dbEntry e214_0 = {NULL, 217 * C, 217 * C, 217 * C, c214_0}; +static const char c215_0[] = "cyan"; +static dbEntry e215_0 = {NULL, 0 * C, 255 * C, 255 * C, c215_0}; +static const char c215_1[] = "grey86"; +static dbEntry e215_1 = {&e215_0, 219 * C, 219 * C, 219 * C, c215_1}; +static const char c216_0[] = "grey87"; +static dbEntry e216_0 = {NULL, 222 * C, 222 * C, 222 * C, c216_0}; +static const char c217_0[] = "palegreen1"; +static dbEntry e217_0 = {NULL, 154 * C, 255 * C, 154 * C, c217_0}; +static const char c217_1[] = "palegreen2"; +static dbEntry e217_1 = {&e217_0, 144 * C, 238 * C, 144 * C, c217_1}; +static const char c217_2[] = "palegreen3"; +static dbEntry e217_2 = {&e217_1, 124 * C, 205 * C, 124 * C, c217_2}; +static const char c217_3[] = "grey88"; +static dbEntry e217_3 = {&e217_2, 224 * C, 224 * C, 224 * C, c217_3}; +static const char c218_0[] = "grey89"; +static dbEntry e218_0 = {NULL, 227 * C, 227 * C, 227 * C, c218_0}; +static const char c220_0[] = "mediumvioletred"; +static dbEntry e220_0 = {NULL, 199 * C, 21 * C, 133 * C, c220_0}; +static const char c221_0[] = "palegreen4"; +static dbEntry e221_0 = {NULL, 84 * C, 139 * C, 84 * C, c221_0}; +static const char c222_0[] = "darkslateblue"; +static dbEntry e222_0 = {NULL, 72 * C, 61 * C, 139 * C, c222_0}; +static const char c222_1[] = "lightslateblue"; +static dbEntry e222_1 = {&e222_0, 132 * C, 112 * C, 255 * C, c222_1}; +static const char c223_0[] = "mediumseagreen"; +static dbEntry e223_0 = {NULL, 60 * C, 179 * C, 113 * C, c223_0}; +static const char c223_1[] = "coral1"; +static dbEntry e223_1 = {&e223_0, 255 * C, 114 * C, 86 * C, c223_1}; +static const char c224_0[] = "lightgrey"; +static dbEntry e224_0 = {NULL, 211 * C, 211 * C, 211 * C, c224_0}; +static const char c224_1[] = "lightgray"; +static dbEntry e224_1 = {&e224_0, 211 * C, 211 * C, 211 * C, c224_1}; +static const char c224_2[] = "coral2"; +static dbEntry e224_2 = {&e224_1, 238 * C, 106 * C, 80 * C, c224_2}; +static const char c225_0[] = "coral3"; +static dbEntry e225_0 = {NULL, 205 * C, 91 * C, 69 * C, c225_0}; +static const char c225_1[] = "grey90"; +static dbEntry e225_1 = {&e225_0, 229 * C, 229 * C, 229 * C, c225_1}; +static const char c226_0[] = "coral4"; +static dbEntry e226_0 = {NULL, 139 * C, 62 * C, 47 * C, c226_0}; +static const char c226_1[] = "grey91"; +static dbEntry e226_1 = {&e226_0, 232 * C, 232 * C, 232 * C, c226_1}; +static const char c227_0[] = "grey92"; +static dbEntry e227_0 = {NULL, 235 * C, 235 * C, 235 * C, c227_0}; +static const char c228_0[] = "grey93"; +static dbEntry e228_0 = {NULL, 237 * C, 237 * C, 237 * C, c228_0}; +static const char c229_0[] = "grey94"; +static dbEntry e229_0 = {NULL, 240 * C, 240 * C, 240 * C, c229_0}; +static const char c230_0[] = "grey95"; +static dbEntry e230_0 = {NULL, 242 * C, 242 * C, 242 * C, c230_0}; +static const char c231_0[] = "grey96"; +static dbEntry e231_0 = {NULL, 245 * C, 245 * C, 245 * C, c231_0}; +static const char c232_0[] = "grey97"; +static dbEntry e232_0 = {NULL, 247 * C, 247 * C, 247 * C, c232_0}; +static const char c233_0[] = "grey98"; +static dbEntry e233_0 = {NULL, 250 * C, 250 * C, 250 * C, c233_0}; +static const char c234_0[] = "violet"; +static dbEntry e234_0 = {NULL, 238 * C, 130 * C, 238 * C, c234_0}; +static const char c234_1[] = "grey99"; +static dbEntry e234_1 = {&e234_0, 252 * C, 252 * C, 252 * C, c234_1}; +static const char c235_0[] = "darkturquoise"; +static dbEntry e235_0 = {NULL, 0 * C, 206 * C, 209 * C, c235_0}; +static const char c237_0[] = "moccasin"; +static dbEntry e237_0 = {NULL, 255 * C, 228 * C, 181 * C, c237_0}; +static const char c239_0[] = "darkgoldenrod"; +static dbEntry e239_0 = {NULL, 184 * C, 134 * C, 11 * C, c239_0}; +static const char c240_0[] = "paleturquoise"; +static dbEntry e240_0 = {NULL, 175 * C, 238 * C, 238 * C, c240_0}; +static const char c240_1[] = "red"; +static dbEntry e240_1 = {&e240_0, 255 * C, 0 * C, 0 * C, c240_1}; +static const char c242_0[] = "limegreen"; +static dbEntry e242_0 = {NULL, 50 * C, 205 * C, 50 * C, c242_0}; +static const char c242_1[] = "orange"; +static dbEntry e242_1 = {&e242_0, 255 * C, 165 * C, 0 * C, c242_1}; +static const char c243_0[] = "chocolate2"; +static dbEntry e243_0 = {NULL, 238 * C, 118 * C, 33 * C, c243_0}; +static const char c244_0[] = "chocolate1"; +static dbEntry e244_0 = {NULL, 255 * C, 127 * C, 36 * C, c244_0}; +static const char c244_1[] = "chocolate3"; +static dbEntry e244_1 = {&e244_0, 205 * C, 102 * C, 29 * C, c244_1}; +static const char c245_0[] = "gainsboro"; +static dbEntry e245_0 = {NULL, 220 * C, 220 * C, 220 * C, c245_0}; +static const char c247_0[] = "chocolate4"; +static dbEntry e247_0 = {NULL, 139 * C, 69 * C, 19 * C, c247_0}; +static const char c256_0[] = "blue"; +static dbEntry e256_0 = {NULL, 0 * C, 0 * C, 255 * C, c256_0}; +static const char c256_1[] = "honeydew4"; +static dbEntry e256_1 = {&e256_0, 131 * C, 139 * C, 131 * C, c256_1}; +static const char c257_0[] = "honeydew1"; +static dbEntry e257_0 = {NULL, 240 * C, 255 * C, 240 * C, c257_0}; +static const char c258_0[] = "honeydew2"; +static dbEntry e258_0 = {NULL, 224 * C, 238 * C, 224 * C, c258_0}; +static const char c259_0[] = "honeydew3"; +static dbEntry e259_0 = {NULL, 193 * C, 205 * C, 193 * C, c259_0}; +static const char c264_0[] = "darkgoldenrod1"; +static dbEntry e264_0 = {NULL, 255 * C, 185 * C, 15 * C, c264_0}; +static const char c265_0[] = "darkgoldenrod2"; +static dbEntry e265_0 = {NULL, 238 * C, 173 * C, 14 * C, c265_0}; +static const char c266_0[] = "lavenderblush1"; +static dbEntry e266_0 = {NULL, 255 * C, 240 * C, 245 * C, c266_0}; +static const char c266_1[] = "azure1"; +static dbEntry e266_1 = {&e266_0, 240 * C, 255 * C, 255 * C, c266_1}; +static const char c266_2[] = "darkgoldenrod3"; +static dbEntry e266_2 = {&e266_1, 205 * C, 149 * C, 12 * C, c266_2}; +static const char c267_0[] = "lavenderblush2"; +static dbEntry e267_0 = {NULL, 238 * C, 224 * C, 229 * C, c267_0}; +static const char c267_1[] = "azure2"; +static dbEntry e267_1 = {&e267_0, 224 * C, 238 * C, 238 * C, c267_1}; +static const char c267_2[] = "darkgoldenrod4"; +static dbEntry e267_2 = {&e267_1, 139 * C, 101 * C, 8 * C, c267_2}; +static const char c268_0[] = "sienna"; +static dbEntry e268_0 = {NULL, 160 * C, 82 * C, 45 * C, c268_0}; +static const char c268_1[] = "lavenderblush3"; +static dbEntry e268_1 = {&e268_0, 205 * C, 193 * C, 197 * C, c268_1}; +static const char c268_2[] = "azure3"; +static dbEntry e268_2 = {&e268_1, 193 * C, 205 * C, 205 * C, c268_2}; +static const char c269_0[] = "lavenderblush4"; +static dbEntry e269_0 = {NULL, 139 * C, 131 * C, 134 * C, c269_0}; +static const char c269_1[] = "azure4"; +static dbEntry e269_1 = {&e269_0, 131 * C, 139 * C, 139 * C, c269_1}; +static const char c272_0[] = "lemonchiffon"; +static dbEntry e272_0 = {NULL, 255 * C, 250 * C, 205 * C, c272_0}; +static const char c277_0[] = "bisque1"; +static dbEntry e277_0 = {NULL, 255 * C, 228 * C, 196 * C, c277_0}; +static const char c277_1[] = "burlywood4"; +static dbEntry e277_1 = {&e277_0, 139 * C, 115 * C, 85 * C, c277_1}; +static const char c278_0[] = "burlywood1"; +static dbEntry e278_0 = {NULL, 255 * C, 211 * C, 155 * C, c278_0}; +static const char c279_0[] = "bisque2"; +static dbEntry e279_0 = {NULL, 238 * C, 213 * C, 183 * C, c279_0}; +static const char c279_1[] = "bisque3"; +static dbEntry e279_1 = {&e279_0, 205 * C, 183 * C, 158 * C, c279_1}; +static const char c279_2[] = "burlywood2"; +static dbEntry e279_2 = {&e279_1, 238 * C, 197 * C, 145 * C, c279_2}; +static const char c280_0[] = "orangered"; +static dbEntry e280_0 = {NULL, 255 * C, 69 * C, 0 * C, c280_0}; +static const char c280_1[] = "burlywood3"; +static dbEntry e280_1 = {&e280_0, 205 * C, 170 * C, 125 * C, c280_1}; +static const char c281_0[] = "bisque4"; +static dbEntry e281_0 = {NULL, 139 * C, 125 * C, 107 * C, c281_0}; +static const char c283_0[] = "darkorange"; +static dbEntry e283_0 = {NULL, 255 * C, 140 * C, 0 * C, c283_0}; +static const char c286_0[] = "lavender"; +static dbEntry e286_0 = {NULL, 230 * C, 230 * C, 250 * C, c286_0}; +static const char c286_1[] = "orchid"; +static dbEntry e286_1 = {&e286_0, 218 * C, 112 * C, 214 * C, c286_1}; +static const char c287_0[] = "green"; +static dbEntry e287_0 = {NULL, 0 * C, 255 * C, 0 * C, c287_0}; +static const char c288_0[] = "ivory"; +static dbEntry e288_0 = {NULL, 255 * C, 255 * C, 240 * C, c288_0}; +static const char c291_0[] = "slategray2"; +static dbEntry e291_0 = {NULL, 185 * C, 211 * C, 238 * C, c291_0}; +static const char c292_0[] = "slategray1"; +static dbEntry e292_0 = {NULL, 198 * C, 226 * C, 255 * C, c292_0}; +static const char c292_1[] = "slategray3"; +static dbEntry e292_1 = {&e292_0, 159 * C, 182 * C, 205 * C, c292_1}; +static const char c294_0[] = "navajowhite"; +static dbEntry e294_0 = {NULL, 255 * C, 222 * C, 173 * C, c294_0}; +static const char c294_1[] = "darkolivegreen2"; +static dbEntry e294_1 = {&e294_0, 188 * C, 238 * C, 104 * C, c294_1}; +static const char c295_0[] = "slategray4"; +static dbEntry e295_0 = {NULL, 108 * C, 123 * C, 139 * C, c295_0}; +static const char c295_1[] = "darkolivegreen1"; +static dbEntry e295_1 = {&e295_0, 202 * C, 255 * C, 112 * C, c295_1}; +static const char c295_2[] = "darkolivegreen3"; +static dbEntry e295_2 = {&e295_1, 162 * C, 205 * C, 90 * C, c295_2}; +static const char c296_0[] = "aquamarine1"; +static dbEntry e296_0 = {NULL, 127 * C, 255 * C, 212 * C, c296_0}; +static const char c296_1[] = "aquamarine2"; +static dbEntry e296_1 = {&e296_0, 118 * C, 238 * C, 198 * C, c296_1}; +static const char c296_2[] = "aquamarine3"; +static dbEntry e296_2 = {&e296_1, 102 * C, 205 * C, 170 * C, c296_2}; +static const char c297_0[] = "khaki"; +static dbEntry e297_0 = {NULL, 240 * C, 230 * C, 140 * C, c297_0}; +static const char c298_0[] = "darkolivegreen4"; +static dbEntry e298_0 = {NULL, 110 * C, 139 * C, 61 * C, c298_0}; +static const char c300_0[] = "aquamarine4"; +static dbEntry e300_0 = {NULL, 69 * C, 139 * C, 116 * C, c300_0}; +static const char c301_0[] = "azure"; +static dbEntry e301_0 = {NULL, 240 * C, 255 * C, 255 * C, c301_0}; +static const char c301_1[] = "aquamarine"; +static dbEntry e301_1 = {&e301_0, 127 * C, 255 * C, 212 * C, c301_1}; +static const char c302_0[] = "darkgray"; +static dbEntry e302_0 = {NULL, 169 * C, 169 * C, 169 * C, c302_0}; +static const char c304_0[] = "thistle1"; +static dbEntry e304_0 = {NULL, 255 * C, 225 * C, 255 * C, c304_0}; +static const char c304_1[] = "thistle2"; +static dbEntry e304_1 = {&e304_0, 238 * C, 210 * C, 238 * C, c304_1}; +static const char c304_2[] = "thistle3"; +static dbEntry e304_2 = {&e304_1, 205 * C, 181 * C, 205 * C, c304_2}; +static const char c304_3[] = "thistle4"; +static dbEntry e304_3 = {&e304_2, 139 * C, 123 * C, 139 * C, c304_3}; +static const char c312_0[] = "red1"; +static dbEntry e312_0 = {NULL, 255 * C, 0 * C, 0 * C, c312_0}; +static const char c313_0[] = "red2"; +static dbEntry e313_0 = {NULL, 238 * C, 0 * C, 0 * C, c313_0}; +static const char c314_0[] = "blanchedalmond"; +static dbEntry e314_0 = {NULL, 255 * C, 235 * C, 205 * C, c314_0}; +static const char c314_1[] = "royalblue1"; +static dbEntry e314_1 = {&e314_0, 72 * C, 118 * C, 255 * C, c314_1}; +static const char c314_2[] = "red3"; +static dbEntry e314_2 = {&e314_1, 205 * C, 0 * C, 0 * C, c314_2}; +static const char c314_3[] = "purple1"; +static dbEntry e314_3 = {&e314_2, 155 * C, 48 * C, 255 * C, c314_3}; +static const char c314_4[] = "purple2"; +static dbEntry e314_4 = {&e314_3, 145 * C, 44 * C, 238 * C, c314_4}; +static const char c314_5[] = "purple3"; +static dbEntry e314_5 = {&e314_4, 125 * C, 38 * C, 205 * C, c314_5}; +static const char c314_6[] = "purple4"; +static dbEntry e314_6 = {&e314_5, 85 * C, 26 * C, 139 * C, c314_6}; +static const char c315_0[] = "snow"; +static dbEntry e315_0 = {NULL, 255 * C, 250 * C, 250 * C, c315_0}; +static const char c315_1[] = "darkorchid"; +static dbEntry e315_1 = {&e315_0, 153 * C, 50 * C, 204 * C, c315_1}; +static const char c315_2[] = "royalblue2"; +static dbEntry e315_2 = {&e315_1, 67 * C, 110 * C, 238 * C, c315_2}; +static const char c315_3[] = "red4"; +static dbEntry e315_3 = {&e315_2, 139 * C, 0 * C, 0 * C, c315_3}; +static const char c316_0[] = "palegreen"; +static dbEntry e316_0 = {NULL, 152 * C, 251 * C, 152 * C, c316_0}; +static const char c316_1[] = "royalblue3"; +static dbEntry e316_1 = {&e316_0, 58 * C, 95 * C, 205 * C, c316_1}; +static const char c317_0[] = "lavenderblush"; +static dbEntry e317_0 = {NULL, 255 * C, 240 * C, 245 * C, c317_0}; +static const char c317_1[] = "royalblue4"; +static dbEntry e317_1 = {&e317_0, 39 * C, 64 * C, 139 * C, c317_1}; +static const char c318_0[] = "aliceblue"; +static dbEntry e318_0 = {NULL, 240 * C, 248 * C, 255 * C, c318_0}; +static const char c319_0[] = "royalblue"; +static dbEntry e319_0 = {NULL, 65 * C, 105 * C, 225 * C, c319_0}; +static const char c322_0[] = "dimgray"; +static dbEntry e322_0 = {NULL, 105 * C, 105 * C, 105 * C, c322_0}; +static const char c322_1[] = "dimgrey"; +static dbEntry e322_1 = {&e322_0, 105 * C, 105 * C, 105 * C, c322_1}; +static const char c332_0[] = "hotpink2"; +static dbEntry e332_0 = {NULL, 238 * C, 106 * C, 167 * C, c332_0}; +static const char c332_1[] = "hotpink4"; +static dbEntry e332_1 = {&e332_0, 139 * C, 58 * C, 98 * C, c332_1}; +static const char c333_0[] = "hotpink1"; +static dbEntry e333_0 = {NULL, 255 * C, 110 * C, 180 * C, c333_0}; +static const char c333_1[] = "hotpink3"; +static dbEntry e333_1 = {&e333_0, 205 * C, 96 * C, 144 * C, c333_1}; +static const char c335_0[] = "cadetblue4"; +static dbEntry e335_0 = {NULL, 83 * C, 134 * C, 139 * C, c335_0}; +static const char c336_0[] = "ghostwhite"; +static dbEntry e336_0 = {NULL, 248 * C, 248 * C, 255 * C, c336_0}; +static const char c336_1[] = "magenta"; +static dbEntry e336_1 = {&e336_0, 255 * C, 0 * C, 255 * C, c336_1}; +static const char c336_2[] = "purple"; +static dbEntry e336_2 = {&e336_1, 160 * C, 32 * C, 240 * C, c336_2}; +static const char c336_3[] = "cadetblue1"; +static dbEntry e336_3 = {&e336_2, 152 * C, 245 * C, 255 * C, c336_3}; +static const char c337_0[] = "cadetblue2"; +static dbEntry e337_0 = {NULL, 142 * C, 229 * C, 238 * C, c337_0}; +static const char c338_0[] = "cadetblue3"; +static dbEntry e338_0 = {NULL, 122 * C, 197 * C, 205 * C, c338_0}; +static const char c339_0[] = "goldenrod"; +static dbEntry e339_0 = {NULL, 218 * C, 165 * C, 32 * C, c339_0}; +static const char c340_0[] = "chartreuse1"; +static dbEntry e340_0 = {NULL, 127 * C, 255 * C, 0 * C, c340_0}; +static const char c340_1[] = "chartreuse2"; +static dbEntry e340_1 = {&e340_0, 118 * C, 238 * C, 0 * C, c340_1}; +static const char c340_2[] = "chartreuse3"; +static dbEntry e340_2 = {&e340_1, 102 * C, 205 * C, 0 * C, c340_2}; +static const char c342_0[] = "papayawhip"; +static dbEntry e342_0 = {NULL, 255 * C, 239 * C, 213 * C, c342_0}; +static const char c342_1[] = "lightgoldenrod"; +static dbEntry e342_1 = {&e342_0, 238 * C, 221 * C, 130 * C, c342_1}; +static const char c343_0[] = "orange2"; +static dbEntry e343_0 = {NULL, 238 * C, 154 * C, 0 * C, c343_0}; +static const char c343_1[] = "orange4"; +static dbEntry e343_1 = {&e343_0, 139 * C, 90 * C, 0 * C, c343_1}; +static const char c344_0[] = "chartreuse4"; +static dbEntry e344_0 = {NULL, 69 * C, 139 * C, 0 * C, c344_0}; +static const char c344_1[] = "orange1"; +static dbEntry e344_1 = {&e344_0, 255 * C, 165 * C, 0 * C, c344_1}; +static const char c344_2[] = "orange3"; +static dbEntry e344_2 = {&e344_1, 205 * C, 133 * C, 0 * C, c344_2}; +static const char c346_0[] = "steelblue"; +static dbEntry e346_0 = {NULL, 70 * C, 130 * C, 180 * C, c346_0}; +static const char c364_0[] = "rosybrown1"; +static dbEntry e364_0 = {NULL, 255 * C, 193 * C, 193 * C, c364_0}; +static const char c364_1[] = "rosybrown2"; +static dbEntry e364_1 = {&e364_0, 238 * C, 180 * C, 180 * C, c364_1}; +static const char c364_2[] = "rosybrown3"; +static dbEntry e364_2 = {&e364_1, 205 * C, 155 * C, 155 * C, c364_2}; +static const char c364_3[] = "rosybrown4"; +static dbEntry e364_3 = {&e364_2, 139 * C, 105 * C, 105 * C, c364_3}; +static const char c366_0[] = "lightsteelblue"; +static dbEntry e366_0 = {NULL, 176 * C, 196 * C, 222 * C, c366_0}; +static const char c366_1[] = "skyblue2"; +static dbEntry e366_1 = {&e366_0, 126 * C, 192 * C, 238 * C, c366_1}; +static const char c366_2[] = "darkgrey"; +static dbEntry e366_2 = {&e366_1, 169 * C, 169 * C, 169 * C, c366_2}; +static const char c367_0[] = "skyblue1"; +static dbEntry e367_0 = {NULL, 135 * C, 206 * C, 255 * C, c367_0}; +static const char c367_1[] = "skyblue3"; +static dbEntry e367_1 = {&e367_0, 108 * C, 166 * C, 205 * C, c367_1}; +static const char c368_0[] = "mediumpurple"; +static dbEntry e368_0 = {NULL, 147 * C, 112 * C, 219 * C, c368_0}; +static const char c368_1[] = "darkslategray1"; +static dbEntry e368_1 = {&e368_0, 151 * C, 255 * C, 255 * C, c368_1}; +static const char c369_0[] = "darkviolet"; +static dbEntry e369_0 = {NULL, 148 * C, 0 * C, 211 * C, c369_0}; +static const char c369_1[] = "darkslategray2"; +static dbEntry e369_1 = {&e369_0, 141 * C, 238 * C, 238 * C, c369_1}; +static const char c370_0[] = "skyblue4"; +static dbEntry e370_0 = {NULL, 74 * C, 112 * C, 139 * C, c370_0}; +static const char c370_1[] = "darkslategray3"; +static dbEntry e370_1 = {&e370_0, 121 * C, 205 * C, 205 * C, c370_1}; +static const char c371_0[] = "darkslategray4"; +static dbEntry e371_0 = {NULL, 82 * C, 139 * C, 139 * C, c371_0}; +static const char c376_0[] = "plum"; +static dbEntry e376_0 = {NULL, 221 * C, 160 * C, 221 * C, c376_0}; +static const char c377_0[] = "midnightblue"; +static dbEntry e377_0 = {NULL, 25 * C, 25 * C, 112 * C, c377_0}; +static const char c379_0[] = "lightgoldenrod1"; +static dbEntry e379_0 = {NULL, 255 * C, 236 * C, 139 * C, c379_0}; +static const char c380_0[] = "lightgoldenrod2"; +static dbEntry e380_0 = {NULL, 238 * C, 220 * C, 130 * C, c380_0}; +static const char c381_0[] = "lightgoldenrod3"; +static dbEntry e381_0 = {NULL, 205 * C, 190 * C, 112 * C, c381_0}; +static const char c382_0[] = "lightgoldenrod4"; +static dbEntry e382_0 = {NULL, 139 * C, 129 * C, 76 * C, c382_0}; +static const char c383_0[] = "indianred"; +static dbEntry e383_0 = {NULL, 205 * C, 92 * C, 92 * C, c383_0}; +static const char c384_0[] = "yellow"; +static dbEntry e384_0 = {NULL, 255 * C, 255 * C, 0 * C, c384_0}; +static const char c386_0[] = "olivedrab1"; +static dbEntry e386_0 = {NULL, 192 * C, 255 * C, 62 * C, c386_0}; +static const char c387_0[] = "olivedrab2"; +static dbEntry e387_0 = {NULL, 179 * C, 238 * C, 58 * C, c387_0}; +static const char c388_0[] = "olivedrab3"; +static dbEntry e388_0 = {NULL, 154 * C, 205 * C, 50 * C, c388_0}; +static const char c389_0[] = "slateblue"; +static dbEntry e389_0 = {NULL, 106 * C, 90 * C, 205 * C, c389_0}; +static const char c389_1[] = "lightsalmon"; +static dbEntry e389_1 = {&e389_0, 255 * C, 160 * C, 122 * C, c389_1}; +static const char c389_2[] = "olivedrab4"; +static dbEntry e389_2 = {&e389_1, 105 * C, 139 * C, 34 * C, c389_2}; +static const char c390_0[] = "lightyellow"; +static dbEntry e390_0 = {NULL, 255 * C, 255 * C, 224 * C, c390_0}; +static const char c393_0[] = "navajowhite1"; +static dbEntry e393_0 = {NULL, 255 * C, 222 * C, 173 * C, c393_0}; +static const char c394_0[] = "navajowhite2"; +static dbEntry e394_0 = {NULL, 238 * C, 207 * C, 161 * C, c394_0}; +static const char c395_0[] = "firebrick"; +static dbEntry e395_0 = {NULL, 178 * C, 34 * C, 34 * C, c395_0}; +static const char c395_1[] = "navajowhite3"; +static dbEntry e395_1 = {&e395_0, 205 * C, 179 * C, 139 * C, c395_1}; +static const char c395_2[] = "indianred1"; +static dbEntry e395_2 = {&e395_1, 255 * C, 106 * C, 106 * C, c395_2}; +static const char c395_3[] = "indianred2"; +static dbEntry e395_3 = {&e395_2, 238 * C, 99 * C, 99 * C, c395_3}; +static const char c395_4[] = "indianred3"; +static dbEntry e395_4 = {&e395_3, 205 * C, 85 * C, 85 * C, c395_4}; +static const char c395_5[] = "indianred4"; +static dbEntry e395_5 = {&e395_4, 139 * C, 58 * C, 58 * C, c395_5}; +static const char c396_0[] = "navajowhite4"; +static dbEntry e396_0 = {NULL, 139 * C, 121 * C, 94 * C, c396_0}; +static const char c399_0[] = "cornsilk"; +static dbEntry e399_0 = {NULL, 255 * C, 248 * C, 220 * C, c399_0}; +static const char c399_1[] = "mistyrose"; +static dbEntry e399_1 = {&e399_0, 255 * C, 228 * C, 225 * C, c399_1}; +static const char c408_0[] = "gold"; +static dbEntry e408_0 = {NULL, 255 * C, 215 * C, 0 * C, c408_0}; +static const char c414_0[] = "sandybrown"; +static dbEntry e414_0 = {NULL, 244 * C, 164 * C, 96 * C, c414_0}; +static const char c416_0[] = "hotpink"; +static dbEntry e416_0 = {NULL, 255 * C, 105 * C, 180 * C, c416_0}; +static const char c417_0[] = "rosybrown"; +static dbEntry e417_0 = {NULL, 188 * C, 143 * C, 143 * C, c417_0}; +static const char c419_0[] = "maroon1"; +static dbEntry e419_0 = {NULL, 255 * C, 52 * C, 179 * C, c419_0}; +static const char c419_1[] = "maroon2"; +static dbEntry e419_1 = {&e419_0, 238 * C, 48 * C, 167 * C, c419_1}; +static const char c419_2[] = "maroon3"; +static dbEntry e419_2 = {&e419_1, 205 * C, 41 * C, 144 * C, c419_2}; +static const char c420_0[] = "palevioletred2"; +static dbEntry e420_0 = {NULL, 238 * C, 121 * C, 159 * C, c420_0}; +static const char c421_0[] = "palevioletred1"; +static dbEntry e421_0 = {NULL, 255 * C, 130 * C, 171 * C, c421_0}; +static const char c421_1[] = "palevioletred3"; +static dbEntry e421_1 = {&e421_0, 205 * C, 104 * C, 137 * C, c421_1}; +static const char c423_0[] = "cyan1"; +static dbEntry e423_0 = {NULL, 0 * C, 255 * C, 255 * C, c423_0}; +static const char c423_1[] = "maroon4"; +static dbEntry e423_1 = {&e423_0, 139 * C, 28 * C, 98 * C, c423_1}; +static const char c424_0[] = "cyan2"; +static dbEntry e424_0 = {NULL, 0 * C, 238 * C, 238 * C, c424_0}; +static const char c424_1[] = "palevioletred4"; +static dbEntry e424_1 = {&e424_0, 139 * C, 71 * C, 93 * C, c424_1}; +static const char c424_2[] = "orchid2"; +static dbEntry e424_2 = {&e424_1, 238 * C, 122 * C, 233 * C, c424_2}; +static const char c424_3[] = "orchid4"; +static dbEntry e424_3 = {&e424_2, 139 * C, 71 * C, 137 * C, c424_3}; +static const char c425_0[] = "cyan3"; +static dbEntry e425_0 = {NULL, 0 * C, 205 * C, 205 * C, c425_0}; +static const char c425_1[] = "orchid1"; +static dbEntry e425_1 = {&e425_0, 255 * C, 131 * C, 250 * C, c425_1}; +static const char c425_2[] = "orchid3"; +static dbEntry e425_2 = {&e425_1, 205 * C, 105 * C, 201 * C, c425_2}; +static const char c426_0[] = "cyan4"; +static dbEntry e426_0 = {NULL, 0 * C, 139 * C, 139 * C, c426_0}; +static const char c427_0[] = "cornsilk1"; +static dbEntry e427_0 = {NULL, 255 * C, 248 * C, 220 * C, c427_0}; +static const char c429_0[] = "cornsilk2"; +static dbEntry e429_0 = {NULL, 238 * C, 232 * C, 205 * C, c429_0}; +static const char c429_1[] = "cornsilk3"; +static dbEntry e429_1 = {&e429_0, 205 * C, 200 * C, 177 * C, c429_1}; +static const char c429_2[] = "tomato1"; +static dbEntry e429_2 = {&e429_1, 255 * C, 99 * C, 71 * C, c429_2}; +static const char c429_3[] = "tomato2"; +static dbEntry e429_3 = {&e429_2, 238 * C, 92 * C, 66 * C, c429_3}; +static const char c429_4[] = "tomato3"; +static dbEntry e429_4 = {&e429_3, 205 * C, 79 * C, 57 * C, c429_4}; +static const char c431_0[] = "cornsilk4"; +static dbEntry e431_0 = {NULL, 139 * C, 136 * C, 120 * C, c431_0}; +static const char c433_0[] = "tomato4"; +static dbEntry e433_0 = {NULL, 139 * C, 54 * C, 38 * C, c433_0}; +static const char c435_0[] = "darkseagreen1"; +static dbEntry e435_0 = {NULL, 193 * C, 255 * C, 193 * C, c435_0}; +static const char c435_1[] = "darkseagreen4"; +static dbEntry e435_1 = {&e435_0, 105 * C, 139 * C, 105 * C, c435_1}; +static const char c437_0[] = "darkseagreen2"; +static dbEntry e437_0 = {NULL, 180 * C, 238 * C, 180 * C, c437_0}; +static const char c437_1[] = "darkseagreen3"; +static dbEntry e437_1 = {&e437_0, 155 * C, 205 * C, 155 * C, c437_1}; +static const char c441_0[] = "tomato"; +static dbEntry e441_0 = {NULL, 255 * C, 99 * C, 71 * C, c441_0}; +static const char c443_0[] = "deeppink"; +static dbEntry e443_0 = {NULL, 255 * C, 20 * C, 147 * C, c443_0}; +static const char c443_1[] = "mediumpurple1"; +static dbEntry e443_1 = {&e443_0, 171 * C, 130 * C, 255 * C, c443_1}; +static const char c444_0[] = "white"; +static dbEntry e444_0 = {NULL, 255 * C, 255 * C, 255 * C, c444_0}; +static const char c444_1[] = "dodgerblue"; +static dbEntry e444_1 = {&e444_0, 30 * C, 144 * C, 255 * C, c444_1}; +static const char c444_2[] = "plum1"; +static dbEntry e444_2 = {&e444_1, 255 * C, 187 * C, 255 * C, c444_2}; +static const char c444_3[] = "mediumpurple2"; +static dbEntry e444_3 = {&e444_2, 159 * C, 121 * C, 238 * C, c444_3}; +static const char c445_0[] = "gold1"; +static dbEntry e445_0 = {NULL, 255 * C, 215 * C, 0 * C, c445_0}; +static const char c445_1[] = "plum2"; +static dbEntry e445_1 = {&e445_0, 238 * C, 174 * C, 238 * C, c445_1}; +static const char c445_2[] = "mediumpurple3"; +static dbEntry e445_2 = {&e445_1, 137 * C, 104 * C, 205 * C, c445_2}; +static const char c446_0[] = "gold2"; +static dbEntry e446_0 = {NULL, 238 * C, 201 * C, 0 * C, c446_0}; +static const char c446_1[] = "plum3"; +static dbEntry e446_1 = {&e446_0, 205 * C, 150 * C, 205 * C, c446_1}; +static const char c446_2[] = "mediumpurple4"; +static dbEntry e446_2 = {&e446_1, 93 * C, 71 * C, 139 * C, c446_2}; +static const char c447_0[] = "gold3"; +static dbEntry e447_0 = {NULL, 205 * C, 173 * C, 0 * C, c447_0}; +static const char c447_1[] = "plum4"; +static dbEntry e447_1 = {&e447_0, 139 * C, 102 * C, 139 * C, c447_1}; +static const char c448_0[] = "seashell1"; +static dbEntry e448_0 = {NULL, 255 * C, 245 * C, 238 * C, c448_0}; +static const char c448_1[] = "gold4"; +static dbEntry e448_1 = {&e448_0, 139 * C, 117 * C, 0 * C, c448_1}; +static const char c449_0[] = "seashell2"; +static dbEntry e449_0 = {NULL, 238 * C, 229 * C, 222 * C, c449_0}; +static const char c450_0[] = "seashell3"; +static dbEntry e450_0 = {NULL, 205 * C, 197 * C, 191 * C, c450_0}; +static const char c451_0[] = "brown"; +static dbEntry e451_0 = {NULL, 165 * C, 42 * C, 42 * C, c451_0}; +static const char c451_1[] = "seashell4"; +static dbEntry e451_1 = {&e451_0, 139 * C, 134 * C, 130 * C, c451_1}; +static const char c452_0[] = "turquoise1"; +static dbEntry e452_0 = {NULL, 0 * C, 245 * C, 255 * C, c452_0}; +static const char c453_0[] = "turquoise2"; +static dbEntry e453_0 = {NULL, 0 * C, 229 * C, 238 * C, c453_0}; +static const char c453_1[] = "wheat1"; +static dbEntry e453_1 = {&e453_0, 255 * C, 231 * C, 186 * C, c453_1}; +static const char c454_0[] = "turquoise3"; +static dbEntry e454_0 = {NULL, 0 * C, 197 * C, 205 * C, c454_0}; +static const char c454_1[] = "wheat2"; +static dbEntry e454_1 = {&e454_0, 238 * C, 216 * C, 174 * C, c454_1}; +static const char c455_0[] = "turquoise4"; +static dbEntry e455_0 = {NULL, 0 * C, 134 * C, 139 * C, c455_0}; +static const char c455_1[] = "wheat3"; +static dbEntry e455_1 = {&e455_0, 205 * C, 186 * C, 150 * C, c455_1}; +static const char c456_0[] = "wheat4"; +static dbEntry e456_0 = {NULL, 139 * C, 126 * C, 102 * C, c456_0}; +static const char c458_0[] = "coral"; +static dbEntry e458_0 = {NULL, 255 * C, 127 * C, 80 * C, c458_0}; +static const char c459_0[] = "slateblue2"; +static dbEntry e459_0 = {NULL, 122 * C, 103 * C, 238 * C, c459_0}; +static const char c460_0[] = "slateblue1"; +static dbEntry e460_0 = {NULL, 131 * C, 111 * C, 255 * C, c460_0}; +static const char c460_1[] = "slateblue3"; +static dbEntry e460_1 = {&e460_0, 105 * C, 89 * C, 205 * C, c460_1}; +static const char c463_0[] = "slateblue4"; +static dbEntry e463_0 = {NULL, 71 * C, 60 * C, 139 * C, c463_0}; +static const char c467_0[] = "violetred2"; +static dbEntry e467_0 = {NULL, 238 * C, 58 * C, 140 * C, c467_0}; +static const char c468_0[] = "violetred1"; +static dbEntry e468_0 = {NULL, 255 * C, 62 * C, 150 * C, c468_0}; +static const char c468_1[] = "violetred3"; +static dbEntry e468_1 = {&e468_0, 205 * C, 50 * C, 120 * C, c468_1}; +static const char c471_0[] = "violetred4"; +static dbEntry e471_0 = {NULL, 139 * C, 34 * C, 82 * C, c471_0}; +static const char c471_1[] = "darkred"; +static dbEntry e471_1 = {&e471_0, 139 * C, 0 * C, 0 * C, c471_1}; +static const char c472_0[] = "whitesmoke"; +static dbEntry e472_0 = {NULL, 245 * C, 245 * C, 245 * C, c472_0}; +static const char c479_0[] = "palegoldenrod"; +static dbEntry e479_0 = {NULL, 238 * C, 232 * C, 170 * C, c479_0}; +static const char c480_0[] = "springgreen"; +static dbEntry e480_0 = {NULL, 0 * C, 255 * C, 127 * C, c480_0}; +static const char c482_0[] = "darkmagenta"; +static dbEntry e482_0 = {NULL, 139 * C, 0 * C, 139 * C, c482_0}; +static const char c485_0[] = "mediumorchid1"; +static dbEntry e485_0 = {NULL, 224 * C, 102 * C, 255 * C, c485_0}; +static const char c486_0[] = "lightblue"; +static dbEntry e486_0 = {NULL, 173 * C, 216 * C, 230 * C, c486_0}; +static const char c486_1[] = "mediumturquoise"; +static dbEntry e486_1 = {&e486_0, 72 * C, 209 * C, 204 * C, c486_1}; +static const char c486_2[] = "lightcyan"; +static dbEntry e486_2 = {&e486_1, 224 * C, 255 * C, 255 * C, c486_2}; +static const char c486_3[] = "tan1"; +static dbEntry e486_3 = {&e486_2, 255 * C, 165 * C, 79 * C, c486_3}; +static const char c486_4[] = "mediumorchid2"; +static dbEntry e486_4 = {&e486_3, 209 * C, 95 * C, 238 * C, c486_4}; +static const char c487_0[] = "tan2"; +static dbEntry e487_0 = {NULL, 238 * C, 154 * C, 73 * C, c487_0}; +static const char c487_1[] = "mediumorchid3"; +static dbEntry e487_1 = {&e487_0, 180 * C, 82 * C, 205 * C, c487_1}; +static const char c488_0[] = "tan3"; +static dbEntry e488_0 = {NULL, 205 * C, 133 * C, 63 * C, c488_0}; +static const char c488_1[] = "mediumorchid4"; +static dbEntry e488_1 = {&e488_0, 122 * C, 55 * C, 139 * C, c488_1}; +static const char c489_0[] = "skyblue"; +static dbEntry e489_0 = {NULL, 135 * C, 206 * C, 235 * C, c489_0}; +static const char c489_1[] = "tan4"; +static dbEntry e489_1 = {&e489_0, 139 * C, 90 * C, 43 * C, c489_1}; +static const char c490_0[] = "snow1"; +static dbEntry e490_0 = {NULL, 255 * C, 250 * C, 250 * C, c490_0}; +static const char c491_0[] = "snow2"; +static dbEntry e491_0 = {NULL, 238 * C, 233 * C, 233 * C, c491_0}; +static const char c492_0[] = "snow3"; +static dbEntry e492_0 = {NULL, 205 * C, 201 * C, 201 * C, c492_0}; +static const char c493_0[] = "snow4"; +static dbEntry e493_0 = {NULL, 139 * C, 137 * C, 137 * C, c493_0}; +static const char c494_0[] = "forestgreen"; +static dbEntry e494_0 = {NULL, 34 * C, 139 * C, 34 * C, c494_0}; +static const char c497_0[] = "blueviolet"; +static dbEntry e497_0 = {NULL, 138 * C, 43 * C, 226 * C, c497_0}; +static const char c499_0[] = "darkslategray"; +static dbEntry e499_0 = {NULL, 47 * C, 79 * C, 79 * C, c499_0}; +static const char c502_0[] = "powderblue"; +static dbEntry e502_0 = {NULL, 176 * C, 224 * C, 230 * C, c502_0}; +static const char c510_0[] = "gray"; +static dbEntry e510_0 = {NULL, 190 * C, 190 * C, 190 * C, c510_0}; + +#undef C + +dbEntryPtr builtinRGBhashTab[HASHSIZE] = { + NULL, + NULL, + NULL, + NULL, + NULL, + &e5_0, + NULL, + NULL, + &e8_0, + NULL, + NULL, + NULL, + NULL, + NULL, + &e14_0, + NULL, + &e16_0, + NULL, + NULL, + &e19_0, + NULL, + &e21_2, + &e22_0, + &e23_2, + &e24_0, + NULL, + &e26_0, + NULL, + &e28_4, + &e29_0, + &e30_0, + &e31_0, + &e32_0, + &e33_0, + &e34_2, + &e35_2, + &e36_1, + &e37_1, + &e38_2, + &e39_2, + &e40_2, + &e41_2, + &e42_7, + &e43_2, + &e44_1, + &e45_0, + NULL, + &e47_1, + NULL, + NULL, + NULL, + &e51_0, + &e52_0, + NULL, + &e54_0, + &e55_0, + &e56_0, + &e57_1, + &e58_2, + &e59_3, + &e60_1, + &e61_0, + &e62_1, + &e63_0, + &e64_0, + &e65_1, + &e66_2, + &e67_2, + &e68_1, + &e69_1, + &e70_1, + &e71_0, + &e72_0, + &e73_1, + &e74_0, + NULL, + NULL, + &e77_0, + NULL, + &e79_0, + NULL, + &e81_0, + &e82_0, + &e83_0, + &e84_0, + &e85_0, + &e86_0, + &e87_0, + &e88_0, + &e89_0, + &e90_0, + &e91_1, + NULL, + &e93_0, + NULL, + &e95_0, + NULL, + &e97_1, + &e98_1, + &e99_1, + &e100_2, + &e101_1, + &e102_1, + &e103_1, + &e104_1, + &e105_1, + &e106_2, + &e107_1, + &e108_3, + &e109_0, + &e110_3, + &e111_0, + &e112_5, + &e113_2, + &e114_2, + &e115_3, + &e116_2, + &e117_2, + &e118_2, + &e119_1, + &e120_2, + &e121_1, + &e122_1, + NULL, + &e124_0, + &e125_1, + &e126_1, + &e127_3, + &e128_1, + &e129_2, + &e130_2, + &e131_2, + &e132_3, + &e133_1, + &e134_1, + &e135_2, + &e136_1, + &e137_1, + &e138_2, + &e139_2, + &e140_0, + &e141_0, + &e142_1, + &e143_0, + NULL, + &e145_2, + &e146_6, + &e147_3, + &e148_1, + &e149_3, + &e150_1, + &e151_2, + &e152_1, + &e153_2, + &e154_2, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &e161_1, + &e162_2, + &e163_2, + &e164_1, + &e165_1, + &e166_1, + &e167_1, + &e168_3, + &e169_3, + &e170_3, + NULL, + &e172_0, + &e173_1, + &e174_7, + &e175_2, + &e176_0, + &e177_1, + &e178_1, + &e179_2, + &e180_2, + &e181_1, + &e182_1, + &e183_1, + &e184_3, + &e185_2, + &e186_4, + &e187_1, + &e188_0, + NULL, + NULL, + NULL, + NULL, + &e193_1, + &e194_1, + &e195_1, + &e196_2, + &e197_1, + &e198_2, + &e199_2, + &e200_3, + &e201_3, + &e202_2, + &e203_0, + &e204_0, + &e205_0, + NULL, + &e207_1, + NULL, + &e209_1, + &e210_0, + &e211_0, + &e212_0, + &e213_0, + &e214_0, + &e215_1, + &e216_0, + &e217_3, + &e218_0, + NULL, + &e220_0, + &e221_0, + &e222_1, + &e223_1, + &e224_2, + &e225_1, + &e226_1, + &e227_0, + &e228_0, + &e229_0, + &e230_0, + &e231_0, + &e232_0, + &e233_0, + &e234_1, + &e235_0, + NULL, + &e237_0, + NULL, + &e239_0, + &e240_1, + NULL, + &e242_1, + &e243_0, + &e244_1, + &e245_0, + NULL, + &e247_0, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &e256_1, + &e257_0, + &e258_0, + &e259_0, + NULL, + NULL, + NULL, + NULL, + &e264_0, + &e265_0, + &e266_2, + &e267_2, + &e268_2, + &e269_1, + NULL, + NULL, + &e272_0, + NULL, + NULL, + NULL, + NULL, + &e277_1, + &e278_0, + &e279_2, + &e280_1, + &e281_0, + NULL, + &e283_0, + NULL, + NULL, + &e286_1, + &e287_0, + &e288_0, + NULL, + NULL, + &e291_0, + &e292_1, + NULL, + &e294_1, + &e295_2, + &e296_2, + &e297_0, + &e298_0, + NULL, + &e300_0, + &e301_1, + &e302_0, + NULL, + &e304_3, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &e312_0, + &e313_0, + &e314_6, + &e315_3, + &e316_1, + &e317_1, + &e318_0, + &e319_0, + NULL, + NULL, + &e322_1, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &e332_1, + &e333_1, + NULL, + &e335_0, + &e336_3, + &e337_0, + &e338_0, + &e339_0, + &e340_2, + NULL, + &e342_1, + &e343_1, + &e344_2, + NULL, + &e346_0, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &e364_3, + NULL, + &e366_2, + &e367_1, + &e368_1, + &e369_1, + &e370_1, + &e371_0, + NULL, + NULL, + NULL, + NULL, + &e376_0, + &e377_0, + NULL, + &e379_0, + &e380_0, + &e381_0, + &e382_0, + &e383_0, + &e384_0, + NULL, + &e386_0, + &e387_0, + &e388_0, + &e389_2, + &e390_0, + NULL, + NULL, + &e393_0, + &e394_0, + &e395_5, + &e396_0, + NULL, + NULL, + &e399_1, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &e408_0, + NULL, + NULL, + NULL, + NULL, + NULL, + &e414_0, + NULL, + &e416_0, + &e417_0, + NULL, + &e419_2, + &e420_0, + &e421_1, + NULL, + &e423_1, + &e424_3, + &e425_2, + &e426_0, + &e427_0, + NULL, + &e429_4, + NULL, + &e431_0, + NULL, + &e433_0, + NULL, + &e435_1, + NULL, + &e437_1, + NULL, + NULL, + NULL, + &e441_0, + NULL, + &e443_1, + &e444_3, + &e445_2, + &e446_2, + &e447_1, + &e448_1, + &e449_0, + &e450_0, + &e451_1, + &e452_0, + &e453_1, + &e454_1, + &e455_1, + &e456_0, + NULL, + &e458_0, + &e459_0, + &e460_1, + NULL, + NULL, + &e463_0, + NULL, + NULL, + NULL, + &e467_0, + &e468_1, + NULL, + NULL, + &e471_1, + &e472_0, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &e479_0, + &e480_0, + NULL, + &e482_0, + NULL, + NULL, + &e485_0, + &e486_4, + &e487_1, + &e488_1, + &e489_1, + &e490_0, + &e491_0, + &e492_0, + &e493_0, + &e494_0, + NULL, + NULL, + &e497_0, + NULL, + &e499_0, + NULL, + NULL, + &e502_0, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &e510_0, +}; Index: xc/programs/Xserver/os/utils.c diff -u xc/programs/Xserver/os/utils.c:3.102 xc/programs/Xserver/os/utils.c:3.110 --- xc/programs/Xserver/os/utils.c:3.102 Wed Feb 2 21:01:14 2005 +++ xc/programs/Xserver/os/utils.c Mon Mar 20 22:56:27 2006 @@ -48,9 +48,9 @@ OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.102 2005/02/03 02:01:14 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/utils.c,v 3.110 2006/03/21 03:56:27 dawes Exp $ */ /* - * Copyright (c) 1996-2005 by The XFree86 Project, Inc. + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -104,10 +104,10 @@ #if defined(WIN32) && !defined(__CYGWIN__) #include #endif -#include "Xos.h" +#include #include #include "misc.h" -#include "X.h" +#include #include #include "input.h" #include "dixfont.h" @@ -154,11 +154,16 @@ #endif #ifdef XKB -#include "XKBsrv.h" +#include #endif + #ifdef XCSECURITY #define _SECURITY_SERVER -#include "security.h" +#include +#endif + +#ifdef XPRINT +#include "DiPrint.h" #endif #ifdef RENDER @@ -173,8 +178,8 @@ Bool CoreDump; Bool noTestExtensions; -Bool noPanoramiXExtension = TRUE; #ifdef PANORAMIX +Bool noPanoramiXExtension = TRUE; Bool PanoramiXVisibilityNotifySent = FALSE; Bool PanoramiXMapped = FALSE; Bool PanoramiXWindowExposureSent = FALSE; @@ -473,13 +478,44 @@ errno = olderrno; } +/*ARGSUSED*/ +SIGVAL +AbortServer(int sig) +{ + static Bool beenHere = FALSE; + +#if defined(SYSV) && defined(X_NOT_POSIX) + if (sig) + OsSignal(sig, SIG_IGN); +#endif + /* + * Once entering here, ignore SIGINT and SIGTERM so that we don't + * re-enter. + */ + OsSignal(SIGINT, SIG_IGN); + OsSignal(SIGTERM, SIG_IGN); + if (!beenHere) { + beenHere = TRUE; + if (sig == SIGINT) + ErrorF("X server terminated by an interrupt signal.\n"); + OsCleanup(TRUE); + AbortDDX(); + } else { + ErrorF("Re-entering AbortServer. Aborting without further cleanup.\n"); + } + fflush(stderr); + if (CoreDump) + abort(); + exit (1); +} + #ifndef DDXTIME CARD32 GetTimeInMillis(void) { struct timeval tp; - register CARD32 val; - register INT32 diff; + CARD32 val; + INT32 diff; static CARD32 oldval = 0; static CARD32 time = 0; @@ -1243,19 +1279,19 @@ void * Xalloc(unsigned long amount) { - register pointer ptr; - - if ((long)amount <= 0) - return NULL; + pointer ptr; /* aligned extra on long word boundary */ amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); + + if ((long)amount <= 0) + return NULL; #ifdef MEMBUG if (!Must_have_memory && Memory_fail && ((random() % MEM_FAIL_SCALE) < Memory_fail)) return NULL; #endif - if ((ptr = (pointer)malloc(amount))) { + if ((ptr = malloc(amount))) { return ptr; } if (Must_have_memory) @@ -1271,14 +1307,18 @@ void * XNFalloc(unsigned long amount) { - register pointer ptr; + pointer ptr; - if ((long)amount <= 0) - return NULL; + if (amount == 0) + return NULL; /* aligned extra on long word boundary */ amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); - ptr = (pointer)malloc(amount); + + if ((long)amount <= 0) + FatalError("Bad request for memory"); + + ptr = malloc(amount); if (!ptr) FatalError("Out of memory"); @@ -1292,11 +1332,11 @@ void * Xcalloc(unsigned long amount) { - unsigned long *ret; + pointer ret; - ret = Xalloc (amount); + ret = Xalloc(amount); if (ret) - bzero ((void *) ret, (int) amount); + bzero (ret, (int) amount); return ret; } @@ -1307,13 +1347,17 @@ void * XNFcalloc(unsigned long amount) { - unsigned long *ret; + pointer ret; - ret = Xalloc (amount); - if (ret) - bzero ((char *) ret, (int) amount); - else if ((long)amount > 0) + if (amount == 0) + return NULL; + + ret = Xalloc(amount); + if (!ret) FatalError("Out of memory"); + + bzero (ret, (int) amount); + return ret; } @@ -1336,10 +1380,12 @@ return NULL; } amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); + if ((long)amount <= 0) + return NULL; if (ptr) - ptr = (pointer)realloc((char *)ptr, amount); + ptr = realloc(ptr, amount); else - ptr = (pointer)malloc(amount); + ptr = malloc(amount); if (ptr) return ptr; if (Must_have_memory) @@ -1355,12 +1401,12 @@ void * XNFrealloc(pointer ptr, unsigned long amount) { - if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL) + if ((ptr = Xrealloc(ptr, amount)) == NULL) { - if ((long)amount > 0) + if (amount != 0) FatalError( "Out of memory" ); } - return ((unsigned long *)ptr); + return ptr; } /***************** @@ -2173,3 +2219,18 @@ } #endif } + +int +getArgc() +{ + return argcGlobal; +} + +const char * +getArgv(int i) +{ + if (i >= 0 && i < argcGlobal) + return argvGlobal[i]; + else + return NULL; +} Index: xc/programs/Xserver/os/xalloc.c diff -u xc/programs/Xserver/os/xalloc.c:3.37 xc/programs/Xserver/os/xalloc.c:3.40 --- xc/programs/Xserver/os/xalloc.c:3.37 Wed Feb 16 14:20:55 2005 +++ xc/programs/Xserver/os/xalloc.c Fri Oct 14 11:17:26 2005 @@ -26,7 +26,7 @@ Pascal Haible. */ -/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.37 2005/02/16 19:20:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xalloc.c,v 3.40 2005/10/14 15:17:26 tsi Exp $ */ /* Only used if INTERNAL_MALLOC is defined * - otherwise xalloc() in utils.c is used @@ -35,9 +35,9 @@ #include /* for malloc() etc. */ -#include "Xos.h" +#include #include "misc.h" -#include "X.h" +#include #ifdef XALLOC_LOG #include @@ -184,7 +184,7 @@ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(__AMD64__) || defined(AMD64) || \ + defined(__amd64__) || defined(__x86_64__) || \ (defined(sgi) && _MIPS_SZLONG == 64) #define MAGIC 0x1404196414071968 #define MAGIC_FREE 0x1506196615061966 @@ -309,7 +309,7 @@ void * Xalloc (unsigned long amount) { - register unsigned long *ptr; + unsigned long *ptr; int indx; /* sanity checks */ @@ -464,7 +464,7 @@ pointer XNFalloc (unsigned long amount) { - register pointer ptr; + pointer ptr; /* zero size requested */ if (amount == 0) { @@ -534,7 +534,7 @@ void * Xrealloc (pointer ptr, unsigned long amount) { - register unsigned long *new_ptr; + unsigned long *new_ptr; /* zero size requested */ if (amount == 0) { Index: xc/programs/Xserver/os/xdmauth.c diff -u xc/programs/Xserver/os/xdmauth.c:1.11 xc/programs/Xserver/os/xdmauth.c:1.12 --- xc/programs/Xserver/os/xdmauth.c:1.11 Wed Jun 23 22:21:16 2004 +++ xc/programs/Xserver/os/xdmauth.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,4 @@ -/* $Xorg: xdmauth.c,v 1.4 2001/02/09 02:05:24 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.12 2005/10/14 15:17:26 tsi Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/os/xdmauth.c,v 1.11 2004/06/24 02:21:16 tsi Exp $ */ /* * XDM-AUTHENTICATION-1 (XDMCP authentication) and @@ -36,8 +35,8 @@ */ #include -#include "X.h" -#include "Xtrans.h" +#include +#include #include "os.h" #include "osdep.h" #include "dixstruct.h" @@ -47,9 +46,9 @@ static Bool authFromXDMCP; #ifdef XDMCP -#include "Xmd.h" +#include #undef REQUEST -#include "Xdmcp.h" +#include /* XDM-AUTHENTICATION-1 */ Index: xc/programs/Xserver/os/xdmcp.c diff -u xc/programs/Xserver/os/xdmcp.c:3.33 xc/programs/Xserver/os/xdmcp.c:3.34 --- xc/programs/Xserver/os/xdmcp.c:3.33 Wed Jun 23 22:21:16 2004 +++ xc/programs/Xserver/os/xdmcp.c Fri Oct 14 11:17:26 2005 @@ -1,4 +1,4 @@ -/* $Xorg: xdmcp.c,v 1.4 2001/01/31 13:37:19 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.34 2005/10/14 15:17:26 tsi Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. * @@ -13,7 +13,6 @@ * without express or implied warranty. * */ -/* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.33 2004/06/24 02:21:16 tsi Exp $ */ #ifdef WIN32 /* avoid conflicting definitions */ @@ -29,7 +28,7 @@ #undef RT_CURSOR #endif -#include "Xos.h" +#include #if !defined(WIN32) #ifndef Lynx @@ -44,10 +43,10 @@ #include #include -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" -#include "Xpoll.h" +#include #include "osdep.h" #include "input.h" #include "dixstruct.h" Index: xc/programs/Xserver/os/tiny/Imakefile diff -u xc/programs/Xserver/os/tiny/Imakefile:1.2 xc/programs/Xserver/os/tiny/Imakefile:removed --- xc/programs/Xserver/os/tiny/Imakefile:1.2 Thu Aug 5 16:37:42 2004 +++ xc/programs/Xserver/os/tiny/Imakefile Tue May 9 21:58:12 2006 @@ -1,66 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/os/tiny/Imakefile,v 1.2 2004/08/05 20:37:42 tsi Exp $ -/* - * Copyright (c) 2004 by The XFree86 Project, Inc. - * All rights reserved. - * - * 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: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution, and in the same place and form as other copyright, - * license and disclaimer information. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: "This product - * includes software developed by The XFree86 Project, Inc - * (http://www.xfree86.org/) and its contributors", in the same - * place and form as other third-party acknowledgments. Alternately, - * this acknowledgment may appear in the software itself, in the - * same form and location as other such third-party acknowledgments. - * - * 4. Except as contained in this notice, the name of The XFree86 - * Project, Inc 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 XFree86 Project, Inc. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#undef XF86Server -#define XF86Server NO -#undef DoLoadableServer -#define DoLoadableServer NO -#undef BuildTinyDIX -#define BuildTinyDIX YES -#define LinkDirectory .. - -/* - * The above doesn't really work because rules that depend on the symbols being - * over-ridden above have already been #define'd. Catch this at the Makefiles - * stage. - */ -IMAKE_DEFINES=-DXF86Server=NO -DBuildTinyDIX=YES - -#include "../Imakefile" - -Makefiles:: Makefile Index: xc/programs/Xserver/randr/Imakefile diff -u xc/programs/Xserver/randr/Imakefile:1.3 xc/programs/Xserver/randr/Imakefile:1.5 --- xc/programs/Xserver/randr/Imakefile:1.3 Wed Jun 2 18:43:06 2004 +++ xc/programs/Xserver/randr/Imakefile Sun Feb 19 10:51:32 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/programs/Xserver/randr/Imakefile,v 1.3 2004/06/02 22:43:06 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/randr/Imakefile,v 1.5 2006/02/19 15:51:32 tsi Exp $ /* - * Copyright (c) 2002-2004 by The XFree86 Project, Inc. + * Copyright (c) 2002-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -46,11 +46,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if BuildSeparateTinyDIX && !BuildTinyDIX -#define IHaveSubdirs -SUBDIRS = tiny -#endif - #include SRCS = randr.c mirandr.c @@ -58,15 +53,14 @@ OBJS = randr.o mirandr.o INCLUDES = -I$(SERVERSRC)/randr -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/fb -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) -I$(SERVERSRC)/render + -I$(SERVERSRC)/fb -I$(SERVERSRC)/render LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln -#if BuildTinyDIX -TINY_DEFINES = TinyDIXDefines +#ifndef LinkDefines +#define LinkDefines /**/ #endif -DEFINES = $(TINY_DEFINES) +DEFINES = $(EXT_DEFINES) LinkDefines NormalLibraryTarget(randr,$(OBJS)) NormalLibraryObjectRule() @@ -75,11 +69,6 @@ DependTarget() -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - #ifdef LinkDirectory LinkSourceFile(mirandr.c,LinkDirectory) LinkSourceFile(randr.c,LinkDirectory) Index: xc/programs/Xserver/randr/mirandr.c diff -u xc/programs/Xserver/randr/mirandr.c:1.7 xc/programs/Xserver/randr/mirandr.c:1.8 --- xc/programs/Xserver/randr/mirandr.c:1.7 Mon Oct 14 14:01:42 2002 +++ xc/programs/Xserver/randr/mirandr.c Fri Oct 14 11:17:27 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.7 2002/10/14 18:01:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/mirandr.c,v 1.8 2005/10/14 15:17:27 tsi Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. @@ -27,7 +27,7 @@ #include "scrnintstr.h" #include "mi.h" -#include "randr.h" +#include #include "randrstr.h" #include Index: xc/programs/Xserver/randr/randr.c diff -u xc/programs/Xserver/randr/randr.c:1.22 xc/programs/Xserver/randr/randr.c:1.23 --- xc/programs/Xserver/randr/randr.c:1.22 Thu Nov 6 13:38:15 2003 +++ xc/programs/Xserver/randr/randr.c Fri Oct 14 11:17:27 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.22 2003/11/06 18:38:15 tsi Exp $ + * $XFree86: xc/programs/Xserver/randr/randr.c,v 1.23 2005/10/14 15:17:27 tsi Exp $ * * Copyright © 2000, Compaq Computer Corporation, * Copyright © 2002, Hewlett Packard, Inc. @@ -27,8 +27,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -38,14 +38,14 @@ #include "pixmapstr.h" #include "extnsionst.h" #include "servermd.h" -#include "randr.h" -#include "randrproto.h" +#include +#include #include "randrstr.h" #ifdef RENDER -#include "render.h" /* we share subpixel order information */ +#include /* we share subpixel order information */ #include "picturestr.h" #endif -#include "Xfuncproto.h" +#include #ifdef EXTMODULE #include "xf86_ansic.h" #endif Index: xc/programs/Xserver/randr/randrstr.h diff -u xc/programs/Xserver/randr/randrstr.h:1.7 xc/programs/Xserver/randr/randrstr.h:1.8 --- xc/programs/Xserver/randr/randrstr.h:1.7 Mon Oct 14 14:01:42 2002 +++ xc/programs/Xserver/randr/randrstr.h Fri Oct 14 11:17:27 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.7 2002/10/14 18:01:42 keithp Exp $ + * $XFree86: xc/programs/Xserver/randr/randrstr.h,v 1.8 2005/10/14 15:17:27 tsi Exp $ * * Copyright © 2000 Compaq Computer Corporation * @@ -25,7 +25,7 @@ #ifndef _RANDRSTR_H_ #define _RANDRSTR_H_ -#include "randr.h" +#include typedef struct _rrScreenRate { int rate; Index: xc/programs/Xserver/randr/tiny/Imakefile diff -u xc/programs/Xserver/randr/tiny/Imakefile:1.2 xc/programs/Xserver/randr/tiny/Imakefile:removed --- xc/programs/Xserver/randr/tiny/Imakefile:1.2 Thu Aug 5 16:37:42 2004 +++ xc/programs/Xserver/randr/tiny/Imakefile Tue May 9 21:58:13 2006 @@ -1,66 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/randr/tiny/Imakefile,v 1.2 2004/08/05 20:37:42 tsi Exp $ -/* - * Copyright (c) 2004 by The XFree86 Project, Inc. - * All rights reserved. - * - * 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: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution, and in the same place and form as other copyright, - * license and disclaimer information. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: "This product - * includes software developed by The XFree86 Project, Inc - * (http://www.xfree86.org/) and its contributors", in the same - * place and form as other third-party acknowledgments. Alternately, - * this acknowledgment may appear in the software itself, in the - * same form and location as other such third-party acknowledgments. - * - * 4. Except as contained in this notice, the name of The XFree86 - * Project, Inc 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 XFree86 Project, Inc. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#undef XF86Server -#define XF86Server NO -#undef DoLoadableServer -#define DoLoadableServer NO -#undef BuildTinyDIX -#define BuildTinyDIX YES -#define LinkDirectory .. - -/* - * The above doesn't really work because rules that depend on the symbols being - * over-ridden above have already been #define'd. Catch this at the Makefiles - * stage. - */ -IMAKE_DEFINES=-DXF86Server=NO -DBuildTinyDIX=YES - -#include "../Imakefile" - -Makefiles:: Makefile Index: xc/programs/Xserver/record/Imakefile diff -u xc/programs/Xserver/record/Imakefile:1.13 xc/programs/Xserver/record/Imakefile:1.18 --- xc/programs/Xserver/record/Imakefile:1.13 Mon Sep 16 21:15:14 2002 +++ xc/programs/Xserver/record/Imakefile Sun Feb 19 10:51:32 2006 @@ -1,33 +1,103 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ +XCOMM $XFree86: xc/programs/Xserver/record/Imakefile,v 1.18 2006/02/19 15:51:32 tsi Exp $ - - - -XCOMM $XFree86: xc/programs/Xserver/record/Imakefile,v 1.13 2002/09/17 01:15:14 dawes Exp $ +/* + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #if DoLoadableServer +#if !BuildModuleInSubdir +#define IHaveModules +#elif !defined(IHaveModules) #define IHaveSubdirs +SUBDIRS = module +#endif #endif #include -#if DoLoadableServer - SUBDIRS = module +#ifdef IHaveModules +MODSRC = recordmod.c +MODOBJ = recordmod.o +#endif + +#ifndef LinkDefines +#define LinkDefines /**/ #endif - SRCS = record.c set.c - OBJS = record.o set.o - INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext - LINTLIBS = ../dix/llib-ldix.ln - DEFINES = -DNDEBUG + SRCS = record.c set.c $(MODSRC) + OBJS = record.o set.o $(MODOBJ) + INCLUDES = -I$(SERVERSRC)/record -I$(SERVERSRC)/include -I$(SERVERSRC)/Xext + LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln + DEFINES = -DNDEBUG $(EXT_DEFINES) LinkDefines + +#ifdef IHaveModules +ModuleObjectRule() +LibraryModuleTarget(record,$(OBJS),extensions) +#else NormalLibraryObjectRule() NormalLibraryTarget(record,$(OBJS)) +#endif + LintLibraryTarget(record,$(SRCS)) NormalLintTarget($(SRCS)) -#if DoLoadableServer +#ifdef IHaveModules +InstallLibraryModule(record,$(MODULEDIR),extensions) +#endif + +#ifdef IHaveSubdirs MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif DependTarget() + +#ifdef LinkDirectory +LinkSourceFile(record.c,LinkDirectory) +LinkSourceFile(set.c,LinkDirectory) +LinkSourceFile(recordmod.c,LinkDirectory) +#endif + Index: xc/programs/Xserver/record/record.c diff -u xc/programs/Xserver/record/record.c:1.12 xc/programs/Xserver/record/record.c:1.14 --- xc/programs/Xserver/record/record.c:1.12 Mon Nov 17 17:20:44 2003 +++ xc/programs/Xserver/record/record.c Fri Oct 14 11:17:27 2005 @@ -1,5 +1,3 @@ -/* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ - /* Copyright 1995, 1998 The Open Group @@ -32,13 +30,13 @@ and Jim Haggerty of Metheus. */ -/* $XFree86: xc/programs/Xserver/record/record.c,v 1.12 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/record.c,v 1.14 2005/10/14 15:17:27 tsi Exp $ */ #define NEED_EVENTS #include "dixstruct.h" #include "extnsionst.h" #define _XRECORD_SERVER_ -#include "recordstr.h" +#include #include "set.h" #ifndef XFree86LOADER @@ -54,6 +52,8 @@ #include "panoramiXsrv.h" #include "cursor.h" #endif +#include "swaprep.h" +#include "recordproc.h" static RESTYPE RTContext; /* internal resource type for Record contexts */ static int RecordErrorBase; /* first Record error number */ @@ -201,8 +201,7 @@ * Side Effects: none. */ static int -RecordFindContextOnAllContexts(pContext) - RecordContextPtr pContext; +RecordFindContextOnAllContexts(RecordContextPtr pContext) { int i; @@ -464,10 +463,7 @@ * Note: this function exists mainly to make RecordARequest smaller. */ static void -RecordABigRequest(pContext, client, stuff) - RecordContextPtr pContext; - ClientPtr client; - xReq *stuff; +RecordABigRequest(RecordContextPtr pContext, ClientPtr client, xReq *stuff) { CARD32 bigLength; char n; @@ -516,8 +512,7 @@ * request for this client. The real Proc function is called. */ static int -RecordARequest(client) - ClientPtr client; +RecordARequest(ClientPtr client) { RecordContextPtr pContext; RecordClientsAndProtocolPtr pRCAP; @@ -600,10 +595,8 @@ * the word skip in ddx.tbl.ms (the porting layer document). */ static void -RecordASkippedRequest(pcbl , nulldata, calldata) - CallbackListPtr *pcbl; - pointer nulldata; - pointer calldata; +RecordASkippedRequest(CallbackListPtr *pcbl, pointer nulldata, + pointer calldata) { SkippedRequestInfoRec *psi = (SkippedRequestInfoRec *)calldata; RecordContextPtr pContext; @@ -690,10 +683,7 @@ * chunk of data belonging to this reply, it is set to 0. */ static void -RecordAReply(pcbl, nulldata, calldata) - CallbackListPtr *pcbl; - pointer nulldata; - pointer calldata; +RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) { RecordContextPtr pContext; RecordClientsAndProtocolPtr pRCAP; @@ -775,10 +765,8 @@ * it for this client. */ static void -RecordADeliveredEventOrError(pcbl, nulldata, calldata) - CallbackListPtr *pcbl; - pointer nulldata; - pointer calldata; +RecordADeliveredEventOrError(CallbackListPtr *pcbl, pointer nulldata, + pointer calldata) { EventInfoRec *pei = (EventInfoRec *)calldata; RecordContextPtr pContext; @@ -844,10 +832,7 @@ * it for this client. */ static void -RecordADeviceEvent(pcbl, nulldata, calldata) - CallbackListPtr *pcbl; - pointer nulldata; - pointer calldata; +RecordADeviceEvent(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) { DeviceEventInfoRec *pei = (DeviceEventInfoRec *)calldata; RecordContextPtr pContext; @@ -968,9 +953,7 @@ * various callback lists. */ static int -RecordInstallHooks(pRCAP, oneclient) - RecordClientsAndProtocolPtr pRCAP; - XID oneclient; +RecordInstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient) { int i = 0; XID client; @@ -1063,9 +1046,7 @@ * various callback lists. */ static void -RecordUninstallHooks(pRCAP, oneclient) - RecordClientsAndProtocolPtr pRCAP; - XID oneclient; +RecordUninstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient) { int i = 0; XID client; @@ -1164,9 +1145,7 @@ * have at least one client.) */ static void -RecordDeleteClientFromRCAP(pRCAP, position) - RecordClientsAndProtocolPtr pRCAP; - int position; +RecordDeleteClientFromRCAP(RecordClientsAndProtocolPtr pRCAP, int position) { if (pRCAP->pContext->pRecordingClient) RecordUninstallHooks(pRCAP, pRCAP->pClientIDs[position]); @@ -1213,9 +1192,7 @@ * is no more room to hold clients internal to the RCAP. */ static void -RecordAddClientToRCAP(pRCAP, clientspec) - RecordClientsAndProtocolPtr pRCAP; - XID clientspec; +RecordAddClientToRCAP(RecordClientsAndProtocolPtr pRCAP, XID clientspec) { if (pRCAP->numClients == pRCAP->sizeClients) { @@ -1261,9 +1238,7 @@ * RCAP. (A given clientspec can only be on one RCAP of a context.) */ static void -RecordDeleteClientFromContext(pContext, clientspec) - RecordContextPtr pContext; - XID clientspec; +RecordDeleteClientFromContext(RecordContextPtr pContext, XID clientspec) { RecordClientsAndProtocolPtr pRCAP; int position; @@ -1286,10 +1261,7 @@ * Side Effects: none. */ static int -RecordSanityCheckClientSpecifiers(clientspecs, nspecs, errorspec) - XID *clientspecs; - int nspecs; - XID errorspec; +RecordSanityCheckClientSpecifiers(XID *clientspecs, int nspecs, XID errorspec) { int i; int clientIndex; @@ -1348,10 +1320,8 @@ * pClientspecs may be modified in place. */ static XID * -RecordCanonicalizeClientSpecifiers(pClientspecs, pNumClientspecs, excludespec) - XID *pClientspecs; - int *pNumClientspecs; - XID excludespec; +RecordCanonicalizeClientSpecifiers(XID *pClientspecs, int *pNumClientspecs, + XID excludespec) { int i; int numClients = *pNumClientspecs; @@ -1448,10 +1418,8 @@ * Side Effects: none. */ static int -RecordSanityCheckRegisterClients(pContext, client, stuff) - RecordContextPtr pContext; - ClientPtr client; - xRecordRegisterClientsReq *stuff; +RecordSanityCheckRegisterClients(RecordContextPtr pContext, ClientPtr client, + xRecordRegisterClientsReq *stuff) { int err; xRecordRange *pRange; @@ -1586,9 +1554,7 @@ * RecordSetIntervals, all zeroed, and psi->size is set to size. */ static int -RecordAllocIntervals(psi, nIntervals) - SetInfoPtr psi; - int nIntervals; +RecordAllocIntervals(SetInfoPtr psi, int nIntervals) { assert(!psi->intervals); psi->intervals = (RecordSetInterval *) @@ -1710,10 +1676,8 @@ * to record the new clients and protocol. */ static int -RecordRegisterClients(pContext, client, stuff) - RecordContextPtr pContext; - ClientPtr client; - xRecordRegisterClientsReq *stuff; +RecordRegisterClients(RecordContextPtr pContext, ClientPtr client, + xRecordRegisterClientsReq *stuff) { int err; int i; @@ -1986,8 +1950,7 @@ */ static int -ProcRecordQueryVersion(client) - ClientPtr client; +ProcRecordQueryVersion(ClientPtr client) { /* REQUEST(xRecordQueryVersionReq); */ xRecordQueryVersionReply rep; @@ -2012,8 +1975,7 @@ static int -ProcRecordCreateContext(client) - ClientPtr client; +ProcRecordCreateContext(ClientPtr client) { REQUEST(xRecordCreateContextReq); RecordContextPtr pContext; @@ -2067,8 +2029,7 @@ static int -ProcRecordRegisterClients(client) - ClientPtr client; +ProcRecordRegisterClients(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordRegisterClientsReq); @@ -2081,8 +2042,7 @@ static int -ProcRecordUnregisterClients(client) - ClientPtr client; +ProcRecordUnregisterClients(ClientPtr client) { RecordContextPtr pContext; int err; @@ -2146,9 +2106,7 @@ * number of ranges. Newly allocated ranges are zeroed. */ static int -RecordAllocRanges(pri, nRanges) - GetContextRangeInfoPtr pri; - int nRanges; +RecordAllocRanges(GetContextRangeInfoPtr pri, int nRanges) { int newsize; xRecordRange *pNewRange; @@ -2308,9 +2266,7 @@ * The 16 bit fields of each xRecordRange are byte swapped. */ static void -RecordSwapRanges(pRanges, nRanges) - xRecordRange *pRanges; - int nRanges; +RecordSwapRanges(xRecordRange *pRanges, int nRanges) { int i; register char n; @@ -2325,8 +2281,7 @@ static int -ProcRecordGetContext(client) - ClientPtr client; +ProcRecordGetContext(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordGetContextReq); @@ -2472,8 +2427,7 @@ static int -ProcRecordEnableContext(client) - ClientPtr client; +ProcRecordEnableContext(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordEnableContextReq); @@ -2551,8 +2505,7 @@ * is resumed. */ static void -RecordDisableContext(pContext) - RecordContextPtr pContext; +RecordDisableContext(RecordContextPtr pContext) { RecordClientsAndProtocolPtr pRCAP; int i; @@ -2589,8 +2542,7 @@ static int -ProcRecordDisableContext(client) - ClientPtr client; +ProcRecordDisableContext(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordDisableContextReq); @@ -2615,9 +2567,7 @@ * it from the ppAllContexts array. */ static int -RecordDeleteContext(value, id) - pointer value; - XID id; +RecordDeleteContext(pointer value, XID id) { int i; RecordContextPtr pContext = (RecordContextPtr)value; @@ -2657,8 +2607,7 @@ static int -ProcRecordFreeContext(client) - ClientPtr client; +ProcRecordFreeContext(ClientPtr client) { RecordContextPtr pContext; REQUEST(xRecordFreeContextReq); @@ -2671,8 +2620,7 @@ static int -ProcRecordDispatch(client) - ClientPtr client; +ProcRecordDispatch(ClientPtr client) { REQUEST(xReq); @@ -2701,8 +2649,7 @@ static int -SProcRecordQueryVersion(client) - ClientPtr client; +SProcRecordQueryVersion(ClientPtr client) { REQUEST(xRecordQueryVersionReq); register char n; @@ -2735,8 +2682,7 @@ static int -SProcRecordCreateContext(client) - ClientPtr client; +SProcRecordCreateContext(ClientPtr client) { REQUEST(xRecordCreateContextReq); register char n; @@ -2749,8 +2695,7 @@ static int -SProcRecordRegisterClients(client) - ClientPtr client; +SProcRecordRegisterClients(ClientPtr client) { REQUEST(xRecordRegisterClientsReq); register char n; @@ -2763,8 +2708,7 @@ static int -SProcRecordUnregisterClients(client) - ClientPtr client; +SProcRecordUnregisterClients(ClientPtr client) { REQUEST(xRecordUnregisterClientsReq); register char n; @@ -2779,8 +2723,7 @@ static int -SProcRecordGetContext(client) - ClientPtr client; +SProcRecordGetContext(ClientPtr client) { REQUEST(xRecordGetContextReq); register char n; @@ -2792,8 +2735,7 @@ } /* SProcRecordGetContext */ static int -SProcRecordEnableContext(client) - ClientPtr client; +SProcRecordEnableContext(ClientPtr client) { REQUEST(xRecordEnableContextReq); register char n; @@ -2806,8 +2748,7 @@ static int -SProcRecordDisableContext(client) - ClientPtr client; +SProcRecordDisableContext(ClientPtr client) { REQUEST(xRecordDisableContextReq); register char n; @@ -2820,8 +2761,7 @@ static int -SProcRecordFreeContext(client) - ClientPtr client; +SProcRecordFreeContext(ClientPtr client) { REQUEST(xRecordFreeContextReq); register char n; @@ -2834,8 +2774,7 @@ static int -SProcRecordDispatch(client) - ClientPtr client; +SProcRecordDispatch(ClientPtr client) { REQUEST(xReq); @@ -2862,9 +2801,6 @@ } } /* SProcRecordDispatch */ -/* XXX goes in header file */ -extern void SwapConnSetupInfo(), SwapConnSetupPrefix(); - /* RecordConnectionSetupInfo * * Arguments: @@ -2878,9 +2814,7 @@ * The connection setup info is sent to the recording client. */ static void -RecordConnectionSetupInfo(pContext, pci) - RecordContextPtr pContext; - NewClientInfoRec *pci; +RecordConnectionSetupInfo(RecordContextPtr pContext, NewClientInfoRec *pci) { int prefixsize = SIZEOF(xConnSetupPrefix); int restsize = pci->prefix->length * 4; @@ -2890,8 +2824,8 @@ char * pConnSetup = (char *)ALLOCATE_LOCAL(prefixsize + restsize); if (!pConnSetup) return; - SwapConnSetupPrefix(pci->prefix, pConnSetup); - SwapConnSetupInfo(pci->setup, pConnSetup + prefixsize); + SwapConnSetupPrefix(pci->prefix, (xConnSetupPrefix *)pConnSetup); + SwapConnSetupInfo((char *)pci->setup, pConnSetup + prefixsize); RecordAProtocolElement(pContext, pci->client, XRecordClientStarted, (pointer)pConnSetup, prefixsize + restsize, 0); DEALLOCATE_LOCAL(pConnSetup); @@ -2933,10 +2867,8 @@ */ static void -RecordAClientStateChange(pcbl, nulldata, calldata) - CallbackListPtr *pcbl; - pointer nulldata; - pointer calldata; +RecordAClientStateChange(CallbackListPtr *pcbl, pointer nulldata, + pointer calldata) { NewClientInfoRec *pci = (NewClientInfoRec *)calldata; int i; @@ -2999,8 +2931,7 @@ * */ static void -RecordCloseDown(extEntry) - ExtensionEntry *extEntry; +RecordCloseDown(ExtensionEntry *extEntry) { DeleteCallback(&ClientStateCallback, RecordAClientStateChange, NULL); } /* RecordCloseDown */ @@ -3016,7 +2947,7 @@ * Enables the RECORD extension if possible. */ void -RecordExtensionInit() +RecordExtensionInit(void) { ExtensionEntry *extentry; Index: xc/programs/Xserver/record/recordmod.c diff -u xc/programs/Xserver/record/recordmod.c:1.6 xc/programs/Xserver/record/recordmod.c:1.7 --- xc/programs/Xserver/record/recordmod.c:1.6 Tue Jan 25 13:37:50 2000 +++ xc/programs/Xserver/record/recordmod.c Thu Mar 16 11:50:36 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.6 2000/01/25 18:37:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.7 2006/03/16 16:50:36 dawes Exp $ */ #include "xf86Module.h" @@ -32,7 +32,7 @@ XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL }; static pointer -recordSetup(pointer module, pointer opts, int *errmaj, int *errmin) +recordSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { LoadExtension(&recordExt, FALSE); Index: xc/programs/Xserver/record/recordproc.h diff -u /dev/null xc/programs/Xserver/record/recordproc.h:1.1 --- /dev/null Tue May 9 21:58:13 2006 +++ xc/programs/Xserver/record/recordproc.h Thu Mar 24 21:22:58 2005 @@ -0,0 +1,4 @@ +/* $XFree86: xc/programs/Xserver/record/recordproc.h,v 1.1 2005/03/25 02:22:58 dawes Exp $ */ + +extern void RecordExtensionInit(void); + Index: xc/programs/Xserver/record/set.c diff -u xc/programs/Xserver/record/set.c:1.8 xc/programs/Xserver/record/set.c:1.9 --- xc/programs/Xserver/record/set.c:1.8 Mon Nov 17 17:20:44 2003 +++ xc/programs/Xserver/record/set.c Thu Mar 24 21:22:58 2005 @@ -1,5 +1,3 @@ -/* $Xorg: set.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ - /* Copyright 1995, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.c,v 1.8 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/set.c,v 1.9 2005/03/25 02:22:58 dawes Exp $ */ /* @@ -73,8 +71,7 @@ #define ALLOCATE_LOCAL malloc #define DEALLOCATE_LOCAL free -void *Xcalloc(size) - int size; +void *Xcalloc(int size) { void *p = malloc(size); if (p) memset(p, 0, size); @@ -95,9 +92,7 @@ #endif static int -maxMemberInInterval(pIntervals, nIntervals) - RecordSetInterval *pIntervals; - int nIntervals; +maxMemberInInterval(RecordSetInterval *pIntervals, int nIntervals) { int i; int maxMember = -1; @@ -110,8 +105,7 @@ } static void -NoopDestroySet(pSet) - RecordSetPtr pSet; +NoopDestroySet(RecordSetPtr pSet) { } @@ -128,16 +122,13 @@ #define BITS_PER_LONG (sizeof(unsigned long) * 8) static void -BitVectorDestroySet(pSet) - RecordSetPtr pSet; +BitVectorDestroySet(RecordSetPtr pSet) { xfree(pSet); } static unsigned long -BitVectorIsMemberOfSet(pSet, pm) - RecordSetPtr pSet; - int pm; +BitVectorIsMemberOfSet(RecordSetPtr pSet, int pm) { BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet; unsigned long *pbitvec; @@ -149,10 +140,7 @@ static int -BitVectorFindBit(pSet, iterbit, bitval) - RecordSetPtr pSet; - int iterbit; - Bool bitval; +BitVectorFindBit(RecordSetPtr pSet, int iterbit, Bool bitval) { BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet; unsigned long *pbitvec = (unsigned long *)(&pbvs[1]); @@ -198,10 +186,8 @@ static RecordSetIteratePtr -BitVectorIterateSet(pSet, pIter, pInterval) - RecordSetPtr pSet; - RecordSetIteratePtr pIter; - RecordSetInterval *pInterval; +BitVectorIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter, + RecordSetInterval *pInterval) { int iterbit = (int)(long)pIter; int b; @@ -222,11 +208,8 @@ NoopDestroySet, BitVectorIsMemberOfSet, BitVectorIterateSet }; static int -BitVectorSetMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) - RecordSetInterval *pIntervals; - int nIntervals; - int maxMember; - int *alignment; +BitVectorSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals, + int maxMember, int *alignment) { int nlongs; @@ -236,11 +219,8 @@ } static RecordSetPtr -BitVectorCreateSet(pIntervals, nIntervals, pMem, memsize) - RecordSetInterval *pIntervals; - int nIntervals; - void *pMem; - int memsize; +BitVectorCreateSet(RecordSetInterval *pIntervals, int nIntervals, void *pMem, + int memsize) { BitVectorSetPtr pbvs; int i, j; @@ -288,16 +268,13 @@ } IntervalListSet, *IntervalListSetPtr; static void -IntervalListDestroySet(pSet) - RecordSetPtr pSet; +IntervalListDestroySet(RecordSetPtr pSet) { xfree(pSet); } static unsigned long -IntervalListIsMemberOfSet(pSet, pm) - RecordSetPtr pSet; - int pm; +IntervalListIsMemberOfSet(RecordSetPtr pSet, int pm) { IntervalListSetPtr prls = (IntervalListSetPtr)pSet; RecordSetInterval *pInterval = (RecordSetInterval *)(&prls[1]); @@ -317,10 +294,8 @@ static RecordSetIteratePtr -IntervalListIterateSet(pSet, pIter, pIntervalReturn) - RecordSetPtr pSet; - RecordSetIteratePtr pIter; - RecordSetInterval *pIntervalReturn; +IntervalListIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter, + RecordSetInterval *pIntervalReturn) { RecordSetInterval *pInterval = (RecordSetInterval *)pIter; IntervalListSetPtr prls = (IntervalListSetPtr)pSet; @@ -346,22 +321,16 @@ NoopDestroySet, IntervalListIsMemberOfSet, IntervalListIterateSet }; static int -IntervalListMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) - RecordSetInterval *pIntervals; - int nIntervals; - int maxMember; - int *alignment; +IntervalListMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals, + int maxMember, int *alignment) { *alignment = sizeof(unsigned long); return sizeof(IntervalListSet) + nIntervals * sizeof(RecordSetInterval); } static RecordSetPtr -IntervalListCreateSet(pIntervals, nIntervals, pMem, memsize) - RecordSetInterval *pIntervals; - int nIntervals; - void *pMem; - int memsize; +IntervalListCreateSet(RecordSetInterval *pIntervals, int nIntervals, + void *pMem, int memsize) { IntervalListSetPtr prls; int i, j, k; @@ -454,11 +423,9 @@ ); static int -_RecordSetMemoryRequirements(pIntervals, nIntervals, alignment, ppCreateSet) - RecordSetInterval *pIntervals; - int nIntervals; - int *alignment; - RecordCreateSetProcPtr *ppCreateSet; +_RecordSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals, + int *alignment, + RecordCreateSetProcPtr *ppCreateSet) { int bmsize, rlsize, bma, rla; int maxMember; Index: xc/programs/Xserver/record/set.h diff -u xc/programs/Xserver/record/set.h:1.3 xc/programs/Xserver/record/set.h:1.4 --- xc/programs/Xserver/record/set.h:1.3 Mon Nov 17 17:20:44 2003 +++ xc/programs/Xserver/record/set.h Mon Jan 9 10:00:39 2006 @@ -1,5 +1,3 @@ -/* $Xorg: set.h,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ - /* Copyright 1995, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/record/set.h,v 1.3 2003/11/17 22:20:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/record/set.h,v 1.4 2006/01/09 15:00:39 dawes Exp $ */ /* A Set Abstract Data Type (ADT) for the RECORD Extension Index: xc/programs/Xserver/record/module/Imakefile diff -u xc/programs/Xserver/record/module/Imakefile:1.4 xc/programs/Xserver/record/module/Imakefile:1.6 --- xc/programs/Xserver/record/module/Imakefile:1.4 Mon May 31 20:17:08 2004 +++ xc/programs/Xserver/record/module/Imakefile Fri May 13 17:02:32 2005 @@ -1,77 +1,6 @@ -XCOMM $XFree86: xc/programs/Xserver/record/module/Imakefile,v 1.4 2004/06/01 00:17:08 dawes Exp $ -/* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. - * All rights reserved. - * - * 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: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution, and in the same place and form as other copyright, - * license and disclaimer information. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: "This product - * includes software developed by The XFree86 Project, Inc - * (http://www.xfree86.org/) and its contributors", in the same - * place and form as other third-party acknowledgments. Alternately, - * this acknowledgment may appear in the software itself, in the - * same form and location as other such third-party acknowledgments. - * - * 4. Except as contained in this notice, the name of The XFree86 - * Project, Inc 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 XFree86 Project, Inc. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +XCOMM $XFree86: xc/programs/Xserver/record/module/Imakefile,v 1.6 2005/05/13 21:02:32 dawes Exp $ #define IHaveModules -#include +#define LinkDirectory .. +#include "../Imakefile" -#if DoLoadableServer - MSRCS = recordmod.c - MOBJS = recordmod.o -#endif - - SRCS = record.c set.c $(MSRCS) - OBJS = record.o set.o $(MOBJS) - INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext - LINTLIBS = ../../dix/llib-ldix.ln - DEFINES = -DNDEBUG - -LinkSourceFile(recordmod.c,..) -LinkSourceFile(record.c,..) -LinkSourceFile(set.c,..) - -ModuleObjectRule() -LibraryModuleTarget(record,$(OBJS),extensions) -LintLibraryTarget(record,$(SRCS)) -NormalLintTarget($(SRCS)) - -InstallLibraryModule(record,$(MODULEDIR),extensions) - -DependTarget() - -InstallDriverSDKLibraryModule(record,$(DRIVERSDKMODULEDIR),extensions) Index: xc/programs/Xserver/render/Imakefile diff -u xc/programs/Xserver/render/Imakefile:1.12 xc/programs/Xserver/render/Imakefile:1.14 --- xc/programs/Xserver/render/Imakefile:1.12 Wed Jun 2 18:43:06 2004 +++ xc/programs/Xserver/render/Imakefile Sun Feb 19 10:51:32 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/programs/Xserver/render/Imakefile,v 1.12 2004/06/02 22:43:06 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/render/Imakefile,v 1.14 2006/02/19 15:51:32 tsi Exp $ /* - * Copyright (c) 2000-2004 by The XFree86 Project, Inc. + * Copyright (c) 2000-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -46,11 +46,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if BuildSeparateTinyDIX && !BuildTinyDIX -#define IHaveSubdirs -SUBDIRS = tiny -#endif - #include SRCS = animcur.c \ @@ -78,15 +73,14 @@ render.o INCLUDES = -I$(SERVERSRC)/render -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/fb -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) -I$(SERVERSRC)/Xext + -I$(SERVERSRC)/fb -I$(SERVERSRC)/Xext LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln -#if BuildTinyDIX -TINY_DEFINES = TinyDIXDefines +#ifndef LinkDefines +#define LinkDefines /**/ #endif -DEFINES = $(TINY_DEFINES) +DEFINES = $(EXT_DEFINES) LinkDefines NormalLibraryTarget(render,$(OBJS)) NormalLibraryObjectRule() @@ -100,11 +94,6 @@ InstallDriverSDKNonExecFile(picture.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(picturestr.h,$(DRIVERSDKINCLUDEDIR)) -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - #ifdef LinkDirectory LinkSourceFile(animcur.c,LinkDirectory) LinkSourceFile(filter.c,LinkDirectory) Index: xc/programs/Xserver/render/animcur.c diff -u xc/programs/Xserver/render/animcur.c:1.6 xc/programs/Xserver/render/animcur.c:1.7 --- xc/programs/Xserver/render/animcur.c:1.6 Mon Nov 3 00:12:01 2003 +++ xc/programs/Xserver/render/animcur.c Fri Oct 14 11:17:27 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.6 2003/11/03 05:12:01 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/animcur.c,v 1.7 2005/10/14 15:17:27 tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * @@ -32,8 +32,8 @@ * delta times between each image. */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "scrnintstr.h" #include "dixstruct.h" Index: xc/programs/Xserver/render/glyphstr.h diff -u xc/programs/Xserver/render/glyphstr.h:1.5 xc/programs/Xserver/render/glyphstr.h:1.6 --- xc/programs/Xserver/render/glyphstr.h:1.5 Wed Jun 30 16:21:46 2004 +++ xc/programs/Xserver/render/glyphstr.h Fri Oct 14 11:17:27 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.5 2004/06/30 20:21:46 martin Exp $ + * $XFree86: xc/programs/Xserver/render/glyphstr.h,v 1.6 2005/10/14 15:17:27 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -26,7 +26,7 @@ #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ -#include "renderproto.h" +#include #include "picture.h" #include "screenint.h" Index: xc/programs/Xserver/render/picture.c diff -u xc/programs/Xserver/render/picture.c:1.31 xc/programs/Xserver/render/picture.c:1.32 --- xc/programs/Xserver/render/picture.c:1.31 Wed Jun 30 16:21:46 2004 +++ xc/programs/Xserver/render/picture.c Sun Feb 19 10:51:32 2006 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.c,v 1.31 2004/06/30 20:21:46 martin Exp $ + * $XFree86: xc/programs/Xserver/render/picture.c,v 1.32 2006/02/19 15:51:32 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -614,7 +614,7 @@ return FALSE; PictureWindowPrivateIndex = AllocateWindowPrivateIndex(); PictureGeneration = serverGeneration; -#ifdef XResExtension +#ifdef XRES RegisterResourceName (PictureType, "PICTURE"); RegisterResourceName (PictFormatType, "PICTFORMAT"); RegisterResourceName (GlyphSetType, "GLYPHSET"); Index: xc/programs/Xserver/render/picture.h diff -u xc/programs/Xserver/render/picture.h:1.21 xc/programs/Xserver/render/picture.h:1.22 --- xc/programs/Xserver/render/picture.h:1.21 Mon Nov 3 00:12:01 2003 +++ xc/programs/Xserver/render/picture.h Tue Jun 28 21:14:12 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/picture.h,v 1.21 2003/11/03 05:12:01 tsi Exp $ + * $XFree86: xc/programs/Xserver/render/picture.h,v 1.22 2005/06/29 01:14:12 dawes Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -170,7 +170,7 @@ defined(ia64) || defined(__ia64__) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(AMD64) || defined (__AMD64__) || \ + defined (__amd64__) || defined(__x86_64__) || \ (defined(sgi) && (_MIPS_SZLONG == 64)) typedef long xFixed_32_32; # else Index: xc/programs/Xserver/render/render.c diff -u xc/programs/Xserver/render/render.c:1.31 xc/programs/Xserver/render/render.c:1.33 --- xc/programs/Xserver/render/render.c:1.31 Wed Jun 30 16:21:46 2004 +++ xc/programs/Xserver/render/render.c Fri Oct 14 11:17:27 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/Xserver/render/render.c,v 1.31 2004/06/30 20:21:46 martin Exp $ + * $XFree86: xc/programs/Xserver/render/render.c,v 1.33 2005/10/14 15:17:27 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -25,8 +25,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -37,11 +37,11 @@ #include "colormapst.h" #include "extnsionst.h" #include "servermd.h" -#include "render.h" -#include "renderproto.h" +#include +#include #include "picturestr.h" #include "glyphstr.h" -#include "Xfuncproto.h" +#include #include "cursorstr.h" #ifdef EXTMODULE #include "xf86_ansic.h" @@ -1300,7 +1300,7 @@ { if (buffer + sizeof (GlyphSet) < end) { - gs = *(GlyphSet *) buffer; + gs = *(CARD32 *) buffer; glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, gs, GlyphSetType, Index: xc/programs/Xserver/render/tiny/Imakefile diff -u xc/programs/Xserver/render/tiny/Imakefile:1.2 xc/programs/Xserver/render/tiny/Imakefile:removed --- xc/programs/Xserver/render/tiny/Imakefile:1.2 Thu Aug 5 16:37:42 2004 +++ xc/programs/Xserver/render/tiny/Imakefile Tue May 9 21:58:13 2006 @@ -1,66 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/render/tiny/Imakefile,v 1.2 2004/08/05 20:37:42 tsi Exp $ -/* - * Copyright (c) 2004 by The XFree86 Project, Inc. - * All rights reserved. - * - * 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: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution, and in the same place and form as other copyright, - * license and disclaimer information. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: "This product - * includes software developed by The XFree86 Project, Inc - * (http://www.xfree86.org/) and its contributors", in the same - * place and form as other third-party acknowledgments. Alternately, - * this acknowledgment may appear in the software itself, in the - * same form and location as other such third-party acknowledgments. - * - * 4. Except as contained in this notice, the name of The XFree86 - * Project, Inc 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 XFree86 Project, Inc. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#undef XF86Server -#define XF86Server NO -#undef DoLoadableServer -#define DoLoadableServer NO -#undef BuildTinyDIX -#define BuildTinyDIX YES -#define LinkDirectory .. - -/* - * The above doesn't really work because rules that depend on the symbols being - * over-ridden above have already been #define'd. Catch this at the Makefiles - * stage. - */ -IMAKE_DEFINES=-DXF86Server=NO -DBuildTinyDIX=YES - -#include "../Imakefile" - -Makefiles:: Makefile Index: xc/programs/Xserver/xkb/Imakefile diff -u xc/programs/Xserver/xkb/Imakefile:3.22 xc/programs/Xserver/xkb/Imakefile:3.25 --- xc/programs/Xserver/xkb/Imakefile:3.22 Tue Jul 15 21:39:03 2003 +++ xc/programs/Xserver/xkb/Imakefile Sun Feb 19 10:51:32 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.22 2003/07/16 01:39:03 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.25 2006/02/19 15:51:32 tsi Exp $ #define SGIHyperOpt #include @@ -25,11 +20,15 @@ XKB_DDXDEFS = XkbServerDefines -#if XF86Server +#if defined(XF86Server) && XF86Server XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o #endif +#ifndef LinkDefines +#define LinkDefines /**/ +#endif + DDX_SRCS = ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c ddxInit.c \ ddxKeyClick.c ddxKillSrv.c ddxLEDs.c ddxVT.c ddxLoad.c \ ddxList.c ddxConfig.c ddxDevBtn.c ddxPrivate.c xkbconfig.c @@ -46,11 +45,10 @@ xkmread.o xkbtext.o xkbfmisc.o xkberrs.o xkbout.o maprules.o \ XKBMisc.o XKBMAlloc.o XKBAlloc.o XKBGAlloc.o \ $(XKBXI_OBJS) $(DDX_OBJS) - INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext \ + INCLUDES = -I$(SERVERSRC)/include -I$(SERVERSRC)/Xext \ -I$(SERVERSRC)/mi $(XF86INCLUDES) - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln -DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) +DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) LinkDefines XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" $(XKB_DISABLE) NormalLibraryObjectRule() @@ -58,7 +56,7 @@ LintLibraryTarget(xkb,$(SRCS)) NormalLintTarget($(SRCS)) -#if XF86Server +#if defined(XF86Server) && XF86Server ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS) @@ -70,7 +68,7 @@ LinkSourceFile(maprules.c,$(XKBFILELIBSRC)) LinkSourceFile(xkmread.c,$(XKBFILELIBSRC)) LinkSourceFile(xkbtext.c,$(XKBFILELIBSRC)) -XCOMM avoid clash between XKBMisc.c and xkbmisc.c on NT +/* avoid clash between XKBMisc.c and xkbmisc.c on NT */ LinkFile(xkbfmisc.c,$(XKBFILELIBSRC)/xkbmisc.c) LinkSourceFile(xkberrs.c,$(XKBFILELIBSRC)) LinkSourceFile(xkbconfig.c,$(XKBFILELIBSRC)) @@ -80,7 +78,38 @@ LinkSourceFile(XKBAlloc.c,$(XLIBSRC)) LinkSourceFile(XKBGAlloc.c,$(XLIBSRC)) -LinkSourceFile(modinit.h,../Xext/extmod) +LinkSourceFile(modinit.h,$(SERVERSRC)/Xext/extmod) + +#ifdef LinkDirectory + +LinkSourceFile(ddxBeep.c,LinkDirectory) +LinkSourceFile(ddxConfig.c,LinkDirectory) +LinkSourceFile(ddxCtrls.c,LinkDirectory) +LinkSourceFile(ddxDevBtn.c,LinkDirectory) +LinkSourceFile(ddxFakeBtn.c,LinkDirectory) +LinkSourceFile(ddxFakeMtn.c,LinkDirectory) +LinkSourceFile(ddxInit.c,LinkDirectory) +LinkSourceFile(ddxKeyClick.c,LinkDirectory) +LinkSourceFile(ddxKillSrv.c,LinkDirectory) +LinkSourceFile(ddxLEDs.c,LinkDirectory) +LinkSourceFile(ddxList.c,LinkDirectory) +LinkSourceFile(ddxLoad.c,LinkDirectory) +LinkSourceFile(ddxPrivate.c,LinkDirectory) +LinkSourceFile(ddxVT.c,LinkDirectory) +LinkSourceFile(xkb.c,LinkDirectory) +LinkSourceFile(xkb.h,LinkDirectory) +LinkSourceFile(xkbAccessX.c,LinkDirectory) +LinkSourceFile(xkbActions.c,LinkDirectory) +LinkSourceFile(xkbDflts.h,LinkDirectory) +LinkSourceFile(xkbEvents.c,LinkDirectory) +LinkSourceFile(xkbInit.c,LinkDirectory) +LinkSourceFile(xkbLEDs.c,LinkDirectory) +LinkSourceFile(xkbPrKeyEv.c,LinkDirectory) +LinkSourceFile(xkbPrOtherEv.c,LinkDirectory) +LinkSourceFile(xkbSwap.c,LinkDirectory) +LinkSourceFile(xkbUtils.c,LinkDirectory) + +#else #if BuildLibraries #if UseConfDirForXkb @@ -99,4 +128,6 @@ #endif #endif +#endif /* defined(LinkDirectory) */ + DependTarget() Index: xc/programs/Xserver/xkb/ddxBeep.c diff -u xc/programs/Xserver/xkb/ddxBeep.c:3.10 xc/programs/Xserver/xkb/ddxBeep.c:3.11 --- xc/programs/Xserver/xkb/ddxBeep.c:3.10 Mon Nov 17 17:20:44 2003 +++ xc/programs/Xserver/xkb/ddxBeep.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxBeep.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.11 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.10 2003/11/17 22:20:44 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include #if (defined(__osf__) && defined(__alpha)) #include Index: xc/programs/Xserver/xkb/ddxConfig.c diff -u xc/programs/Xserver/xkb/ddxConfig.c:3.9 xc/programs/Xserver/xkb/ddxConfig.c:3.10 --- xc/programs/Xserver/xkb/ddxConfig.c:3.9 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxConfig.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxConfig.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.10 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -36,7 +35,7 @@ #include "windowstr.h" #include "os.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #include Bool Index: xc/programs/Xserver/xkb/ddxCtrls.c diff -u xc/programs/Xserver/xkb/ddxCtrls.c:1.4 xc/programs/Xserver/xkb/ddxCtrls.c:1.5 --- xc/programs/Xserver/xkb/ddxCtrls.c:1.4 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxCtrls.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxCtrls.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.5 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include void XkbDDXKeybdCtrlProc(DeviceIntPtr dev,KeybdCtrl *ctrl) Index: xc/programs/Xserver/xkb/ddxDevBtn.c diff -u xc/programs/Xserver/xkb/ddxDevBtn.c:3.4 xc/programs/Xserver/xkb/ddxDevBtn.c:3.5 --- xc/programs/Xserver/xkb/ddxDevBtn.c:3.4 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxDevBtn.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxDevBtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.5 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.4 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,9 +33,9 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" -#include "XIproto.h" +#include +#include +#include extern int DeviceValuator; Index: xc/programs/Xserver/xkb/ddxFakeBtn.c diff -u xc/programs/Xserver/xkb/ddxFakeBtn.c:1.2 xc/programs/Xserver/xkb/ddxFakeBtn.c:1.3 --- xc/programs/Xserver/xkb/ddxFakeBtn.c:1.2 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxFakeBtn.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxFakeBtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxFakeBtn.c,v 1.3 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxFakeBtn.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include void XkbDDXFakePointerButton(int event,int button) Index: xc/programs/Xserver/xkb/ddxFakeMtn.c diff -u xc/programs/Xserver/xkb/ddxFakeMtn.c:1.6 xc/programs/Xserver/xkb/ddxFakeMtn.c:1.7 --- xc/programs/Xserver/xkb/ddxFakeMtn.c:1.6 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxFakeMtn.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxFakeMtn.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.7 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.6 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include #ifdef PANORAMIX #include "panoramiX.h" Index: xc/programs/Xserver/xkb/ddxInit.c diff -u xc/programs/Xserver/xkb/ddxInit.c:1.2 xc/programs/Xserver/xkb/ddxInit.c:1.3 --- xc/programs/Xserver/xkb/ddxInit.c:1.2 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxInit.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxInit.c,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxInit.c,v 1.3 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxInit.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include int XkbDDXInitDevice(DeviceIntPtr dev) Index: xc/programs/Xserver/xkb/ddxKeyClick.c diff -u xc/programs/Xserver/xkb/ddxKeyClick.c:1.2 xc/programs/Xserver/xkb/ddxKeyClick.c:1.3 --- xc/programs/Xserver/xkb/ddxKeyClick.c:1.2 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxKeyClick.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxKeyClick.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxKeyClick.c,v 1.3 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxKeyClick.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include void XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic) Index: xc/programs/Xserver/xkb/ddxKillSrv.c diff -u xc/programs/Xserver/xkb/ddxKillSrv.c:1.4 xc/programs/Xserver/xkb/ddxKillSrv.c:1.5 --- xc/programs/Xserver/xkb/ddxKillSrv.c:1.4 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxKillSrv.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxKillSrv.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.5 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include #ifdef XF86DDXACTIONS #include "xf86.h" Index: xc/programs/Xserver/xkb/ddxLEDs.c diff -u xc/programs/Xserver/xkb/ddxLEDs.c:1.2 xc/programs/Xserver/xkb/ddxLEDs.c:1.3 --- xc/programs/Xserver/xkb/ddxLEDs.c:1.2 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxLEDs.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxLEDs.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxLEDs.c,v 1.3 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxLEDs.c,v 1.2 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include void XkbDDXUpdateIndicators(DeviceIntPtr dev,CARD32 new) Index: xc/programs/Xserver/xkb/ddxList.c diff -u xc/programs/Xserver/xkb/ddxList.c:3.9 xc/programs/Xserver/xkb/ddxList.c:3.11 --- xc/programs/Xserver/xkb/ddxList.c:3.9 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxList.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,3 @@ -/* $Xorg: ddxList.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.9 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.11 2005/10/14 15:17:28 tsi Exp $ */ #include #include @@ -38,8 +37,8 @@ #include "scrnintstr.h" #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "XI.h" +#include +#include #ifndef PATH_MAX #ifdef MAXPATHLEN @@ -98,7 +97,7 @@ wire16[1]= slen; memcpy(wire8,str,slen); if (client->swapped) { - register int n; + int n; swaps(&wire16[0],n); swaps(&wire16[1],n); } @@ -211,7 +210,7 @@ list->nFound[what]= 0; while ((status==Success)&&((tmp=fgets(buf,PATH_MAX,in))!=NULL)) { unsigned flags; - register unsigned int i; + unsigned int i; if (*tmp=='#') /* comment, skip it */ continue; if (!strncmp(tmp, "Warning:", 8) || !strncmp(tmp, " ", 8)) Index: xc/programs/Xserver/xkb/ddxLoad.c diff -u xc/programs/Xserver/xkb/ddxLoad.c:3.36 xc/programs/Xserver/xkb/ddxLoad.c:3.37 --- xc/programs/Xserver/xkb/ddxLoad.c:3.36 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxLoad.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxLoad.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.37 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.36 2003/11/17 22:20:45 dawes Exp $ */ #include #include @@ -38,8 +37,8 @@ #include "scrnintstr.h" #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "XI.h" +#include +#include #include "xkb.h" #if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__) Index: xc/programs/Xserver/xkb/ddxPrivate.c diff -u xc/programs/Xserver/xkb/ddxPrivate.c:1.3 xc/programs/Xserver/xkb/ddxPrivate.c:1.4 --- xc/programs/Xserver/xkb/ddxPrivate.c:1.3 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxPrivate.c Fri Oct 14 11:17:28 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.3 2003/11/17 22:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.4 2005/10/14 15:17:28 tsi Exp $ */ #include #define NEED_EVENTS 1 #include #include "windowstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #ifdef XF86DDXACTIONS #include "xf86.h" Index: xc/programs/Xserver/xkb/ddxVT.c diff -u xc/programs/Xserver/xkb/ddxVT.c:1.4 xc/programs/Xserver/xkb/ddxVT.c:1.5 --- xc/programs/Xserver/xkb/ddxVT.c:1.4 Mon Nov 17 17:20:45 2003 +++ xc/programs/Xserver/xkb/ddxVT.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ddxVT.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.5 2005/10/14 15:17:28 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.4 2003/11/17 22:20:45 dawes Exp $ */ #include #define NEED_EVENTS 1 @@ -34,8 +33,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include "XKBsrv.h" -#include "XI.h" +#include +#include #ifdef XF86DDXACTIONS #include "xf86.h" Index: xc/programs/Xserver/xkb/xkb.c diff -u xc/programs/Xserver/xkb/xkb.c:3.23 xc/programs/Xserver/xkb/xkb.c:3.26 --- xc/programs/Xserver/xkb/xkb.c:3.23 Mon Dec 22 12:48:11 2003 +++ xc/programs/Xserver/xkb/xkb.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xkb.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,22 +23,70 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.23 2003/12/22 17:48:11 tsi Exp $ */ +/* + * Copyright (c) 2005 by The XFree86 Project, Inc. + * Copyright (c) 2005 by Michal Maruska. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.26 2005/10/14 15:17:28 tsi Exp $ */ #include -#include "X.h" +#include #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #include "extnsionst.h" #include "modinit.h" #include "xkb.h" -#include "XI.h" +#include int XkbEventBase; int XkbErrorBase; @@ -161,7 +208,7 @@ { REQUEST(xkbUseExtensionReq); xkbUseExtensionReply rep; - register int n; + int n; int supported; REQUEST_SIZE_MATCH(xkbUseExtensionReq); @@ -240,7 +287,7 @@ CARD16 *c16; CARD32 *c32; } from,to; - register unsigned bit,ndx,maskLeft,dataLeft,size; + unsigned bit,ndx,maskLeft,dataLeft,size; from.c8= (CARD8 *)&stuff[1]; dataLeft= (stuff->length*4)-SIZEOF(xkbSelectEventsReq); @@ -530,7 +577,7 @@ rep.compatState = xkb->compat_state; rep.ptrBtnState = xkb->ptr_buttons; if (client->swapped) { - register int n; + int n; swaps(&rep.sequenceNumber,n); swaps(&rep.ptrBtnState,n); } @@ -605,7 +652,7 @@ xkbGetControlsReply rep; XkbControlsPtr xkb; DeviceIntPtr dev; - register int n; + int n; REQUEST(xkbGetControlsReq); REQUEST_SIZE_MATCH(xkbGetControlsReq); @@ -926,7 +973,7 @@ type= &xkb->map->types[rep->firstType]; for (i=0;inTypes;i++,type++) { - register unsigned n; + unsigned n; wire= (xkbKeyTypeWireDesc *)buf; wire->mask = type->mods.mask; wire->realMods = type->mods.real_mods; @@ -935,7 +982,7 @@ wire->nMapEntries = type->map_count; wire->preserve = (type->preserve!=NULL); if (client->swapped) { - register int n; + int n; swaps(&wire->virtualMods,n); } @@ -952,7 +999,7 @@ wire->realMods= entry->mods.real_mods; wire->virtualMods= entry->mods.vmods; if (client->swapped) { - register int n; + int n; swaps(&wire->virtualMods,n); } } @@ -967,7 +1014,7 @@ pwire->realMods= preserve->real_mods; pwire->virtualMods= preserve->vmods; if (client->swapped) { - register int n; + int n; swaps(&pwire->virtualMods,n); } } @@ -1008,7 +1055,7 @@ static int XkbSizeVirtualMods(XkbDescPtr xkb,xkbGetMapReply *rep) { -register unsigned i,nMods,bit; +unsigned i,nMods,bit; if (((rep->present&XkbVirtualModsMask)==0)||(rep->virtualMods==0)|| (!xkb)||(!xkb->server)) { @@ -1026,10 +1073,10 @@ static char * XkbWriteKeySyms(XkbDescPtr xkb,xkbGetMapReply *rep,char *buf,ClientPtr client) { -register KeySym * pSym; +KeySym * pSym; XkbSymMapPtr symMap; xkbSymMapWireDesc * outMap; -register unsigned i; +unsigned i; symMap = &xkb->map->key_sym_map[rep->firstKeySym]; for (i=0;inKeySyms;i++,symMap++) { @@ -1048,7 +1095,7 @@ pSym = &xkb->map->syms[symMap->offset]; memcpy((char *)buf,(char *)pSym,outMap->nSyms*4); if (client->swapped) { - register int n,nSyms= outMap->nSyms; + int n,nSyms= outMap->nSyms; swaps(&outMap->nSyms,n); while (nSyms-->0) { swapl(buf,n); @@ -1064,7 +1111,7 @@ XkbSizeKeyActions(XkbDescPtr xkb,xkbGetMapReply *rep) { unsigned i,len,nActs; - register KeyCode firstKey; + KeyCode firstKey; if (((rep->present&XkbKeyActionsMask)==0)||(rep->nKeyActs<1)|| (!xkb)||(!xkb->server)||(!xkb->server->key_acts)) { @@ -1319,7 +1366,7 @@ if ( rep->totalKeyBehaviors>0 ) desc = XkbWriteKeyBehaviors(xkb,rep,desc,client); if ( rep->virtualMods ) { - register int sz,bit; + int sz,bit; for (i=sz=0,bit=1;ivirtualMods&bit) { desc[sz++]= xkb->server->vmods[i]; @@ -1338,7 +1385,7 @@ len, (unsigned long)(desc-start)); } if (client->swapped) { - register int n; + int n; swaps(&rep->sequenceNumber,n); swapl(&rep->length,n); swaps(&rep->present,n); @@ -1489,9 +1536,9 @@ CARD8 * mapWidthRtrn) { unsigned nMaps; -register unsigned i,n; -register CARD8 * map; -register xkbKeyTypeWireDesc *wire = *wireRtrn; +unsigned i,n; +CARD8 * map; +xkbKeyTypeWireDesc *wire = *wireRtrn; if (req->firstType>((unsigned)xkb->map->num_types)) { *nMapsRtrn = _XkbErrCode3(0x01,req->firstType,xkb->map->num_types); @@ -1515,17 +1562,22 @@ *nMapsRtrn = xkb->map->num_types; for (i=0;imap->num_types;i++) { mapWidthRtrn[i] = xkb->map->types[i].num_levels; + /* + * mmc: mapWidthRtrn is allocated for max keycodes. Is the same + * limit valid for # of levels of Types??? + */ } return 1; } + /* Copy the unaffected interval: */ for (i=0;ifirstType;i++) { mapWidthRtrn[i] = xkb->map->types[i].num_levels; } for (i=0;inTypes;i++) { unsigned width; if (client->swapped) { - register int s; + int s; swaps(&wire->virtualMods,s); } n= i+req->firstType; @@ -1552,7 +1604,7 @@ preWire= (xkbModsWireDesc *)&mapWire[wire->nMapEntries]; for (n=0;nnMapEntries;n++) { if (client->swapped) { - register int s; + int s; swaps(&mapWire[n].virtualMods,s); } if (mapWire[n].realMods&(~wire->realMods)) { @@ -1571,7 +1623,7 @@ } if (wire->preserve) { if (client->swapped) { - register int s; + int s; swaps(&preWire[n].virtualMods,s); } if (preWire[n].realMods&(~mapWire[n].realMods)) { @@ -1611,16 +1663,36 @@ xkbSymMapWireDesc ** wireRtrn, int * errorRtrn) { -register unsigned i; + /* mmc: + * Checks consistency of the data: + * - types inside an interval + * - number of syms must be = width * ngroups + * AND + * constructs the symsPerKey mapping keycode->number. This will be + * used by the caller for checking n. of actions! + * Uses mapWidths for that(?) + */ +unsigned i; XkbSymMapPtr map; xkbSymMapWireDesc* wire = *wireRtrn; +#if 0 + /* mmc: Is this correct? symsPerKey would not be computed! */ if (!(XkbKeySymsMask&req->present)) return 1; +#endif + CHK_REQ_KEY_RANGE2(0x11,req->firstKeySym,req->nKeySyms,req,(*errorRtrn),0); map = &xkb->map->key_sym_map[xkb->min_key_code]; + + /* + * mmc: This checks if the keycodes `below' (think this ordering: + * min_keycode --- req->firstKeySym --- + * (req->firstKeySym + req->nKeySyms) --- max_keycode) + * have types above the nTypes. If so => error. + */ for (i=xkb->min_key_code;i<(unsigned)req->firstKeySym;i++,map++) { - register int g,ng,w; + int g,ng,w; ng= XkbNumGroups(map->group_info); for (w=g=0;gkt_index[g]>=(unsigned)nTypes) { @@ -1630,21 +1702,26 @@ if (mapWidths[map->kt_index[g]]>w) w= mapWidths[map->kt_index[g]]; } + /* + * mmc: Now w is the maximum of widths, and + * the caller is interested in this info: + */ symsPerKey[i] = w*ng; } for (i=0;inKeySyms;i++) { KeySym *pSyms; - register unsigned nG; + unsigned nG; if (client->swapped) { swaps(&wire->nSyms,nG); } + /* mmc: Checking the Nodes: 1/ good group information? */ nG = XkbNumGroups(wire->groupInfo); if (nG>XkbNumKbdGroups) { *errorRtrn = _XkbErrCode3(0x14,i+req->firstKeySym,nG); return 0; } if (nG>0) { - register int g,w; + int g,w; for (g=w=0;gktIndex[g]>=(unsigned)nTypes) { *errorRtrn= _XkbErrCode4(0x15,i+req->firstKeySym,g, @@ -1669,13 +1746,16 @@ *errorRtrn = _XkbErrCode3(0x17,i+req->firstKeySym,wire->nSyms); return 0; } + /* Go to next? Skip the record & following syms! */ pSyms = (KeySym *)&wire[1]; wire = (xkbSymMapWireDesc *)&pSyms[wire->nSyms]; } + /* mmc: Keycodes after affected ones: */ map = &xkb->map->key_sym_map[i]; - for (;i<=(unsigned)xkb->max_key_code;i++,map++) { - register int g,nG,w; + for (i= req->nKeySyms + req->firstKeySym ; + i<=(unsigned)xkb->max_key_code;i++,map++) { /* mmc: Bug was here. */ + int g,nG,w; nG= XkbKeyNumGroups(xkb,i); for (w=g=0;gkt_index[g]>=(unsigned)nTypes) { @@ -1702,7 +1782,7 @@ { int nActs; CARD8 * wire = *wireRtrn; -register unsigned i; +unsigned i; if (!(XkbKeyActionsMask&req->present)) return 1; @@ -1731,9 +1811,9 @@ xkbBehaviorWireDesc ** wireRtrn, int * errorRtrn) { -register xkbBehaviorWireDesc * wire = *wireRtrn; -register XkbServerMapPtr server = xkb->server; -register unsigned i; +xkbBehaviorWireDesc * wire = *wireRtrn; +XkbServerMapPtr server = xkb->server; +unsigned i; unsigned first,last; if (((req->present&XkbKeyBehaviorsMask)==0)||(req->nKeyBehaviors<1)) { @@ -1783,8 +1863,8 @@ CARD8 ** wireRtrn, int * errorRtrn) { -register CARD8 *wire = *wireRtrn; -register unsigned i,nMods,bit; +CARD8 *wire = *wireRtrn; +unsigned i,nMods,bit; if (((req->present&XkbVirtualModsMask)==0)||(req->virtualMods==0)) return 1; @@ -1802,9 +1882,9 @@ CARD8 ** wireRtrn, int * errorRtrn) { -register CARD8 * wire = *wireRtrn; +CARD8 * wire = *wireRtrn; CARD8 * start; -register unsigned i; +unsigned i; int first,last; if (((req->present&XkbExplicitComponentsMask)==0)||(req->nKeyExplicit<1)) { @@ -1841,9 +1921,9 @@ static int CheckModifierMap(XkbDescPtr xkb,xkbSetMapReq *req,CARD8 **wireRtrn,int *errRtrn) { -register CARD8 * wire = *wireRtrn; +CARD8 * wire = *wireRtrn; CARD8 * start; -register unsigned i; +unsigned i; int first,last; if (((req->present&XkbModifierMapMask)==0)||(req->nModMapKeys<1)) { @@ -1879,8 +1959,8 @@ xkbVModMapWireDesc **wireRtrn, int *errRtrn) { -register xkbVModMapWireDesc * wire = *wireRtrn; -register unsigned i; +xkbVModMapWireDesc * wire = *wireRtrn; +unsigned i; int first,last; if (((req->present&XkbVirtualModMapMask)==0)||(req->nVModMapKeys<1)) { @@ -1914,7 +1994,7 @@ xkbKeyTypeWireDesc * wire, XkbChangesPtr changes) { -register unsigned i; +unsigned i; unsigned first,last; CARD8 *map; @@ -1929,7 +2009,7 @@ for (i=0;inTypes;i++) { XkbKeyTypePtr pOld; - register unsigned n; + unsigned n; if (XkbResizeKeyType(xkb,i+req->firstType,wire->nMapEntries, wire->preserve,wire->numLevels)!=Success) { @@ -2001,7 +2081,7 @@ XkbChangesPtr changes, DeviceIntPtr dev) { -register unsigned i,s; +unsigned i,s; XkbSymMapPtr oldMap; KeySym * newSyms; KeySym * pSyms; @@ -2069,7 +2149,7 @@ CARD8 * wire, XkbChangesPtr changes) { -register unsigned i,first,last; +unsigned i,first,last; CARD8 * nActs = wire; XkbAction * newActs; @@ -2089,6 +2169,10 @@ if (changes->map.changed&XkbKeyActionsMask) { int oldLast; oldLast= changes->map.first_key_act+changes->map.num_key_acts-1; + /* + * mmc: Isn't there a function to enlarge an interval to include + * 2 points? (inverse of CLAMP) + */ if (changes->map.first_key_actmap.first_key_act; if (oldLast>last) @@ -2106,7 +2190,7 @@ xkbBehaviorWireDesc *wire, XkbChangesPtr changes) { -register unsigned i; +unsigned i; int maxRG = -1; XkbDescPtr xkb = xkbi->desc; XkbServerMapPtr server = xkb->server; @@ -2158,7 +2242,7 @@ SetVirtualMods(XkbSrvInfoPtr xkbi,xkbSetMapReq *req,CARD8 *wire, XkbChangesPtr changes) { -register int i,bit,nMods; +int i,bit,nMods; XkbServerMapPtr srv = xkbi->desc->server; if (((req->present&XkbVirtualModsMask)==0)||(req->virtualMods==0)) @@ -2180,7 +2264,7 @@ SetKeyExplicit(XkbSrvInfoPtr xkbi,xkbSetMapReq *req,CARD8 *wire, XkbChangesPtr changes) { -register unsigned i,first,last; +unsigned i,first,last; XkbServerMapPtr xkb = xkbi->desc->server; CARD8 * start; @@ -2214,7 +2298,7 @@ CARD8 * wire, XkbChangesPtr changes) { -register unsigned i,first,last; +unsigned i,first,last; XkbClientMapPtr xkb = xkbi->desc->map; CARD8 * start; @@ -2248,7 +2332,7 @@ xkbVModMapWireDesc * wire, XkbChangesPtr changes) { -register unsigned i,first,last; +unsigned i,first,last; XkbServerMapPtr srv = xkbi->desc->server; first= req->firstVModMapKey; @@ -2321,13 +2405,14 @@ } tmp = (char *)&stuff[1]; - if ((stuff->present&XkbKeyTypesMask)&& + /* Bug: We need `mapWidths' which is calculated in CheckKeyTypes. */ + if (/* (stuff->present&XkbKeyTypesMask)&& */ (!CheckKeyTypes(client,xkb,stuff,(xkbKeyTypeWireDesc **)&tmp, &nTypes,mapWidths))) { client->errorValue = nTypes; return BadValue; } - if ((stuff->present&XkbKeySymsMask)&& + if (/* (stuff->present&XkbKeySymsMask)&& */ /* symsPerKey is used later */ (!CheckKeySyms(client,xkb,stuff,nTypes,mapWidths,symsPerKey, (xkbSymMapWireDesc **)&tmp,&error))) { client->errorValue = error; @@ -2471,7 +2556,7 @@ nGroups= 0; if (rep->groups!=0) { - register int i,bit; + int i,bit; for (i=0,bit=1;igroups&bit) nGroups++; @@ -2495,7 +2580,7 @@ if (size>0) { data = (char *)ALLOCATE_LOCAL(size); if (data) { - register unsigned i,bit; + unsigned i,bit; xkbModsWireDesc * grp; XkbSymInterpretPtr sym= &compat->sym_interpret[rep->firstSI]; xkbSymInterpretWireDesc *wire = (xkbSymInterpretWireDesc *)data; @@ -2507,7 +2592,7 @@ wire->flags= sym->flags; memcpy((char*)&wire->act,(char*)&sym->act,sz_xkbActionWireDesc); if (client->swapped) { - register int n; + int n; swapl(&wire->sym,n); } } @@ -2519,7 +2604,7 @@ grp->realMods= compat->groups[i].real_mods; grp->virtualMods= compat->groups[i].vmods; if (client->swapped) { - register int n; + int n; swaps(&grp->virtualMods,n); } grp++; @@ -2533,7 +2618,7 @@ else data= NULL; if (client->swapped) { - register int n; + int n; swaps(&rep->sequenceNumber,n); swapl(&rep->length,n); swaps(&rep->firstSI,n); @@ -2598,7 +2683,7 @@ XkbCompatMapPtr compat; char * data; int nGroups; - register unsigned i,bit; + unsigned i,bit; REQUEST(xkbSetCompatMapReq); REQUEST_AT_LEAST_SIZE(xkbSetCompatMapReq); @@ -2653,7 +2738,7 @@ sym = &compat->sym_interpret[stuff->firstSI]; for (i=0;inSI;i++,wire++,sym++) { if (client->swapped) { - register int n; + int n; swapl(&wire->sym,n); } sym->sym= wire->sym; @@ -2671,12 +2756,12 @@ } if (stuff->groups!=0) { - register unsigned i,bit; + unsigned i,bit; xkbModsWireDesc *wire = (xkbModsWireDesc *)data; for (i=0,bit=1;igroups&bit) { if (client->swapped) { - register int n; + int n; swaps(&wire->virtualMods,n); } compat->groups[i].mask= wire->realMods; @@ -2719,7 +2804,12 @@ &cause); if (check) XkbCheckSecondaryEffects(xkbi,check,&change,&cause); - XkbUpdateCoreDescription(dev,False); + /* + * mmc: Was False. I think there will be problems, but i want to + * discover them. Besides, this function probably does not resize + * the XKB map. + */ + XkbUpdateCoreDescription(dev,True); XkbSendNotification(dev,&change,&cause); } return client->noClientException; @@ -2733,7 +2823,7 @@ xkbGetIndicatorStateReply rep; XkbSrvLedInfoPtr sli; DeviceIntPtr dev; - register int i; + int i; REQUEST(xkbGetIndicatorStateReq); REQUEST_SIZE_MATCH(xkbGetIndicatorStateReq); @@ -2769,7 +2859,7 @@ XkbIndicatorPtr indicators, xkbGetIndicatorMapReply *rep) { -register int i,bit; +int i,bit; int nIndicators; rep->realIndicators = indicators->phys_indicators; @@ -2788,8 +2878,8 @@ { int length; CARD8 * map; -register int i; -register unsigned bit; +int i; +unsigned bit; length = rep->length*4; if (length>0) { @@ -2808,7 +2898,7 @@ wire->virtualMods= indicators->maps[i].mods.vmods; wire->ctrls= indicators->maps[i].ctrls; if (client->swapped) { - register int n; + int n; swaps(&wire->virtualMods,n); swapl(&wire->ctrls,n); } @@ -2869,7 +2959,7 @@ int ProcXkbSetIndicatorMap(ClientPtr client) { - register int i,bit; + int i,bit; int nIndicators,why; DeviceIntPtr dev; XkbSrvInfoPtr xkbi; @@ -2911,7 +3001,7 @@ for (i=0,bit=1;iwhich&bit) { if (client->swapped) { - register int n; + int n; swaps(&from->virtualMods,n); swapl(&from->ctrls,n); } @@ -2953,7 +3043,7 @@ { DeviceIntPtr dev; xkbGetNamedIndicatorReply rep; - register int i = 0; + int i = 0; XkbSrvLedInfoPtr sli; XkbIndicatorMapPtr map = NULL; Bool supported; @@ -3028,7 +3118,7 @@ rep.supported= supported; } if ( client->swapped ) { - register int n; + int n; swapl(&rep.length,n); swaps(&rep.sequenceNumber,n); swapl(&rep.indicator,n); @@ -3061,7 +3151,7 @@ DeviceIntPtr dev,kbd; XkbIndicatorMapPtr map; XkbSrvLedInfoPtr sli; - register int led = 0; + int led = 0; unsigned extDevReason; unsigned statec,namec,mapc; XkbEventCauseRec cause; @@ -3169,8 +3259,8 @@ static CARD32 _XkbCountAtoms(Atom *atoms,int maxAtoms,int *count) { -register unsigned int i,bit,nAtoms; -register CARD32 atomsPresent; +unsigned int i,bit,nAtoms; +CARD32 atomsPresent; for (i=nAtoms=atomsPresent=0,bit=1;iminKeyCode= xkb->min_key_code; rep->maxKeyCode= xkb->max_key_code; @@ -3311,14 +3401,14 @@ static int XkbSendNames(ClientPtr client,XkbDescPtr xkb,xkbGetNamesReply *rep) { -register unsigned i,length,which; +unsigned i,length,which; char * start; char * desc; length= rep->length*4; which= rep->which; if (client->swapped) { - register int n; + int n; swaps(&rep->sequenceNumber,n); swapl(&rep->length,n); swapl(&rep->which,n); @@ -3332,7 +3422,7 @@ if (which&XkbKeycodesNameMask) { *((CARD32 *)desc)= xkb->names->keycodes; if (client->swapped) { - register int n; + int n; swapl(desc,n); } desc+= 4; @@ -3340,7 +3430,7 @@ if (which&XkbGeometryNameMask) { *((CARD32 *)desc)= xkb->names->geometry; if (client->swapped) { - register int n; + int n; swapl(desc,n); } desc+= 4; @@ -3348,16 +3438,16 @@ if (which&XkbSymbolsNameMask) { *((CARD32 *)desc)= xkb->names->symbols; if (client->swapped) { - register int n; + int n; swapl(desc,n); } desc+= 4; } if (which&XkbPhysSymbolsNameMask) { - register CARD32 *atm= (CARD32 *)desc; + CARD32 *atm= (CARD32 *)desc; atm[0]= (CARD32)xkb->names->phys_symbols; if (client->swapped) { - register int n; + int n; swapl(&atm[0],n); } desc+= 4; @@ -3365,7 +3455,7 @@ if (which&XkbTypesNameMask) { *((CARD32 *)desc)= (CARD32)xkb->names->types; if (client->swapped) { - register int n; + int n; swapl(desc,n); } desc+= 4; @@ -3373,19 +3463,19 @@ if (which&XkbCompatNameMask) { *((CARD32 *)desc)= (CARD32)xkb->names->compat; if (client->swapped) { - register int n; + int n; swapl(desc,n); } desc+= 4; } if (which&XkbKeyTypeNamesMask) { - register CARD32 *atm= (CARD32 *)desc; - register XkbKeyTypePtr type= xkb->map->types; + CARD32 *atm= (CARD32 *)desc; + XkbKeyTypePtr type= xkb->map->types; for (i=0;imap->num_types;i++,atm++,type++) { *atm= (CARD32)type->name; if (client->swapped) { - register int n; + int n; swapl(atm,n); } } @@ -3393,7 +3483,7 @@ } if (which&XkbKTLevelNamesMask) { XkbKeyTypePtr type = xkb->map->types; - register CARD32 *atm; + CARD32 *atm; for (i=0;inTypes;i++,type++) { *desc++ = type->num_levels; } @@ -3402,12 +3492,12 @@ atm= (CARD32 *)desc; type = xkb->map->types; for (i=0;imap->num_types;i++,type++) { - register unsigned l; + unsigned l; if (type->level_names) { for (l=0;lnum_levels;l++,atm++) { *atm= type->level_names[l]; if (client->swapped) { - register unsigned n; + unsigned n; swapl(atm,n); } } @@ -3440,11 +3530,11 @@ } } if ((which&XkbRGNamesMask)&&(rep->nRadioGroups>0)) { - register CARD32 *atm= (CARD32 *)desc; + CARD32 *atm= (CARD32 *)desc; for (i=0;inRadioGroups;i++,atm++) { *atm= (CARD32)xkb->names->radio_groups[i]; if (client->swapped) { - register unsigned n; + unsigned n; swapl(atm,n); } } @@ -3501,11 +3591,11 @@ static CARD32 * _XkbCheckAtoms(CARD32 *wire,int nAtoms,int swapped,Atom *pError) { -register int i; +int i; for (i=0;iwhich&XkbKeyTypeNamesMask) { - register int i; + int i; CARD32 *old; if ( stuff->nTypes<1 ) { client->errorValue = _XkbErrCode2(0x02,stuff->nTypes); @@ -3660,7 +3750,7 @@ } } if (stuff->which&XkbKTLevelNamesMask) { - register unsigned i; + unsigned i; XkbKeyTypePtr type; CARD8 * width; if ( stuff->nKTLevels<1 ) { @@ -3783,8 +3873,8 @@ if (stuff->which&XkbCompatNameMask) names->compat= *tmp++; if ((stuff->which&XkbKeyTypeNamesMask)&&(stuff->nTypes>0)) { - register unsigned i; - register XkbKeyTypePtr type; + unsigned i; + XkbKeyTypePtr type; type= &xkb->map->types[stuff->firstType]; for (i=0;inTypes;i++,type++) { @@ -3794,8 +3884,8 @@ nn.nTypes= stuff->nTypes; } if (stuff->which&XkbKTLevelNamesMask) { - register XkbKeyTypePtr type; - register unsigned i; + XkbKeyTypePtr type; + unsigned i; CARD8 *width; width = (CARD8 *)tmp; @@ -3804,7 +3894,7 @@ for (i=0;inKTLevels;i++,type++) { if (width[i]>0) { if (type->level_names) { - register unsigned n; + unsigned n; for (n=0;nlevel_names[n]= tmp[n]; } @@ -3839,7 +3929,7 @@ } if (stuff->which&XkbKeyAliasesMask) { if (stuff->nKeyAliases>0) { - register int na= stuff->nKeyAliases; + int na= stuff->nKeyAliases; if (XkbAllocNames(xkb,XkbKeyAliasesMask,0,na)!=Success) return BadAlloc; memcpy((char *)names->key_aliases,(char *)tmp, @@ -3855,7 +3945,7 @@ } if (stuff->which&XkbRGNamesMask) { if (stuff->nRadioGroups>0) { - register unsigned i,nrg; + unsigned i,nrg; nrg= stuff->nRadioGroups; if (XkbAllocNames(xkb,XkbRGNamesMask,nrg,0)!=Success) return BadAlloc; @@ -3879,8 +3969,8 @@ if (needExtEvent) { XkbSrvLedInfoPtr sli; xkbExtensionDeviceNotify edev; - register int i; - register unsigned bit; + int i; + unsigned bit; sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId, XkbXI_IndicatorsMask); @@ -3907,7 +3997,7 @@ /***====================================================================***/ -#include "XKBgeom.h" +#include #define XkbSizeCountedString(s) ((s)?((((2+strlen(s))+3)/4)*4):4) @@ -3920,7 +4010,7 @@ pLen= (CARD16 *)wire; *pLen= len; if (swap) { - register int n; + int n; swaps(pLen,n); } memcpy(&wire[2],str,len); @@ -3931,7 +4021,7 @@ static int XkbSizeGeomProperties(XkbGeometryPtr geom) { -register int i,size; +int i,size; XkbPropertyPtr prop; for (size=i=0,prop=geom->properties;inum_properties;i++,prop++) { @@ -3944,8 +4034,8 @@ static char * XkbWriteGeomProperties(char *wire,XkbGeometryPtr geom,Bool swap) { -register int i; -register XkbPropertyPtr prop; +int i; +XkbPropertyPtr prop; for (i=0,prop=geom->properties;inum_properties;i++,prop++) { wire= XkbWriteCountedString(wire,prop->name,swap); @@ -3963,7 +4053,7 @@ static char * XkbWriteGeomKeyAliases(char *wire,XkbGeometryPtr geom,Bool swap) { -register int sz; +int sz; sz= geom->num_key_aliases*(XkbKeyNameLength*2); if (sz>0) { @@ -3976,8 +4066,8 @@ static int XkbSizeGeomColors(XkbGeometryPtr geom) { -register int i,size; -register XkbColorPtr color; +int i,size; +XkbColorPtr color; for (i=size=0,color=geom->colors;inum_colors;i++,color++) { size+= XkbSizeCountedString(color->spec); @@ -3988,8 +4078,8 @@ static char * XkbWriteGeomColors(char *wire,XkbGeometryPtr geom,Bool swap) { -register int i; -register XkbColorPtr color; +int i; +XkbColorPtr color; for (i=0,color=geom->colors;inum_colors;i++,color++) { wire= XkbWriteCountedString(wire,color->spec,swap); @@ -4000,12 +4090,12 @@ static int XkbSizeGeomShapes(XkbGeometryPtr geom) { -register int i,size; -register XkbShapePtr shape; +int i,size; +XkbShapePtr shape; for (i=size=0,shape=geom->shapes;inum_shapes;i++,shape++) { - register int n; - register XkbOutlinePtr ol; + int n; + XkbOutlinePtr ol; size+= SIZEOF(xkbShapeWireDesc); for (n=0,ol=shape->outlines;nnum_outlines;n++,ol++) { size+= SIZEOF(xkbOutlineWireDesc); @@ -4023,7 +4113,7 @@ xkbShapeWireDesc * shapeWire; for (i=0,shape=geom->shapes;inum_shapes;i++,shape++) { - register int o; + int o; XkbOutlinePtr ol; xkbOutlineWireDesc * olWire; shapeWire= (xkbShapeWireDesc *)wire; @@ -4036,12 +4126,12 @@ shapeWire->approxNdx= XkbOutlineIndex(shape,shape->approx); else shapeWire->approxNdx= XkbNoShape; if (swap) { - register int n; + int n; swapl(&shapeWire->name,n); } wire= (char *)&shapeWire[1]; for (o=0,ol=shape->outlines;onum_outlines;o++,ol++) { - register int p; + int p; XkbPointPtr pt; xkbPointWireDesc * ptWire; olWire= (xkbOutlineWireDesc *)wire; @@ -4053,7 +4143,7 @@ ptWire[p].x= pt->x; ptWire[p].y= pt->y; if (swap) { - register int n; + int n; swaps(&ptWire[p].x,n); swaps(&ptWire[p].y,n); } @@ -4067,7 +4157,7 @@ static int XkbSizeGeomDoodads(int num_doodads,XkbDoodadPtr doodad) { -register int i,size; +int i,size; for (i=size=0;iany.top= doodad->any.top; doodadWire->any.left= doodad->any.left; if (swap) { - register int n; + int n; swapl(&doodadWire->any.name,n); swaps(&doodadWire->any.top,n); swaps(&doodadWire->any.left,n); @@ -4110,7 +4200,7 @@ doodadWire->shape.colorNdx= doodad->shape.color_ndx; doodadWire->shape.shapeNdx= doodad->shape.shape_ndx; if (swap) { - register int n; + int n; swaps(&doodadWire->shape.angle,n); } break; @@ -4120,7 +4210,7 @@ doodadWire->text.height= doodad->text.height; doodadWire->text.colorNdx= doodad->text.color_ndx; if (swap) { - register int n; + int n; swaps(&doodadWire->text.angle,n); swaps(&doodadWire->text.width,n); swaps(&doodadWire->text.height,n); @@ -4153,7 +4243,7 @@ static char * XkbWriteGeomOverlay(char *wire,XkbOverlayPtr ol,Bool swap) { -register int r; +int r; XkbOverlayRowPtr row; xkbOverlayWireDesc * olWire; @@ -4161,7 +4251,7 @@ olWire->name= ol->name; olWire->nRows= ol->num_rows; if (swap) { - register int n; + int n; swapl(&olWire->name,n); } wire= (char *)&olWire[1]; @@ -4187,7 +4277,7 @@ static int XkbSizeGeomSections(XkbGeometryPtr geom) { -register int i,size; +int i,size; XkbSectionPtr section; for (i=size=0,section=geom->sections;inum_sections;i++,section++) { @@ -4222,7 +4312,7 @@ static char * XkbWriteGeomSections(char *wire,XkbGeometryPtr geom,Bool swap) { -register int i; +int i; XkbSectionPtr section; xkbSectionWireDesc * sectionWire; @@ -4240,7 +4330,7 @@ sectionWire->nOverlays= section->num_overlays; sectionWire->pad= 0; if (swap) { - register int n; + int n; swapl(§ionWire->name,n); swaps(§ionWire->top,n); swaps(§ionWire->left,n); @@ -4261,7 +4351,7 @@ rowWire->vertical= row->vertical; rowWire->pad= 0; if (swap) { - register int n; + int n; swaps(&rowWire->top,n); swaps(&rowWire->left,n); } @@ -4277,7 +4367,7 @@ keyWire[k].shapeNdx= key->shape_ndx; keyWire[k].colorNdx= key->color_ndx; if (swap) { - register int n; + int n; swaps(&keyWire[k].gap,n); } } @@ -4291,7 +4381,7 @@ swap); } if (section->overlays) { - register int o; + int o; for (o=0;onum_overlays;o++) { wire= XkbWriteGeomOverlay(wire,§ion->overlays[o],swap); } @@ -4380,7 +4470,7 @@ start= NULL; } if (client->swapped) { - register int n; + int n; swaps(&rep->sequenceNumber,n); swapl(&rep->length,n); swapl(&rep->name,n); @@ -4443,7 +4533,7 @@ wire= *wire_inout; plen= (CARD16 *)wire; if (swap) { - register int n; + int n; swaps(plen,n); } len= *plen; @@ -4470,7 +4560,7 @@ dWire= (xkbDoodadWireDesc *)(*wire_inout); wire= (char *)&dWire[1]; if (client->swapped) { - register int n; + int n; swapl(&dWire->any.name,n); swaps(&dWire->any.top,n); swaps(&dWire->any.left,n); @@ -4508,7 +4598,7 @@ return BadMatch; } if (client->swapped) { - register int n; + int n; swaps(&dWire->text.width,n); swaps(&dWire->text.height,n); } @@ -4567,7 +4657,7 @@ XkbSectionPtr section, ClientPtr client) { -register int r; +int r; char * wire; XkbOverlayPtr ol; xkbOverlayWireDesc * olWire; @@ -4576,14 +4666,14 @@ wire= *wire_inout; olWire= (xkbOverlayWireDesc *)wire; if (client->swapped) { - register int n; + int n; swapl(&olWire->name,n); } CHK_ATOM_ONLY(olWire->name); ol= XkbAddGeomOverlay(section,olWire->name,olWire->nRows); rWire= (xkbOverlayRowWireDesc *)&olWire[1]; for (r=0;rnRows;r++) { - register int k; + int k; xkbOverlayKeyWireDesc * kWire; XkbOverlayRowPtr row; @@ -4616,7 +4706,7 @@ ClientPtr client) { Status status; -register int s; +int s; char * wire; xkbSectionWireDesc * sWire; XkbSectionPtr section; @@ -4626,10 +4716,10 @@ return Success; sWire= (xkbSectionWireDesc *)wire; for (s=0;snSections;s++) { - register int r; + int r; xkbRowWireDesc * rWire; if (client->swapped) { - register int n; + int n; swapl(&sWire->name,n); swaps(&sWire->top,n); swaps(&sWire->left,n); @@ -4650,11 +4740,11 @@ section->angle= sWire->angle; rWire= (xkbRowWireDesc *)&sWire[1]; for (r=0;rnRows;r++) { - register int k; + int k; XkbRowPtr row; xkbKeyWireDesc * kWire; if (client->swapped) { - register int n; + int n; swaps(&rWire->top,n); swaps(&rWire->left,n); } @@ -4689,7 +4779,7 @@ } wire= (char *)rWire; if (sWire->nDoodads>0) { - register int d; + int d; for (d=0;dnDoodads;d++) { status=_CheckSetDoodad(&wire,geom,section,client); if (status!=Success) @@ -4697,7 +4787,7 @@ } } if (sWire->nOverlays>0) { - register int o; + int o; for (o=0;onOverlays;o++) { status= _CheckSetOverlay(&wire,geom,section,client); if (status!=Success) @@ -4717,7 +4807,7 @@ char ** wire_inout, ClientPtr client) { -register int i; +int i; char * wire; wire= *wire_inout; @@ -4728,7 +4818,7 @@ else { xkbShapeWireDesc * shapeWire; XkbShapePtr shape; - register int o; + int o; shapeWire= (xkbShapeWireDesc *)wire; for (i=0;inShapes;i++) { xkbOutlineWireDesc * olWire; @@ -4738,7 +4828,7 @@ return BadAlloc; olWire= (xkbOutlineWireDesc *)(&shapeWire[1]); for (o=0;onOutlines;o++) { - register int p; + int p; XkbPointPtr pt; xkbPointWireDesc * ptWire; @@ -4751,7 +4841,7 @@ pt->x= ptWire[p].x; pt->y= ptWire[p].y; if (client->swapped) { - register int n; + int n; swaps(&pt->x,n); swaps(&pt->y,n); } @@ -4781,7 +4871,7 @@ xkbSetGeometryReq * req, ClientPtr client) { -register int i; +int i; Status status; char * wire; @@ -4952,7 +5042,7 @@ return BadAlloc; } if (interest && want ) { - register unsigned affect; + unsigned affect; affect= stuff->ctrlsToChange; CHK_MASK_LEGAL(0x03,affect,XkbAllBooleanCtrlsMask); @@ -4975,7 +5065,7 @@ rep.autoCtrls= rep.autoCtrlValues= 0; } if ( client->swapped ) { - register int n; + int n; swaps(&rep.sequenceNumber, n); swapl(&rep.supported,n); swapl(&rep.value,n); @@ -5009,7 +5099,7 @@ GetComponentSpec(unsigned char **pWire,Bool allowExpr,int *errRtrn) { int len; -register int i; +int i; unsigned char *wire,*str,*tmp,*legal; if (allowExpr) legal= &componentExprLegal[0]; @@ -5101,7 +5191,7 @@ if (list.nTotal>list.maxRtrn) rep.extra = (list.nTotal-list.maxRtrn); if (client->swapped) { - register int n; + int n; swaps(&rep.sequenceNumber,n); swapl(&rep.length,n); swaps(&rep.nKeymaps,n); @@ -5369,7 +5459,7 @@ reported= rep.reported; if ( client->swapped ) { - register int n; + int n; swaps(&rep.sequenceNumber,n); swapl(&rep.length,n); swaps(&rep.found,n); @@ -5458,7 +5548,7 @@ XkbSrvLedInfoPtr sli) { int nNames,nMaps; -register unsigned n,bit; +unsigned n,bit; if (sli==NULL) return 0; @@ -5558,7 +5648,7 @@ wire.physIndicators= sli->physIndicators; wire.state= sli->effectiveState; if (client->swapped) { - register int n; + int n; swaps(&wire.ledClass,n); swaps(&wire.ledID,n); swapl(&wire.namesPresent,n); @@ -5569,14 +5659,14 @@ WriteToClient(client,SIZEOF(xkbDeviceLedsWireDesc),(char *)&wire); length+= SIZEOF(xkbDeviceLedsWireDesc); if (sli->namesPresent|sli->mapsPresent) { - register unsigned i,bit; + unsigned i,bit; if (sli->namesPresent) { CARD32 awire; for (i=0,bit=1;inamesPresent&bit) { awire= (CARD32)sli->names[i]; if (client->swapped) { - register int n; + int n; swapl(&awire,n); } WriteToClient(client,4,(char *)&awire); @@ -5597,7 +5687,7 @@ iwire.virtualMods= sli->maps[i].mods.vmods; iwire.ctrls= sli->maps[i].ctrls; if (client->swapped) { - register int n; + int n; swaps(&iwire.virtualMods,n); swapl(&iwire.ctrls,n); } @@ -5723,7 +5813,7 @@ rep.nBtnsWanted= stuff->nBtns; if (dev->button->xkb_acts!=NULL) { XkbAction *act; - register int i; + int i; rep.firstBtnRtrn= stuff->firstBtn; rep.nBtnsRtrn= stuff->nBtns; @@ -5754,7 +5844,7 @@ supported= rep.supported; nDeviceLedFBs = rep.nDeviceLedFBs; if (client->swapped) { - register int n; + int n; swaps(&rep.sequenceNumber,n); swapl(&rep.length,n); swaps(&rep.present,n); @@ -5823,7 +5913,7 @@ ledWire= (xkbDeviceLedsWireDesc *)wire; for (i=0;iswapped) { - register int n; + int n; swaps(&ledWire->ledClass,n); swaps(&ledWire->ledID,n); swapl(&ledWire->namesPresent,n); @@ -5834,8 +5924,8 @@ sli= XkbFindSrvLedInfo(dev,ledWire->ledClass,ledWire->ledID, XkbXI_IndicatorsMask); if (sli!=NULL) { - register int n; - register unsigned bit; + int n; + unsigned bit; int nMaps,nNames; CARD32 *atomWire; xkbIndicatorMapWireDesc *mapWire; @@ -5851,7 +5941,7 @@ if (nNames>0) { for (n=0;nswapped) { - register int t; + int t; swapl(atomWire,t); } CHK_ATOM_OR_NONE3(((Atom)(*atomWire)),client->errorValue, @@ -5863,7 +5953,7 @@ if (nMaps>0) { for (n=0;nswapped) { - register int t; + int t; swaps(&mapWire->virtualMods,t); swapl(&mapWire->ctrls,t); } @@ -5909,8 +5999,8 @@ XkbSetCauseXkbReq(&cause,X_kbSetDeviceInfo,client); ledWire= (xkbDeviceLedsWireDesc *)wire; for (i=0;iswapped ) { - register int n; + int n; swaps(&rep.sequenceNumber, n); swapl(&rep.currentFlags, n); swapl(&rep.currentCtrls, n); Index: xc/programs/Xserver/xkb/xkbAccessX.c diff -u xc/programs/Xserver/xkb/xkbAccessX.c:1.10 xc/programs/Xserver/xkb/xkbAccessX.c:1.12 --- xc/programs/Xserver/xkb/xkbAccessX.c:1.10 Mon Nov 17 17:20:46 2003 +++ xc/programs/Xserver/xkb/xkbAccessX.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xkbAccessX.c,v 1.4 2001/02/05 18:50:20 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.10 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.12 2005/10/14 15:17:28 tsi Exp $ */ #include #include @@ -36,7 +35,7 @@ #include #include #include "inputstr.h" -#include "XKBsrv.h" +#include #if !defined(WIN32) && !defined(Lynx) #include #endif @@ -446,8 +445,8 @@ /* */ /************************************************************************/ Bool -AccessXFilterPressEvent( register xEvent * xE, - register DeviceIntPtr keybd, +AccessXFilterPressEvent( xEvent * xE, + DeviceIntPtr keybd, int count) { XkbSrvInfoPtr xkbi = keybd->key->xkbInfo; @@ -581,8 +580,8 @@ /* */ /************************************************************************/ Bool -AccessXFilterReleaseEvent( register xEvent * xE, - register DeviceIntPtr keybd, +AccessXFilterReleaseEvent( xEvent * xE, + DeviceIntPtr keybd, int count) { XkbSrvInfoPtr xkbi = keybd->key->xkbInfo; @@ -689,8 +688,8 @@ /* */ /************************************************************************/ void -ProcessPointerEvent( register xEvent * xE, - register DeviceIntPtr mouse, +ProcessPointerEvent( xEvent * xE, + DeviceIntPtr mouse, int count) { DeviceIntPtr dev = (DeviceIntPtr)LookupKeyboardDevice(); Index: xc/programs/Xserver/xkb/xkbActions.c diff -u xc/programs/Xserver/xkb/xkbActions.c:3.14 xc/programs/Xserver/xkb/xkbActions.c:3.16 --- xc/programs/Xserver/xkb/xkbActions.c:3.14 Mon Nov 17 17:20:46 2003 +++ xc/programs/Xserver/xkb/xkbActions.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xkbActions.c,v 1.3 2000/08/17 19:53:47 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.14 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.16 2005/10/14 15:17:28 tsi Exp $ */ #include #include @@ -34,7 +33,7 @@ #include #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" +#include #include "xkb.h" #include @@ -156,8 +155,8 @@ } type= XkbKeyKeyType(xkb,key,effectiveGroup); if (type->map!=NULL) { - register unsigned i,mods; - register XkbKTMapEntryPtr entry; + unsigned i,mods; + XkbKTMapEntryPtr entry; mods= xkbState->mods&type->mods.mask; for (entry= type->map,i=0;imap_count;i++,entry++) { if ((entry->active)&&(entry->mods.mask==mods)) { @@ -599,7 +598,7 @@ break; case XkbSA_PtrBtn: { - register int i,nClicks; + int i,nClicks; AccessXCancelRepeatKey(xkbi,keycode); if (pAction->btn.count>0) { nClicks= pAction->btn.count; @@ -1052,7 +1051,7 @@ void ) { -register int i; +int i; if (szFilters==0) { szFilters = 4; @@ -1075,7 +1074,7 @@ static int _XkbApplyFilters(XkbSrvInfoPtr xkbi,unsigned kc,XkbAction *pAction) { -register int i,send; +int i,send; send= 1; for (i=0;i #define NEED_EVENTS 1 #include #include #include -#include "XI.h" +#include #include "inputstr.h" #include "windowstr.h" -#include "XKBsrv.h" +#include #include "xkb.h" /***====================================================================***/ @@ -42,7 +41,7 @@ void XkbSendNewKeyboardNotify(DeviceIntPtr kbd,xkbNewKeyboardNotify *pNKN) { -register int i; +int i; Time time; CARD16 changed; @@ -63,7 +62,7 @@ pNKN->time = time; pNKN->changed = changed; if ( clients[i]->swapped ) { - register int n; + int n; swaps(&pNKN->sequenceNumber,n); swapl(&pNKN->time,n); swaps(&pNKN->changed,n); @@ -103,7 +102,7 @@ XkbStatePtr state; XkbInterestPtr interest; Time time; -register CARD16 changed,bState; +CARD16 changed,bState; interest = kbd->xkb_interest; if (!interest) @@ -142,7 +141,7 @@ pSN->changed = changed; pSN->ptrBtnState = bState; if ( interest->client->swapped ) { - register int n; + int n; swaps(&pSN->sequenceNumber,n); swapl(&pSN->time,n); swaps(&pSN->changed,n); @@ -188,7 +187,7 @@ pMN->sequenceNumber = clients[i]->sequence; pMN->changed = changed; if ( clients[i]->swapped ) { - register int n; + int n; swaps(&pMN->sequenceNumber,n); swapl(&pMN->time,n); swaps(&pMN->changed,n); @@ -311,7 +310,7 @@ pCN->sequenceNumber = interest->client->sequence; pCN->time = time; if ( interest->client->swapped ) { - register int n; + int n; swaps(&pCN->sequenceNumber,n); swapl(&pCN->changedControls,n); swapl(&pCN->enabledControls,n); @@ -360,7 +359,7 @@ pEv->changed = changed; pEv->state = state; if ( interest->client->swapped ) { - register int n; + int n; swaps(&pEv->sequenceNumber,n); swapl(&pEv->time,n); swapl(&pEv->changed,n); @@ -443,7 +442,7 @@ bn.name = name; bn.window= winID; if ( interest->client->swapped ) { - register int n; + int n; swaps(&bn.sequenceNumber,n); swapl(&bn.time,n); swaps(&bn.pitch,n); @@ -490,7 +489,7 @@ pEv->slowKeysDelay = sk_delay; pEv->debounceDelay = db_delay; if ( interest->client->swapped ) { - register int n; + int n; swaps(&pEv->sequenceNumber,n); swapl(&pEv->time,n); swaps(&pEv->slowKeysDelay,n); @@ -538,7 +537,7 @@ pEv->changedIndicators = changedIndicators; pEv->changedVirtualMods= changedVirtualMods; if ( interest->client->swapped ) { - register int n; + int n; swaps(&pEv->sequenceNumber,n); swapl(&pEv->time,n); swaps(&pEv->changed,n); @@ -586,7 +585,7 @@ pEv->nSI = nSI; pEv->nTotalSI = nTotalSI; if ( interest->client->swapped ) { - register int n; + int n; swaps(&pEv->sequenceNumber,n); swapl(&pEv->time,n); swaps(&pEv->firstSI,n); @@ -632,7 +631,7 @@ pEv->sequenceNumber = interest->client->sequence; pEv->time = time; if ( interest->client->swapped ) { - register int n; + int n; swaps(&pEv->sequenceNumber,n); swapl(&pEv->time,n); } @@ -692,7 +691,7 @@ continue; } if ( interest->client->swapped ) { - register int n; + int n; swaps(&pEv->sequenceNumber,n); swapl(&pEv->time,n); swapl(&pEv->ledsDefined,n); @@ -827,7 +826,7 @@ } if ((pXDev->grab != NullGrab) && pXDev->fromPassiveGrab && ((xE[0].u.u.type==KeyPress)||(xE[0].u.u.type==KeyRelease))) { - register unsigned state,flags; + unsigned state,flags; flags= pClient->xkbClientFlags; state= xkbi->state.compat_grab_mods; @@ -865,7 +864,7 @@ } } else { - register CARD8 type; + CARD8 type; for (i=0;i #include @@ -40,8 +40,8 @@ #include "opaque.h" #include "property.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include #include #include #include "xkb.h" @@ -309,7 +309,7 @@ static Status XkbInitCompatStructs(XkbDescPtr xkb,SrvXkmInfo *file) { -register int i; +int i; XkbCompatMapPtr compat; if (file->xkbinfo.defined&XkmCompatMapMask) Index: xc/programs/Xserver/xkb/xkbLEDs.c diff -u xc/programs/Xserver/xkb/xkbLEDs.c:3.8 xc/programs/Xserver/xkb/xkbLEDs.c:3.10 --- xc/programs/Xserver/xkb/xkbLEDs.c:3.8 Mon Nov 17 17:20:46 2003 +++ xc/programs/Xserver/xkb/xkbLEDs.c Fri Oct 14 11:17:28 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xkbLEDs.c,v 1.4 2001/05/10 19:54:01 steve Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.8 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.10 2005/10/14 15:17:28 tsi Exp $ */ #include #include @@ -35,8 +34,8 @@ #include "misc.h" #include "inputstr.h" -#include "XI.h" -#include "XKBsrv.h" +#include +#include #include "xkb.h" /***====================================================================***/ @@ -56,7 +55,7 @@ unsigned long state_changes, Bool enable_changes) { -register unsigned update= 0; +unsigned update= 0; XkbSrvLedInfoPtr sli; sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0); @@ -116,8 +115,8 @@ } state= &xkbi->state; if ((map->groups)&&((map->which_groups&(~XkbIM_UseBase))!=0)) { - register int i; - register unsigned bit,match; + int i; + unsigned bit,match; if (on) match= (map->groups)&XkbAllGroupsMask; else match= (~map->groups)&XkbAllGroupsMask; @@ -143,7 +142,7 @@ } if ((map->mods.mask)&&((map->which_mods&(~XkbIM_UseBase))!=0)) { if (map->which_mods&(XkbIM_UseLocked|XkbIM_UseEffective)) { - register unsigned long old; + unsigned long old; old= state->locked_mods; if (on) state->locked_mods|= map->mods.mask; else state->locked_mods&= ~map->mods.mask; @@ -151,7 +150,7 @@ stateChange= True; } if (map->which_mods&(XkbIM_UseLatched|XkbIM_UseEffective)) { - register unsigned long newmods; + unsigned long newmods; newmods= state->latched_mods; if (on) newmods|= map->mods.mask; else newmods&= ~map->mods.mask; @@ -296,7 +295,7 @@ void XkbUpdateIndicators( DeviceIntPtr dev, - register CARD32 update, + CARD32 update, Bool check_edevs, XkbChangesPtr changes, XkbEventCausePtr cause) @@ -361,7 +360,7 @@ void XkbCheckIndicatorMaps(DeviceIntPtr dev,XkbSrvLedInfoPtr sli,unsigned which) { -register unsigned i,bit; +unsigned i,bit; XkbIndicatorMapPtr map; XkbDescPtr xkb; @@ -509,7 +508,7 @@ if ((sli->maps==NULL)&&(needed_parts&XkbXI_IndicatorMapsMask)) sli->maps= _XkbTypedCalloc(XkbNumIndicators,XkbIndicatorMapRec); if (checkNames) { - register unsigned i,bit; + unsigned i,bit; sli->namesPresent= 0; for (i=0,bit=1;inames[i]!=None) @@ -782,7 +781,7 @@ DeviceIntPtr kbd; XkbChangesRec my_changes; xkbExtensionDeviceNotify my_ed; -register unsigned i,bit,affected; +unsigned i,bit,affected; XkbIndicatorMapPtr map; unsigned oldState; Bool kb_changed; @@ -870,8 +869,8 @@ XkbControlsPtr ctrls; XkbChangesRec my_changes; xkbExtensionDeviceNotify my_ed; -register unsigned i,bit,affected; -register XkbIndicatorMapPtr map; +unsigned i,bit,affected; +XkbIndicatorMapPtr map; unsigned oldState; if ((maps_to_check==0)||(sli->maps==NULL)||(sli->mapsPresent==0)) @@ -940,7 +939,7 @@ unsigned changed, xkbExtensionDeviceNotify * ed_inout) { -register int i; +int i; for (i=0;iany.type!=XkbSA_NoAction)&& @@ -960,11 +959,11 @@ static void _UpdateMapVMods( XkbDescPtr xkb, - register XkbIndicatorMapPtr map, + XkbIndicatorMapPtr map, unsigned changed_vmods, unsigned * changed_maps_rtrn) { -register int i; +int i; *changed_maps_rtrn= 0; for (i=0;i #include @@ -34,7 +33,7 @@ #include #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" +#include #include Index: xc/programs/Xserver/xkb/xkbPrOtherEv.c diff -u xc/programs/Xserver/xkb/xkbPrOtherEv.c:1.2 xc/programs/Xserver/xkb/xkbPrOtherEv.c:1.3 --- xc/programs/Xserver/xkb/xkbPrOtherEv.c:1.2 Mon Nov 17 17:20:46 2003 +++ xc/programs/Xserver/xkb/xkbPrOtherEv.c Fri Oct 14 11:17:29 2005 @@ -1,4 +1,4 @@ -/* $Xorg: xkbPrOtherEv.c,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbPrOtherEv.c,v 1.3 2005/10/14 15:17:29 tsi Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbPrOtherEv.c,v 1.2 2003/11/17 22:20:46 dawes Exp $ */ #include #include @@ -34,10 +33,10 @@ #include #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" +#include -#include "XI.h" -#include "XIproto.h" +#include +#include extern void ProcessOtherEvent( xEvent * /* xE */, Index: xc/programs/Xserver/xkb/xkbSwap.c diff -u xc/programs/Xserver/xkb/xkbSwap.c:3.5 xc/programs/Xserver/xkb/xkbSwap.c:3.7 --- xc/programs/Xserver/xkb/xkbSwap.c:3.5 Mon Nov 17 17:20:46 2003 +++ xc/programs/Xserver/xkb/xkbSwap.c Fri Oct 14 11:17:29 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xkbSwap.c,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,17 +23,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.5 2003/11/17 22:20:46 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.7 2005/10/14 15:17:29 tsi Exp $ */ #include "stdio.h" -#include "X.h" +#include #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" -#include "XKBstr.h" +#include +#include #include "extnsionst.h" #include "xkb.h" @@ -44,7 +43,7 @@ static int SProcXkbUseExtension(ClientPtr client) { -register int n; +int n; REQUEST(xkbUseExtensionReq); @@ -58,7 +57,7 @@ static int SProcXkbSelectEvents(ClientPtr client) { -register int n; +int n; REQUEST(xkbSelectEventsReq); @@ -77,7 +76,7 @@ CARD16 *c16; CARD32 *c32; } from; - register unsigned bit,ndx,maskLeft,dataLeft,size; + unsigned bit,ndx,maskLeft,dataLeft,size; from.c8= (CARD8 *)&stuff[1]; dataLeft= (stuff->length*4)-SIZEOF(xkbSelectEventsReq); @@ -137,7 +136,7 @@ static int SProcXkbBell(ClientPtr client) { -register int n; +int n; REQUEST(xkbBellReq); @@ -156,7 +155,7 @@ static int SProcXkbGetState(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetStateReq); @@ -169,7 +168,7 @@ static int SProcXkbLatchLockState(ClientPtr client) { -register int n; +int n; REQUEST(xkbLatchLockStateReq); @@ -183,7 +182,7 @@ static int SProcXkbGetControls(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetControlsReq); @@ -196,7 +195,7 @@ static int SProcXkbSetControls(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetControlsReq); @@ -231,7 +230,7 @@ static int SProcXkbGetMap(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetMapReq); @@ -247,7 +246,7 @@ static int SProcXkbSetMap(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetMapReq); @@ -266,7 +265,7 @@ static int SProcXkbGetCompatMap(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetCompatMapReq); @@ -281,7 +280,7 @@ static int SProcXkbSetCompatMap(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetCompatMapReq); @@ -296,7 +295,7 @@ static int SProcXkbGetIndicatorState(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetIndicatorStateReq); @@ -309,7 +308,7 @@ static int SProcXkbGetIndicatorMap(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetIndicatorMapReq); @@ -323,7 +322,7 @@ static int SProcXkbSetIndicatorMap(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetIndicatorMapReq); @@ -337,7 +336,7 @@ static int SProcXkbGetNamedIndicator(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetNamedIndicatorReq); @@ -353,7 +352,7 @@ static int SProcXkbSetNamedIndicator(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetNamedIndicatorReq); @@ -372,7 +371,7 @@ static int SProcXkbGetNames(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetNamesReq); @@ -386,7 +385,7 @@ static int SProcXkbSetNames(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetNamesReq); @@ -403,7 +402,7 @@ static int SProcXkbGetGeometry(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetGeometryReq); @@ -417,7 +416,7 @@ static int SProcXkbSetGeometry(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetGeometryReq); @@ -437,7 +436,7 @@ static int SProcXkbPerClientFlags(ClientPtr client) { -register int n; +int n; REQUEST(xkbPerClientFlagsReq); @@ -455,7 +454,7 @@ static int SProcXkbListComponents(ClientPtr client) { -register int n; +int n; REQUEST(xkbListComponentsReq); @@ -469,7 +468,7 @@ static int SProcXkbGetKbdByName(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetKbdByNameReq); @@ -484,7 +483,7 @@ static int SProcXkbGetDeviceInfo(ClientPtr client) { -register int n; +int n; REQUEST(xkbGetDeviceInfoReq); @@ -500,7 +499,7 @@ static int SProcXkbSetDeviceInfo(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetDeviceInfoReq); @@ -515,7 +514,7 @@ static int SProcXkbSetDebuggingFlags(ClientPtr client) { -register int n; +int n; REQUEST(xkbSetDebuggingFlagsReq); Index: xc/programs/Xserver/xkb/xkbUtils.c diff -u xc/programs/Xserver/xkb/xkbUtils.c:3.17 xc/programs/Xserver/xkb/xkbUtils.c:3.21 --- xc/programs/Xserver/xkb/xkbUtils.c:3.17 Mon Nov 17 17:20:46 2003 +++ xc/programs/Xserver/xkb/xkbUtils.c Fri Oct 14 11:17:29 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xkbUtils.c,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,55 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.17 2003/11/17 22:20:46 dawes Exp $ */ +/* + * Copyright (c) 2005 by The XFree86 Project, Inc. + * Copyright (c) 2005 by Michal Maruska. + * All rights reserved. + * + * 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: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc 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 XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.21 2005/10/14 15:17:29 tsi Exp $ */ #include #include @@ -38,8 +85,8 @@ #include "inputstr.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "extensions/XKBgeom.h" +#include +#include #include "xkb.h" #ifdef MODE_SWITCH @@ -147,7 +194,7 @@ void XkbSetActionKeyMods(XkbDescPtr xkb,XkbAction *act,unsigned mods) { -register unsigned tmp; +unsigned tmp; switch (act->type) { case XkbSA_SetMods: case XkbSA_LatchMods: case XkbSA_LockMods: @@ -169,8 +216,8 @@ unsigned XkbMaskForVMask(XkbDescPtr xkb,unsigned vmask) { -register int i,bit; -register unsigned mask; +int i,bit; +unsigned mask; for (mask=i=0,bit=1;idesc; #ifdef DEBUG { -register unsigned i,bit; +unsigned i,bit; for (i=0,bit=1;imap.changed&(XkbVirtualModMapMask|XkbModifierMapMask)) { unsigned char newVMods[XkbNumVirtualMods]; - register unsigned bit,i; + unsigned bit,i; unsigned present; bzero(newVMods,XkbNumVirtualMods); @@ -373,10 +420,15 @@ return; } +#if 0 +extern char* ConnectionInfo; /* mmc: I think it's a precomputed byte + array to send to clients on connection.*/ +#endif + void XkbUpdateCoreDescription(DeviceIntPtr keybd,Bool resize) { -register int key,tmp; +int key,tmp; int maxSymsPerKey,maxKeysPerMod; int first,last,firstCommon,lastCommon; XkbDescPtr xkb; @@ -389,6 +441,12 @@ keyc= keybd->key; maxSymsPerKey= maxKeysPerMod= 0; bzero(keysPerMod,sizeof(keysPerMod)); + + /* mmc: + * 1/ does it start w/ keycode 0? or min? + * 2/ modifierMap is always 256 + * xkb->max_key_code might be > keyc->curKeySyms.maxKeyCode + */ memcpy(keyc->modifierMap,xkb->map->modmap,xkb->max_key_code+1); if ((xkb->min_key_code==keyc->curKeySyms.minKeyCode)&& (xkb->max_key_code==keyc->curKeySyms.maxKeyCode)) { @@ -404,6 +462,12 @@ FatalError("Couldn't allocate keysyms\n"); first= firstCommon= xkb->min_key_code; last= lastCommon= xkb->max_key_code; + +#if 0 + /* mmc: i should recompute: ConnectionInfo in dix/main.c !! */ + ((xConnSetup*) ConnectionInfo)->minKeyCode = xkb->min_key_code; + ((xConnSetup*) ConnectionInfo)->maxKeyCode = xkb->max_key_code; +#endif } else { if (xkb->min_key_codecurKeySyms.minKeyCode) { @@ -411,6 +475,7 @@ firstCommon= keyc->curKeySyms.minKeyCode; } else { + /* mmc: Core (partly) superset of xkb? */ firstCommon= xkb->min_key_code; first= keyc->curKeySyms.minKeyCode; } @@ -424,7 +489,10 @@ } } - /* determine sizes */ + /* + * Determine sizes: maxSymsPerKey and maxKeysPerMod: + * minimum 2 ! Sum of group1 & group2 ? + */ for (key=first;key<=last;key++) { if (XkbKeycodeInRange(xkb,key)) { int nGroups; @@ -442,6 +510,7 @@ tmp+= 2; else tmp+= w; } else { + /* group 1 provides more than 2: */ if ((w=XkbKeyGroupWidth(xkb,key,XkbGroup2Index))>2) tmp+= w - 2; } @@ -455,7 +524,7 @@ } if (_XkbCoreKeycodeInRange(keyc,key)) { if (keyc->modifierMap[key]!=0) { - register unsigned bit,i,mask; + unsigned bit,i,mask; mask= keyc->modifierMap[key]; for (i=0,bit=1;imaxKeysPerModifier= maxKeysPerMod; - if (maxSymsPerKey>0) { + /* Now, that we have the `maxSymsPerKey'. */ + if (maxSymsPerKey>0) { /* mmc: this could fail if ... xkb keycode range is disjoint from the core range? */ tmp= maxSymsPerKey*_XkbCoreNumKeys(keyc); keyc->curKeySyms.map= _XkbTypedRealloc(keyc->curKeySyms.map,tmp,KeySym); if (keyc->curKeySyms.map==NULL) @@ -496,6 +566,11 @@ } keyc->curKeySyms.mapWidth= maxSymsPerKey; + if (maxSymsPerKey>0) { /* mmc! */ + /* + * What use in core for keysPerMod? 8 numbers -- count of keycodes + * associtated with the modifier bit. + */ bzero(keysPerMod,sizeof(keysPerMod)); for (key=firstCommon;key<=lastCommon;key++) { if (keyc->curKeySyms.map!=NULL) { @@ -508,12 +583,15 @@ bzero(pCore,maxSymsPerKey*sizeof(KeySym)); pXKB= XkbKeySymsPtr(xkb,key); nOut= 2; + /* Copy the initial keysyms? */ if (nGroups>0) { groupWidth= XkbKeyGroupWidth(xkb,key,XkbGroup1Index); if (groupWidth>0) pCore[0]= pXKB[0]; if (groupWidth>1) pCore[1]= pXKB[1]; for (n=2;n2) nOut= groupWidth; @@ -532,7 +610,7 @@ } pXKB+= XkbKeyGroupsWidth(xkb,key); for (n=XkbGroup3Index;nmodifierMap[key]!=0) { - register unsigned bit,i,mask; + unsigned bit,i,mask; mask= keyc->modifierMap[key]; for (i=0,bit=1;ilocked_group; if (grp>=ctrls->num_groups) - state->locked_group= XkbAdjustGroup(grp,ctrls); + state->locked_group= XkbAdjustGroup(XkbCharToInt(grp),ctrls); grp= state->locked_group+state->base_group+state->latched_group; if (grp>=ctrls->num_groups) - state->group= XkbAdjustGroup(grp,ctrls); + state->group= XkbAdjustGroup(XkbCharToInt(grp),ctrls); else state->group= grp; XkbComputeCompatState(xkbi); return; @@ -882,7 +961,7 @@ } void -XkbConvertCase(register KeySym sym, KeySym *lower, KeySym *upper) +XkbConvertCase(KeySym sym, KeySym *lower, KeySym *upper) { *lower = sym; *upper = sym; Index: xc/programs/appres/Imakefile diff -u xc/programs/appres/Imakefile:1.2 xc/programs/appres/Imakefile:1.3 --- xc/programs/appres/Imakefile:1.2 Tue May 27 13:58:21 2003 +++ xc/programs/appres/Imakefile Mon Jan 9 10:00:39 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/appres/Imakefile,v 1.2 2003/05/27 17:58:21 tsi Exp $ +XCOMM $XFree86: xc/programs/appres/Imakefile,v 1.3 2006/01/09 15:00:39 dawes Exp $ DEPLIBS = $(DEPXTOOLLIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XTOOLLIB) $(XONLYLIB) Index: xc/programs/appres/appres.c diff -u xc/programs/appres/appres.c:1.4 xc/programs/appres/appres.c:1.5 --- xc/programs/appres/appres.c:1.4 Fri Dec 14 15:00:38 2001 +++ xc/programs/appres/appres.c Mon Jan 9 10:00:39 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: appres.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/appres/appres.c,v 1.4 2001/12/14 20:00:38 dawes Exp $ */ +/* $XFree86: xc/programs/appres/appres.c,v 1.5 2006/01/09 15:00:39 dawes Exp $ */ #include #include Index: xc/programs/appres/appres.man diff -u xc/programs/appres/appres.man:1.10 xc/programs/appres/appres.man:1.11 --- xc/programs/appres/appres.man:1.10 Thu Feb 10 22:03:11 2005 +++ xc/programs/appres/appres.man Mon Jan 9 10:00:39 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: appres.man,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/appres/appres.man,v 1.10 2005/02/11 03:03:11 dawes Exp $ +.\" $XFree86: xc/programs/appres/appres.man,v 1.11 2006/01/09 15:00:39 dawes Exp $ .\" .TH APPRES 1 __vendorversion__ .SH NAME Index: xc/programs/bdftopcf/Imakefile diff -u xc/programs/bdftopcf/Imakefile:3.10 xc/programs/bdftopcf/Imakefile:3.11 --- xc/programs/bdftopcf/Imakefile:3.10 Tue Jul 31 20:45:00 2001 +++ xc/programs/bdftopcf/Imakefile Fri Oct 14 11:17:30 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:48 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/bdftopcf/Imakefile,v 3.10 2001/08/01 00:45:00 tsi Exp $ +XCOMM $XFree86: xc/programs/bdftopcf/Imakefile,v 3.11 2005/10/14 15:17:30 tsi Exp $ #if GzipFontCompression ZLIB = GzipLibrary @@ -11,7 +6,7 @@ LOCAL_LIBRARIES = $(FONTLIB) SYS_LIBRARIES = $(ZLIB) MathLibrary DEPLIBS = $(DEPFONTLIB) -INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include -I$(FONTLIBSRC)/bitmap +INCLUDES = -I$(FONTLIBSRC)/include -I$(FONTLIBSRC)/bitmap SRCS = bdftopcf.c OBJS = bdftopcf.o Index: xc/programs/bdftopcf/bdftopcf.c diff -u xc/programs/bdftopcf/bdftopcf.c:1.6 xc/programs/bdftopcf/bdftopcf.c:1.7 --- xc/programs/bdftopcf/bdftopcf.c:1.6 Thu Dec 16 15:26:24 2004 +++ xc/programs/bdftopcf/bdftopcf.c Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: bdftopcf.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ +/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.7 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1991, 1993, 1998 The Open Group @@ -27,12 +27,10 @@ */ -/* $XFree86: xc/programs/bdftopcf/bdftopcf.c,v 1.6 2004/12/16 20:26:24 dawes Exp $ */ - #include #include #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fntfilio.h" #include "fntfil.h" #include "bdfint.h" Index: xc/programs/bdftopcf/bdftopcf.man diff -u xc/programs/bdftopcf/bdftopcf.man:1.9 xc/programs/bdftopcf/bdftopcf.man:1.10 --- xc/programs/bdftopcf/bdftopcf.man:1.9 Thu Feb 10 22:03:11 2005 +++ xc/programs/bdftopcf/bdftopcf.man Mon Jan 9 10:00:39 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: bdftopcf.man,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/bdftopcf/bdftopcf.man,v 1.9 2005/02/11 03:03:11 dawes Exp $ +.\" $XFree86: xc/programs/bdftopcf/bdftopcf.man,v 1.10 2006/01/09 15:00:39 dawes Exp $ .\" .TH BDFTOPCF 1 __vendorversion__ .SH NAME Index: xc/programs/beforelight/Imakefile diff -u xc/programs/beforelight/Imakefile:3.6 xc/programs/beforelight/Imakefile:3.7 --- xc/programs/beforelight/Imakefile:3.6 Fri Oct 24 16:38:10 2003 +++ xc/programs/beforelight/Imakefile Mon Jan 9 10:00:39 2006 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.2 93/09/18 16:23:30 rws Exp $ -XCOMM $XFree86: xc/programs/beforelight/Imakefile,v 3.6 2003/10/24 20:38:10 tsi Exp $ +XCOMM $XFree86: xc/programs/beforelight/Imakefile,v 3.7 2006/01/09 15:00:39 dawes Exp $ + DEPLIBS = $(DEPXSSLIB) $(DEPXTOOLLIB) $(DEPXLIB) LOCAL_LIBRARIES = $(XSSLIB) $(XTOOLLIB) $(XLIB) SRCS = b4light.c Index: xc/programs/beforelight/b4light.c diff -u xc/programs/beforelight/b4light.c:3.8 xc/programs/beforelight/b4light.c:3.9 --- xc/programs/beforelight/b4light.c:3.8 Sat Apr 3 17:38:53 2004 +++ xc/programs/beforelight/b4light.c Mon Jan 9 10:00:39 2006 @@ -1,5 +1,4 @@ /* - * $XConsortium: b4light.c,v 1.3 94/04/17 20:59:38 rws Exp $ * Copyright (c) 1992 X Consortium @@ -26,7 +25,7 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/beforelight/b4light.c,v 3.8 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/beforelight/b4light.c,v 3.9 2006/01/09 15:00:39 dawes Exp $ */ #include #include Index: xc/programs/bitmap/BitEdit.c diff -u xc/programs/bitmap/BitEdit.c:1.7 xc/programs/bitmap/BitEdit.c:1.8 --- xc/programs/bitmap/BitEdit.c:1.7 Tue May 27 18:26:55 2003 +++ xc/programs/bitmap/BitEdit.c Mon Jan 9 10:00:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: BitEdit.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.7 2003/05/27 22:26:55 tsi Exp $ */ +/* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.8 2006/01/09 15:00:39 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/Bitmap-co.ad diff -u xc/programs/bitmap/Bitmap-co.ad:1.1.1.2 xc/programs/bitmap/Bitmap-co.ad:1.2 --- xc/programs/bitmap/Bitmap-co.ad:1.1.1.2 Tue Jan 16 17:45:20 2001 +++ xc/programs/bitmap/Bitmap-co.ad Mon Jan 9 10:00:39 2006 @@ -1,4 +1,4 @@ -! $Xorg: Bitmap-co.ad,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ +! $XFree86: xc/programs/bitmap/Bitmap-co.ad,v 1.2 2006/01/09 15:00:39 dawes Exp $ ! The App-defaults file for Bitmap on a color screen. #include "Bitmap" Index: xc/programs/bitmap/Bitmap-nocase.ad diff -u xc/programs/bitmap/Bitmap-nocase.ad:1.1 xc/programs/bitmap/Bitmap-nocase.ad:1.2 --- xc/programs/bitmap/Bitmap-nocase.ad:1.1 Wed May 29 17:37:42 2002 +++ xc/programs/bitmap/Bitmap-nocase.ad Mon Jan 9 10:00:39 2006 @@ -1,6 +1,4 @@ -! $Xorg: Bitmap.ad,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ -! -! $XFree86: xc/programs/bitmap/Bitmap-nocase.ad,v 1.1 2002/05/29 21:37:42 torrey Exp $ +! $XFree86: xc/programs/bitmap/Bitmap-nocase.ad,v 1.2 2006/01/09 15:00:39 dawes Exp $ ! ! The App-defaults file for Bitmap for use on file systems ! that are not case sensitive. Index: xc/programs/bitmap/Bitmap.ad diff -u xc/programs/bitmap/Bitmap.ad:3.1 xc/programs/bitmap/Bitmap.ad:3.2 --- xc/programs/bitmap/Bitmap.ad:3.1 Wed Jan 17 18:44:50 2001 +++ xc/programs/bitmap/Bitmap.ad Mon Jan 9 10:00:39 2006 @@ -1,4 +1,4 @@ -! $Xorg: Bitmap.ad,v 1.3 2000/08/17 19:53:49 cpqbld Exp $ +! $XFree86: xc/programs/bitmap/Bitmap.ad,v 3.2 2006/01/09 15:00:39 dawes Exp $ ! The App-defaults file for Bitmap. *TransientShell.allowShellResize: True Index: xc/programs/bitmap/Bitmap.c diff -u xc/programs/bitmap/Bitmap.c:1.6 xc/programs/bitmap/Bitmap.c:1.7 --- xc/programs/bitmap/Bitmap.c:1.6 Mon Feb 18 16:43:17 2002 +++ xc/programs/bitmap/Bitmap.c Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Bitmap.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.6 2002/02/18 21:43:17 herrb Exp $ */ +/* $XFree86: xc/programs/bitmap/Bitmap.c,v 1.7 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/Bitmap.h diff -u xc/programs/bitmap/Bitmap.h:1.5 xc/programs/bitmap/Bitmap.h:1.6 --- xc/programs/bitmap/Bitmap.h:1.5 Fri Dec 14 15:00:40 2001 +++ xc/programs/bitmap/Bitmap.h Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Bitmap.h,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Bitmap.h,v 1.5 2001/12/14 20:00:40 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Bitmap.h,v 1.6 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/BitmapP.h diff -u xc/programs/bitmap/BitmapP.h:1.4 xc/programs/bitmap/BitmapP.h:1.5 --- xc/programs/bitmap/BitmapP.h:1.4 Fri Dec 14 15:00:40 2001 +++ xc/programs/bitmap/BitmapP.h Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: BitmapP.h,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/BitmapP.h,v 1.4 2001/12/14 20:00:40 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/BitmapP.h,v 1.5 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/CutPaste.c diff -u xc/programs/bitmap/CutPaste.c:1.5 xc/programs/bitmap/CutPaste.c:1.6 --- xc/programs/bitmap/CutPaste.c:1.5 Mon Feb 18 16:43:17 2002 +++ xc/programs/bitmap/CutPaste.c Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CutPaste.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/CutPaste.c,v 1.5 2002/02/18 21:43:17 herrb Exp $ */ +/* $XFree86: xc/programs/bitmap/CutPaste.c,v 1.6 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/Dialog.c diff -u xc/programs/bitmap/Dialog.c:1.4 xc/programs/bitmap/Dialog.c:1.5 --- xc/programs/bitmap/Dialog.c:1.4 Fri Dec 14 15:00:40 2001 +++ xc/programs/bitmap/Dialog.c Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Dialog.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Dialog.c,v 1.4 2001/12/14 20:00:40 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Dialog.c,v 1.5 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/Dialog.h diff -u xc/programs/bitmap/Dialog.h:1.4 xc/programs/bitmap/Dialog.h:1.5 --- xc/programs/bitmap/Dialog.h:1.4 Fri Dec 14 15:00:40 2001 +++ xc/programs/bitmap/Dialog.h Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Dialog.h,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Dialog.h,v 1.4 2001/12/14 20:00:40 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Dialog.h,v 1.5 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/Graphics.c diff -u xc/programs/bitmap/Graphics.c:1.6 xc/programs/bitmap/Graphics.c:1.7 --- xc/programs/bitmap/Graphics.c:1.6 Fri Dec 14 15:00:40 2001 +++ xc/programs/bitmap/Graphics.c Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Graphics.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Graphics.c,v 1.6 2001/12/14 20:00:40 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Graphics.c,v 1.7 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/Handlers.c diff -u xc/programs/bitmap/Handlers.c:1.5 xc/programs/bitmap/Handlers.c:1.6 --- xc/programs/bitmap/Handlers.c:1.5 Mon Feb 18 16:43:17 2002 +++ xc/programs/bitmap/Handlers.c Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Handlers.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Handlers.c,v 1.5 2002/02/18 21:43:17 herrb Exp $ */ +/* $XFree86: xc/programs/bitmap/Handlers.c,v 1.6 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/Imakefile diff -u xc/programs/bitmap/Imakefile:3.7 xc/programs/bitmap/Imakefile:3.8 --- xc/programs/bitmap/Imakefile:3.7 Fri May 31 14:46:07 2002 +++ xc/programs/bitmap/Imakefile Mon Jan 9 10:00:40 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:50 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/bitmap/Imakefile,v 3.7 2002/05/31 18:46:07 dawes Exp $ +XCOMM $XFree86: xc/programs/bitmap/Imakefile,v 3.8 2006/01/09 15:00:40 dawes Exp $ #if CaseSensitiveFileSystem BUTTONPICTURES = \ Index: xc/programs/bitmap/ReqMach.c diff -u xc/programs/bitmap/ReqMach.c:1.5 xc/programs/bitmap/ReqMach.c:1.6 --- xc/programs/bitmap/ReqMach.c:1.5 Mon Feb 18 16:43:17 2002 +++ xc/programs/bitmap/ReqMach.c Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ReqMach.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/ReqMach.c,v 1.5 2002/02/18 21:43:17 herrb Exp $ */ +/* $XFree86: xc/programs/bitmap/ReqMach.c,v 1.6 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/Requests.h diff -u xc/programs/bitmap/Requests.h:1.5 xc/programs/bitmap/Requests.h:1.6 --- xc/programs/bitmap/Requests.h:1.5 Fri Dec 14 15:00:41 2001 +++ xc/programs/bitmap/Requests.h Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Requests.h,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/Requests.h,v 1.5 2001/12/14 20:00:41 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/Requests.h,v 1.6 2006/01/09 15:00:40 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/bitmap/atobm.c diff -u xc/programs/bitmap/atobm.c:3.5 xc/programs/bitmap/atobm.c:3.6 --- xc/programs/bitmap/atobm.c:3.5 Fri Dec 14 15:00:41 2001 +++ xc/programs/bitmap/atobm.c Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: atobm.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1988, 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/atobm.c,v 3.5 2001/12/14 20:00:41 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/atobm.c,v 3.6 2006/01/09 15:00:40 dawes Exp $ */ /* * atobm - ascii to bitmap filter Index: xc/programs/bitmap/bitmap.man diff -u xc/programs/bitmap/bitmap.man:1.9 xc/programs/bitmap/bitmap.man:1.10 --- xc/programs/bitmap/bitmap.man:1.9 Thu Feb 10 22:03:12 2005 +++ xc/programs/bitmap/bitmap.man Mon Jan 9 10:00:40 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: bitmap.man,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/bitmap/bitmap.man,v 1.9 2005/02/11 03:03:12 dawes Exp $ +.\" $XFree86: xc/programs/bitmap/bitmap.man,v 1.10 2006/01/09 15:00:40 dawes Exp $ .\" .TH BITMAP 1 __vendorversion__ .SH NAME Index: xc/programs/bitmap/bmtoa.c diff -u xc/programs/bitmap/bmtoa.c:3.7 xc/programs/bitmap/bmtoa.c:3.9 --- xc/programs/bitmap/bmtoa.c:3.7 Fri Dec 14 15:00:41 2001 +++ xc/programs/bitmap/bmtoa.c Sun Feb 19 19:14:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: bmtoa.c,v 1.4 2001/02/09 02:05:28 xorgcvs Exp $ */ /* Copyright 1988, 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/bitmap/bmtoa.c,v 3.7 2001/12/14 20:00:41 dawes Exp $ */ +/* $XFree86: xc/programs/bitmap/bmtoa.c,v 3.9 2006/02/20 00:14:38 dawes Exp $ */ /* * bmtoa - bitmap to ascii filter @@ -42,9 +41,6 @@ #include #include -#ifndef HAS_MKSTEMP -extern char *mktemp(); -#endif char *ProgramName; Index: xc/programs/dbedizzy/Imakefile diff -u /dev/null xc/programs/dbedizzy/Imakefile:1.1 --- /dev/null Tue May 9 21:58:15 2006 +++ xc/programs/dbedizzy/Imakefile Sat Jan 28 20:12:29 2006 @@ -0,0 +1,11 @@ +XCOMM $XFree86: xc/programs/dbedizzy/Imakefile,v 1.1 2006/01/29 01:12:29 tsi Exp $ + + DEFINES = DBEDefines + DEPLIBS = $(DEPXLIB) +LOCAL_LIBRARIES = $(XLIB) + SYS_LIBRARIES = MathLibrary + + SRCS = dbedizzy.c + OBJS = dbedizzy.o + +ComplexProgramTargetNoMan(dbedizzy) Index: xc/programs/dbedizzy/dbedizzy.c diff -u /dev/null xc/programs/dbedizzy/dbedizzy.c:1.1 --- /dev/null Tue May 9 21:58:15 2006 +++ xc/programs/dbedizzy/dbedizzy.c Sat Jan 28 20:12:29 2006 @@ -0,0 +1,497 @@ +/* $XFree86: xc/programs/dbedizzy/dbedizzy.c,v 1.1 2006/01/29 01:12:29 tsi Exp $ */ +/****************************************************************************** + * + * Copyright (c) 1994, 1995 Silicon Graphics Inc. + * + * 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 name of Silicon Graphics not be + * used in advertising or publicity pertaining to distribution + * of the software without specific prior written permission. + * Silicon Graphics makes no representation about the suitability + * of this software for any purpose. It is provided "as is" + * without any express or implied warranty. + * + * SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON + * GRAPHICS 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. + * + *****************************************************************************/ + +/* + * dbedizzy - demo of DBE creating a double buffered spinning scene + * + * Original dizzy program written by Mark Kilgard. + * + * Adapted to use DBE for double buffering by Allen Leinwand, 2/24/95 . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Global variables */ +static char *ProgName; +static Display *dpy; +static int black, pink, green, orange, blue; +static int width = 300; +static int height = 300; +static Window win; +static XID buf; +static XdbeSwapInfo swapInfo; +static GC gc; +static float rotation = 0.0; +static float delta = 0.05; +static int paused = 0; +static int manual_paused = 0; + +/* Default values for unspecified command line arguments */ +static char *display_name = NULL; +static int class = PseudoColor; +static int depth = 0; +static int listVis = 0; +static int slow = 0; +static int spokes = 10; +static int db = 1; +static int verbose = 0; +static int visid = 0; + +static char *help_message[] = { +" where options include:", +" -display host:dpy X server connection to use", +" -class [pseudo,true] class of visual to use", +" -depth n depth of visual to use", +" -help print this message", +" -list list double buffer capable visuals", +" -slow rotate image slowly", +" -spokes n specify number of spokes to draw", +" -nodb single buffer (ignore -class, -depth, -visid)", +" -verbose produce chatty messages while running", +" -visid [nn,0xnn] visual ID to use (ignore -class, -depth)", +NULL}; + +static void +usage(void) +{ + char **cpp; + + fprintf (stderr, "\nusage: %s [-options ...]\n", ProgName); + for (cpp = help_message; *cpp; cpp++) { + fprintf (stderr, "%s\n", *cpp); + } + fprintf (stderr, "\n"); +} + +static int +getColor(Colormap cmap, char *color_name) +{ + XColor color; + XColor exact; + int status; + + status = XAllocNamedColor(dpy, cmap, color_name, &color, &exact); + if (status == 0) { + fprintf(stderr, "%s: Couldn't get color: %s\n", ProgName, color_name); + exit(1); + } + return (color.pixel); +} + +#define RATIO1 0.4 +#define RATIO2 0.7 +#define RATIO3 0.95 + +#ifndef M_PI +#define M_PI 3.1415927 +#endif + +#define ANGLE (M_PI*2/spokes) + +static void +redraw(void) +{ + int i; + int x, y; + XPoint pnt[4]; + + if (verbose) { + printf("redraw.\n"); + } + if (!db) { + XClearWindow(dpy, win); + } + x = width / 2; + x += (int) (sin(rotation * 2) * 20); + y = height / 2; + y += (int) (cos(rotation * 2) * 20); + for (i = 5; i < 20; i += 3) { + XSetForeground(dpy, gc, orange); + XDrawArc(dpy, buf, gc, x - i * 10, y - i * 10, + i * 20, i * 20, 0, 360 * 64); + XSetForeground(dpy, gc, green); + XDrawArc(dpy, buf, gc, x - i * 10 - 5, y - i * 10 - 5, + i * 20 + 10, i * 20 + 10, 0, 360 * 64); + XSetForeground(dpy, gc, blue); + XDrawArc(dpy, buf, gc, x - i * 10 - 10, y - i * 10 - 10, + i * 20 + 20, i * 20 + 20, 0, 360 * 64); + } + x = width / 2; + y = height / 2; + XSetForeground(dpy, gc, pink); + pnt[0].x = x; + pnt[0].y = y; + for (i = 0; i < spokes; i++) { + pnt[1].x = (int) (cos(i * ANGLE + rotation) * (RATIO1 * x)) + x; + pnt[1].y = (int) (sin(i * ANGLE + rotation) * (RATIO1 * y)) + y; + pnt[2].x = (int) (cos(i * ANGLE + rotation - 0.1) * (RATIO2 * x)) + x; + pnt[2].y = (int) (sin(i * ANGLE + rotation - 0.1) * (RATIO2 * y)) + y; + pnt[3].x = (int) (cos(i * ANGLE + rotation - 0.2) * (RATIO3 * x)) + x; + pnt[3].y = (int) (sin(i * ANGLE + rotation - 0.2) * (RATIO3 * y)) + y; + XDrawLines(dpy, buf, gc, pnt, 4, CoordModeOrigin); + } + if (db) { + XdbeSwapBuffers(dpy, &swapInfo, 1); + } +} + +static Visual * +choose_DB_visual( /* Input */ Display *dpy, int listVis, int class, + /* Input, Output */ int *pDepth) +{ + Drawable screen_list[1]; + int num_screens; + XdbeScreenVisualInfo *DBEvisInfo; + int i, nitems; + int chosenDepth = 0; + Visual *chosenVisual = NULL; + XVisualInfo vinfo_template, *XvisInfo; + char visualClassName[12]; + + screen_list[0] = DefaultRootWindow(dpy); + num_screens = 1; + DBEvisInfo = XdbeGetVisualInfo(dpy, screen_list, &num_screens); + if (DBEvisInfo == NULL) { + fprintf(stderr, "XdbeGetVisualInfo returned NULL\n"); + return (NULL); + } + + if (listVis) { + printf("\nThe double buffer capable visuals are:\n"); + printf(" visual ID depth class\n"); + } + for (i = 0; i < DBEvisInfo->count; i++) { + + vinfo_template.visualid = DBEvisInfo->visinfo[i].visual; + XvisInfo = XGetVisualInfo(dpy, VisualIDMask, + &vinfo_template, &nitems); + if (XvisInfo == NULL) { + fprintf(stderr, + "%s: XGetVisualInfo returned NULL for visual %ld\n", + ProgName, (unsigned long)vinfo_template.visualid); + return (NULL); + } + if (listVis) { + if (XvisInfo->class == PseudoColor) + strcpy(visualClassName, "PseudoColor"); + else + strcpy(visualClassName, "TrueColor"); + + printf(" %#4lx %4d %s\n", + (unsigned long)DBEvisInfo->visinfo[i].visual, + DBEvisInfo->visinfo[i].depth, + visualClassName); + } + + if (visid) { + if (XvisInfo->visualid == visid) { + chosenVisual = XvisInfo->visual; + chosenDepth = XvisInfo->depth; + } + } + else if (XvisInfo->class == class) { + if (*pDepth == 0) { + /* Choose first deepest visual of matching class. */ + if (DBEvisInfo->visinfo[i].depth > chosenDepth) { + chosenVisual = XvisInfo->visual; + chosenDepth = XvisInfo->depth; + } + } + else { + /* Choose last visual of matching depth and class. */ + if (DBEvisInfo->visinfo[i].depth == *pDepth) { + chosenVisual = XvisInfo->visual; + chosenDepth = XvisInfo->depth; + } + } + } + } + + if (chosenVisual) { + if (listVis) { + printf("\n"); + } + *pDepth = chosenDepth; + return (chosenVisual); + } + else { + return (NULL); + } +} + +int +main(int argc, char *argv[]) +{ + int i; + XSetWindowAttributes attrs; + Visual *visual; + Colormap cmap; + XGCValues gcvals; + fd_set select_mask; + int fd; + struct timeval timeout; + int new_event; + int pending; + + ProgName = argv[0]; + + for (i = 1; i < argc; i++) { + char *arg; + + arg = argv[i]; + if (strcmp(arg, "-display") == 0) { + if (++i >= argc) { + fprintf(stderr, "%s: Missing argument to -display\n", ProgName); + exit(1); + } + display_name = argv[i]; + } else if (strcmp(arg, "-class") == 0) { + arg = argv[++i]; + if (arg == NULL) { + fprintf(stderr, "%s: Missing argument to -class\n", ProgName); + exit(1); + } + if (strcmp(arg, "True") == 0) + class = TrueColor; + else if (strcmp(arg, "Pseudo") == 0) + class = PseudoColor; + else { + fprintf(stderr, "%s: Wrong argument %s for -class\n", + ProgName, arg); + exit(1); + } + } else if (strcmp(arg, "-depth") == 0) { + arg = argv[++i]; + if (arg == NULL) { + fprintf(stderr, "%s: Missing argument to -depth\n", ProgName); + exit(1); + } + depth = atoi(arg); + } else if (strcmp(arg, "-help") == 0) { + usage(); + } else if (strcmp(arg, "-list") == 0) { + listVis = 1; + } else if (strcmp(arg, "-slow") == 0) { + slow = 1; + } else if (strcmp(arg, "-spokes") == 0) { + arg = argv[++i]; + if (arg == NULL) { + fprintf(stderr, "%s: Missing argument to -spokes\n", ProgName); + exit(1); + } + spokes = atoi(arg); + } else if (strcmp(arg, "-nodb") == 0) { + db = 0; + } else if (strcmp(arg, "-verbose") == 0) { + verbose = 1; + } else if (strcmp(arg, "-visid") == 0) { + arg = argv[++i]; + if (arg == NULL) { + fprintf(stderr, "%s: Missing argument to -visid\n", ProgName); + exit(1); + } + visid = (int) strtol(arg, (char **)NULL, 0); + } + else { + fprintf(stderr, "%s: Unrecognized option %s\n", ProgName, arg); + usage(); + exit(1); + } + } + + dpy = XOpenDisplay(display_name); + if (dpy == NULL) { + fprintf(stderr, "%s: Cannot open display %s\n", + ProgName, XDisplayName(display_name)); + exit(1); + } + + if (db) { + int majorVersion, minorVersion; + + if (!XdbeQueryExtension (dpy, &majorVersion, &minorVersion)) { + fprintf(stderr, "%s: XdbeQueryExtension() failed.\n", ProgName); + exit(1); + } + + if ((visual = choose_DB_visual(dpy, listVis, class, &depth)) == NULL) { + fprintf(stderr, + "%s: Failed to find matching double buffer capable visual.\n", + ProgName); + exit(1); + } + fprintf(stdout, "%s: Chose visual ID: %#lx depth: %d\n\n", + ProgName, (unsigned long)visual->visualid, depth); + } + else { + /* No double buffering: ignore class, depth; use default visual. */ + visual = DefaultVisual(dpy, DefaultScreen(dpy)); + depth = DefaultDepth(dpy, DefaultScreen(dpy)); + } + + cmap = XCreateColormap(dpy, DefaultRootWindow(dpy), visual, AllocNone); + black = getColor(cmap, "black"); + pink = getColor(cmap, "pink"); + green = getColor(cmap, "green"); + orange = getColor(cmap, "orange"); + blue = getColor(cmap, "blue"); + attrs.colormap = cmap; + attrs.background_pixel = black; + attrs.border_pixel = black; + win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, width, height, + 0, depth, InputOutput, visual, + CWBorderPixel | CWColormap | CWBackPixel, &attrs); + XSetStandardProperties(dpy, win, "DBE dizzy demo", ProgName, None, + argv, argc, NULL); + XSelectInput(dpy, win, + VisibilityChangeMask | ExposureMask | ButtonPressMask | KeyPressMask | + StructureNotifyMask); + if (db) { + swapInfo.swap_action = XdbeBackground; + buf = XdbeAllocateBackBufferName (dpy, win, swapInfo.swap_action); + if (buf == None) { + fprintf(stderr, "%s: Couldn't create buffers\n", ProgName); + exit(1); + } + else { + swapInfo.swap_window = win; + } + } + else { + buf = win; /* No double buffering. */ + } + + gcvals.line_width = 8; + gcvals.cap_style = CapRound; + gc = XCreateGC(dpy, win, GCLineWidth | GCCapStyle, &gcvals); + + XMapWindow(dpy, win); + + fd = ConnectionNumber(dpy); + FD_ZERO(&select_mask); + FD_SET(fd, &select_mask); + + while (1) { + XEvent event; + + if (!paused && !manual_paused) { + pending = XEventsQueued(dpy, QueuedAfterFlush); + if (pending == 0) { + do { + XFlush(dpy); + FD_ZERO(&select_mask); + FD_SET(fd, &select_mask); + if (slow) { + timeout.tv_sec = 2; + timeout.tv_usec = 0; + } else { + timeout.tv_sec = 0; + timeout.tv_usec = 100000; + } + new_event = + select(fd + 1, &select_mask, NULL, NULL, &timeout); + rotation = rotation + delta; + redraw(); + } while (new_event == 0); + } + } + XNextEvent(dpy, &event); + switch (event.type) { + case MapNotify: + if (verbose) + printf("mapping...\n"); + paused = 0; + break; + case UnmapNotify: + if (verbose) + printf("unmapping...\n"); + paused = 1; + break; + case VisibilityNotify: + switch (event.xvisibility.state) { + case VisibilityUnobscured: + case VisibilityPartiallyObscured: + if (verbose) + printf("resuming...\n"); + paused = 0; + break; + case VisibilityFullyObscured: + if (verbose) + printf("pausing...\n"); + paused = 1; + break; + } + break; + case Expose: + if (verbose) + printf("expose.\n"); + while (XCheckTypedEvent(dpy, Expose, &event)); + redraw(); + break; + case ButtonPress: + switch (event.xbutton.button) { + case 1: + printf("faster: %g\n", delta); + delta += 0.005; + break; + case 2: + printf("slower: %g\n", delta); + delta += -0.005; + break; + case 3: + if (manual_paused) { + printf("manual resume.\n"); + manual_paused = 0; + } else { + printf("manual pause.\n"); + manual_paused = 1; + } + } + break; + case KeyPress: + printf("done.\n"); + exit(1); + break; + case ConfigureNotify: + if (verbose) { + printf("resizing.\n"); + } + width = event.xconfigure.width; + height = event.xconfigure.height; + break; + } + } +} Index: xc/programs/dpsexec/dpsexec.man diff -u xc/programs/dpsexec/dpsexec.man:1.1 xc/programs/dpsexec/dpsexec.man:1.2 --- xc/programs/dpsexec/dpsexec.man:1.1 Wed Feb 28 20:23:58 2001 +++ xc/programs/dpsexec/dpsexec.man Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ -.\" Id: dpsexec.man,v 6.1 1994/05/18 23:21:36 asente Exp $ -.\" $XFree86: xc/programs/dpsexec/dpsexec.man,v 1.1 2001/03/01 01:23:58 dawes Exp $ +.\" $XFree86: xc/programs/dpsexec/dpsexec.man,v 1.2 2006/01/09 15:00:41 dawes Exp $ .TH DPSEXEC 1 __vendorversion__ .SH NAME dpsexec \- Display PostScript Executive Index: xc/programs/editres/Edit-col.ad diff -u xc/programs/editres/Edit-col.ad:1.4 xc/programs/editres/Edit-col.ad:1.5 --- xc/programs/editres/Edit-col.ad:1.4 Thu Jul 4 13:04:23 2002 +++ xc/programs/editres/Edit-col.ad Mon Jan 9 10:00:41 2006 @@ -1,7 +1,6 @@ -! $Xorg: Edit-col.ad,v 1.3 2000/08/17 19:53:50 cpqbld Exp $ ! Here are some suggested resources if you are using a color workstation. ! They look pretty good on my display, your mileage may vary. -! $XFree86: xc/programs/editres/Edit-col.ad,v 1.4 2002/07/04 17:04:23 paulo Exp $ +! $XFree86: xc/programs/editres/Edit-col.ad,v 1.5 2006/01/09 15:00:41 dawes Exp $ #include "Editres" Index: xc/programs/editres/Editres.ad diff -u xc/programs/editres/Editres.ad:1.4 xc/programs/editres/Editres.ad:1.5 --- xc/programs/editres/Editres.ad:1.4 Thu Jul 4 13:04:23 2002 +++ xc/programs/editres/Editres.ad Mon Jan 9 10:00:41 2006 @@ -1,9 +1,4 @@ -! $Xorg: Editres.ad,v 1.3 2000/08/17 19:53:51 cpqbld Exp $ -! -! -! -! -! $XFree86: xc/programs/editres/Editres.ad,v 1.4 2002/07/04 17:04:23 paulo Exp $ +! $XFree86: xc/programs/editres/Editres.ad,v 1.5 2006/01/09 15:00:41 dawes Exp $ ! ! The App-defaults file for Editres. Index: xc/programs/editres/Imakefile diff -u xc/programs/editres/Imakefile:1.1.1.3 xc/programs/editres/Imakefile:1.2 --- xc/programs/editres/Imakefile:1.1.1.3 Tue Jan 16 17:45:28 2001 +++ xc/programs/editres/Imakefile Mon Jan 9 10:00:41 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:51 cpqbld Exp $ +XCOMM $XFree86: xc/programs/editres/Imakefile,v 1.2 2006/01/09 15:00:41 dawes Exp $ + DEPLIBS = XawClientDepLibs XkbClientDepLibs LOCAL_LIBRARIES = XawClientLibs XkbClientLibs SRCS = actions.c comm.c editres.c geometry.c handler.c setvalues.c \ Index: xc/programs/editres/actions.c diff -u xc/programs/editres/actions.c:1.7 xc/programs/editres/actions.c:1.8 --- xc/programs/editres/actions.c:1.7 Tue May 27 18:26:55 2003 +++ xc/programs/editres/actions.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: actions.c,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/editres/actions.c,v 1.7 2003/05/27 22:26:55 tsi Exp $ */ +/* $XFree86: xc/programs/editres/actions.c,v 1.8 2006/01/09 15:00:41 dawes Exp $ */ #include #include Index: xc/programs/editres/comm.c diff -u xc/programs/editres/comm.c:1.5 xc/programs/editres/comm.c:1.6 --- xc/programs/editres/comm.c:1.5 Fri Dec 14 15:00:42 2001 +++ xc/programs/editres/comm.c Mon Jan 9 10:00:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: comm.c,v 1.5 2001/02/09 02:05:29 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/editres/comm.c,v 1.5 2001/12/14 20:00:42 dawes Exp $ */ +/* $XFree86: xc/programs/editres/comm.c,v 1.6 2006/01/09 15:00:41 dawes Exp $ */ /* Index: xc/programs/editres/editres.c diff -u xc/programs/editres/editres.c:1.7 xc/programs/editres/editres.c:1.8 --- xc/programs/editres/editres.c:1.7 Fri Dec 14 15:00:42 2001 +++ xc/programs/editres/editres.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: editres.c,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/editres/editres.c,v 1.7 2001/12/14 20:00:42 dawes Exp $ */ +/* $XFree86: xc/programs/editres/editres.c,v 1.8 2006/01/09 15:00:41 dawes Exp $ */ #include #include Index: xc/programs/editres/editres.man diff -u xc/programs/editres/editres.man:1.10 xc/programs/editres/editres.man:1.11 --- xc/programs/editres/editres.man:1.10 Thu Feb 10 22:03:12 2005 +++ xc/programs/editres/editres.man Mon Jan 9 10:00:41 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: editres.man,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/editres/editres.man,v 1.10 2005/02/11 03:03:12 dawes Exp $ +.\" $XFree86: xc/programs/editres/editres.man,v 1.11 2006/01/09 15:00:41 dawes Exp $ .\" .TH EDITRES 1 __vendorversion__ .SH NAME Index: xc/programs/editres/editresP.h diff -u xc/programs/editres/editresP.h:1.7 xc/programs/editres/editresP.h:1.8 --- xc/programs/editres/editresP.h:1.7 Fri Dec 14 15:00:42 2001 +++ xc/programs/editres/editresP.h Mon Jan 9 10:00:41 2006 @@ -1,6 +1,4 @@ - /* - * $Xorg: editresP.h,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/editresP.h,v 1.7 2001/12/14 20:00:42 dawes Exp $ */ +/* $XFree86: xc/programs/editres/editresP.h,v 1.8 2006/01/09 15:00:41 dawes Exp $ */ #include #include Index: xc/programs/editres/geometry.c diff -u xc/programs/editres/geometry.c:1.5 xc/programs/editres/geometry.c:1.6 --- xc/programs/editres/geometry.c:1.5 Fri Dec 14 15:00:43 2001 +++ xc/programs/editres/geometry.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: geometry.c,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/geometry.c,v 1.5 2001/12/14 20:00:43 dawes Exp $ */ +/* $XFree86: xc/programs/editres/geometry.c,v 1.6 2006/01/09 15:00:41 dawes Exp $ */ #include #include Index: xc/programs/editres/handler.c diff -u xc/programs/editres/handler.c:1.8 xc/programs/editres/handler.c:1.9 --- xc/programs/editres/handler.c:1.8 Fri Oct 24 16:38:10 2003 +++ xc/programs/editres/handler.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: handler.c,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/editres/handler.c,v 1.8 2003/10/24 20:38:10 tsi Exp $ */ +/* $XFree86: xc/programs/editres/handler.c,v 1.9 2006/01/09 15:00:41 dawes Exp $ */ #include #include Index: xc/programs/editres/setvalues.c diff -u xc/programs/editres/setvalues.c:1.5 xc/programs/editres/setvalues.c:1.6 --- xc/programs/editres/setvalues.c:1.5 Fri Dec 14 15:00:43 2001 +++ xc/programs/editres/setvalues.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: setvalues.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/setvalues.c,v 1.5 2001/12/14 20:00:43 dawes Exp $ */ +/* $XFree86: xc/programs/editres/setvalues.c,v 1.6 2006/01/09 15:00:41 dawes Exp $ */ #include #include Index: xc/programs/editres/svpopup.c diff -u xc/programs/editres/svpopup.c:1.6 xc/programs/editres/svpopup.c:1.7 --- xc/programs/editres/svpopup.c:1.6 Fri Dec 14 15:00:43 2001 +++ xc/programs/editres/svpopup.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: svpopup.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/programs/editres/svpopup.c,v 1.6 2001/12/14 20:00:43 dawes Exp $ */ +/* $XFree86: xc/programs/editres/svpopup.c,v 1.7 2006/01/09 15:00:41 dawes Exp $ */ #include #include /* Get standard string definations. */ Index: xc/programs/editres/utils.c diff -u xc/programs/editres/utils.c:1.6 xc/programs/editres/utils.c:1.7 --- xc/programs/editres/utils.c:1.6 Fri Dec 14 15:00:43 2001 +++ xc/programs/editres/utils.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: utils.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/editres/utils.c,v 1.6 2001/12/14 20:00:43 dawes Exp $ */ +/* $XFree86: xc/programs/editres/utils.c,v 1.7 2006/01/09 15:00:41 dawes Exp $ */ #include #include Index: xc/programs/editres/widgets.c diff -u xc/programs/editres/widgets.c:1.6 xc/programs/editres/widgets.c:1.7 --- xc/programs/editres/widgets.c:1.6 Fri Dec 14 15:00:43 2001 +++ xc/programs/editres/widgets.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: widgets.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/editres/widgets.c,v 1.6 2001/12/14 20:00:43 dawes Exp $ */ +/* $XFree86: xc/programs/editres/widgets.c,v 1.7 2006/01/09 15:00:41 dawes Exp $ */ /* * Code for creating all widgets used by EditRes. Index: xc/programs/editres/wtree.c diff -u xc/programs/editres/wtree.c:1.5 xc/programs/editres/wtree.c:1.6 --- xc/programs/editres/wtree.c:1.5 Fri Dec 14 15:00:44 2001 +++ xc/programs/editres/wtree.c Mon Jan 9 10:00:41 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: wtree.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/editres/wtree.c,v 1.5 2001/12/14 20:00:44 dawes Exp $ */ +/* $XFree86: xc/programs/editres/wtree.c,v 1.6 2006/01/09 15:00:41 dawes Exp $ */ #include #include Index: xc/programs/fc-cache/Imakefile diff -u xc/programs/fc-cache/Imakefile:1.1 xc/programs/fc-cache/Imakefile:1.2 --- xc/programs/fc-cache/Imakefile:1.1 Mon Jun 9 11:11:16 2003 +++ xc/programs/fc-cache/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/fc-cache/Imakefile,v 1.1 2003/06/09 15:11:16 dawes Exp $ +XCOMM $XFree86: xc/programs/fc-cache/Imakefile,v 1.2 2006/03/18 01:34:23 dawes Exp $ FONTCONFIGDIR = $(TOP)/extras/fontconfig @@ -13,11 +13,6 @@ ComplexProgramTarget(fc-cache) LinkBuildBinary(ProgramTargetName(fc-cache)) -install:: - if [ x$${DESTDIR} = x ]; then \ - $(FCCACHE) -v -f;\ - fi - LinkSourceFile(fc-cache.c,$(FONTCONFIGDIR)/fc-cache) LinkSourceFile(fc-cache.man,$(FONTCONFIGDIR)/fc-cache) Index: xc/programs/fonttosfnt/Imakefile diff -u xc/programs/fonttosfnt/Imakefile:1.9 xc/programs/fonttosfnt/Imakefile:1.10 --- xc/programs/fonttosfnt/Imakefile:1.9 Tue Dec 9 21:58:07 2003 +++ xc/programs/fonttosfnt/Imakefile Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/fonttosfnt/Imakefile,v 1.9 2003/12/10 02:58:07 dawes Exp $ +XCOMM $XFree86: xc/programs/fonttosfnt/Imakefile,v 1.10 2005/10/14 15:17:30 tsi Exp $ #if !HasSetenv SETENV_SRCS = env.c @@ -15,12 +15,10 @@ OBJS = fonttosfnt.o read.o write.o struct.o util.o $(SETENV_OBJS) -FONTENC_INCS = -I$(BUILDINCDIR)/X11/fonts FONTENC_LIBS = -lfontenc DEFINES = $(SETENV_DEFINES) $(SNPRINTF_DEFINES) -DXFREE86_FT2 -INCLUDES = $(FONTENC_INCS) \ - $(FREETYPE2INCLUDES) $(SNPRINTF_INCLUDES) -I$(XBUILDINCDIR) +INCLUDES = $(FREETYPE2INCLUDES) $(SNPRINTF_INCLUDES) LOCAL_LIBRARIES = $(FREETYPE2LIB) $(FONTENC_LIBS) GzipLibrary MathLibrary ComplexProgramTarget(fonttosfnt) Index: xc/programs/fonttosfnt/read.c diff -u xc/programs/fonttosfnt/read.c:1.6 xc/programs/fonttosfnt/read.c:1.7 --- xc/programs/fonttosfnt/read.c:1.6 Thu Dec 18 21:16:36 2003 +++ xc/programs/fonttosfnt/read.c Fri Oct 14 11:17:30 2005 @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.6 2003/12/19 02:16:36 dawes Exp $ */ +/* $XFree86: xc/programs/fonttosfnt/read.c,v 1.7 2005/10/14 15:17:30 tsi Exp $ */ #include @@ -28,7 +28,7 @@ #include FT_BDF_H #include "X11/Xos.h" #include "fonttosfnt.h" -#include "fontenc.h" +#include #define FLOOR2(x, y) ((x) >= 0 ? (x) / (y) : -(((-(x)) + (y) - 1) / (y))) #define CEIL2(x, y) (FLOOR2((x) + (y) - 1, (y))) Index: xc/programs/fslsfonts/Imakefile diff -u xc/programs/fslsfonts/Imakefile:1.3 xc/programs/fslsfonts/Imakefile:1.4 --- xc/programs/fslsfonts/Imakefile:1.3 Tue Aug 28 12:48:09 2001 +++ xc/programs/fslsfonts/Imakefile Mon Jan 9 10:00:42 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/fslsfonts/Imakefile,v 1.3 2001/08/28 16:48:09 tsi Exp $ +XCOMM $XFree86: xc/programs/fslsfonts/Imakefile,v 1.4 2006/01/09 15:00:42 dawes Exp $ LOCAL_LIBRARIES = $(FSLIB) DEPLIBS = $(DEPFSLIB) Index: xc/programs/fslsfonts/fslsfonts.c diff -u xc/programs/fslsfonts/fslsfonts.c:3.8 xc/programs/fslsfonts/fslsfonts.c:3.9 --- xc/programs/fslsfonts/fslsfonts.c:3.8 Fri Dec 14 15:00:45 2001 +++ xc/programs/fslsfonts/fslsfonts.c Mon Jan 9 10:00:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: fslsfonts.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.8 2001/12/14 20:00:45 dawes Exp $ */ +/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.9 2006/01/09 15:00:42 dawes Exp $ */ #include #include Index: xc/programs/fslsfonts/fslsfonts.man diff -u xc/programs/fslsfonts/fslsfonts.man:1.8 xc/programs/fslsfonts/fslsfonts.man:1.9 --- xc/programs/fslsfonts/fslsfonts.man:1.8 Thu Feb 10 22:03:12 2005 +++ xc/programs/fslsfonts/fslsfonts.man Mon Jan 9 10:00:42 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: fslsfonts.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ .\" Copyright 1991, Network Computing Devices, Inc .\" Copyright 1993, 1994, 1998 The Open Group .\" @@ -24,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.8 2005/02/11 03:03:12 dawes Exp $ +.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.9 2006/01/09 15:00:42 dawes Exp $ .\" .TH FSLSFONTS 1 __vendorversion__ .SH NAME Index: xc/programs/fstobdf/Imakefile diff -u xc/programs/fstobdf/Imakefile:1.4 xc/programs/fstobdf/Imakefile:1.5 --- xc/programs/fstobdf/Imakefile:1.4 Tue May 27 13:58:23 2003 +++ xc/programs/fstobdf/Imakefile Mon Jan 9 10:00:42 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:52 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/fstobdf/Imakefile,v 1.4 2003/05/27 17:58:23 tsi Exp $ +XCOMM $XFree86: xc/programs/fstobdf/Imakefile,v 1.5 2006/01/09 15:00:42 dawes Exp $ LOCAL_LIBRARIES = $(FSLIB) $(XONLYLIB) DEPLIBS = $(DEPFSLIB) $(DEPXONLYLIB) Index: xc/programs/fstobdf/chars.c diff -u xc/programs/fstobdf/chars.c:3.9 xc/programs/fstobdf/chars.c:3.10 --- xc/programs/fstobdf/chars.c:3.9 Mon Oct 25 17:23:58 2004 +++ xc/programs/fstobdf/chars.c Mon Jan 9 10:00:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: chars.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/chars.c,v 3.9 2004/10/25 21:23:58 dawes Exp $ */ +/* $XFree86: xc/programs/fstobdf/chars.c,v 3.10 2006/01/09 15:00:42 dawes Exp $ */ /* Morten Storgaard Nielsen: chars.c,v 3.2-1 2000/01/30 14:11:19 kat Exp */ Index: xc/programs/fstobdf/fstobdf.c diff -u xc/programs/fstobdf/fstobdf.c:1.7 xc/programs/fstobdf/fstobdf.c:1.8 --- xc/programs/fstobdf/fstobdf.c:1.7 Wed Jul 9 11:27:36 2003 +++ xc/programs/fstobdf/fstobdf.c Mon Jan 9 10:00:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: fstobdf.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.7 2003/07/09 15:27:36 tsi Exp $ */ +/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.8 2006/01/09 15:00:42 dawes Exp $ */ #include #include Index: xc/programs/fstobdf/fstobdf.man diff -u xc/programs/fstobdf/fstobdf.man:1.8 xc/programs/fstobdf/fstobdf.man:1.9 --- xc/programs/fstobdf/fstobdf.man:1.8 Thu Feb 10 22:03:12 2005 +++ xc/programs/fstobdf/fstobdf.man Mon Jan 9 10:00:42 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: fstobdf.man,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ .\" Copyright 1990, Network Computing Devices .\" Copyright 1990, 1998 The Open Group .\" @@ -24,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.8 2005/02/11 03:03:12 dawes Exp $ +.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.9 2006/01/09 15:00:42 dawes Exp $ .\" .TH FSTOBDF 1 __vendorversion__ .SH NAME Index: xc/programs/fstobdf/header.c diff -u xc/programs/fstobdf/header.c:3.7 xc/programs/fstobdf/header.c:3.8 --- xc/programs/fstobdf/header.c:3.7 Fri Dec 14 15:00:46 2001 +++ xc/programs/fstobdf/header.c Mon Jan 9 10:00:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: header.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/header.c,v 3.7 2001/12/14 20:00:46 dawes Exp $ */ +/* $XFree86: xc/programs/fstobdf/header.c,v 3.8 2006/01/09 15:00:42 dawes Exp $ */ #include #include Index: xc/programs/fstobdf/props.c diff -u xc/programs/fstobdf/props.c:1.6 xc/programs/fstobdf/props.c:1.7 --- xc/programs/fstobdf/props.c:1.6 Fri Dec 14 15:00:46 2001 +++ xc/programs/fstobdf/props.c Mon Jan 9 10:00:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: props.c,v 1.4 2001/02/09 02:05:30 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fstobdf/props.c,v 1.6 2001/12/14 20:00:46 dawes Exp $ */ +/* $XFree86: xc/programs/fstobdf/props.c,v 1.7 2006/01/09 15:00:43 dawes Exp $ */ #include #include Index: xc/programs/glxgears/Imakefile diff -u xc/programs/glxgears/Imakefile:1.1 xc/programs/glxgears/Imakefile:1.2 --- xc/programs/glxgears/Imakefile:1.1 Mon Apr 2 17:12:11 2001 +++ xc/programs/glxgears/Imakefile Mon Jan 9 10:00:43 2006 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile /main/7 1995/12/04 15:10:00 dpw $ -XCOMM $XFree86: xc/programs/glxgears/Imakefile,v 1.1 2001/04/02 21:12:11 dawes Exp $ +XCOMM $XFree86: xc/programs/glxgears/Imakefile,v 1.2 2006/01/09 15:00:43 dawes Exp $ + #include DEPLIBS = $(DEPGLXLIB) $(DEPXLIB) LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) Index: xc/programs/glxinfo/glxinfo.man diff -u xc/programs/glxinfo/glxinfo.man:1.6 xc/programs/glxinfo/glxinfo.man:1.7 --- xc/programs/glxinfo/glxinfo.man:1.6 Mon Sep 30 18:28:04 2002 +++ xc/programs/glxinfo/glxinfo.man Mon Jan 9 10:00:43 2006 @@ -1,4 +1,3 @@ -.\" $TOG: xdpyinfo.man /main/22 1998/02/09 13:57:10 kaleb $ .\" Copyright 1988, 1989, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/glxinfo/glxinfo.man,v 1.6 2002/09/30 22:28:04 alanh Exp $ +.\" $XFree86: xc/programs/glxinfo/glxinfo.man,v 1.7 2006/01/09 15:00:43 dawes Exp $ .\" .TH GLXINFO 1 __vendorversion__ .SH NAME Index: xc/programs/iceauth/Imakefile diff -u xc/programs/iceauth/Imakefile:1.4 xc/programs/iceauth/Imakefile:1.5 --- xc/programs/iceauth/Imakefile:1.4 Wed Jan 17 18:44:54 2001 +++ xc/programs/iceauth/Imakefile Mon Jan 9 10:00:43 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/iceauth/Imakefile,v 1.4 2001/01/17 23:44:54 dawes Exp $ +XCOMM $XFree86: xc/programs/iceauth/Imakefile,v 1.5 2006/01/09 15:00:43 dawes Exp $ DEPLIBS = $(DEPICELIB) LOCAL_LIBRARIES = $(ICELIB) Index: xc/programs/iceauth/iceauth.c diff -u xc/programs/iceauth/iceauth.c:1.5 xc/programs/iceauth/iceauth.c:1.6 --- xc/programs/iceauth/iceauth.c:1.5 Fri Dec 14 15:00:48 2001 +++ xc/programs/iceauth/iceauth.c Mon Jan 9 10:00:43 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: iceauth.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ * * xauth - manipulate authorization file * @@ -29,7 +28,7 @@ * Original Author of "xauth" : Jim Fulton, MIT X Consortium * Modified into "iceauth" : Ralph Mor, X Consortium */ -/* $XFree86: xc/programs/iceauth/iceauth.c,v 1.5 2001/12/14 20:00:48 dawes Exp $ */ +/* $XFree86: xc/programs/iceauth/iceauth.c,v 1.6 2006/01/09 15:00:43 dawes Exp $ */ #include "iceauth.h" Index: xc/programs/iceauth/iceauth.h diff -u xc/programs/iceauth/iceauth.h:3.5 xc/programs/iceauth/iceauth.h:3.6 --- xc/programs/iceauth/iceauth.h:3.5 Fri Dec 14 15:00:48 2001 +++ xc/programs/iceauth/iceauth.h Mon Jan 9 10:00:43 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: iceauth.h,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/iceauth/iceauth.h,v 3.5 2001/12/14 20:00:48 dawes Exp $ */ +/* $XFree86: xc/programs/iceauth/iceauth.h,v 3.6 2006/01/09 15:00:43 dawes Exp $ */ #include #include Index: xc/programs/iceauth/iceauth.man diff -u xc/programs/iceauth/iceauth.man:3.8 xc/programs/iceauth/iceauth.man:3.9 --- xc/programs/iceauth/iceauth.man:3.8 Thu Feb 10 22:03:13 2005 +++ xc/programs/iceauth/iceauth.man Mon Jan 9 10:00:43 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ - .\" Copyright 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86: xc/programs/iceauth/iceauth.man,v 3.8 2005/02/11 03:03:13 dawes Exp $ +.\" $XFree86: xc/programs/iceauth/iceauth.man,v 3.9 2006/01/09 15:00:43 dawes Exp $ .\" .TH ICEAUTH 1 __vendorversion__ .SH NAME Index: xc/programs/iceauth/process.c diff -u xc/programs/iceauth/process.c:3.8 xc/programs/iceauth/process.c:3.9 --- xc/programs/iceauth/process.c:3.8 Fri May 31 14:46:07 2002 +++ xc/programs/iceauth/process.c Mon Jan 9 10:00:43 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: process.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -28,7 +26,7 @@ * Modified into "iceauth" : Ralph Mor, X Consortium */ -/* $XFree86: xc/programs/iceauth/process.c,v 3.8 2002/05/31 18:46:07 dawes Exp $ */ +/* $XFree86: xc/programs/iceauth/process.c,v 3.9 2006/01/09 15:00:43 dawes Exp $ */ #include "iceauth.h" #include Index: xc/programs/ico/Imakefile diff -u xc/programs/ico/Imakefile:1.1 xc/programs/ico/Imakefile:1.3 --- xc/programs/ico/Imakefile:1.1 Sat Feb 12 22:26:12 2000 +++ xc/programs/ico/Imakefile Mon Jan 9 10:00:43 2006 @@ -1,9 +1,9 @@ -XCOMM $XConsortium: Imakefile,v 1.14 94/03/30 12:10:30 gildea Exp $ +XCOMM $XFree86: xc/programs/ico/Imakefile,v 1.3 2006/01/09 15:00:43 dawes Exp $ #define LocalThreadsDefines -DMULTITHREAD #include - DEFINES = ExtensionDefines + DEFINES = MultibufferDefines DEPLIBS = $(DEPXLIB) LOCAL_LIBRARIES = $(XLIB) SYS_LIBRARIES = MathLibrary Index: xc/programs/ico/ico.c diff -u xc/programs/ico/ico.c:1.11 xc/programs/ico/ico.c:1.12 --- xc/programs/ico/ico.c:1.11 Sat Apr 3 17:38:53 2004 +++ xc/programs/ico/ico.c Mon Jan 9 10:00:43 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: ico.c,v 1.47 94/04/17 20:45:15 gildea Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/ico/ico.c,v 1.11 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/ico/ico.c,v 1.12 2006/01/09 15:00:43 dawes Exp $ */ /****************************************************************************** * Description Index: xc/programs/ico/ico.man diff -u xc/programs/ico/ico.man:1.6 xc/programs/ico/ico.man:1.7 --- xc/programs/ico/ico.man:1.6 Thu Feb 10 22:03:13 2005 +++ xc/programs/ico/ico.man Mon Jan 9 10:00:44 2006 @@ -1,5 +1,4 @@ -.\" $XConsortium: ico.man,v 1.14 94/04/17 20:45:16 gildea Exp $ -.\" $XFree86: xc/programs/ico/ico.man,v 1.6 2005/02/11 03:03:13 dawes Exp $ +.\" $XFree86: xc/programs/ico/ico.man,v 1.7 2006/01/09 15:00:44 dawes Exp $ .TH ICO 1 __vendorversion__ .SH NAME ico \- animate an icosahedron or other polyhedron Index: xc/programs/lbxproxy/Imakefile diff -u xc/programs/lbxproxy/Imakefile:1.14 xc/programs/lbxproxy/Imakefile:1.16 --- xc/programs/lbxproxy/Imakefile:1.14 Wed Jan 17 18:44:55 2001 +++ xc/programs/lbxproxy/Imakefile Sat Jan 28 21:31:23 2006 @@ -1,10 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ - - - - - -XCOMM $XFree86: xc/programs/lbxproxy/Imakefile,v 1.14 2001/01/17 23:44:55 dawes Exp $ +XCOMM $XFree86: xc/programs/lbxproxy/Imakefile,v 1.16 2006/01/29 02:31:23 tsi Exp $ #include #define IHaveSubdirs @@ -29,11 +23,7 @@ di/LibraryTargetName(dilbx): di -#if !defined(LynxOSArchitecture) && !defined(QNX4Architecture) -ServerTarget(lbxproxy,$(SUBDIRS),NullParameter,$(LBXLIBS),$(OTHERLIBS)) -#else ServerTarget(lbxproxy,$(SUBDIRS),di/main.o,$(LBXLIBS),$(OTHERLIBS)) -#endif LinkConfDirectory(lbxproxy,.,lbxproxy,.) Index: xc/programs/lbxproxy/design diff -u xc/programs/lbxproxy/design:1.3 xc/programs/lbxproxy/design:1.4 --- xc/programs/lbxproxy/design:1.3 Wed Jan 17 18:44:55 2001 +++ xc/programs/lbxproxy/design Mon Jan 9 10:00:44 2006 @@ -262,5 +262,4 @@ -------- -$NCDXorg: @(#)design,v 1.4 1994/04/11 18:17:03 lemke Exp $ -$Xorg: design,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ +$XFree86: xc/programs/lbxproxy/design,v 1.4 2006/01/09 15:00:44 dawes Exp $ Index: xc/programs/lbxproxy/lbxproxy.man diff -u xc/programs/lbxproxy/lbxproxy.man:1.10 xc/programs/lbxproxy/lbxproxy.man:1.11 --- xc/programs/lbxproxy/lbxproxy.man:1.10 Thu Feb 10 22:03:13 2005 +++ xc/programs/lbxproxy/lbxproxy.man Mon Jan 9 10:00:44 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: lbxproxy.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/lbxproxy/lbxproxy.man,v 1.10 2005/02/11 03:03:13 dawes Exp $ +.\" $XFree86: xc/programs/lbxproxy/lbxproxy.man,v 1.11 2006/01/09 15:00:44 dawes Exp $ .\" .TH LBXPROXY 1 __vendorversion__ .SH NAME Index: xc/programs/lbxproxy/config/AtomControl diff -u xc/programs/lbxproxy/config/AtomControl:1.1.1.2 xc/programs/lbxproxy/config/AtomControl:1.2 --- xc/programs/lbxproxy/config/AtomControl:1.1.1.2 Tue Jan 16 17:46:08 2001 +++ xc/programs/lbxproxy/config/AtomControl Mon Jan 9 10:00:44 2006 @@ -1,4 +1,4 @@ -! $Xorg: AtomControl,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ +! $XFree86: xc/programs/lbxproxy/config/AtomControl,v 1.2 2006/01/09 15:00:44 dawes Exp $ ! ! z ! means do not cache property data smaller than this many bytes Index: xc/programs/lbxproxy/config/Imakefile diff -u xc/programs/lbxproxy/config/Imakefile:1.1.1.2 xc/programs/lbxproxy/config/Imakefile:1.2 --- xc/programs/lbxproxy/config/Imakefile:1.1.1.2 Tue Jan 16 17:46:09 2001 +++ xc/programs/lbxproxy/config/Imakefile Mon Jan 9 10:00:44 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:53 cpqbld Exp $ +XCOMM $XFree86: xc/programs/lbxproxy/config/Imakefile,v 1.2 2006/01/09 15:00:44 dawes Exp $ all:: Index: xc/programs/lbxproxy/di/Imakefile diff -u xc/programs/lbxproxy/di/Imakefile:1.3 xc/programs/lbxproxy/di/Imakefile:1.5 --- xc/programs/lbxproxy/di/Imakefile:1.3 Wed Jul 9 11:27:36 2003 +++ xc/programs/lbxproxy/di/Imakefile Sat Jan 28 21:31:23 2006 @@ -1,14 +1,8 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:54 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/lbxproxy/di/Imakefile,v 1.3 2003/07/09 15:27:36 tsi Exp $ +XCOMM $XFree86: xc/programs/lbxproxy/di/Imakefile,v 1.5 2006/01/29 02:31:23 tsi Exp $ #include -INCLUDES = -I../include -I$(TOP)/include -I$(EXTINCSRC) \ - -I../../../include/extensions +INCLUDES = -I../include SRCS = main.c dispatch.c wire.c globals.c \ utils.c tables.c init.c \ @@ -23,7 +17,7 @@ props.o swapreq.o swaprep.o unsquish.o extensions.o \ options.o zeropad.o pm.o - DEFINES = AllocateLocalDefines + DEFINES = AllocateLocalDefines BigReqDefines #ifdef DefaultRGBDatabase DEFAULTRGBDATABASE = DefaultRGBDatabase @@ -36,14 +30,14 @@ IPv6_FLAGS = IPv6Flags #endif -DEPEND_DEFINES = $(PROXYMNGR_INCLUDES) $(UTIL_DEFINES) DependDefines +DEPEND_DEFINES = $(UTIL_DEFINES) $(IPv6_FLAGS) DependDefines NormalLibraryObjectRule() NormalLibraryTarget(dilbx,$(OBJS)) LintLibraryTarget(dilbx,$(SRCS)) NormalLintTarget($(SRCS)) -SpecialCObjectRule(dispatch,$(ICONFIGFILES),$(EXT_DEFINES)) +SpecialCObjectRule(wire,$(ICONFIGFILES),NullParameter) SpecialCObjectRule(utils,$(ICONFIGFILES),$(UTIL_DEFINES)) SpecialCObjectRule(pm,$(ICONFIGFILES),$(IPv6_FLAGS)) Index: xc/programs/lbxproxy/di/atomcache.c diff -u xc/programs/lbxproxy/di/atomcache.c:1.8 xc/programs/lbxproxy/di/atomcache.c:1.9 --- xc/programs/lbxproxy/di/atomcache.c:1.8 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/atomcache.c Mon Jan 9 10:00:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: atomcache.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/atomcache.c,v 1.8 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/atomcache.c,v 1.9 2006/01/09 15:00:44 dawes Exp $ */ /* * atom cache for LBX Index: xc/programs/lbxproxy/di/cache.c diff -u xc/programs/lbxproxy/di/cache.c:1.8 xc/programs/lbxproxy/di/cache.c:1.9 --- xc/programs/lbxproxy/di/cache.c:1.8 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/cache.c Mon Jan 9 10:00:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cache.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/cache.c,v 1.8 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/cache.c,v 1.9 2006/01/09 15:00:44 dawes Exp $ */ #include "misc.h" #include "util.h" #include "cache.h" Index: xc/programs/lbxproxy/di/cmap.c diff -u xc/programs/lbxproxy/di/cmap.c:1.8 xc/programs/lbxproxy/di/cmap.c:1.9 --- xc/programs/lbxproxy/di/cmap.c:1.8 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/cmap.c Mon Jan 9 10:00:44 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmap.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -48,7 +46,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/cmap.c,v 1.8 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/cmap.c,v 1.9 2006/01/09 15:00:44 dawes Exp $ */ #include #include "assert.h" Index: xc/programs/lbxproxy/di/cmaputil.c diff -u xc/programs/lbxproxy/di/cmaputil.c:1.13 xc/programs/lbxproxy/di/cmaputil.c:1.14 --- xc/programs/lbxproxy/di/cmaputil.c:1.13 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/cmaputil.c Fri Oct 14 11:17:30 2005 @@ -1,5 +1,4 @@ -/* $Xorg: cmaputil.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/lbxproxy/di/cmaputil.c,v 1.14 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -48,7 +47,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/cmaputil.c,v 1.13 2004/04/03 22:38:53 tsi Exp $ */ #include #include "misc.h" @@ -59,7 +57,7 @@ #include "resource.h" #include "wire.h" #define XK_LATIN1 -#include "keysymdef.h" +#include #include "utils.h" typedef struct { Index: xc/programs/lbxproxy/di/dispatch.c diff -u xc/programs/lbxproxy/di/dispatch.c:1.8 xc/programs/lbxproxy/di/dispatch.c:1.9 --- xc/programs/lbxproxy/di/dispatch.c:1.8 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/dispatch.c Mon Jan 9 10:00:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: dispatch.c,v 1.3 2000/08/17 19:53:55 cpqbld Exp $ */ /* * Copyright 1992 Network Computing Devices * Copyright 1996 X Consortium, Inc. @@ -21,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/dispatch.c,v 1.8 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/dispatch.c,v 1.9 2006/01/09 15:00:44 dawes Exp $ */ #include #include "assert.h" Index: xc/programs/lbxproxy/di/extensions.c diff -u xc/programs/lbxproxy/di/extensions.c:1.6 xc/programs/lbxproxy/di/extensions.c:1.7 --- xc/programs/lbxproxy/di/extensions.c:1.6 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/extensions.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: extensions.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/extensions.c,v 1.6 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/extensions.c,v 1.7 2006/01/09 15:00:45 dawes Exp $ */ /* tracks server extensions */ Index: xc/programs/lbxproxy/di/gfx.c diff -u xc/programs/lbxproxy/di/gfx.c:1.7 xc/programs/lbxproxy/di/gfx.c:1.8 --- xc/programs/lbxproxy/di/gfx.c:1.7 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/gfx.c Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: gfx.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/gfx.c,v 1.8 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +46,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/gfx.c,v 1.7 2004/04/03 22:38:53 tsi Exp $ */ /* * graphics acceleration @@ -59,7 +58,7 @@ #include "util.h" #include "resource.h" #include "wire.h" -#include "lbximage.h" +#include #include "proxyopts.h" #include "swap.h" #include "gfx.h" Index: xc/programs/lbxproxy/di/gfx.h diff -u xc/programs/lbxproxy/di/gfx.h:1.1 xc/programs/lbxproxy/di/gfx.h:1.2 --- xc/programs/lbxproxy/di/gfx.h:1.1 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/gfx.h Sun Mar 27 21:51:13 2005 @@ -1,32 +1,13 @@ -/* $XFree86: xc/programs/lbxproxy/di/gfx.h,v 1.1 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/gfx.h,v 1.2 2005/03/28 02:51:13 dawes Exp $ */ #ifndef _GFX_H_ #define _GFX_H_ -extern int ProcInitialConnection(ClientPtr client), - ProcEstablishConnection(ClientPtr client); - -extern int ProcStandardRequest(ClientPtr client); - extern int ProcLBXChangeWindowAttributes(ClientPtr client), ProcLBXGetWindowAttributes(ClientPtr client), ProcLBXGetGeometry(ClientPtr client), - ProcLBXInternAtom(ClientPtr client), - ProcLBXGetAtomName(ClientPtr client), - ProcLBXCreateColormap(ClientPtr client), - ProcLBXFreeColormap(ClientPtr client), - ProcLBXCopyColormapAndFree(ClientPtr client), - ProcLBXFreeColors(ClientPtr client), - ProcLBXLookupColor(ClientPtr client), - ProcLBXAllocColor(ClientPtr client), - ProcLBXAllocNamedColor(ClientPtr client), ProcLBXAllocColorCells(ClientPtr client), ProcLBXAllocColorPlanes(ClientPtr client), - ProcLBXGetModifierMapping(ClientPtr client), - ProcLBXGetKeyboardMapping(ClientPtr client), - ProcLBXQueryFont(ClientPtr client), - ProcLBXChangeProperty(ClientPtr client), - ProcLBXGetProperty(ClientPtr client), ProcLBXCopyArea(ClientPtr client), ProcLBXCopyPlane(ClientPtr client), ProcLBXPolyPoint(ClientPtr client), @@ -39,12 +20,9 @@ ProcLBXPolyFillArc(ClientPtr client), ProcLBXPolyText(ClientPtr client), ProcLBXImageText(ClientPtr client), - ProcLBXQueryExtension(ClientPtr client), ProcLBXGetImage(ClientPtr client), ProcLBXPutImage(ClientPtr client); -extern int ProcBadRequest(ClientPtr client); - /* tables */ extern int (*InitialVector[3]) (ClientPtr client); Index: xc/programs/lbxproxy/di/globals.c diff -u xc/programs/lbxproxy/di/globals.c:1.5 xc/programs/lbxproxy/di/globals.c:1.6 --- xc/programs/lbxproxy/di/globals.c:1.5 Fri Dec 14 15:00:51 2001 +++ xc/programs/lbxproxy/di/globals.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: globals.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/globals.c,v 1.6 2006/01/09 15:00:45 dawes Exp $ */ /************************************************************ Copyright 1987, 1998 The Open Group Index: xc/programs/lbxproxy/di/init.c diff -u xc/programs/lbxproxy/di/init.c:1.7 xc/programs/lbxproxy/di/init.c:1.8 --- xc/programs/lbxproxy/di/init.c:1.7 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/init.c Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: init.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/init.c,v 1.8 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1998 The Open Group @@ -45,7 +45,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/init.c,v 1.7 2004/04/03 22:38:53 tsi Exp $ */ /* * This file is used for anything that needs to dip into Xlib structures @@ -61,7 +60,7 @@ #include #include #include -#include "XLbx.h" +#include #include "init.h" /* Hook up to an X server and set up a multiplexing LBX encoded connection */ Index: xc/programs/lbxproxy/di/lbxfuncs.c diff -u xc/programs/lbxproxy/di/lbxfuncs.c:1.8 xc/programs/lbxproxy/di/lbxfuncs.c:1.9 --- xc/programs/lbxproxy/di/lbxfuncs.c:1.8 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/lbxfuncs.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lbxfuncs.c,v 1.3 2000/08/17 19:53:55 cpqbld Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * Copyright 1996 X Consortium, Inc. @@ -22,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/lbxfuncs.c,v 1.8 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/lbxfuncs.c,v 1.9 2006/01/09 15:00:45 dawes Exp $ */ /* * top level LBX request & reply handling Index: xc/programs/lbxproxy/di/lbxutil.c diff -u xc/programs/lbxproxy/di/lbxutil.c:1.6 xc/programs/lbxproxy/di/lbxutil.c:1.7 --- xc/programs/lbxproxy/di/lbxutil.c:1.6 Sat Apr 3 17:38:53 2004 +++ xc/programs/lbxproxy/di/lbxutil.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lbxutil.c,v 1.4 2000/08/17 19:53:55 cpqbld Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * @@ -21,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/lbxutil.c,v 1.6 2004/04/03 22:38:53 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/lbxutil.c,v 1.7 2006/01/09 15:00:45 dawes Exp $ */ /* * utility routines for LBX requests Index: xc/programs/lbxproxy/di/main.c diff -u xc/programs/lbxproxy/di/main.c:1.10 xc/programs/lbxproxy/di/main.c:1.11 --- xc/programs/lbxproxy/di/main.c:1.10 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/main.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: main.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -45,7 +44,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/main.c,v 1.10 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/main.c,v 1.11 2006/01/09 15:00:45 dawes Exp $ */ #include #include "lbx.h" Index: xc/programs/lbxproxy/di/options.c diff -u xc/programs/lbxproxy/di/options.c:1.11 xc/programs/lbxproxy/di/options.c:1.12 --- xc/programs/lbxproxy/di/options.c:1.11 Sun Apr 25 20:23:37 2004 +++ xc/programs/lbxproxy/di/options.c Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: options.c,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.12 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1998 The Open Group @@ -46,19 +46,18 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.11 2004/04/26 00:23:37 tsi Exp $ */ #include -#include "X.h" +#include #include "misc.h" -#include "XLbx.h" -#include "lbxopts.h" +#include +#include #include "proxyopts.h" -#include "lbximage.h" +#include #include "util.h" #include "colormap.h" #ifndef NO_ZLIB -#include "lbxzlib.h" +#include #endif /* NO_ZLIB */ #include "wire.h" #include "utils.h" Index: xc/programs/lbxproxy/di/pm.c diff -u xc/programs/lbxproxy/di/pm.c:1.16 xc/programs/lbxproxy/di/pm.c:1.17 --- xc/programs/lbxproxy/di/pm.c:1.16 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/pm.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pm.c,v 1.5 2001/02/09 02:05:31 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/lbxproxy/di/pm.c,v 1.16 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/pm.c,v 1.17 2006/01/09 15:00:45 dawes Exp $ */ #include #include Index: xc/programs/lbxproxy/di/props.c diff -u xc/programs/lbxproxy/di/props.c:1.8 xc/programs/lbxproxy/di/props.c:1.9 --- xc/programs/lbxproxy/di/props.c:1.8 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/props.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: props.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/props.c,v 1.8 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/props.c,v 1.9 2006/01/09 15:00:45 dawes Exp $ */ /* * property handling Index: xc/programs/lbxproxy/di/reqtype.c diff -u xc/programs/lbxproxy/di/reqtype.c:1.1.1.2 xc/programs/lbxproxy/di/reqtype.c:1.2 --- xc/programs/lbxproxy/di/reqtype.c:1.1.1.2 Tue Jan 16 17:46:25 2001 +++ xc/programs/lbxproxy/di/reqtype.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: reqtype.c,v 1.3 2000/08/17 19:53:56 cpqbld Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/reqtype.c,v 1.2 2006/01/09 15:00:45 dawes Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * Index: xc/programs/lbxproxy/di/resource.c diff -u xc/programs/lbxproxy/di/resource.c:1.6 xc/programs/lbxproxy/di/resource.c:1.7 --- xc/programs/lbxproxy/di/resource.c:1.6 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/resource.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: resource.c,v 1.4 2000/08/17 19:53:56 cpqbld Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -72,7 +71,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/lbxproxy/di/resource.c,v 1.6 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/resource.c,v 1.7 2006/01/09 15:00:45 dawes Exp $ */ #include #include "misc.h" Index: xc/programs/lbxproxy/di/swaprep.c diff -u xc/programs/lbxproxy/di/swaprep.c:1.6 xc/programs/lbxproxy/di/swaprep.c:1.7 --- xc/programs/lbxproxy/di/swaprep.c:1.6 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/swaprep.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: swaprep.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -47,7 +46,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/swaprep.c,v 1.6 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/swaprep.c,v 1.7 2006/01/09 15:00:45 dawes Exp $ */ #include #include "misc.h" Index: xc/programs/lbxproxy/di/swapreq.c diff -u xc/programs/lbxproxy/di/swapreq.c:1.5 xc/programs/lbxproxy/di/swapreq.c:1.6 --- xc/programs/lbxproxy/di/swapreq.c:1.5 Fri Dec 14 15:00:53 2001 +++ xc/programs/lbxproxy/di/swapreq.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: swapreq.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/swapreq.c,v 1.6 2006/01/09 15:00:45 dawes Exp $ */ /* Copyright 1998 The Open Group Index: xc/programs/lbxproxy/di/tables.c diff -u xc/programs/lbxproxy/di/tables.c:1.2 xc/programs/lbxproxy/di/tables.c:1.3 --- xc/programs/lbxproxy/di/tables.c:1.2 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/tables.c Sun Mar 27 21:51:13 2005 @@ -1,4 +1,3 @@ -/* $Xorg: tables.c,v 1.3 2000/08/17 19:53:56 cpqbld Exp $ */ /* * Copyright 1992 Network Computing Devices * @@ -20,12 +19,13 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/tables.c,v 1.2 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/tables.c,v 1.3 2005/03/28 02:51:13 dawes Exp $ */ #include "lbx.h" #include "gfx.h" #include "wire.h" #include "tables.h" +#include "lbxext.h" int (*InitialVector[3]) (ClientPtr client) = { Index: xc/programs/lbxproxy/di/tags.c diff -u xc/programs/lbxproxy/di/tags.c:1.6 xc/programs/lbxproxy/di/tags.c:1.7 --- xc/programs/lbxproxy/di/tags.c:1.6 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/tags.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: tags.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/tags.c,v 1.6 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/tags.c,v 1.7 2006/01/09 15:00:45 dawes Exp $ */ #include "misc.h" #include "util.h" Index: xc/programs/lbxproxy/di/unsquish.c diff -u xc/programs/lbxproxy/di/unsquish.c:1.6 xc/programs/lbxproxy/di/unsquish.c:1.7 --- xc/programs/lbxproxy/di/unsquish.c:1.6 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/unsquish.c Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: unsquish.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/unsquish.c,v 1.7 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -46,17 +46,16 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/unsquish.c,v 1.6 2004/04/03 22:38:54 tsi Exp $ */ /* handles unsquishing events */ -#include "X.h" +#include #define NEED_REPLIES #define NEED_EVENTS -#include "Xproto.h" +#include #include "misc.h" #define _XLBX_SERVER_ -#include "lbxstr.h" +#include #include "proxyopts.h" #include "lbx.h" Index: xc/programs/lbxproxy/di/utils.c diff -u xc/programs/lbxproxy/di/utils.c:1.19 xc/programs/lbxproxy/di/utils.c:1.20 --- xc/programs/lbxproxy/di/utils.c:1.19 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/utils.c Mon Jan 9 10:00:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: utils.c,v 1.5 2001/02/09 02:05:32 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1996, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/di/utils.c,v 1.19 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/utils.c,v 1.20 2006/01/09 15:00:45 dawes Exp $ */ #include "lbx.h" #include Index: xc/programs/lbxproxy/di/wire.c diff -u xc/programs/lbxproxy/di/wire.c:1.17 xc/programs/lbxproxy/di/wire.c:1.18 --- xc/programs/lbxproxy/di/wire.c:1.17 Sun Apr 25 20:23:37 2004 +++ xc/programs/lbxproxy/di/wire.c Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: wire.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.18 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1998 The Open Group @@ -45,7 +45,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.17 2004/04/26 00:23:37 tsi Exp $ */ #include "lbx.h" #include @@ -76,7 +75,7 @@ #include #ifdef BIGREQS -#include "bigreqstr.h" +#include #endif /* Index: xc/programs/lbxproxy/di/zeropad.c diff -u xc/programs/lbxproxy/di/zeropad.c:1.3 xc/programs/lbxproxy/di/zeropad.c:1.4 --- xc/programs/lbxproxy/di/zeropad.c:1.3 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/di/zeropad.c Mon Jan 9 10:00:45 2006 @@ -1,5 +1,3 @@ -/* $Xorg: zeropad.c,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/lbxproxy/di/zeropad.c,v 1.3 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/zeropad.c,v 1.4 2006/01/09 15:00:45 dawes Exp $ */ /* * This module handles zeroing out unused pad bytes in X requests. Index: xc/programs/lbxproxy/include/assert.h diff -u xc/programs/lbxproxy/include/assert.h:1.1.1.2 xc/programs/lbxproxy/include/assert.h:1.2 --- xc/programs/lbxproxy/include/assert.h:1.1.1.2 Tue Jan 16 17:46:30 2001 +++ xc/programs/lbxproxy/include/assert.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: assert.h,v 1.3 2000/08/17 19:53:57 cpqbld Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/assert.h,v 1.2 2006/01/09 15:00:46 dawes Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * @@ -20,7 +20,6 @@ * WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $NCDId$ */ #ifdef DEBUG #include Index: xc/programs/lbxproxy/include/atomcache.h diff -u xc/programs/lbxproxy/include/atomcache.h:1.6 xc/programs/lbxproxy/include/atomcache.h:1.7 --- xc/programs/lbxproxy/include/atomcache.h:1.6 Mon Nov 17 17:20:48 2003 +++ xc/programs/lbxproxy/include/atomcache.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: atomcache.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/atomcache.h,v 1.6 2003/11/17 22:20:48 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/atomcache.h,v 1.7 2006/01/09 15:00:46 dawes Exp $ */ #ifndef _ATOMCACHE_H_ #define _ATOMCACHE_H_ Index: xc/programs/lbxproxy/include/cache.h diff -u xc/programs/lbxproxy/include/cache.h:1.8 xc/programs/lbxproxy/include/cache.h:1.9 --- xc/programs/lbxproxy/include/cache.h:1.8 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/include/cache.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cache.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group @@ -50,7 +49,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/cache.h,v 1.8 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/cache.h,v 1.9 2006/01/09 15:00:46 dawes Exp $ */ #ifndef _CACHE_H_ #define _CACHE_H_ Index: xc/programs/lbxproxy/include/colormap.h diff -u xc/programs/lbxproxy/include/colormap.h:1.7 xc/programs/lbxproxy/include/colormap.h:1.8 --- xc/programs/lbxproxy/include/colormap.h:1.7 Mon Nov 17 17:20:48 2003 +++ xc/programs/lbxproxy/include/colormap.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/colormap.h,v 1.7 2003/11/17 22:20:48 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/colormap.h,v 1.8 2006/01/09 15:00:46 dawes Exp $ */ #ifndef COLORMAP_H_ #define COLORMAP_H_ Index: xc/programs/lbxproxy/include/init.h diff -u xc/programs/lbxproxy/include/init.h:1.3 xc/programs/lbxproxy/include/init.h:1.4 --- xc/programs/lbxproxy/include/init.h:1.3 Mon Nov 17 17:20:48 2003 +++ xc/programs/lbxproxy/include/init.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: init.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -45,7 +44,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/init.h,v 1.3 2003/11/17 22:20:48 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/init.h,v 1.4 2006/01/09 15:00:46 dawes Exp $ */ #ifndef _INIT_H_ #define _INIT_H_ Index: xc/programs/lbxproxy/include/lbx.h diff -u xc/programs/lbxproxy/include/lbx.h:1.8 xc/programs/lbxproxy/include/lbx.h:1.9 --- xc/programs/lbxproxy/include/lbx.h:1.8 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/include/lbx.h Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lbx.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.9 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -45,14 +45,13 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.8 2004/04/03 22:38:54 tsi Exp $ */ #ifndef _LBX_H_ #define _LBX_H_ #include "misc.h" #include "os.h" #include "util.h" -#include "lbxstr.h" +#include /* we keep the ifdefs in the code as a guide to what's going on */ /* but we want the proxy to work with all possible servers */ Index: xc/programs/lbxproxy/include/lbxext.h diff -u xc/programs/lbxproxy/include/lbxext.h:1.3 xc/programs/lbxproxy/include/lbxext.h:1.4 --- xc/programs/lbxproxy/include/lbxext.h:1.3 Mon Nov 17 17:20:48 2003 +++ xc/programs/lbxproxy/include/lbxext.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lbxext.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/lbxext.h,v 1.3 2003/11/17 22:20:48 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/lbxext.h,v 1.4 2006/01/09 15:00:46 dawes Exp $ */ #ifndef _LBXEXT_H_ #define _LBXEXT_H_ Index: xc/programs/lbxproxy/include/misc.h diff -u xc/programs/lbxproxy/include/misc.h:1.7 xc/programs/lbxproxy/include/misc.h:1.8 --- xc/programs/lbxproxy/include/misc.h:1.7 Fri Dec 14 15:00:55 2001 +++ xc/programs/lbxproxy/include/misc.h Fri Oct 14 11:17:30 2005 @@ -1,5 +1,4 @@ -/* $Xorg: misc.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/lbxproxy/include/misc.h,v 1.8 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1995, 1998 The Open Group @@ -27,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/lbxproxy/include/misc.h,v 1.7 2001/12/14 20:00:55 dawes Exp $ */ #ifndef MISC_H #define MISC_H 1 @@ -37,13 +35,13 @@ #include #include #include -#include "Xos.h" +#include #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc(_size) #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree(_ptr) -#include "Xalloca.h" -#include "Xfuncs.h" -#include "Xfuncproto.h" -#include "lbxstr.h" +#include +#include +#include +#include #ifndef TRUE #define FALSE 0 Index: xc/programs/lbxproxy/include/os.h diff -u xc/programs/lbxproxy/include/os.h:1.9 xc/programs/lbxproxy/include/os.h:1.10 --- xc/programs/lbxproxy/include/os.h:1.9 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/include/os.h Mon Jan 9 10:00:46 2006 @@ -1,5 +1,3 @@ -/* $Xorg: os.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ - /* Copyright 1995, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/lbxproxy/include/os.h,v 1.9 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/os.h,v 1.10 2006/01/09 15:00:46 dawes Exp $ */ #ifndef OS_H #define OS_H Index: xc/programs/lbxproxy/include/pm.h diff -u xc/programs/lbxproxy/include/pm.h:1.5 xc/programs/lbxproxy/include/pm.h:1.6 --- xc/programs/lbxproxy/include/pm.h:1.5 Mon Nov 17 17:20:48 2003 +++ xc/programs/lbxproxy/include/pm.h Mon Jan 9 10:00:46 2006 @@ -1,5 +1,3 @@ -/* $Xorg: pm.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/lbxproxy/include/pm.h,v 1.5 2003/11/17 22:20:48 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/pm.h,v 1.6 2006/01/09 15:00:46 dawes Exp $ */ #include Index: xc/programs/lbxproxy/include/pmP.h diff -u xc/programs/lbxproxy/include/pmP.h:1.4 xc/programs/lbxproxy/include/pmP.h:1.5 --- xc/programs/lbxproxy/include/pmP.h:1.4 Fri Dec 14 15:00:56 2001 +++ xc/programs/lbxproxy/include/pmP.h Mon Jan 9 10:00:46 2006 @@ -1,5 +1,4 @@ -/* $Xorg: pmP.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/lbxproxy/include/pmP.h,v 1.5 2006/01/09 15:00:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/lbxproxy/include/proxyopts.h diff -u xc/programs/lbxproxy/include/proxyopts.h:1.7 xc/programs/lbxproxy/include/proxyopts.h:1.8 --- xc/programs/lbxproxy/include/proxyopts.h:1.7 Sun Apr 25 20:23:37 2004 +++ xc/programs/lbxproxy/include/proxyopts.h Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: proxyopts.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/proxyopts.h,v 1.8 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1998 The Open Group @@ -46,13 +46,12 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/proxyopts.h,v 1.7 2004/04/26 00:23:37 tsi Exp $ */ #ifndef _LBX_PROXYOPTS_H_ #define _LBX_PROXYOPTS_H_ -#include "lbximage.h" -#include "lbxopts.h" +#include +#include typedef struct _LbxNegOpts { short proxyDeltaN; Index: xc/programs/lbxproxy/include/reqtype.h diff -u xc/programs/lbxproxy/include/reqtype.h:1.6 xc/programs/lbxproxy/include/reqtype.h:1.7 --- xc/programs/lbxproxy/include/reqtype.h:1.6 Mon Nov 17 17:20:49 2003 +++ xc/programs/lbxproxy/include/reqtype.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: reqtype.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/reqtype.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/reqtype.h,v 1.7 2006/01/09 15:00:46 dawes Exp $ */ #ifndef _REQTYPE_H_ #define _REQTYPE_H_ Index: xc/programs/lbxproxy/include/resource.h diff -u xc/programs/lbxproxy/include/resource.h:1.6 xc/programs/lbxproxy/include/resource.h:1.7 --- xc/programs/lbxproxy/include/resource.h:1.6 Mon Nov 17 17:20:49 2003 +++ xc/programs/lbxproxy/include/resource.h Mon Jan 9 10:00:46 2006 @@ -1,5 +1,3 @@ -/* $Xorg: resource.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ - /* Copyright 1995, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/lbxproxy/include/resource.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/resource.h,v 1.7 2006/01/09 15:00:46 dawes Exp $ */ #ifndef RESOURCE_H #define RESOURCE_H 1 Index: xc/programs/lbxproxy/include/swap.h diff -u xc/programs/lbxproxy/include/swap.h:1.3 xc/programs/lbxproxy/include/swap.h:1.4 --- xc/programs/lbxproxy/include/swap.h:1.3 Mon Nov 17 17:20:49 2003 +++ xc/programs/lbxproxy/include/swap.h Mon Jan 9 10:00:46 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: swap.h,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ - * * Copyright 1994 Network Computing Devices, Inc. * * Permission to use, copy, modify, distribute, and sell this software and @@ -22,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/swap.h,v 1.3 2003/11/17 22:20:49 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/swap.h,v 1.4 2006/01/09 15:00:46 dawes Exp $ */ #ifndef _SWAP_H_ #define _SWAP_H_ Index: xc/programs/lbxproxy/include/tags.h diff -u xc/programs/lbxproxy/include/tags.h:1.6 xc/programs/lbxproxy/include/tags.h:1.7 --- xc/programs/lbxproxy/include/tags.h:1.6 Mon Nov 17 17:20:49 2003 +++ xc/programs/lbxproxy/include/tags.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: tags.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/tags.h,v 1.6 2003/11/17 22:20:49 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/tags.h,v 1.7 2006/01/09 15:00:46 dawes Exp $ */ #ifndef _TAGS_H_ #define _TAGS_H_ Index: xc/programs/lbxproxy/include/util.h diff -u xc/programs/lbxproxy/include/util.h:1.9 xc/programs/lbxproxy/include/util.h:1.10 --- xc/programs/lbxproxy/include/util.h:1.9 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/include/util.h Mon Jan 9 10:00:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: util.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ /* Copyright 1998 The Open Group @@ -46,7 +45,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/util.h,v 1.9 2004/04/03 22:38:54 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/util.h,v 1.10 2006/01/09 15:00:46 dawes Exp $ */ #ifndef _UTIL_H_ #define _UTIL_H_ Index: xc/programs/lbxproxy/include/wire.h diff -u xc/programs/lbxproxy/include/wire.h:1.9 xc/programs/lbxproxy/include/wire.h:1.10 --- xc/programs/lbxproxy/include/wire.h:1.9 Sat Apr 3 17:38:54 2004 +++ xc/programs/lbxproxy/include/wire.h Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: wire.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/include/wire.h,v 1.10 2005/10/14 15:17:30 tsi Exp $ */ /* Copyright 1998 The Open Group @@ -45,7 +45,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/include/wire.h,v 1.9 2004/04/03 22:38:54 tsi Exp $ */ #ifdef DEBUG /* Need this here because lbx.h undef's DEBUG */ #define LBX_DEBUG @@ -54,8 +53,8 @@ #include "misc.h" #include "lbx.h" -#include "lbxdeltastr.h" -#include "lbximage.h" +#include +#include #include "proxyopts.h" #include "colormap.h" #include "atomcache.h" Index: xc/programs/lbxproxy/os/Imakefile diff -u xc/programs/lbxproxy/os/Imakefile:1.9 xc/programs/lbxproxy/os/Imakefile:1.11 --- xc/programs/lbxproxy/os/Imakefile:1.9 Wed Dec 4 05:28:08 2002 +++ xc/programs/lbxproxy/os/Imakefile Sat Jan 28 21:31:23 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:58 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/lbxproxy/os/Imakefile,v 1.9 2002/12/04 10:28:08 eich Exp $ +XCOMM $XFree86: xc/programs/lbxproxy/os/Imakefile,v 1.11 2006/01/29 02:31:23 tsi Exp $ #include @@ -16,12 +11,11 @@ #endif - DEFINES = $(CONNECTION_FLAGS) $(RPC_DEFINES) \ - AllocateLocalDefines ServerOSDefines $(SIGNAL_DEFINES) + DEFINES = $(CONNECTION_FLAGS) $(RPC_DEFINES) BigReqDefines \ + AllocateLocalDefines ServerOSDefines $(SIGNAL_DEFINES) DEPEND_DEFINES = $(TRANS_INCLUDES) DependDefines -INCLUDES = -I../include -I$(TOP)/include -I$(EXTINCSRC) \ - -I../../../include/extensions +INCLUDES = -I../include SRCS = connection.c io.c WaitFor.c osinit.c transport.c $(SNPRINTF_SRC) @@ -40,7 +34,7 @@ LinkSourceFile(transport.c,$(TRANSCOMMSRC)) -SpecialCObjectRule(io,$(ICONFIGFILES),$(CONN_DEFINES) $(EXT_DEFINES)) +SpecialCObjectRule(io,$(ICONFIGFILES),$(CONN_DEFINES)) SpecialCObjectRule(connection,$(ICONFIGFILES),$(CONN_DEFINES) $(SOCK_DEFINES)) SpecialCObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES)) Index: xc/programs/lbxproxy/os/WaitFor.c diff -u xc/programs/lbxproxy/os/WaitFor.c:1.10 xc/programs/lbxproxy/os/WaitFor.c:1.11 --- xc/programs/lbxproxy/os/WaitFor.c:1.10 Sat Apr 3 17:38:55 2004 +++ xc/programs/lbxproxy/os/WaitFor.c Fri Oct 14 11:17:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: WaitFor.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/WaitFor.c,v 1.11 2005/10/14 15:17:30 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/WaitFor.c,v 1.10 2004/04/03 22:38:55 tsi Exp $ */ /***************************************************************** * OS Dependent input routines: @@ -55,7 +54,7 @@ * *****************************************************************/ -#include "Xos.h" /* for strings, fcntl, time */ +#include /* for strings, fcntl, time */ #include #include Index: xc/programs/lbxproxy/os/connection.c diff -u xc/programs/lbxproxy/os/connection.c:1.20 xc/programs/lbxproxy/os/connection.c:1.21 --- xc/programs/lbxproxy/os/connection.c:1.20 Sat Apr 3 17:38:55 2004 +++ xc/programs/lbxproxy/os/connection.c Mon Jan 9 10:00:47 2006 @@ -1,4 +1,3 @@ -/* $Xorg: connection.c,v 1.5 2001/02/09 02:05:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group @@ -60,7 +59,7 @@ * socket ids aren't small nums (0 - 2^8) * *****************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/connection.c,v 1.20 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/connection.c,v 1.21 2006/01/09 15:00:47 dawes Exp $ */ #include "misc.h" #include Index: xc/programs/lbxproxy/os/io.c diff -u xc/programs/lbxproxy/os/io.c:1.13 xc/programs/lbxproxy/os/io.c:1.14 --- xc/programs/lbxproxy/os/io.c:1.13 Sun Apr 25 20:23:37 2004 +++ xc/programs/lbxproxy/os/io.c Fri Oct 14 11:17:31 2005 @@ -1,4 +1,4 @@ -/* $Xorg: io.c,v 1.6 2001/02/09 02:05:33 xorgcvs Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/io.c,v 1.14 2005/10/14 15:17:31 tsi Exp $ */ /*********************************************************** Copyright 1987, 1989, 1998 The Open Group @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/io.c,v 1.13 2004/04/26 00:23:37 tsi Exp $ */ /***************************************************************** * i/o functions * @@ -56,7 +55,7 @@ #include #include -#include "Xos.h" +#include #include "misc.h" #include #include @@ -68,7 +67,7 @@ #include "io.h" #ifdef BIGREQS -#include "bigreqstr.h" +#include #endif /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX Index: xc/programs/lbxproxy/os/osdep.h diff -u xc/programs/lbxproxy/os/osdep.h:1.13 xc/programs/lbxproxy/os/osdep.h:1.14 --- xc/programs/lbxproxy/os/osdep.h:1.13 Sun Apr 25 20:23:37 2004 +++ xc/programs/lbxproxy/os/osdep.h Mon Jan 9 10:00:47 2006 @@ -1,4 +1,3 @@ -/* $Xorg: osdep.h,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/osdep.h,v 1.13 2004/04/26 00:23:37 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/osdep.h,v 1.14 2006/01/09 15:00:47 dawes Exp $ */ #define BOTIMEOUT 200 /* in milliseconds */ #define BUFSIZE 4096 Index: xc/programs/lbxproxy/os/osinit.c diff -u xc/programs/lbxproxy/os/osinit.c:1.6 xc/programs/lbxproxy/os/osinit.c:1.7 --- xc/programs/lbxproxy/os/osinit.c:1.6 Sat Apr 3 17:38:55 2004 +++ xc/programs/lbxproxy/os/osinit.c Mon Jan 9 10:00:47 2006 @@ -1,4 +1,3 @@ -/* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/lbxproxy/os/osinit.c,v 1.6 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/lbxproxy/os/osinit.c,v 1.7 2006/01/09 15:00:47 dawes Exp $ */ #include #include "misc.h" Index: xc/programs/listres/Imakefile diff -u xc/programs/listres/Imakefile:1.2 xc/programs/listres/Imakefile:1.3 --- xc/programs/listres/Imakefile:1.2 Wed May 28 12:02:35 2003 +++ xc/programs/listres/Imakefile Mon Jan 9 10:00:47 2006 @@ -1,8 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.14 93/08/17 21:15:52 rws Exp $ - - - -XCOMM $XFree86: xc/programs/listres/Imakefile,v 1.2 2003/05/28 16:02:35 tsi Exp $ +XCOMM $XFree86: xc/programs/listres/Imakefile,v 1.3 2006/01/09 15:00:47 dawes Exp $ DEPLIBS = XawClientDepLibs LOCAL_LIBRARIES = XawClientLibs Index: xc/programs/listres/listres.c diff -u xc/programs/listres/listres.c:1.5 xc/programs/listres/listres.c:1.6 --- xc/programs/listres/listres.c:1.5 Sat Apr 3 17:38:55 2004 +++ xc/programs/listres/listres.c Mon Jan 9 10:00:47 2006 @@ -1,6 +1,4 @@ /* - * $XConsortium: listres.c,v 1.32 94/04/17 20:43:22 dave Exp $ - * * Copyright (c) 1989 X Consortium @@ -27,7 +25,7 @@ * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/listres/listres.c,v 1.5 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/listres/listres.c,v 1.6 2006/01/09 15:00:47 dawes Exp $ */ #include #include Index: xc/programs/listres/listres.man diff -u xc/programs/listres/listres.man:1.5 xc/programs/listres/listres.man:1.6 --- xc/programs/listres/listres.man:1.5 Thu Feb 10 22:03:13 2005 +++ xc/programs/listres/listres.man Mon Jan 9 10:00:47 2006 @@ -1,4 +1,3 @@ -.\" $XConsortium: listres.man,v 1.8 94/04/17 20:43:22 gildea Exp $ .\" Copyright (c) 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/listres/listres.man,v 1.5 2005/02/11 03:03:13 dawes Exp $ +.\" $XFree86: xc/programs/listres/listres.man,v 1.6 2006/01/09 15:00:47 dawes Exp $ .\" .TH LISTRES 1 __vendorversion__ .SH NAME Index: xc/programs/makepsres/makepsres.c diff -u xc/programs/makepsres/makepsres.c:1.10 xc/programs/makepsres/makepsres.c:1.11 --- xc/programs/makepsres/makepsres.c:1.10 Sat Apr 3 17:38:55 2004 +++ xc/programs/makepsres/makepsres.c Wed Mar 1 18:40:11 2006 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/programs/makepsres/makepsres.c,v 1.10 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/makepsres/makepsres.c,v 1.11 2006/03/01 23:40:11 dawes Exp $ */ #include #include @@ -1603,7 +1603,7 @@ { FILE *file; ResourceKey *resourceType; - char version[10]; + char version[11]; if (fileName[0] == '.') return; Index: xc/programs/makepsres/makepsres.man diff -u xc/programs/makepsres/makepsres.man:1.2 xc/programs/makepsres/makepsres.man:1.3 --- xc/programs/makepsres/makepsres.man:1.2 Wed Feb 23 15:30:19 2000 +++ xc/programs/makepsres/makepsres.man Mon Jan 9 10:00:47 2006 @@ -1,4 +1,4 @@ -.\" Id: makepsres.man,v 6.1 1994/05/18 23:21:05 asente Exp $ +.\" $XFree86: xc/programs/makepsres/makepsres.man,v 1.3 2006/01/09 15:00:47 dawes Exp $ .TH MAKEPSRES 1 "13 May 1993" "Adobe Systems" .SH NAME makepsres \- Build PostScript resource database file. Index: xc/programs/mkcfm/Imakefile diff -u xc/programs/mkcfm/Imakefile:1.4 xc/programs/mkcfm/Imakefile:1.5 --- xc/programs/mkcfm/Imakefile:1.4 Tue Nov 14 20:36:16 2000 +++ xc/programs/mkcfm/Imakefile Fri Oct 14 11:17:31 2005 @@ -1,9 +1,8 @@ -XCOMM $XFree86: xc/programs/mkcfm/Imakefile,v 1.4 2000/11/15 01:36:16 dawes Exp $ +XCOMM $XFree86: xc/programs/mkcfm/Imakefile,v 1.5 2005/10/14 15:17:31 tsi Exp $ SYS_LIBRARIES = MathLibrary -INCLUDES = -I$(FONTLIBSRC)/Type1 -I$(FONTINCSRC) -I$(FONTLIBSRC)/include \ - -I$(XINCLUDESRC) -I$(SERVERSRC)/include +INCLUDES = -I$(FONTLIBSRC)/Type1 -I$(FONTLIBSRC)/include -I$(SERVERSRC)/include DEFINES = -DBUILDCID -DCID_ALL_CHARS Index: xc/programs/mkcfm/mkcfm.c diff -u xc/programs/mkcfm/mkcfm.c:1.14 xc/programs/mkcfm/mkcfm.c:1.15 --- xc/programs/mkcfm/mkcfm.c:1.14 Tue Jan 11 18:01:14 2005 +++ xc/programs/mkcfm/mkcfm.c Fri Oct 14 11:17:31 2005 @@ -15,7 +15,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/programs/mkcfm/mkcfm.c,v 1.14 2005/01/11 23:01:14 tsi Exp $ */ +/* $XFree86: xc/programs/mkcfm/mkcfm.c,v 1.15 2005/10/14 15:17:31 tsi Exp $ */ #include #include @@ -27,12 +27,12 @@ #include "os.h" #include "fntfilst.h" -#include "FSproto.h" -#include "FS.h" -#include "font.h" -#include "fontenc.h" -#include "fontstruct.h" -#include "fsmasks.h" +#include +#include +#include +#include +#include +#include #include "range.h" #include "objects.h" #include "spaces.h" Index: xc/programs/mkfontdir/Imakefile diff -u xc/programs/mkfontdir/Imakefile:3.14 xc/programs/mkfontdir/Imakefile:3.15 --- xc/programs/mkfontdir/Imakefile:3.14 Wed Sep 15 11:01:26 2004 +++ xc/programs/mkfontdir/Imakefile Fri Oct 14 11:17:31 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/mkfontdir/Imakefile,v 3.14 2004/09/15 15:01:26 dawes Exp $ +XCOMM $XFree86: xc/programs/mkfontdir/Imakefile,v 3.15 2005/10/14 15:17:31 tsi Exp $ /* * Copyright (c) 2004 by The XFree86 Project, Inc. @@ -49,7 +49,7 @@ LOCAL_LIBRARIES = $(FONTLIB) DEPLIBS = $(DEPFONTLIB) - INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include + INCLUDES = -I$(FONTLIBSRC)/include #if GzipFontCompression ZLIB = GzipLibrary ZDEFINES = -DX_GZIP_FONT_COMPRESSION Index: xc/programs/mkfontdir/mkfontdir.c diff -u xc/programs/mkfontdir/mkfontdir.c:3.22 xc/programs/mkfontdir/mkfontdir.c:3.23 --- xc/programs/mkfontdir/mkfontdir.c:3.22 Wed Sep 15 11:02:54 2004 +++ xc/programs/mkfontdir/mkfontdir.c Fri Oct 14 11:17:31 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/mkfontdir/mkfontdir.c,v 3.22 2004/09/15 15:02:54 dawes Exp $ */ +/* $XFree86: xc/programs/mkfontdir/mkfontdir.c,v 3.23 2005/10/14 15:17:31 tsi Exp $ */ /*********************************************************** Copyright (c) 1988 X Consortium @@ -47,8 +47,6 @@ ******************************************************************/ -/* $Xorg: mkfontdir.c,v 1.5 2000/08/17 19:53:59 cpqbld Exp $ */ - #ifdef WIN32 #define _WILLWINSOCK_ #endif @@ -109,7 +107,7 @@ #include #include #include "fntfilst.h" -#include "fontenc.h" +#include #include "bitmap.h" #include Index: xc/programs/mkfontdir/mkfontdir.man diff -u xc/programs/mkfontdir/mkfontdir.man:1.16 xc/programs/mkfontdir/mkfontdir.man:1.17 --- xc/programs/mkfontdir/mkfontdir.man:1.16 Thu Feb 10 22:03:14 2005 +++ xc/programs/mkfontdir/mkfontdir.man Mon Jan 9 10:00:48 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: mkfontdir.man,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.16 2005/02/11 03:03:14 dawes Exp $ +.\" $XFree86: xc/programs/mkfontdir/mkfontdir.man,v 1.17 2006/01/09 15:00:48 dawes Exp $ .\" .TH MKFONTDIR 1 __vendorversion__ .SH NAME Index: xc/programs/mkfontscale/Imakefile diff -u xc/programs/mkfontscale/Imakefile:1.8 xc/programs/mkfontscale/Imakefile:1.9 --- xc/programs/mkfontscale/Imakefile:1.8 Mon Nov 17 10:18:06 2003 +++ xc/programs/mkfontscale/Imakefile Fri Oct 14 11:17:31 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/mkfontscale/Imakefile,v 1.8 2003/11/17 15:18:06 tsi Exp $ +XCOMM $XFree86: xc/programs/mkfontscale/Imakefile,v 1.9 2005/10/14 15:17:31 tsi Exp $ LOCAL_LIBRARIES = $(XFONTENCLIB) $(FREETYPE2LIB) DEPLIBS = $(DEPXFONTENCLIB) $(DEPFREETYPE2LIB) @@ -14,7 +14,7 @@ SNPRINTF_INCLUDES = -I$(LIBSRC)/misc #endif -INCLUDES = $(FREETYPE2INCLUDES) $(SNPRINTF_INCLUDES) -I$(XBUILDINCDIR) +INCLUDES = $(FREETYPE2INCLUDES) $(SNPRINTF_INCLUDES) DEFINES = $(FREETYPE2DEFINES) $(SNPRINTF_DEFINES) -DXFREE86_FT2 ComplexProgramTarget(mkfontscale) Index: xc/programs/mkfontscale/ident.c diff -u xc/programs/mkfontscale/ident.c:1.4 xc/programs/mkfontscale/ident.c:1.5 --- xc/programs/mkfontscale/ident.c:1.4 Fri Oct 24 16:38:13 2003 +++ xc/programs/mkfontscale/ident.c Thu Mar 24 21:22:58 2005 @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/ident.c,v 1.4 2003/10/24 20:38:13 tsi Exp $ */ +/* $XFree86: xc/programs/mkfontscale/ident.c,v 1.5 2005/03/25 02:22:58 dawes Exp $ */ /* The function identifyBitmap returns -1 if filename is definitively not a font file, 1 if it is a single-face bitmap font with a XLFD name, @@ -29,6 +29,7 @@ #include #include #include "zlib.h" +#include "ident.h" #define PCF_VERSION (('p'<<24)|('c'<<16)|('f'<<8)|1) #define PCF_PROPERTIES (1 << 0) Index: xc/programs/mkfontscale/mkfontscale.c diff -u xc/programs/mkfontscale/mkfontscale.c:1.24 xc/programs/mkfontscale/mkfontscale.c:1.25 --- xc/programs/mkfontscale/mkfontscale.c:1.24 Sun Feb 6 20:01:16 2005 +++ xc/programs/mkfontscale/mkfontscale.c Mon Apr 25 20:44:07 2005 @@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.24 2005/02/07 01:01:16 tsi Exp $ */ +/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.25 2005/04/26 00:44:07 dawes Exp $ */ #include #include @@ -407,14 +407,16 @@ #define NUMWIDTHS (sizeof(widths) / sizeof(widths[0])) +#define NAME_BUFFER_SIZE 500 + static char* nameWidth(char *name) { - char buf[500]; + char buf[NAME_BUFFER_SIZE]; int i; int n = strlen(name); - if(n >= 499) return NULL; + if(n >= NAME_BUFFER_SIZE - 1) return NULL; for(i = 0; i < n; i++) buf[i] = tolower(name[i]); buf[i] = '\0'; @@ -425,37 +427,29 @@ return NULL; } -static char* +static char weightL[NAME_BUFFER_SIZE]; + +static const char* t1Weight(char *weight) { - if(!weight) - return NULL; - if(strcmp(weight, "Thin") == 0) - return "thin"; - if(strcmp(weight, "Light") == 0) - return "light"; - if(strcmp(weight, "Regular") == 0) - return "medium"; - if(strcmp(weight, "Normal") == 0) - return "medium"; - if(strcmp(weight, "Medium") == 0) - return "medium"; - if(strcmp(weight, "Book") == 0) - return "medium"; - if(strcmp(weight, "Roman") == 0) /* Some URW++ fonts do that! */ - return "medium"; - if(strcmp(weight, "Demi") == 0) - return "semibold"; - if(strcmp(weight, "DemiBold") == 0) - return "semibold"; - else if(strcmp(weight, "Bold") == 0) - return "bold"; - else if(strcmp(weight, "Black") == 0) - return "black"; - else { - fprintf(stderr, "Unknown Type 1 weight \"%s\"\n", weight); - return NULL; + unsigned int i = 0; + unsigned int n = strlen(weight); + unsigned int j; + unsigned char ch; + unsigned char space = ' '; + + if(n >= NAME_BUFFER_SIZE - 1) return NULL; + for(j = 0; j < n; j++) { + ch = (unsigned char) tolower(weight[j]); + if ( ch != space) { + weightL[i] = ch ; + i++ ; + } } + weightL[i] = '\0'; + if(!weightL) + return NULL; + else return weightL; } static int @@ -502,8 +496,9 @@ makeXLFD(char *filename, FT_Face face, int isBitmap) { ListPtr xlfd = NULL; - char *foundry, *family, *weight, *slant, *sWidth, *adstyle, + char *foundry, *family, *slant, *sWidth, *adstyle, *spacing, *full_name; + const char *weight; TT_Header *head; TT_HoriHeader *hhea; TT_OS2 *os2; Index: xc/programs/oclock/Clock-col.ad diff -u xc/programs/oclock/Clock-col.ad:1.1.1.2 xc/programs/oclock/Clock-col.ad:1.2 --- xc/programs/oclock/Clock-col.ad:1.1.1.2 Tue Jan 16 17:46:39 2001 +++ xc/programs/oclock/Clock-col.ad Mon Jan 9 10:00:48 2006 @@ -1,4 +1,4 @@ -! $Xorg: Clock-col.ad,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ +! $XFree86: xc/programs/oclock/Clock-col.ad,v 1.2 2006/01/09 15:00:48 dawes Exp $ Clock*Background: grey Clock*BorderColor: light blue Clock*hour: yellow Index: xc/programs/oclock/Clock.c diff -u xc/programs/oclock/Clock.c:1.7 xc/programs/oclock/Clock.c:1.8 --- xc/programs/oclock/Clock.c:1.7 Fri Dec 14 15:01:00 2001 +++ xc/programs/oclock/Clock.c Mon Jan 9 10:00:48 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: Clock.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/oclock/Clock.c,v 1.7 2001/12/14 20:01:00 dawes Exp $ */ +/* $XFree86: xc/programs/oclock/Clock.c,v 1.8 2006/01/09 15:00:48 dawes Exp $ */ /* * Clock.c Index: xc/programs/oclock/Clock.h diff -u xc/programs/oclock/Clock.h:1.5 xc/programs/oclock/Clock.h:1.6 --- xc/programs/oclock/Clock.h:1.5 Fri Dec 14 15:01:00 2001 +++ xc/programs/oclock/Clock.h Mon Jan 9 10:00:48 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Clock.h,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/oclock/Clock.h,v 1.5 2001/12/14 20:01:00 dawes Exp $ */ +/* $XFree86: xc/programs/oclock/Clock.h,v 1.6 2006/01/09 15:00:48 dawes Exp $ */ #ifndef _XtClock_h #define _XtClock_h Index: xc/programs/oclock/ClockP.h diff -u xc/programs/oclock/ClockP.h:1.5 xc/programs/oclock/ClockP.h:1.6 --- xc/programs/oclock/ClockP.h:1.5 Fri Dec 14 15:01:00 2001 +++ xc/programs/oclock/ClockP.h Mon Jan 9 10:00:48 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ClockP.h,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/oclock/ClockP.h,v 1.5 2001/12/14 20:01:00 dawes Exp $ */ +/* $XFree86: xc/programs/oclock/ClockP.h,v 1.6 2006/01/09 15:00:48 dawes Exp $ */ #ifndef _ClockP_h Index: xc/programs/oclock/Imakefile diff -u xc/programs/oclock/Imakefile:1.1.1.3 xc/programs/oclock/Imakefile:1.2 --- xc/programs/oclock/Imakefile:1.1.1.3 Tue Jan 16 17:46:41 2001 +++ xc/programs/oclock/Imakefile Mon Jan 9 10:00:48 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ +XCOMM $XFree86: xc/programs/oclock/Imakefile,v 1.2 2006/01/09 15:00:48 dawes Exp $ + SYS_LIBRARIES = MathLibrary DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) XkbClientDepLibs LOCAL_LIBRARIES = $(XMULIB) $(XTOOLLIB) $(XLIB) XkbClientLibs Index: xc/programs/oclock/oclock.c diff -u xc/programs/oclock/oclock.c:1.8 xc/programs/oclock/oclock.c:1.9 --- xc/programs/oclock/oclock.c:1.8 Tue May 27 18:26:57 2003 +++ xc/programs/oclock/oclock.c Mon Jan 9 10:00:48 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: oclock.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/oclock/oclock.c,v 1.8 2003/05/27 22:26:57 tsi Exp $ */ +/* $XFree86: xc/programs/oclock/oclock.c,v 1.9 2006/01/09 15:00:48 dawes Exp $ */ #include #include Index: xc/programs/oclock/oclock.man diff -u xc/programs/oclock/oclock.man:1.10 xc/programs/oclock/oclock.man:1.11 --- xc/programs/oclock/oclock.man:1.10 Thu Feb 10 22:03:14 2005 +++ xc/programs/oclock/oclock.man Mon Jan 9 10:00:48 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: oclock.man,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ .\" Copyright 1989, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/oclock/oclock.man,v 1.10 2005/02/11 03:03:14 dawes Exp $ +.\" $XFree86: xc/programs/oclock/oclock.man,v 1.11 2006/01/09 15:00:48 dawes Exp $ .\" .TH OCLOCK 1 __vendorversion__ .SH NAME Index: xc/programs/oclock/transform.c diff -u xc/programs/oclock/transform.c:3.5 xc/programs/oclock/transform.c:3.6 --- xc/programs/oclock/transform.c:3.5 Fri Dec 14 15:01:00 2001 +++ xc/programs/oclock/transform.c Mon Jan 9 10:00:48 2006 @@ -1,4 +1,3 @@ -/* $Xorg: transform.c,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/oclock/transform.c,v 3.5 2001/12/14 20:01:00 dawes Exp $ */ +/* $XFree86: xc/programs/oclock/transform.c,v 3.6 2006/01/09 15:00:48 dawes Exp $ */ /* Index: xc/programs/oclock/transform.h diff -u xc/programs/oclock/transform.h:1.5 xc/programs/oclock/transform.h:1.6 --- xc/programs/oclock/transform.h:1.5 Fri Dec 14 15:01:00 2001 +++ xc/programs/oclock/transform.h Mon Jan 9 10:00:48 2006 @@ -1,4 +1,3 @@ -/* $Xorg: transform.h,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/oclock/transform.h,v 1.5 2001/12/14 20:01:00 dawes Exp $ */ +/* $XFree86: xc/programs/oclock/transform.h,v 1.6 2006/01/09 15:00:48 dawes Exp $ */ /* Index: xc/programs/proxymngr/Imakefile diff -u xc/programs/proxymngr/Imakefile:1.14 xc/programs/proxymngr/Imakefile:1.15 --- xc/programs/proxymngr/Imakefile:1.14 Wed Jul 9 11:27:36 2003 +++ xc/programs/proxymngr/Imakefile Mon Jan 9 10:00:48 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:59 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/proxymngr/Imakefile,v 1.14 2003/07/09 15:27:36 tsi Exp $ +XCOMM $XFree86: xc/programs/proxymngr/Imakefile,v 1.15 2006/01/09 15:00:48 dawes Exp $ DEFINES = StrcasecmpDefines Index: xc/programs/proxymngr/PM.h diff -u xc/programs/proxymngr/PM.h:1.2 xc/programs/proxymngr/PM.h:1.3 --- xc/programs/proxymngr/PM.h:1.2 Fri Dec 14 15:01:01 2001 +++ xc/programs/proxymngr/PM.h Mon Jan 9 10:00:48 2006 @@ -1,5 +1,4 @@ -/* $Xorg: PM.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/proxymngr/PM.h,v 1.3 2006/01/09 15:00:48 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/proxymngr/PMproto.h diff -u xc/programs/proxymngr/PMproto.h:1.2 xc/programs/proxymngr/PMproto.h:1.3 --- xc/programs/proxymngr/PMproto.h:1.2 Fri Dec 14 15:01:01 2001 +++ xc/programs/proxymngr/PMproto.h Mon Jan 9 10:00:48 2006 @@ -1,5 +1,4 @@ -/* $Xorg: PMproto.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/proxymngr/PMproto.h,v 1.3 2006/01/09 15:00:48 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/proxymngr/config.c diff -u xc/programs/proxymngr/config.c:1.7 xc/programs/proxymngr/config.c:1.8 --- xc/programs/proxymngr/config.c:1.7 Fri Dec 14 15:01:01 2001 +++ xc/programs/proxymngr/config.c Mon Jan 9 10:00:48 2006 @@ -1,4 +1,3 @@ -/* $Xorg: config.c,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -25,7 +24,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/config.c,v 1.7 2001/12/14 20:01:01 dawes Exp $ */ +/* $XFree86: xc/programs/proxymngr/config.c,v 1.8 2006/01/09 15:00:48 dawes Exp $ */ #include Index: xc/programs/proxymngr/config.h diff -u xc/programs/proxymngr/config.h:1.2 xc/programs/proxymngr/config.h:1.3 --- xc/programs/proxymngr/config.h:1.2 Fri Dec 14 15:01:01 2001 +++ xc/programs/proxymngr/config.h Mon Jan 9 10:00:49 2006 @@ -1,5 +1,4 @@ -/* $Xorg: config.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/proxymngr/config.h,v 1.3 2006/01/09 15:00:49 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/proxymngr/main.c diff -u xc/programs/proxymngr/main.c:1.9 xc/programs/proxymngr/main.c:1.10 --- xc/programs/proxymngr/main.c:1.9 Wed Jul 9 11:27:36 2003 +++ xc/programs/proxymngr/main.c Mon Jan 9 10:00:49 2006 @@ -1,5 +1,3 @@ -/* $Xorg: main.c,v 1.6 2001/02/09 02:05:34 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/main.c,v 1.9 2003/07/09 15:27:36 tsi Exp $ */ +/* $XFree86: xc/programs/proxymngr/main.c,v 1.10 2006/01/09 15:00:49 dawes Exp $ */ #include #include "pmint.h" Index: xc/programs/proxymngr/pmconfig.cpp diff -u xc/programs/proxymngr/pmconfig.cpp:1.1.1.2 xc/programs/proxymngr/pmconfig.cpp:1.2 --- xc/programs/proxymngr/pmconfig.cpp:1.1.1.2 Tue Jan 16 17:46:44 2001 +++ xc/programs/proxymngr/pmconfig.cpp Mon Jan 9 10:00:49 2006 @@ -1,4 +1,4 @@ -! $Xorg: pmconfig.cpp,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ +! $XFree86: xc/programs/proxymngr/pmconfig.cpp,v 1.2 2006/01/09 15:00:49 dawes Exp $ ! proxy manager config file ! ! Each line has the format: Index: xc/programs/proxymngr/pmdb.c diff -u xc/programs/proxymngr/pmdb.c:1.8 xc/programs/proxymngr/pmdb.c:1.9 --- xc/programs/proxymngr/pmdb.c:1.8 Sat Sep 13 17:33:11 2003 +++ xc/programs/proxymngr/pmdb.c Mon Jan 9 10:00:49 2006 @@ -1,5 +1,3 @@ -/* $Xorg: pmdb.c,v 1.5 2001/02/09 02:05:34 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/pmdb.c,v 1.8 2003/09/13 21:33:11 dawes Exp $ */ +/* $XFree86: xc/programs/proxymngr/pmdb.c,v 1.9 2006/01/09 15:00:49 dawes Exp $ */ #include "pmint.h" #include "pmdb.h" Index: xc/programs/proxymngr/pmdb.h diff -u xc/programs/proxymngr/pmdb.h:1.2 xc/programs/proxymngr/pmdb.h:1.3 --- xc/programs/proxymngr/pmdb.h:1.2 Fri Dec 14 15:01:02 2001 +++ xc/programs/proxymngr/pmdb.h Mon Jan 9 10:00:49 2006 @@ -1,5 +1,4 @@ -/* $Xorg: pmdb.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/proxymngr/pmdb.h,v 1.3 2006/01/09 15:00:49 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/proxymngr/pmint.h diff -u xc/programs/proxymngr/pmint.h:1.6 xc/programs/proxymngr/pmint.h:1.7 --- xc/programs/proxymngr/pmint.h:1.6 Sat Sep 13 17:33:11 2003 +++ xc/programs/proxymngr/pmint.h Mon Jan 9 10:00:49 2006 @@ -1,5 +1,3 @@ -/* $Xorg: pmint.h,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/proxymngr/pmint.h,v 1.6 2003/09/13 21:33:11 dawes Exp $ */ +/* $XFree86: xc/programs/proxymngr/pmint.h,v 1.7 2006/01/09 15:00:49 dawes Exp $ */ #include #include @@ -53,9 +51,6 @@ char *release; } PMconn; - -/* main.c: $TOG: main.c /main/36 1998/03/04 11:30:05 barstow $ */ - extern void ForwardRequest ( PMconn *requestor, char *serviceName, char *serverAddress, char *hostAddress, char *startOptions, int authLen, char *authName, char *authData ); extern int HostBasedAuthProc ( char *hostname ); extern int InitWatchProcs ( XtAppContext appContext ); Index: xc/programs/proxymngr/proxymngr.man diff -u xc/programs/proxymngr/proxymngr.man:1.10 xc/programs/proxymngr/proxymngr.man:1.11 --- xc/programs/proxymngr/proxymngr.man:1.10 Thu Feb 10 22:03:14 2005 +++ xc/programs/proxymngr/proxymngr.man Mon Jan 9 10:00:49 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: proxymngr.man,v 1.4 2001/02/09 02:05:34 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/proxymngr/proxymngr.man,v 1.10 2005/02/11 03:03:14 dawes Exp $ +.\" $XFree86: xc/programs/proxymngr/proxymngr.man,v 1.11 2006/01/09 15:00:49 dawes Exp $ .\" .TH PROXYMNGR 1 __vendorversion__ .SH NAME Index: xc/programs/rgb/Imakefile diff -u xc/programs/rgb/Imakefile:3.10 xc/programs/rgb/Imakefile:3.11 --- xc/programs/rgb/Imakefile:3.10 Wed Jan 17 18:45:02 2001 +++ xc/programs/rgb/Imakefile Tue Jun 21 23:28:51 2005 @@ -1,70 +1,19 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ +XCOMM $XFree86: xc/programs/rgb/Imakefile,v 3.11 2005/06/22 03:28:51 dawes Exp $ - - - -XCOMM $XFree86: xc/programs/rgb/Imakefile,v 3.10 2001/01/17 23:45:02 dawes Exp $ - -#if UseRgbTxt - RGB_DEFINES = -DUSE_RGB_TXT -#else - RGB_PROG = ProgramTargetName(rgb) -#endif RGB_DB = DefaultRGBDatabase SITE_RGB_DB = -DRGB_DB=\"$(RGB_DB)\" DEPLIBS = - DEFINES = NdbmDefines $(SITE_RGB_DB) $(RGB_DEFINES) + DEFINES = $(SITE_RGB_DB) $(RGB_DEFINES) INCLUDES = -I$(SERVERSRC)/include -#if !UseRgbTxt - SRCS1 = rgb.c - OBJS1 = rgb.o -#endif - SRCS2 = showrgb.c - OBJS2 = showrgb.o - SRCS = $(SRCS1) $(SRCS2) - OBJS = $(OBJS1) $(OBJS2) - PROGRAMS = $(RGB_PROG) ProgramTargetName(showrgb) -#if !UseRgbTxt -#if defined(BSDOSArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) - DATAFILES = rgb.db - DATADEP = rgb.db -#else - DATAFILES = rgb.pag rgb.dir - DATADEP = rgb.dir /* just want one run of rgb */ -#if !(defined(SGIArchitecture) || defined(SVR4Architecture) || defined(NetBSDArchitecture)) - DBMLIB = DBMLibrary -#endif -#endif -#if defined(SparcArchitecture) && HasGcc && !HasGcc2 - CC = cc - CCOPTIONS = /**/ - EXTRA_LOAD_FLAGS = /**/ -#endif -#if defined(i386Architecture) && defined(SVR4Architecture) && !defined(SCOArchitecture) - DBMLIB = DBMLibrary -lucb -#endif -#endif /*!UseRgbTxt */ + SRCS = showrgb.c + OBJS = showrgb.o + PROGRAMS = ProgramTargetName(showrgb) all:: $(PROGRAMS) $(DATADEP) -#if !UseRgbTxt -SingleProgramTarget(rgb,$(OBJS1),NullParameter,$(DBMLIB)) -SpecialCObjectRule(rgb,$(ICONFIGFILES),$(_NOOP_)) -LinkBuildBinary(rgb) -#endif -SingleProgramTarget(showrgb,$(OBJS2),NullParameter,$(DBMLIB)) -SpecialCObjectRule(showrgb,$(ICONFIGFILES),$(_NOOP_)) -InstallMultiple($(DATAFILES) rgb.txt,$(LIBDIR)) +SingleProgramTarget(showrgb,$(OBJS),NullParameter,NullParameter) +InstallNonExecFile(rgb.txt,$(LIBDIR)) InstallProgramWithFlags(showrgb,$(BINDIR),NullParameter) InstallManPage(showrgb,$(MANDIR)) -#if !UseRgbTxt -$(DATADEP): rgb rgb.txt - RemoveFile($(DATAFILES)) - ./rgb rgb < rgb.txt - -clean:: - RemoveFile($(DATAFILES)) -#endif - DependTarget() Index: xc/programs/rgb/rgb.c diff -u xc/programs/rgb/rgb.c:3.10 xc/programs/rgb/rgb.c:removed --- xc/programs/rgb/rgb.c:3.10 Sat Apr 3 17:26:25 2004 +++ xc/programs/rgb/rgb.c Tue May 9 21:58:18 2006 @@ -1,166 +0,0 @@ -/* $Xorg: rgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */ -/* - -Copyright 1985, 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. - -*/ -/* $XFree86: xc/programs/rgb/rgb.c,v 3.10 2004/04/03 22:26:25 dawes Exp $ */ - - -/* reads from standard input lines of the form: - red green blue name - where red/green/blue are decimal values, and inserts them in a database. - */ - -#ifdef NDBM -#include -#else -#if defined(SVR4) && !defined(__SCO__) -#include -#else -#include -#endif -#define dbm_open(name,flags,mode) (!dbminit(name)) -#define dbm_store(db,key,content,flags) (store(key,content)) -#define dbm_close(db) dbmclose() -#endif - -#undef NULL -#include -#include -#include -#include "rgb.h" -#include "site.h" -#include - -#include - -char *ProgramName; - -char *SysError () -{ - register char *s = strerror(errno); - return s ? s : "?"; -} - -int -main(argc, argv) - int argc; - char **argv; -{ - char *dbname; - char line[512]; - int red, green, blue; - RGB rgb; - datum key, content; - char name[512]; - int items; - int lineno; - int i, n; - int fd; -#ifdef NDBM - DBM *rgb_dbm; -#else - int rgb_dbm; -#endif - - ProgramName = argv[0]; - - if (argc == 2) - dbname = argv[1]; - else - dbname = RGB_DB; - - strcpy (name, dbname); - strcat (name, ".dir"); - fd = open (name, O_WRONLY|O_CREAT, 0666); - if (fd < 0) { - fprintf (stderr, - "%s: unable to create dbm file \"%s\" (error %d, %s)\n", - ProgramName, name, errno, strerror(errno)); - exit (1); - } - (void) close (fd); - - strcpy (name, dbname); - strcat (name, ".pag"); - fd = open (name, O_WRONLY|O_CREAT, 0666); - if (fd < 0) { - fprintf (stderr, - "%s: unable to create dbm file \"%s\" (error %d, %s)\n", - ProgramName, name, errno, strerror(errno)); - exit (1); - } - (void) close (fd); - - rgb_dbm = dbm_open (dbname, O_RDWR|O_CREAT, 0666); - if (!rgb_dbm) { - fprintf (stderr, - "%s: unable to open dbm database \"%s\" (error %d, %s)\n", - ProgramName, dbname, errno, strerror(errno)); - exit (1); - } - - key.dptr = name; - content.dptr = (char *) &rgb; - content.dsize = sizeof (rgb); - lineno = 0; - while (fgets (line, sizeof (line), stdin)) { - lineno++; - if (line[0] == '!') - continue; - items = sscanf (line, "%d %d %d %[^\n]\n", &red, &green, &blue, name); - if (items != 4) { - fprintf (stderr, "syntax error on line %d\n", lineno); - fflush (stderr); - continue; - } - if (red < 0 || red > 0xff || - green < 0 || green > 0xff || - blue < 0 || blue > 0xff) { - fprintf (stderr, "value for %s out of range\n", name); - fflush (stderr); - continue; - } - n = strlen (name); - for (i = 0; i < n; i++) { - if (isupper (name[i])) - name[i] = tolower (name[i]); - } - key.dsize = n; - rgb.red = (red * 65535) / 255; - rgb.green = (green * 65535) / 255; - rgb.blue = (blue * 65535) / 255; - if (dbm_store (rgb_dbm, key, content, DBM_REPLACE)) { - fprintf (stderr, "%s: store of entry \"%s\" failed\n", - ProgramName, name); - fflush (stderr); - } - } - - dbm_close(rgb_dbm); - - exit(0); -} Index: xc/programs/rgb/rgb.txt diff -u xc/programs/rgb/rgb.txt:1.1.1.2 xc/programs/rgb/rgb.txt:1.2 --- xc/programs/rgb/rgb.txt:1.1.1.2 Tue Jan 16 17:46:46 2001 +++ xc/programs/rgb/rgb.txt Tue Jun 21 23:28:51 2005 @@ -1,226 +1,138 @@ -! $Xorg: rgb.txt,v 1.3 2000/08/17 19:54:00 cpqbld Exp $ +! $XFree86: xc/programs/rgb/rgb.txt,v 1.2 2005/06/22 03:28:51 dawes Exp $ 255 250 250 snow -248 248 255 ghost white 248 248 255 GhostWhite -245 245 245 white smoke 245 245 245 WhiteSmoke 220 220 220 gainsboro -255 250 240 floral white 255 250 240 FloralWhite -253 245 230 old lace 253 245 230 OldLace 250 240 230 linen -250 235 215 antique white 250 235 215 AntiqueWhite -255 239 213 papaya whip 255 239 213 PapayaWhip -255 235 205 blanched almond 255 235 205 BlanchedAlmond 255 228 196 bisque -255 218 185 peach puff 255 218 185 PeachPuff -255 222 173 navajo white 255 222 173 NavajoWhite 255 228 181 moccasin 255 248 220 cornsilk 255 255 240 ivory -255 250 205 lemon chiffon 255 250 205 LemonChiffon 255 245 238 seashell 240 255 240 honeydew -245 255 250 mint cream 245 255 250 MintCream 240 255 255 azure -240 248 255 alice blue 240 248 255 AliceBlue 230 230 250 lavender -255 240 245 lavender blush 255 240 245 LavenderBlush -255 228 225 misty rose 255 228 225 MistyRose 255 255 255 white 0 0 0 black - 47 79 79 dark slate gray 47 79 79 DarkSlateGray - 47 79 79 dark slate grey 47 79 79 DarkSlateGrey -105 105 105 dim gray 105 105 105 DimGray -105 105 105 dim grey 105 105 105 DimGrey -112 128 144 slate gray 112 128 144 SlateGray -112 128 144 slate grey 112 128 144 SlateGrey -119 136 153 light slate gray 119 136 153 LightSlateGray -119 136 153 light slate grey 119 136 153 LightSlateGrey 190 190 190 gray 190 190 190 grey -211 211 211 light grey 211 211 211 LightGrey -211 211 211 light gray 211 211 211 LightGray - 25 25 112 midnight blue 25 25 112 MidnightBlue 0 0 128 navy - 0 0 128 navy blue 0 0 128 NavyBlue -100 149 237 cornflower blue 100 149 237 CornflowerBlue - 72 61 139 dark slate blue 72 61 139 DarkSlateBlue -106 90 205 slate blue 106 90 205 SlateBlue -123 104 238 medium slate blue 123 104 238 MediumSlateBlue -132 112 255 light slate blue 132 112 255 LightSlateBlue - 0 0 205 medium blue 0 0 205 MediumBlue - 65 105 225 royal blue 65 105 225 RoyalBlue 0 0 255 blue - 30 144 255 dodger blue 30 144 255 DodgerBlue - 0 191 255 deep sky blue 0 191 255 DeepSkyBlue -135 206 235 sky blue 135 206 235 SkyBlue -135 206 250 light sky blue 135 206 250 LightSkyBlue - 70 130 180 steel blue 70 130 180 SteelBlue -176 196 222 light steel blue 176 196 222 LightSteelBlue -173 216 230 light blue 173 216 230 LightBlue -176 224 230 powder blue 176 224 230 PowderBlue -175 238 238 pale turquoise 175 238 238 PaleTurquoise - 0 206 209 dark turquoise 0 206 209 DarkTurquoise - 72 209 204 medium turquoise 72 209 204 MediumTurquoise 64 224 208 turquoise 0 255 255 cyan -224 255 255 light cyan 224 255 255 LightCyan - 95 158 160 cadet blue 95 158 160 CadetBlue -102 205 170 medium aquamarine 102 205 170 MediumAquamarine 127 255 212 aquamarine - 0 100 0 dark green 0 100 0 DarkGreen - 85 107 47 dark olive green 85 107 47 DarkOliveGreen -143 188 143 dark sea green 143 188 143 DarkSeaGreen - 46 139 87 sea green 46 139 87 SeaGreen - 60 179 113 medium sea green 60 179 113 MediumSeaGreen - 32 178 170 light sea green 32 178 170 LightSeaGreen -152 251 152 pale green 152 251 152 PaleGreen - 0 255 127 spring green 0 255 127 SpringGreen -124 252 0 lawn green 124 252 0 LawnGreen 0 255 0 green 127 255 0 chartreuse - 0 250 154 medium spring green 0 250 154 MediumSpringGreen -173 255 47 green yellow 173 255 47 GreenYellow - 50 205 50 lime green 50 205 50 LimeGreen -154 205 50 yellow green 154 205 50 YellowGreen - 34 139 34 forest green 34 139 34 ForestGreen -107 142 35 olive drab 107 142 35 OliveDrab -189 183 107 dark khaki 189 183 107 DarkKhaki 240 230 140 khaki -238 232 170 pale goldenrod 238 232 170 PaleGoldenrod -250 250 210 light goldenrod yellow 250 250 210 LightGoldenrodYellow -255 255 224 light yellow 255 255 224 LightYellow 255 255 0 yellow 255 215 0 gold -238 221 130 light goldenrod 238 221 130 LightGoldenrod 218 165 32 goldenrod -184 134 11 dark goldenrod 184 134 11 DarkGoldenrod -188 143 143 rosy brown 188 143 143 RosyBrown -205 92 92 indian red 205 92 92 IndianRed -139 69 19 saddle brown 139 69 19 SaddleBrown 160 82 45 sienna 205 133 63 peru 222 184 135 burlywood 245 245 220 beige 245 222 179 wheat -244 164 96 sandy brown 244 164 96 SandyBrown 210 180 140 tan 210 105 30 chocolate 178 34 34 firebrick 165 42 42 brown -233 150 122 dark salmon 233 150 122 DarkSalmon 250 128 114 salmon -255 160 122 light salmon 255 160 122 LightSalmon 255 165 0 orange -255 140 0 dark orange 255 140 0 DarkOrange 255 127 80 coral -240 128 128 light coral 240 128 128 LightCoral 255 99 71 tomato -255 69 0 orange red 255 69 0 OrangeRed 255 0 0 red -255 105 180 hot pink 255 105 180 HotPink -255 20 147 deep pink 255 20 147 DeepPink 255 192 203 pink -255 182 193 light pink 255 182 193 LightPink -219 112 147 pale violet red 219 112 147 PaleVioletRed 176 48 96 maroon -199 21 133 medium violet red 199 21 133 MediumVioletRed -208 32 144 violet red 208 32 144 VioletRed 255 0 255 magenta 238 130 238 violet 221 160 221 plum 218 112 214 orchid -186 85 211 medium orchid 186 85 211 MediumOrchid -153 50 204 dark orchid 153 50 204 DarkOrchid -148 0 211 dark violet 148 0 211 DarkViolet -138 43 226 blue violet 138 43 226 BlueViolet 160 32 240 purple -147 112 219 medium purple 147 112 219 MediumPurple 216 191 216 thistle 255 250 250 snow1 @@ -737,17 +649,10 @@ 252 252 252 grey99 255 255 255 gray100 255 255 255 grey100 -169 169 169 dark grey 169 169 169 DarkGrey -169 169 169 dark gray 169 169 169 DarkGray -0 0 139 dark blue 0 0 139 DarkBlue -0 139 139 dark cyan 0 139 139 DarkCyan -139 0 139 dark magenta 139 0 139 DarkMagenta -139 0 0 dark red 139 0 0 DarkRed -144 238 144 light green 144 238 144 LightGreen Index: xc/programs/rgb/showrgb.c diff -u xc/programs/rgb/showrgb.c:3.10 xc/programs/rgb/showrgb.c:3.11 --- xc/programs/rgb/showrgb.c:3.10 Sat Apr 3 17:26:25 2004 +++ xc/programs/rgb/showrgb.c Tue Jun 21 23:28:51 2005 @@ -1,6 +1,4 @@ /* - * $Xorg: showrgb.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ - * Copyright 1989, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -26,25 +24,8 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/rgb/showrgb.c,v 3.10 2004/04/03 22:26:25 dawes Exp $ */ +/* $XFree86: xc/programs/rgb/showrgb.c,v 3.11 2005/06/22 03:28:51 dawes Exp $ */ -#ifndef USE_RGB_TXT -#ifdef NDBM -#include -#else -#if defined(SVR4) && !defined(__SCO__) -#include -#else -#include -#endif -#define dbm_open(name,flags,mode) (!dbminit(name)) -#define dbm_firstkey(db) (firstkey()) -#define dbm_fetch(db,key) (fetch(key)) -#define dbm_close(db) dbmclose() -#endif -#endif /* USE_RGB_TXT */ - -#undef NULL #include #include #include @@ -68,57 +49,6 @@ exit (0); } -#ifndef USE_RGB_TXT -static void -dumprgb (filename) - char *filename; -{ -#ifdef NDBM - DBM *rgb_dbm; -#else - int rgb_dbm; -#endif - datum key; - - rgb_dbm = dbm_open (filename, O_RDONLY, 0); - if (!rgb_dbm) { - fprintf (stderr, "%s: unable to open rgb database \"%s\"\n", - ProgramName, filename); - exit (1); - } - -#ifndef NDBM -#define dbm_nextkey(db) (nextkey(key)) /* need variable called key */ -#endif - - for (key = dbm_firstkey(rgb_dbm); key.dptr != NULL; - key = dbm_nextkey(rgb_dbm)) { - datum value; - - value = dbm_fetch(rgb_dbm, key); - if (value.dptr) { - RGB rgb; - unsigned short r, g, b; - memcpy( (char *)&rgb, value.dptr, sizeof rgb); -#define N(x) (((x) >> 8) & 0xff) - r = N(rgb.red); - g = N(rgb.green); - b = N(rgb.blue); -#undef N - printf ("%3u %3u %3u\t\t", r, g, b); - fwrite (key.dptr, 1, key.dsize, stdout); - putchar ('\n'); - } else { - fprintf (stderr, "%s: no value found for key \"", ProgramName); - fwrite (key.dptr, 1, key.dsize, stderr); - fprintf (stderr, "\"\n"); - } - } - - dbm_close (rgb_dbm); -} - -#else /* USE_RGB_TXT */ static void dumprgb (filename) char *filename; @@ -173,4 +103,3 @@ fclose(rgb); } -#endif /* USE_RGB_TXT */ Index: xc/programs/rgb/showrgb.man diff -u xc/programs/rgb/showrgb.man:1.9 xc/programs/rgb/showrgb.man:1.10 --- xc/programs/rgb/showrgb.man:1.9 Thu Feb 10 22:03:14 2005 +++ xc/programs/rgb/showrgb.man Mon Jan 9 10:00:49 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: showrgb.man,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/rgb/showrgb.man,v 1.9 2005/02/11 03:03:14 dawes Exp $ +.\" $XFree86: xc/programs/rgb/showrgb.man,v 1.10 2006/01/09 15:00:49 dawes Exp $ .\" .TH SHOWRGB 1 __vendorversion__ .SH NAME Index: xc/programs/rstart/Imakefile diff -u xc/programs/rstart/Imakefile:3.13 xc/programs/rstart/Imakefile:3.14 --- xc/programs/rstart/Imakefile:3.13 Thu Jan 8 19:28:50 2004 +++ xc/programs/rstart/Imakefile Mon Jan 9 10:00:49 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:54:01 cpqbld Exp $ -XCOMM -XCOMM -XCOMM -XCOMM -XCOMM $XFree86: xc/programs/rstart/Imakefile,v 3.13 2004/01/09 00:28:50 dawes Exp $ +XCOMM $XFree86: xc/programs/rstart/Imakefile,v 3.14 2006/01/09 15:00:49 dawes Exp $ XCOMM XCOMM Copyright (c) 1993 Quarterdeck Office Systems XCOMM Index: xc/programs/rstart/auth.c diff -u xc/programs/rstart/auth.c:1.5 xc/programs/rstart/auth.c:1.6 --- xc/programs/rstart/auth.c:1.5 Wed Jul 25 11:05:15 2001 +++ xc/programs/rstart/auth.c Mon Jan 9 10:00:49 2006 @@ -1,5 +1,3 @@ -/* $Xorg: auth.c,v 1.4 2000/08/17 19:54:01 cpqbld Exp $ */ - /************************************************************************/ /* Copyright (c) 1993 Quarterdeck Office Systems */ /* */ @@ -23,7 +21,7 @@ /* OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT */ /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /************************************************************************/ -/* $XFree86: xc/programs/rstart/auth.c,v 1.5 2001/07/25 15:05:15 dawes Exp $ */ +/* $XFree86: xc/programs/rstart/auth.c,v 1.6 2006/01/09 15:00:49 dawes Exp $ */ #include #include Index: xc/programs/rstart/c diff -u xc/programs/rstart/c:1.1.1.2 xc/programs/rstart/c:1.2 --- xc/programs/rstart/c:1.1.1.2 Tue Jan 16 17:46:49 2001 +++ xc/programs/rstart/c Mon Jan 9 10:00:49 2006 @@ -1,4 +1,4 @@ -# $Xorg: c,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/c,v 1.2 2006/01/09 15:00:49 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems # Index: xc/programs/rstart/client.cpp diff -u xc/programs/rstart/client.cpp:1.2 xc/programs/rstart/client.cpp:1.3 --- xc/programs/rstart/client.cpp:1.2 Mon Dec 17 23:24:00 2001 +++ xc/programs/rstart/client.cpp Mon Jan 9 10:00:49 2006 @@ -1,5 +1,5 @@ XCOMM! /bin/sh -XCOMM $Xorg: client.cpp,v 1.4 2000/12/20 16:41:43 pookie Exp $ +XCOMM $XFree86: xc/programs/rstart/client.cpp,v 1.3 2006/01/09 15:00:49 dawes Exp $ XCOMM XCOMM Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/config.cpp diff -u xc/programs/rstart/config.cpp:1.1.1.2 xc/programs/rstart/config.cpp:1.2 --- xc/programs/rstart/config.cpp:1.1.1.2 Tue Jan 16 17:46:49 2001 +++ xc/programs/rstart/config.cpp Mon Jan 9 10:00:49 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: config.cpp,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +XCOMM $XFree86: xc/programs/rstart/config.cpp,v 1.2 2006/01/09 15:00:49 dawes Exp $ XCOMM XCOMM Copyright (c) 1993 Quarterdeck Office Systems XCOMM Index: xc/programs/rstart/rstart.man diff -u xc/programs/rstart/rstart.man:1.8 xc/programs/rstart/rstart.man:1.9 --- xc/programs/rstart/rstart.man:1.8 Thu Feb 10 22:03:14 2005 +++ xc/programs/rstart/rstart.man Mon Jan 9 10:00:49 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: rstart.man,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ .\" Copyright (c) 1993 Quarterdeck Office Systems .\" .\" Permission to use, copy, modify, distribute, and sell this software and @@ -19,7 +18,7 @@ .\" REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $XFree86: xc/programs/rstart/rstart.man,v 1.8 2005/02/11 03:03:14 dawes Exp $ +.\" $XFree86: xc/programs/rstart/rstart.man,v 1.9 2006/01/09 15:00:49 dawes Exp $ .\" .hy 0 \" I hate hyphenation. .de EX \"Begin example Index: xc/programs/rstart/rstartd.man diff -u xc/programs/rstart/rstartd.man:1.8 xc/programs/rstart/rstartd.man:1.9 --- xc/programs/rstart/rstartd.man:1.8 Thu Feb 10 22:03:14 2005 +++ xc/programs/rstart/rstartd.man Mon Jan 9 10:00:49 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: rstartd.man,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ .\" Copyright (c) 1993 Quarterdeck Office Systems .\" .\" Permission to use, copy, modify, distribute, and sell this software and @@ -19,7 +18,7 @@ .\" REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $XFree86: xc/programs/rstart/rstartd.man,v 1.8 2005/02/11 03:03:14 dawes Exp $ +.\" $XFree86: xc/programs/rstart/rstartd.man,v 1.9 2006/01/09 15:00:49 dawes Exp $ .\" .hy 0 \" I hate hyphenation. .de EX \"Begin example Index: xc/programs/rstart/server.c diff -u xc/programs/rstart/server.c:1.6 xc/programs/rstart/server.c:1.7 --- xc/programs/rstart/server.c:1.6 Tue May 27 18:26:57 2003 +++ xc/programs/rstart/server.c Mon Jan 9 10:00:49 2006 @@ -1,5 +1,3 @@ -/* $Xorg: server.c,v 1.5 2000/08/17 19:54:01 cpqbld Exp $ */ - /************************************************************************/ /* Copyright (c) 1993 Quarterdeck Office Systems */ /* */ @@ -23,7 +21,7 @@ /* OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT */ /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ /************************************************************************/ -/* $XFree86: xc/programs/rstart/server.c,v 1.6 2003/05/27 22:26:57 tsi Exp $ */ +/* $XFree86: xc/programs/rstart/server.c,v 1.7 2006/01/09 15:00:49 dawes Exp $ */ /* Extended rsh "helper" program */ #include Index: xc/programs/rstart/server.cpp diff -u xc/programs/rstart/server.cpp:3.3 xc/programs/rstart/server.cpp:3.4 --- xc/programs/rstart/server.cpp:3.3 Thu Jan 8 19:28:50 2004 +++ xc/programs/rstart/server.cpp Mon Jan 9 10:00:49 2006 @@ -1,6 +1,4 @@ XCOMM! /bin/sh -XCOMM $Xorg: server.cpp,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ -XCOMM XCOMM Copyright (c) 1993 Quarterdeck Office Systems XCOMM @@ -24,6 +22,6 @@ XCOMM OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT XCOMM OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. XCOMM -XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.3 2004/01/09 00:28:50 dawes Exp $ +XCOMM $XFree86: xc/programs/rstart/server.cpp,v 3.4 2006/01/09 15:00:49 dawes Exp $ exec BINDIR/SERVERNAME.real -c LIBDIR/config Index: xc/programs/rstart/server.os2 diff -u xc/programs/rstart/server.os2:1.1 xc/programs/rstart/server.os2:1.2 --- xc/programs/rstart/server.os2:1.1 Sat Aug 26 00:30:57 2000 +++ xc/programs/rstart/server.os2 Mon Jan 9 10:00:49 2006 @@ -1,5 +1,4 @@ /* REXX script */ -XCOMM $XConsortium: server.cpp,v 1.4 94/02/06 19:52:05 mor Exp $ XCOMM XCOMM Copyright (c) 1993 Quarterdeck Office Systems @@ -24,6 +23,6 @@ XCOMM OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT XCOMM OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. XCOMM -XCOMM $XFree86: xc/programs/rstart/server.os2,v 1.1 2000/08/26 04:30:57 dawes Exp $ +XCOMM $XFree86: xc/programs/rstart/server.os2,v 1.2 2006/01/09 15:00:49 dawes Exp $ start LIBDIR/SERVERNAME -c LIBDIR/config Index: xc/programs/rstart/commands/@List diff -u xc/programs/rstart/commands/@List:1.1.1.2 xc/programs/rstart/commands/@List:1.2 --- xc/programs/rstart/commands/@List:1.1.1.2 Tue Jan 16 17:46:52 2001 +++ xc/programs/rstart/commands/@List Mon Jan 9 10:00:50 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/commands/@List,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems # Index: xc/programs/rstart/commands/ListContexts diff -u xc/programs/rstart/commands/ListContexts:1.1.1.2 xc/programs/rstart/commands/ListContexts:1.2 --- xc/programs/rstart/commands/ListContexts:1.1.1.2 Tue Jan 16 17:46:52 2001 +++ xc/programs/rstart/commands/ListContexts Mon Jan 9 10:00:50 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: ListContexts,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/commands/ListContexts,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/commands/ListGenericCommands diff -u xc/programs/rstart/commands/ListGenericCommands:1.1.1.2 xc/programs/rstart/commands/ListGenericCommands:1.2 --- xc/programs/rstart/commands/ListGenericCommands:1.1.1.2 Tue Jan 16 17:46:52 2001 +++ xc/programs/rstart/commands/ListGenericCommands Mon Jan 9 10:00:50 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: ListGenericCommands,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/commands/ListGenericCommands,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/commands/x11r6/@List diff -u xc/programs/rstart/commands/x11r6/@List:1.1.1.2 xc/programs/rstart/commands/x11r6/@List:1.2 --- xc/programs/rstart/commands/x11r6/@List:1.1.1.2 Tue Jan 16 17:46:53 2001 +++ xc/programs/rstart/commands/x11r6/@List Mon Jan 9 10:00:50 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/commands/x11r6/@List,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems # Index: xc/programs/rstart/commands/x11r6/LoadMonitor diff -u xc/programs/rstart/commands/x11r6/LoadMonitor:1.1.1.2 xc/programs/rstart/commands/x11r6/LoadMonitor:1.2 --- xc/programs/rstart/commands/x11r6/LoadMonitor:1.1.1.2 Tue Jan 16 17:46:53 2001 +++ xc/programs/rstart/commands/x11r6/LoadMonitor Mon Jan 9 10:00:50 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: LoadMonitor,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/commands/x11r6/LoadMonitor,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/commands/x11r6/Terminal diff -u xc/programs/rstart/commands/x11r6/Terminal:1.1.1.2 xc/programs/rstart/commands/x11r6/Terminal:1.2 --- xc/programs/rstart/commands/x11r6/Terminal:1.1.1.2 Tue Jan 16 17:46:54 2001 +++ xc/programs/rstart/commands/x11r6/Terminal Mon Jan 9 10:00:50 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: Terminal,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/commands/x11r6/Terminal,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/contexts/@Aliases diff -u xc/programs/rstart/contexts/@Aliases:1.1.1.2 xc/programs/rstart/contexts/@Aliases:1.2 --- xc/programs/rstart/contexts/@Aliases:1.1.1.2 Tue Jan 16 17:46:56 2001 +++ xc/programs/rstart/contexts/@Aliases Mon Jan 9 10:00:50 2006 @@ -1,4 +1,4 @@ -# $Xorg: @Aliases,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/contexts/@Aliases,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems # Index: xc/programs/rstart/contexts/@List diff -u xc/programs/rstart/contexts/@List:1.1.1.2 xc/programs/rstart/contexts/@List:1.2 --- xc/programs/rstart/contexts/@List:1.1.1.2 Tue Jan 16 17:46:56 2001 +++ xc/programs/rstart/contexts/@List Mon Jan 9 10:00:50 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/contexts/@List,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems # Index: xc/programs/rstart/contexts/default diff -u xc/programs/rstart/contexts/default:1.1.1.2 xc/programs/rstart/contexts/default:1.2 --- xc/programs/rstart/contexts/default:1.1.1.2 Tue Jan 16 17:46:57 2001 +++ xc/programs/rstart/contexts/default Mon Jan 9 10:00:50 2006 @@ -1,4 +1,4 @@ -# $Xorg: default,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/contexts/default,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Null context Index: xc/programs/rstart/contexts/x11r6 diff -u xc/programs/rstart/contexts/x11r6:1.1.1.2 xc/programs/rstart/contexts/x11r6:1.2 --- xc/programs/rstart/contexts/x11r6:1.1.1.2 Tue Jan 16 17:46:57 2001 +++ xc/programs/rstart/contexts/x11r6 Mon Jan 9 10:00:50 2006 @@ -1,4 +1,4 @@ -# $Xorg: x11r6,v 1.3 2000/08/17 19:54:01 cpqbld Exp $ +# $XFree86: xc/programs/rstart/contexts/x11r6,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems # Index: xc/programs/rstart/samples/commands/@List diff -u xc/programs/rstart/samples/commands/@List:1.1.1.2 xc/programs/rstart/samples/commands/@List:1.2 --- xc/programs/rstart/samples/commands/@List:1.1.1.2 Tue Jan 16 17:46:58 2001 +++ xc/programs/rstart/samples/commands/@List Mon Jan 9 10:00:50 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:02 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/@List,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems # Index: xc/programs/rstart/samples/commands/ListContexts diff -u xc/programs/rstart/samples/commands/ListContexts:1.1.1.2 xc/programs/rstart/samples/commands/ListContexts:1.2 --- xc/programs/rstart/samples/commands/ListContexts:1.1.1.2 Tue Jan 16 17:46:57 2001 +++ xc/programs/rstart/samples/commands/ListContexts Mon Jan 9 10:00:50 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: ListContexts,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/ListContexts,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/ListGenericCommands diff -u xc/programs/rstart/samples/commands/ListGenericCommands:1.1.1.2 xc/programs/rstart/samples/commands/ListGenericCommands:1.2 --- xc/programs/rstart/samples/commands/ListGenericCommands:1.1.1.2 Tue Jan 16 17:46:58 2001 +++ xc/programs/rstart/samples/commands/ListGenericCommands Mon Jan 9 10:00:50 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: ListGenericCommands,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/ListGenericCommands,v 1.2 2006/01/09 15:00:50 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/odt1/@List diff -u xc/programs/rstart/samples/commands/odt1/@List:1.1.1.2 xc/programs/rstart/samples/commands/odt1/@List:1.2 --- xc/programs/rstart/samples/commands/odt1/@List:1.1.1.2 Tue Jan 16 17:46:59 2001 +++ xc/programs/rstart/samples/commands/odt1/@List Mon Jan 9 10:00:51 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/odt1/@List,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems # Index: xc/programs/rstart/samples/commands/odt1/LoadMonitor diff -u xc/programs/rstart/samples/commands/odt1/LoadMonitor:1.1.1.2 xc/programs/rstart/samples/commands/odt1/LoadMonitor:1.2 --- xc/programs/rstart/samples/commands/odt1/LoadMonitor:1.1.1.2 Tue Jan 16 17:46:59 2001 +++ xc/programs/rstart/samples/commands/odt1/LoadMonitor Mon Jan 9 10:00:51 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: LoadMonitor,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/odt1/LoadMonitor,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/odt1/Terminal diff -u xc/programs/rstart/samples/commands/odt1/Terminal:1.1.1.2 xc/programs/rstart/samples/commands/odt1/Terminal:1.2 --- xc/programs/rstart/samples/commands/odt1/Terminal:1.1.1.2 Tue Jan 16 17:46:59 2001 +++ xc/programs/rstart/samples/commands/odt1/Terminal Mon Jan 9 10:00:51 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: Terminal,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/odt1/Terminal,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/openwindows2/@List diff -u xc/programs/rstart/samples/commands/openwindows2/@List:1.1.1.2 xc/programs/rstart/samples/commands/openwindows2/@List:1.2 --- xc/programs/rstart/samples/commands/openwindows2/@List:1.1.1.2 Tue Jan 16 17:47:00 2001 +++ xc/programs/rstart/samples/commands/openwindows2/@List Mon Jan 9 10:00:51 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/openwindows2/@List,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/openwindows2/LoadMonitor diff -u xc/programs/rstart/samples/commands/openwindows2/LoadMonitor:1.1.1.2 xc/programs/rstart/samples/commands/openwindows2/LoadMonitor:1.2 --- xc/programs/rstart/samples/commands/openwindows2/LoadMonitor:1.1.1.2 Tue Jan 16 17:47:00 2001 +++ xc/programs/rstart/samples/commands/openwindows2/LoadMonitor Mon Jan 9 10:00:51 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: LoadMonitor,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/openwindows2/LoadMonitor,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/openwindows2/Terminal diff -u xc/programs/rstart/samples/commands/openwindows2/Terminal:1.1.1.2 xc/programs/rstart/samples/commands/openwindows2/Terminal:1.2 --- xc/programs/rstart/samples/commands/openwindows2/Terminal:1.1.1.2 Tue Jan 16 17:47:00 2001 +++ xc/programs/rstart/samples/commands/openwindows2/Terminal Mon Jan 9 10:00:51 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: Terminal,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/openwindows2/Terminal,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/openwindows3/@List diff -u xc/programs/rstart/samples/commands/openwindows3/@List:1.1.1.2 xc/programs/rstart/samples/commands/openwindows3/@List:1.2 --- xc/programs/rstart/samples/commands/openwindows3/@List:1.1.1.2 Tue Jan 16 17:47:01 2001 +++ xc/programs/rstart/samples/commands/openwindows3/@List Mon Jan 9 10:00:51 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/openwindows3/@List,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/openwindows3/LoadMonitor diff -u xc/programs/rstart/samples/commands/openwindows3/LoadMonitor:1.1.1.2 xc/programs/rstart/samples/commands/openwindows3/LoadMonitor:1.2 --- xc/programs/rstart/samples/commands/openwindows3/LoadMonitor:1.1.1.2 Tue Jan 16 17:47:01 2001 +++ xc/programs/rstart/samples/commands/openwindows3/LoadMonitor Mon Jan 9 10:00:51 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: LoadMonitor,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/openwindows3/LoadMonitor,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/openwindows3/Terminal diff -u xc/programs/rstart/samples/commands/openwindows3/Terminal:1.1.1.2 xc/programs/rstart/samples/commands/openwindows3/Terminal:1.2 --- xc/programs/rstart/samples/commands/openwindows3/Terminal:1.1.1.2 Tue Jan 16 17:47:01 2001 +++ xc/programs/rstart/samples/commands/openwindows3/Terminal Mon Jan 9 10:00:51 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: Terminal,v 1.3 2000/08/17 19:54:03 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/openwindows3/Terminal,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/x11r5/@List diff -u xc/programs/rstart/samples/commands/x11r5/@List:1.1.1.2 xc/programs/rstart/samples/commands/x11r5/@List:1.2 --- xc/programs/rstart/samples/commands/x11r5/@List:1.1.1.2 Tue Jan 16 17:47:02 2001 +++ xc/programs/rstart/samples/commands/x11r5/@List Mon Jan 9 10:00:51 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/x11r5/@List,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/x11r5/LoadMonitor diff -u xc/programs/rstart/samples/commands/x11r5/LoadMonitor:1.1.1.2 xc/programs/rstart/samples/commands/x11r5/LoadMonitor:1.2 --- xc/programs/rstart/samples/commands/x11r5/LoadMonitor:1.1.1.2 Tue Jan 16 17:47:02 2001 +++ xc/programs/rstart/samples/commands/x11r5/LoadMonitor Mon Jan 9 10:00:51 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: LoadMonitor,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/x11r5/LoadMonitor,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/commands/x11r5/Terminal diff -u xc/programs/rstart/samples/commands/x11r5/Terminal:1.1.1.2 xc/programs/rstart/samples/commands/x11r5/Terminal:1.2 --- xc/programs/rstart/samples/commands/x11r5/Terminal:1.1.1.2 Tue Jan 16 17:47:02 2001 +++ xc/programs/rstart/samples/commands/x11r5/Terminal Mon Jan 9 10:00:51 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# $Xorg: Terminal,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/commands/x11r5/Terminal,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.odt1/@Aliases diff -u xc/programs/rstart/samples/contexts.odt1/@Aliases:1.1.1.2 xc/programs/rstart/samples/contexts.odt1/@Aliases:1.2 --- xc/programs/rstart/samples/contexts.odt1/@Aliases:1.1.1.2 Tue Jan 16 17:47:03 2001 +++ xc/programs/rstart/samples/contexts.odt1/@Aliases Mon Jan 9 10:00:51 2006 @@ -1,4 +1,4 @@ -# $Xorg: @Aliases,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.odt1/@Aliases,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.odt1/@List diff -u xc/programs/rstart/samples/contexts.odt1/@List:1.1.1.2 xc/programs/rstart/samples/contexts.odt1/@List:1.2 --- xc/programs/rstart/samples/contexts.odt1/@List:1.1.1.2 Tue Jan 16 17:47:03 2001 +++ xc/programs/rstart/samples/contexts.odt1/@List Mon Jan 9 10:00:51 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.odt1/@List,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.odt1/default diff -u xc/programs/rstart/samples/contexts.odt1/default:1.1.1.2 xc/programs/rstart/samples/contexts.odt1/default:1.2 --- xc/programs/rstart/samples/contexts.odt1/default:1.1.1.2 Tue Jan 16 17:47:03 2001 +++ xc/programs/rstart/samples/contexts.odt1/default Mon Jan 9 10:00:51 2006 @@ -1,4 +1,4 @@ -# $Xorg: default,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.odt1/default,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Null context Index: xc/programs/rstart/samples/contexts.odt1/odt1 diff -u xc/programs/rstart/samples/contexts.odt1/odt1:1.1.1.2 xc/programs/rstart/samples/contexts.odt1/odt1:1.2 --- xc/programs/rstart/samples/contexts.odt1/odt1:1.1.1.2 Tue Jan 16 17:47:03 2001 +++ xc/programs/rstart/samples/contexts.odt1/odt1 Mon Jan 9 10:00:51 2006 @@ -1,4 +1,4 @@ -# $Xorg: odt1,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.odt1/odt1,v 1.2 2006/01/09 15:00:51 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.sun/@Aliases diff -u xc/programs/rstart/samples/contexts.sun/@Aliases:1.1.1.2 xc/programs/rstart/samples/contexts.sun/@Aliases:1.2 --- xc/programs/rstart/samples/contexts.sun/@Aliases:1.1.1.2 Tue Jan 16 17:47:04 2001 +++ xc/programs/rstart/samples/contexts.sun/@Aliases Mon Jan 9 10:00:52 2006 @@ -1,4 +1,4 @@ -# $Xorg: @Aliases,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.sun/@Aliases,v 1.2 2006/01/09 15:00:52 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.sun/@List diff -u xc/programs/rstart/samples/contexts.sun/@List:1.1.1.2 xc/programs/rstart/samples/contexts.sun/@List:1.2 --- xc/programs/rstart/samples/contexts.sun/@List:1.1.1.2 Tue Jan 16 17:47:05 2001 +++ xc/programs/rstart/samples/contexts.sun/@List Mon Jan 9 10:00:52 2006 @@ -1,4 +1,4 @@ -# $Xorg: @List,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.sun/@List,v 1.2 2006/01/09 15:00:52 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.sun/default diff -u xc/programs/rstart/samples/contexts.sun/default:1.1.1.2 xc/programs/rstart/samples/contexts.sun/default:1.2 --- xc/programs/rstart/samples/contexts.sun/default:1.1.1.2 Tue Jan 16 17:47:05 2001 +++ xc/programs/rstart/samples/contexts.sun/default Mon Jan 9 10:00:52 2006 @@ -1,4 +1,4 @@ -# $Xorg: default,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.sun/default,v 1.2 2006/01/09 15:00:52 dawes Exp $ # # Null context Index: xc/programs/rstart/samples/contexts.sun/openwindows2 diff -u xc/programs/rstart/samples/contexts.sun/openwindows2:1.1.1.2 xc/programs/rstart/samples/contexts.sun/openwindows2:1.2 --- xc/programs/rstart/samples/contexts.sun/openwindows2:1.1.1.2 Tue Jan 16 17:47:05 2001 +++ xc/programs/rstart/samples/contexts.sun/openwindows2 Mon Jan 9 10:00:52 2006 @@ -1,4 +1,4 @@ -# $Xorg: openwindows2,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.sun/openwindows2,v 1.2 2006/01/09 15:00:52 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.sun/openwindows3 diff -u xc/programs/rstart/samples/contexts.sun/openwindows3:1.1.1.2 xc/programs/rstart/samples/contexts.sun/openwindows3:1.2 --- xc/programs/rstart/samples/contexts.sun/openwindows3:1.1.1.2 Tue Jan 16 17:47:05 2001 +++ xc/programs/rstart/samples/contexts.sun/openwindows3 Mon Jan 9 10:00:52 2006 @@ -1,4 +1,4 @@ -# $Xorg: openwindows3,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.sun/openwindows3,v 1.2 2006/01/09 15:00:52 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.sun/x11r5 diff -u xc/programs/rstart/samples/contexts.sun/x11r5:1.1.1.2 xc/programs/rstart/samples/contexts.sun/x11r5:1.2 --- xc/programs/rstart/samples/contexts.sun/x11r5:1.1.1.2 Tue Jan 16 17:47:06 2001 +++ xc/programs/rstart/samples/contexts.sun/x11r5 Mon Jan 9 10:00:52 2006 @@ -1,4 +1,4 @@ -# $Xorg: x11r5,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.sun/x11r5,v 1.2 2006/01/09 15:00:52 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/rstart/samples/contexts.sun/x11r6 diff -u xc/programs/rstart/samples/contexts.sun/x11r6:1.1.1.2 xc/programs/rstart/samples/contexts.sun/x11r6:1.2 --- xc/programs/rstart/samples/contexts.sun/x11r6:1.1.1.2 Tue Jan 16 17:47:06 2001 +++ xc/programs/rstart/samples/contexts.sun/x11r6 Mon Jan 9 10:00:52 2006 @@ -1,4 +1,4 @@ -# $Xorg: x11r6,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ +# $XFree86: xc/programs/rstart/samples/contexts.sun/x11r6,v 1.2 2006/01/09 15:00:52 dawes Exp $ # # Copyright (c) 1993 Quarterdeck Office Systems Index: xc/programs/scripts/Imakefile diff -u xc/programs/scripts/Imakefile:3.2 xc/programs/scripts/Imakefile:3.3 --- xc/programs/scripts/Imakefile:3.2 Fri May 31 14:46:09 2002 +++ xc/programs/scripts/Imakefile Mon Jan 9 10:00:52 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:04 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/scripts/Imakefile,v 3.2 2002/05/31 18:46:09 dawes Exp $ +XCOMM $XFree86: xc/programs/scripts/Imakefile,v 3.3 2006/01/09 15:00:52 dawes Exp $ all:: Index: xc/programs/scripts/xon.man diff -u xc/programs/scripts/xon.man:1.8 xc/programs/scripts/xon.man:1.9 --- xc/programs/scripts/xon.man:1.8 Thu Feb 10 22:03:15 2005 +++ xc/programs/scripts/xon.man Mon Jan 9 10:00:52 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xon.man,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86: xc/programs/scripts/xon.man,v 1.8 2005/02/11 03:03:15 dawes Exp $ +.\" $XFree86: xc/programs/scripts/xon.man,v 1.9 2006/01/09 15:00:52 dawes Exp $ .\" .TH XON 1 __vendorversion__ .SH NAME Index: xc/programs/scripts/xon.sh diff -u xc/programs/scripts/xon.sh:1.9 xc/programs/scripts/xon.sh:1.10 --- xc/programs/scripts/xon.sh:1.9 Sat Feb 7 19:48:27 2004 +++ xc/programs/scripts/xon.sh Mon Jan 9 10:00:52 2006 @@ -1,6 +1,5 @@ #!/bin/sh -# $Xorg: xon.sh,v 1.4 2000/12/20 16:50:07 pookie Exp $ -# $XFree86: xc/programs/scripts/xon.sh,v 1.9 2004/02/08 00:48:27 dawes Exp $ +# $XFree86: xc/programs/scripts/xon.sh,v 1.10 2006/01/09 15:00:52 dawes Exp $ # start up xterm (or any other X command) on the specified host # Usage: xon host [arguments] [command] Index: xc/programs/setxkbmap/Imakefile diff -u xc/programs/setxkbmap/Imakefile:3.3 xc/programs/setxkbmap/Imakefile:3.5 --- xc/programs/setxkbmap/Imakefile:3.3 Tue May 27 13:58:23 2003 +++ xc/programs/setxkbmap/Imakefile Mon Jan 9 10:00:52 2006 @@ -1,9 +1,4 @@ -XCOMM $XConsortium: Imakefile /main/1 1995/11/30 19:18:08 kaleb $ - - - - -XCOMM $XFree86: xc/programs/setxkbmap/Imakefile,v 3.3 2003/05/27 17:58:23 tsi Exp $ +XCOMM $XFree86: xc/programs/setxkbmap/Imakefile,v 3.5 2006/01/09 15:00:52 dawes Exp $ SRCS = setxkbmap.c OBJS = setxkbmap.o @@ -12,8 +7,6 @@ DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\" -INCLUDES = -I$(EXTINCSRC) - all:: clean:: Index: xc/programs/setxkbmap/setxkbmap.c diff -u xc/programs/setxkbmap/setxkbmap.c:3.8 xc/programs/setxkbmap/setxkbmap.c:3.10 --- xc/programs/setxkbmap/setxkbmap.c:3.8 Mon Nov 17 17:20:50 2003 +++ xc/programs/setxkbmap/setxkbmap.c Fri Jul 22 12:01:32 2005 @@ -23,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/setxkbmap/setxkbmap.c,v 3.8 2003/11/17 22:20:50 dawes Exp $ */ +/* $XFree86: xc/programs/setxkbmap/setxkbmap.c,v 3.10 2005/07/22 16:01:32 tsi Exp $ */ #include #include @@ -467,6 +467,8 @@ tmp = DFLT_XKB_RULES_FILE; vd.model = DFLT_XKB_MODEL; vd.layout = DFLT_XKB_LAYOUT; + vd.variant = NULL; + vd.options = NULL; VMSG3(3,"Use defaults: rules - '%s' model - '%s' layout - '%s'\n", tmp, vd.model, vd.layout); } @@ -721,7 +723,7 @@ /* Primitive sanity check - filter out 'map names' (inside parenthesis) */ /* that can confuse xkbcomp parser */ -Bool +static Bool checkName(char *name, char* string) { char *i = name, *opar = NULL; Index: xc/programs/showfont/Imakefile diff -u xc/programs/showfont/Imakefile:1.3 xc/programs/showfont/Imakefile:1.4 --- xc/programs/showfont/Imakefile:1.3 Mon Aug 27 13:41:01 2001 +++ xc/programs/showfont/Imakefile Mon Jan 9 10:00:52 2006 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.8 94/06/09 17:23:09 gildea Exp $ -XCOMM $XFree86: xc/programs/showfont/Imakefile,v 1.3 2001/08/27 17:41:01 dawes Exp $ +XCOMM $XFree86: xc/programs/showfont/Imakefile,v 1.4 2006/01/09 15:00:52 dawes Exp $ + LOCAL_LIBRARIES = $(FSLIB) DEPLIBS = $(DEPFSLIB) SRCS = showfont.c Index: xc/programs/showfont/showfont.c diff -u xc/programs/showfont/showfont.c:1.4 xc/programs/showfont/showfont.c:1.5 --- xc/programs/showfont/showfont.c:1.4 Mon Aug 27 13:41:01 2001 +++ xc/programs/showfont/showfont.c Mon Jan 9 10:00:52 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: showfont.c,v 1.13 94/04/17 20:44:07 gildea Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation and the @@ -49,7 +48,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/showfont/showfont.c,v 1.4 2001/08/27 17:41:01 dawes Exp $ */ +/* $XFree86: xc/programs/showfont/showfont.c,v 1.5 2006/01/09 15:00:52 dawes Exp $ */ #include #include Index: xc/programs/showfont/showfont.man diff -u xc/programs/showfont/showfont.man:1.5 xc/programs/showfont/showfont.man:1.6 --- xc/programs/showfont/showfont.man:1.5 Thu Feb 10 22:03:15 2005 +++ xc/programs/showfont/showfont.man Mon Jan 9 10:00:52 2006 @@ -1,5 +1,4 @@ -.\" $XConsortium: showfont.man,v 1.3 94/04/11 14:29:57 gildea Exp $ -.\" $XFree86: xc/programs/showfont/showfont.man,v 1.5 2005/02/11 03:03:15 dawes Exp $ +.\" $XFree86: xc/programs/showfont/showfont.man,v 1.6 2006/01/09 15:00:52 dawes Exp $ .TH SHOWFONT 1 __vendorversion__ .SH NAME showfont \- font dumper for X font server Index: xc/programs/smproxy/Imakefile diff -u xc/programs/smproxy/Imakefile:1.4 xc/programs/smproxy/Imakefile:1.5 --- xc/programs/smproxy/Imakefile:1.4 Wed Jan 17 18:45:04 2001 +++ xc/programs/smproxy/Imakefile Mon Jan 9 10:00:53 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:05 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/smproxy/Imakefile,v 1.4 2001/01/17 23:45:04 dawes Exp $ +XCOMM $XFree86: xc/programs/smproxy/Imakefile,v 1.5 2006/01/09 15:00:53 dawes Exp $ #if HasMkstemp DEFINES = -DHAS_MKSTEMP Index: xc/programs/smproxy/save.c diff -u xc/programs/smproxy/save.c:1.8 xc/programs/smproxy/save.c:1.9 --- xc/programs/smproxy/save.c:1.8 Fri Dec 14 15:01:05 2001 +++ xc/programs/smproxy/save.c Mon Jan 9 10:00:53 2006 @@ -1,4 +1,3 @@ -/* $Xorg: save.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -25,7 +24,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/save.c,v 1.8 2001/12/14 20:01:05 dawes Exp $ */ +/* $XFree86: xc/programs/smproxy/save.c,v 1.9 2006/01/09 15:00:53 dawes Exp $ */ #include "smproxy.h" #ifdef HAS_MKSTEMP Index: xc/programs/smproxy/smproxy.c diff -u xc/programs/smproxy/smproxy.c:3.9 xc/programs/smproxy/smproxy.c:3.10 --- xc/programs/smproxy/smproxy.c:3.9 Fri Dec 14 15:01:05 2001 +++ xc/programs/smproxy/smproxy.c Mon Jan 9 10:00:53 2006 @@ -1,4 +1,3 @@ -/* $Xorg: smproxy.c,v 1.6 2001/02/09 02:05:35 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -25,7 +24,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/smproxy.c,v 3.9 2001/12/14 20:01:05 dawes Exp $ */ +/* $XFree86: xc/programs/smproxy/smproxy.c,v 3.10 2006/01/09 15:00:53 dawes Exp $ */ #include "smproxy.h" #include Index: xc/programs/smproxy/smproxy.h diff -u xc/programs/smproxy/smproxy.h:1.6 xc/programs/smproxy/smproxy.h:1.7 --- xc/programs/smproxy/smproxy.h:1.6 Fri Dec 14 15:01:05 2001 +++ xc/programs/smproxy/smproxy.h Mon Jan 9 10:00:53 2006 @@ -1,4 +1,3 @@ -/* $Xorg: smproxy.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -25,7 +24,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.6 2001/12/14 20:01:05 dawes Exp $ */ +/* $XFree86: xc/programs/smproxy/smproxy.h,v 1.7 2006/01/09 15:00:53 dawes Exp $ */ #include #include Index: xc/programs/smproxy/smproxy.man diff -u xc/programs/smproxy/smproxy.man:1.8 xc/programs/smproxy/smproxy.man:1.9 --- xc/programs/smproxy/smproxy.man:1.8 Thu Feb 10 22:03:15 2005 +++ xc/programs/smproxy/smproxy.man Mon Jan 9 10:00:53 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: smproxy.man,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/smproxy/smproxy.man,v 1.8 2005/02/11 03:03:15 dawes Exp $ +.\" $XFree86: xc/programs/smproxy/smproxy.man,v 1.9 2006/01/09 15:00:53 dawes Exp $ .\" .TH XSM 1 __vendorversion__ .SH NAME Index: xc/programs/texteroids/texteroids.man diff -u xc/programs/texteroids/texteroids.man:1.1 xc/programs/texteroids/texteroids.man:1.2 --- xc/programs/texteroids/texteroids.man:1.1 Wed Feb 28 20:23:59 2001 +++ xc/programs/texteroids/texteroids.man Mon Jan 9 10:00:53 2006 @@ -1,5 +1,4 @@ -.\" Id: texteroids.man,v 6.1 1994/05/18 23:21:41 asente Exp $ -.\" $XFree86: xc/programs/texteroids/texteroids.man,v 1.1 2001/03/01 01:23:59 dawes Exp $ +.\" $XFree86: xc/programs/texteroids/texteroids.man,v 1.2 2006/01/09 15:00:53 dawes Exp $ .TH TEXTEROIDS 1 __vendorversion__ .SH NAME texteroids \- test your mousing skills on spinning text Index: xc/programs/twm/Imakefile diff -u xc/programs/twm/Imakefile:3.16 xc/programs/twm/Imakefile:3.17 --- xc/programs/twm/Imakefile:3.16 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/Imakefile Mon Jan 9 10:00:53 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:05 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/twm/Imakefile,v 3.16 2004/06/08 01:17:02 dawes Exp $ +XCOMM $XFree86: xc/programs/twm/Imakefile,v 3.17 2006/01/09 15:00:53 dawes Exp $ #if HasMkstemp MKTMP_DEFINES = -DHAS_MKSTEMP Index: xc/programs/twm/add_window.c diff -u xc/programs/twm/add_window.c:1.14 xc/programs/twm/add_window.c:1.15 --- xc/programs/twm/add_window.c:1.14 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/add_window.c Mon Jan 9 10:00:53 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/twm/add_window.c,v 1.14 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/add_window.c,v 1.15 2006/01/09 15:00:53 dawes Exp $ */ /*****************************************************************************/ /* @@ -53,8 +53,6 @@ /********************************************************************** * - * $Xorg: add_window.c,v 1.5 2001/02/09 02:05:36 xorgcvs Exp $ - * * Add a new window, put the titlbar and other stuff around * the window * Index: xc/programs/twm/add_window.h diff -u xc/programs/twm/add_window.h:1.6 xc/programs/twm/add_window.h:1.7 --- xc/programs/twm/add_window.h:1.6 Fri Dec 14 15:01:06 2001 +++ xc/programs/twm/add_window.h Mon Jan 9 10:00:53 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/add_window.h,v 1.6 2001/12/14 20:01:06 dawes Exp $ */ +/* $XFree86: xc/programs/twm/add_window.h,v 1.7 2006/01/09 15:00:53 dawes Exp $ */ /********************************************************************** * - * $Xorg: add_window.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * AddWindow include file * * 31-Mar-88 Tom LaStrange Initial Version. Index: xc/programs/twm/cursor.c diff -u xc/programs/twm/cursor.c:1.5 xc/programs/twm/cursor.c:1.6 --- xc/programs/twm/cursor.c:1.5 Fri Dec 14 15:01:06 2001 +++ xc/programs/twm/cursor.c Mon Jan 9 10:00:53 2006 @@ -22,12 +22,10 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/twm/cursor.c,v 1.5 2001/12/14 20:01:06 dawes Exp $ */ +/* $XFree86: xc/programs/twm/cursor.c,v 1.6 2006/01/09 15:00:53 dawes Exp $ */ /*********************************************************************** * - * $Xorg: cursor.c,v 1.5 2001/02/09 02:05:36 xorgcvs Exp $ - * * cursor creation code * * 05-Apr-89 Thomas E. LaStrange File created Index: xc/programs/twm/events.c diff -u xc/programs/twm/events.c:1.14 xc/programs/twm/events.c:1.16 --- xc/programs/twm/events.c:1.14 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/events.c Mon Jan 9 10:00:53 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/twm/events.c,v 1.14 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/events.c,v 1.16 2006/01/09 15:00:53 dawes Exp $ */ /*****************************************************************************/ /* @@ -53,8 +53,6 @@ /*********************************************************************** * - * $Xorg: events.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * twm event handling * * 17-Nov-87 Thomas E. LaStrange File created @@ -1738,6 +1736,7 @@ case F_CIRCLEUP: case F_CIRCLEDOWN: case F_REFRESH: + case F_CHANGELABEL: PopDownMenu(); break; default: Index: xc/programs/twm/events.h diff -u xc/programs/twm/events.h:1.7 xc/programs/twm/events.h:1.8 --- xc/programs/twm/events.h:1.7 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/events.h Mon Jan 9 10:00:53 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/events.h,v 1.7 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/events.h,v 1.8 2006/01/09 15:00:53 dawes Exp $ */ /*********************************************************************** * - * $Xorg: events.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * twm event handler include file * * 17-Nov-87 Thomas E. LaStrange File created Index: xc/programs/twm/gc.c diff -u xc/programs/twm/gc.c:1.6 xc/programs/twm/gc.c:1.7 --- xc/programs/twm/gc.c:1.6 Fri Dec 14 15:01:07 2001 +++ xc/programs/twm/gc.c Mon Jan 9 10:00:53 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/gc.c,v 1.6 2001/12/14 20:01:07 dawes Exp $ */ +/* $XFree86: xc/programs/twm/gc.c,v 1.7 2006/01/09 15:00:53 dawes Exp $ */ /********************************************************************** * - * $Xorg: gc.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * Open the fonts and create the GCs * * 31-Mar-88 Tom LaStrange Initial Version. Index: xc/programs/twm/gc.h diff -u xc/programs/twm/gc.h:1.5 xc/programs/twm/gc.h:1.6 --- xc/programs/twm/gc.h:1.5 Fri Dec 14 15:01:07 2001 +++ xc/programs/twm/gc.h Mon Jan 9 10:00:54 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/gc.h,v 1.5 2001/12/14 20:01:07 dawes Exp $ */ +/* $XFree86: xc/programs/twm/gc.h,v 1.6 2006/01/09 15:00:54 dawes Exp $ */ /********************************************************************** * - * $Xorg: gc.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * GC related externs * * 8-Apr-88 Tom LaStrange Initial Version. Index: xc/programs/twm/gram.y diff -u xc/programs/twm/gram.y:3.9 xc/programs/twm/gram.y:3.10 --- xc/programs/twm/gram.y:3.9 Mon Oct 21 09:33:05 2002 +++ xc/programs/twm/gram.y Mon Jan 9 10:00:55 2006 @@ -48,19 +48,16 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ - +/* $XFree86: xc/programs/twm/gram.y,v 3.10 2006/01/09 15:00:55 dawes Exp $ */ /*********************************************************************** * - * $Xorg: gram.y,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * .twmrc command grammer * * 07-Jan-86 Thomas E. LaStrange File created * 11-Nov-90 Dave Sternlicht Adding SaveColors * 10-Oct-90 David M. Sternlicht Storing saved colors on root * - * $XFree86: xc/programs/twm/gram.y,v 3.9 2002/10/21 13:33:05 alanh Exp $ * ***********************************************************************/ Index: xc/programs/twm/iconmgr.c diff -u xc/programs/twm/iconmgr.c:1.6 xc/programs/twm/iconmgr.c:1.7 --- xc/programs/twm/iconmgr.c:1.6 Fri Dec 14 15:01:08 2001 +++ xc/programs/twm/iconmgr.c Mon Jan 9 10:00:55 2006 @@ -22,18 +22,15 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/twm/iconmgr.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/iconmgr.c,v 1.7 2006/01/09 15:00:55 dawes Exp $ */ /*********************************************************************** * - * $Xorg: iconmgr.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * Icon Manager routines * * 09-Mar-89 Tom LaStrange File Created * ***********************************************************************/ -/* $XFree86: xc/programs/twm/iconmgr.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ #include #include "twm.h" Index: xc/programs/twm/iconmgr.h diff -u xc/programs/twm/iconmgr.h:1.6 xc/programs/twm/iconmgr.h:1.7 --- xc/programs/twm/iconmgr.h:1.6 Fri Dec 14 15:01:08 2001 +++ xc/programs/twm/iconmgr.h Mon Jan 9 10:00:55 2006 @@ -22,12 +22,10 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/twm/iconmgr.h,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/iconmgr.h,v 1.7 2006/01/09 15:00:55 dawes Exp $ */ /*********************************************************************** * - * $Xorg: iconmgr.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * Icon Manager includes * * 09-Mar-89 Tom LaStrange File Created Index: xc/programs/twm/icons.c diff -u xc/programs/twm/icons.c:1.8 xc/programs/twm/icons.c:1.9 --- xc/programs/twm/icons.c:1.8 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/icons.c Mon Jan 9 10:00:55 2006 @@ -22,12 +22,10 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/twm/icons.c,v 1.8 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/icons.c,v 1.9 2006/01/09 15:00:55 dawes Exp $ */ /********************************************************************** * - * $Xorg: icons.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * Icon releated routines * * 10-Apr-89 Tom LaStrange Initial Version. Index: xc/programs/twm/icons.h diff -u xc/programs/twm/icons.h:1.5 xc/programs/twm/icons.h:1.6 --- xc/programs/twm/icons.h:1.5 Fri Dec 14 15:01:08 2001 +++ xc/programs/twm/icons.h Mon Jan 9 10:00:55 2006 @@ -22,12 +22,10 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/twm/icons.h,v 1.5 2001/12/14 20:01:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/icons.h,v 1.6 2006/01/09 15:00:55 dawes Exp $ */ /********************************************************************** * - * $Xorg: icons.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * Icon releated definitions * * 10-Apr-89 Tom LaStrange Initial Version. Index: xc/programs/twm/lex.l diff -u xc/programs/twm/lex.l:3.14 xc/programs/twm/lex.l:3.16 --- xc/programs/twm/lex.l:3.14 Fri Dec 14 15:01:08 2001 +++ xc/programs/twm/lex.l Mon Jan 9 10:00:55 2006 @@ -52,14 +52,12 @@ /*********************************************************************** * - * $Xorg: lex.l,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * .twmrc lex file * * 12-Nov-87 Thomas E. LaStrange File created * ***********************************************************************/ -/* $XFree86: xc/programs/twm/lex.l,v 3.14 2001/12/14 20:01:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/lex.l,v 3.16 2006/01/09 15:00:55 dawes Exp $ */ /* #include */ /* lex already includes stdio.h */ #include "twm.h" @@ -67,8 +65,10 @@ #include "list.h" #include "parse.h" -#ifdef FLEX_SCANNER +#if defined(FLEX_SCANNER) +#if !defined(YY_FLEX_LEX_COMPAT) int yylineno; +#endif #undef YY_INPUT #define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size))) Index: xc/programs/twm/list.c diff -u xc/programs/twm/list.c:1.9 xc/programs/twm/list.c:1.10 --- xc/programs/twm/list.c:1.9 Mon Apr 21 07:46:13 2003 +++ xc/programs/twm/list.c Mon Jan 9 10:00:55 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/list.c,v 1.9 2003/04/21 11:46:13 herrb Exp $ */ +/* $XFree86: xc/programs/twm/list.c,v 1.10 2006/01/09 15:00:55 dawes Exp $ */ /********************************************************************** * - * $Xorg: list.c,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * TWM code to deal with the name lists for the NoTitle list and * the AutoRaise list * Index: xc/programs/twm/list.h diff -u xc/programs/twm/list.h:1.5 xc/programs/twm/list.h:1.6 --- xc/programs/twm/list.h:1.5 Fri Dec 14 15:01:08 2001 +++ xc/programs/twm/list.h Mon Jan 9 10:00:55 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/list.h,v 1.5 2001/12/14 20:01:08 dawes Exp $ */ +/* $XFree86: xc/programs/twm/list.h,v 1.6 2006/01/09 15:00:55 dawes Exp $ */ /********************************************************************** * - * $Xorg: list.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ - * * TWM list handling external definitions * * 11-Apr-88 Tom LaStrange Initial Version. Index: xc/programs/twm/menus.c diff -u xc/programs/twm/menus.c:1.20 xc/programs/twm/menus.c:1.25 --- xc/programs/twm/menus.c:1.20 Mon Aug 4 06:32:30 2003 +++ xc/programs/twm/menus.c Sun Feb 19 19:14:38 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/twm/menus.c,v 1.20 2003/08/04 10:32:30 eich Exp $ */ +/* $XFree86: xc/programs/twm/menus.c,v 1.25 2006/02/20 00:14:38 dawes Exp $ */ /*****************************************************************************/ /* @@ -53,8 +53,6 @@ /*********************************************************************** * - * $Xorg: menus.c,v 1.6 2001/02/09 02:05:36 xorgcvs Exp $ - * * twm menu code * * 17-Nov-87 Thomas E. LaStrange File created @@ -81,6 +79,7 @@ #include "version.h" #include #include +#include int RootFunction = 0; MenuRoot *ActiveMenu = NULL; /* the active menu */ @@ -115,6 +114,7 @@ static void send_clientmessage ( Window w, Atom a, Time timestamp ); #define SHADOWWIDTH 5 /* in pixels */ +#define EMPTY_LABEL "" @@ -379,6 +379,7 @@ { int y_offset; int text_y; + int x, y; GC gc; #ifdef DEBUG_MENUS @@ -389,7 +390,8 @@ if (mi->func != F_TITLE) { - int x, y; + if (mi->func == F_NOP && mi->strlen == 0) + return; if (mi->state) { @@ -422,7 +424,6 @@ MyFont_DrawString(dpy, mr->w, &Scr->MenuFont, gc, mi->x, text_y, mi->item, mi->strlen); - } if (mi->func == F_MENU) @@ -441,23 +442,19 @@ } else { - int y; - XSetForeground(dpy, Scr->NormalGC, mi->back); /* fill the rectangle with the title background color */ XFillRectangle(dpy, mr->w, Scr->NormalGC, 0, y_offset, mr->width, Scr->EntryHeight); - { - XSetForeground(dpy, Scr->NormalGC, mi->fore); - /* now draw the dividing lines */ - if (y_offset) - XDrawLine (dpy, mr->w, Scr->NormalGC, 0, y_offset, - mr->width, y_offset); - y = ((mi->item_num+1) * Scr->EntryHeight)-1; - XDrawLine(dpy, mr->w, Scr->NormalGC, 0, y, mr->width, y); - } + XSetForeground(dpy, Scr->NormalGC, mi->fore); + /* now draw the dividing lines */ + if (y_offset) + XDrawLine (dpy, mr->w, Scr->NormalGC, 0, y_offset, + mr->width, y_offset); + y = ((mi->item_num+1) * Scr->EntryHeight)-1; + XDrawLine(dpy, mr->w, Scr->NormalGC, 0, y, mr->width, y); MyFont_ChangeGC(mi->fore, mi->back, &Scr->MenuFont); /* finally render the title */ @@ -522,8 +519,7 @@ break; } - if (!DispatchEvent ()) - continue; + if (!DispatchEvent ()) continue; if (Event.type == ButtonRelease || Cancel) { menuFromFrameOrWindowOrTitlebar = FALSE; @@ -651,6 +647,12 @@ #define UNUSED_PIXEL ((unsigned long) (~0)) /* more than 24 bits */ + if (name != NULL && *name == '$') + { + /* resolve this environment variable */ + name = getenv(name + 1); + } + tmp = (MenuRoot *) malloc(sizeof(MenuRoot)); tmp->hi_fore = UNUSED_PIXEL; tmp->hi_back = UNUSED_PIXEL; @@ -1062,7 +1064,7 @@ for (i=0; iname, (char *)WindowNames[i], - NULL, F_POPUP,NULL,NULL); + NULL, F_POPUP, NULL, NULL); } free(WindowNames); } @@ -1377,7 +1379,7 @@ { static Time last_time = 0; char tmp[200]; - char *ptr; + char *ptr, *orig_icon_name, *orig_name; char buff[MAX_FILE_SIZE]; int count, fd; Window rootw; @@ -1568,8 +1570,8 @@ if (fromtitlebar && Event.type == ButtonPress) { fromtitlebar = False; - continue; - } + continue; + } if (Event.type == MotionNotify) { /* discard any extra motion events before a release */ @@ -1596,6 +1598,7 @@ case F_RIGHTZOOM: case F_TOPZOOM: case F_BOTTOMZOOM: + case F_TOTALZOOM: if (DeferExecution(context, func, Scr->SelectCursor)) return TRUE; fullzoom(tmp_win, func); @@ -2060,6 +2063,79 @@ Bell(XkbBI_MinorError,0,tmp_win->w); break; + case F_CHANGELABEL: + if (DeferExecution(context, func, Scr->SelectCursor)) + return TRUE; + + EventHandler[KeyPress] = HandleUnknown; + + XGrabKeyboard(dpy, tmp_win->frame, False, GrabModeAsync, GrabModeAsync, CurrentTime); + + /* backup original names */ + orig_icon_name = tmp_win->icon_name; + orig_name = tmp_win->name; + + strcpy(tmp, orig_name); + + /* read in a new name */ + while (TRUE) + { + XMaskEvent(dpy, KeyPressMask | ExposureMask | + PropertyChangeMask, &Event); + + if (!DispatchEvent ()) continue; + + if (Event.type == KeyPress) { + char xlat[20]; + int nchar = 20; + int count; + KeySym key; + XComposeStatus cs; + + count = XLookupString(&Event.xkey, xlat, nchar, &key, &cs); + xlat[count] = '\0'; + + if (key == XK_Escape) { + /* restore original names */ + XSetIconName(dpy, tmp_win->w, orig_icon_name); + XStoreName(dpy, tmp_win->w, orig_name); + break; + } + + if (key == XK_Return) { + break; + } + + if (key == XK_BackSpace || key == XK_Delete) { + if (strcmp(tmp, EMPTY_LABEL) != 0) { + count = strlen(tmp); + if (count == 1) + strcpy(tmp, EMPTY_LABEL); + else if (count > 0) + tmp[count - 1] = '\0'; + } + } + else { + if (strcmp(tmp, EMPTY_LABEL) != 0) + strcat(tmp, xlat); + else + strcpy(tmp, xlat); + } + + /* do the change */ + XSetIconName(dpy, tmp_win->w, tmp); + XStoreName(dpy, tmp_win->w, tmp); + } + } + + /* to exit from the UpdateMenu function */ + Event.type = ButtonRelease; + + XUngrabKeyboard(dpy, CurrentTime); + + EventHandler[KeyPress] = HandleKeyPress; + break; + case F_CIRCLEUP: XCirculateSubwindowsUp(dpy, Scr->Root); break; @@ -2423,6 +2499,7 @@ case F_DESTROY: case F_WINREFRESH: case F_ZOOM: + case F_TOTALZOOM: case F_FULLZOOM: case F_HORIZOOM: case F_RIGHTZOOM: @@ -2430,6 +2507,7 @@ case F_TOPZOOM: case F_BOTTOMZOOM: case F_AUTORAISE: + case F_CHANGELABEL: return TRUE; } } @@ -2451,13 +2529,12 @@ #if defined(sun) && defined(SVR4) static int -System (s) - char *s; +System (char *s) { int pid, status; if ((pid = fork ()) == 0) { (void) setpgrp(); - execl ("/bin/sh", "sh", "-c", s, 0); + execl ("/bin/sh", "sh", "-c", s, (void *)0); } else waitpid (pid, &status, 0); return status; Index: xc/programs/twm/menus.h diff -u xc/programs/twm/menus.h:1.6 xc/programs/twm/menus.h:1.7 --- xc/programs/twm/menus.h:1.6 Fri Dec 14 15:01:09 2001 +++ xc/programs/twm/menus.h Mon Jan 9 10:00:55 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/menus.h,v 1.6 2001/12/14 20:01:09 dawes Exp $ */ +/* $XFree86: xc/programs/twm/menus.h,v 1.7 2006/01/09 15:00:55 dawes Exp $ */ /*********************************************************************** * - * $Xorg: menus.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ - * * twm menus include file * * 17-Nov-87 Thomas E. LaStrange File created Index: xc/programs/twm/parse.c diff -u xc/programs/twm/parse.c:1.18 xc/programs/twm/parse.c:1.20 --- xc/programs/twm/parse.c:1.18 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/parse.c Tue Jul 19 20:32:38 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/twm/parse.c,v 1.18 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/parse.c,v 1.20 2005/07/20 00:32:38 dawes Exp $ */ /*****************************************************************************/ /* @@ -52,9 +52,6 @@ /*********************************************************************** - * - * $Xorg: parse.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ - * * parse the .twmrc file * * 17-Nov-87 Thomas E. LaStrange File created @@ -453,6 +450,7 @@ { "f.backiconmgr", FKEYWORD, F_BACKICONMGR }, { "f.beep", FKEYWORD, F_BEEP }, { "f.bottomzoom", FKEYWORD, F_BOTTOMZOOM }, + { "f.changelabel", FKEYWORD, F_CHANGELABEL }, { "f.circledown", FKEYWORD, F_CIRCLEDOWN }, { "f.circleup", FKEYWORD, F_CIRCLEUP }, { "f.colormap", FSKEYWORD, F_COLORMAP }, @@ -501,6 +499,7 @@ { "f.startwm", FSKEYWORD, F_STARTWM }, { "f.title", FKEYWORD, F_TITLE }, { "f.topzoom", FKEYWORD, F_TOPZOOM }, + { "f.totalzoom", FKEYWORD, F_TOTALZOOM }, { "f.twmrc", FKEYWORD, F_RESTART }, { "f.unfocus", FKEYWORD, F_UNFOCUS }, { "f.upiconmgr", FKEYWORD, F_UPICONMGR }, Index: xc/programs/twm/parse.h diff -u xc/programs/twm/parse.h:1.11 xc/programs/twm/parse.h:1.13 --- xc/programs/twm/parse.h:1.11 Fri Dec 14 15:01:09 2001 +++ xc/programs/twm/parse.h Tue Jul 19 20:32:38 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/twm/parse.h,v 1.11 2001/12/14 20:01:09 dawes Exp $ */ +/* $XFree86: xc/programs/twm/parse.h,v 1.13 2005/07/20 00:32:38 dawes Exp $ */ /*****************************************************************************/ /* @@ -53,8 +53,6 @@ /********************************************************************** * - * $Xorg: parse.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ - * * .twmrc parsing externs * * 8-Apr-88 Tom LaStrange Initial Version. @@ -136,6 +134,8 @@ #define F_CUTFILE 43 #define F_SHOWLIST 44 #define F_HIDELIST 45 +#define F_CHANGELABEL 46 +#define F_TOTALZOOM 47 #define F_MENU 101 /* string */ #define F_WARPNEXT 112 /* string */ Index: xc/programs/twm/resize.c diff -u xc/programs/twm/resize.c:1.9 xc/programs/twm/resize.c:1.10 --- xc/programs/twm/resize.c:1.9 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/resize.c Tue Jul 19 20:32:38 2005 @@ -52,15 +52,13 @@ /*********************************************************************** * - * $Xorg: resize.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ - * * window resizing borrowed from the "wm" window manager * * 11-Dec-87 Thomas E. LaStrange File created * ***********************************************************************/ -/* $XFree86: xc/programs/twm/resize.c,v 1.9 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/resize.c,v 1.10 2005/07/20 00:32:38 dawes Exp $ */ #include #include "twm.h" @@ -997,35 +995,32 @@ int basex, basey; int frame_bw_times_2; - XGetGeometry(dpy, (Drawable) tmp_win->frame, &junkRoot, - &dragx, &dragy, (unsigned int *)&dragWidth, (unsigned int *)&dragHeight, &junkbw, - &junkDepth); - - basex = 0; - basey = 0; + XGetGeometry(dpy, (Drawable) tmp_win->frame, &junkRoot, &dragx, &dragy, + (unsigned int *)&dragWidth, (unsigned int *)&dragHeight, + &junkbw, &junkDepth); - if (tmp_win->zoomed == flag) - { - dragHeight = tmp_win->save_frame_height; - dragWidth = tmp_win->save_frame_width; - dragx = tmp_win->save_frame_x; - dragy = tmp_win->save_frame_y; - tmp_win->zoomed = ZOOM_NONE; - } - else - { - if (tmp_win->zoomed == ZOOM_NONE) - { - tmp_win->save_frame_x = dragx; - tmp_win->save_frame_y = dragy; - tmp_win->save_frame_width = dragWidth; - tmp_win->save_frame_height = dragHeight; - tmp_win->zoomed = flag; - } - else - tmp_win->zoomed = flag; + basex = 0; + basey = 0; + if (tmp_win->zoomed == flag) + { + dragHeight = tmp_win->save_frame_height; + dragWidth = tmp_win->save_frame_width; + dragx = tmp_win->save_frame_x; + dragy = tmp_win->save_frame_y; + tmp_win->zoomed = ZOOM_NONE; + } + else + { + if (tmp_win->zoomed == ZOOM_NONE) + { + tmp_win->save_frame_x = dragx; + tmp_win->save_frame_y = dragy; + tmp_win->save_frame_width = dragWidth; + tmp_win->save_frame_height = dragHeight; + } + tmp_win->zoomed = flag; frame_bw_times_2 = 2*tmp_win->frame_bw; switch (flag) @@ -1070,15 +1065,22 @@ dragHeight = Scr->MyDisplayHeight/2 - frame_bw_times_2; dragWidth = Scr->MyDisplayWidth - frame_bw_times_2; break; + case F_TOTALZOOM: + dragx = -tmp_win->frame_bw; + dragy = -tmp_win->title_height - tmp_win->frame_bw; + dragHeight = Scr->MyDisplayHeight + tmp_win->title_height; + dragWidth = Scr->MyDisplayWidth; + break; } - } + } if (!Scr->NoRaiseResize) XRaiseWindow(dpy, tmp_win->frame); - ConstrainSize(tmp_win, &dragWidth, &dragHeight); + if (flag != F_TOTALZOOM) + ConstrainSize(tmp_win, &dragWidth, &dragHeight); - SetupWindow (tmp_win, dragx , dragy , dragWidth, dragHeight, -1); + SetupWindow (tmp_win, dragx, dragy, dragWidth, dragHeight, -1); XUngrabPointer (dpy, CurrentTime); XUngrabServer (dpy); } Index: xc/programs/twm/resize.h diff -u xc/programs/twm/resize.h:1.5 xc/programs/twm/resize.h:1.6 --- xc/programs/twm/resize.h:1.5 Fri Dec 14 15:01:10 2001 +++ xc/programs/twm/resize.h Mon Jan 9 10:00:55 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/resize.h,v 1.5 2001/12/14 20:01:10 dawes Exp $ */ +/* $XFree86: xc/programs/twm/resize.h,v 1.6 2006/01/09 15:00:55 dawes Exp $ */ /********************************************************************** * - * $Xorg: resize.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ - * * resize function externs * * 8-Apr-88 Tom LaStrange Initial Version. Index: xc/programs/twm/screen.h diff -u xc/programs/twm/screen.h:1.7 xc/programs/twm/screen.h:1.8 --- xc/programs/twm/screen.h:1.7 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/screen.h Mon Jan 9 10:00:55 2006 @@ -25,14 +25,12 @@ /*********************************************************************** * - * $Xorg: screen.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ - * * twm per-screen data include file * * 11-3-88 Dave Payne, Apple Computer File created * ***********************************************************************/ -/* $XFree86: xc/programs/twm/screen.h,v 1.7 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/screen.h,v 1.8 2006/01/09 15:00:55 dawes Exp $ */ #ifndef _SCREEN_ #define _SCREEN_ Index: xc/programs/twm/session.c diff -u xc/programs/twm/session.c:3.9 xc/programs/twm/session.c:3.10 --- xc/programs/twm/session.c:3.9 Mon Apr 21 07:46:13 2003 +++ xc/programs/twm/session.c Mon Jan 9 10:00:55 2006 @@ -1,4 +1,3 @@ -/* $Xorg: session.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -25,7 +24,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/twm/session.c,v 3.9 2003/04/21 11:46:13 herrb Exp $ */ +/* $XFree86: xc/programs/twm/session.c,v 3.10 2006/01/09 15:00:55 dawes Exp $ */ #include Index: xc/programs/twm/system.twmrc diff -u xc/programs/twm/system.twmrc:1.5 xc/programs/twm/system.twmrc:1.6 --- xc/programs/twm/system.twmrc:1.5 Mon Aug 4 06:32:30 2003 +++ xc/programs/twm/system.twmrc Mon Jan 9 10:00:55 2006 @@ -1,6 +1,4 @@ # -# $Xorg: system.twmrc,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ -# # Default twm configuration file; needs to be kept small to conserve string # space in systems whose compilers don't handle medium-sized strings. # @@ -9,7 +7,7 @@ # users were accustomed to uwm, the defaults could be set up not to decorate # any windows and to use meta-keys. # -# $XFree86: xc/programs/twm/system.twmrc,v 1.5 2003/08/04 10:32:30 eich Exp $ +# $XFree86: xc/programs/twm/system.twmrc,v 1.6 2006/01/09 15:00:55 dawes Exp $ # NoGrabServer Index: xc/programs/twm/twm.c diff -u xc/programs/twm/twm.c:3.16 xc/programs/twm/twm.c:3.17 --- xc/programs/twm/twm.c:3.16 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/twm.c Mon Jan 9 10:00:55 2006 @@ -52,14 +52,12 @@ /*********************************************************************** * - * $Xorg: twm.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ - * * twm - "Tom's Window Manager" * * 27-Oct-87 Thomas E. LaStrange File created * 10-Oct-90 David M. Sternlicht Storing saved colors on root ***********************************************************************/ -/* $XFree86: xc/programs/twm/twm.c,v 3.16 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/twm.c,v 3.17 2006/01/09 15:00:55 dawes Exp $ */ #include #include Index: xc/programs/twm/twm.h diff -u xc/programs/twm/twm.h:3.13 xc/programs/twm/twm.h:3.15 --- xc/programs/twm/twm.h:3.13 Mon Apr 21 07:46:14 2003 +++ xc/programs/twm/twm.h Sat Feb 25 21:41:02 2006 @@ -52,15 +52,12 @@ /*********************************************************************** - * - * $Xorg: twm.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ - * * twm include file * * 28-Oct-87 Thomas E. LaStrange File created * 10-Oct-90 David M. Sternlicht Storeing saved colors on root ***********************************************************************/ -/* $XFree86: xc/programs/twm/twm.h,v 3.13 2003/04/21 11:46:14 herrb Exp $ */ +/* $XFree86: xc/programs/twm/twm.h,v 3.15 2006/02/26 02:41:02 dawes Exp $ */ #ifndef _TWM_ #define _TWM_ @@ -408,7 +405,9 @@ extern void twmrc_error_prefix ( void ); +#if !defined(YYBISON) && !(defined(YYBYACC) && defined(__NetBSD__)) extern int yyparse ( void ); +#endif extern int yylex ( void ); extern void yyerror ( char *s ); extern int doinput ( char *buf, int size ); Index: xc/programs/twm/twm.man diff -u xc/programs/twm/twm.man:1.13 xc/programs/twm/twm.man:1.15 --- xc/programs/twm/twm.man:1.13 Thu Feb 10 22:03:15 2005 +++ xc/programs/twm/twm.man Tue Jul 19 20:32:38 2005 @@ -1,4 +1,3 @@ -.\" $Xorg: twm.man,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" Portions copyright 1988 Evans & Sutherland Computer Corporation. .\" Portions copyright 1989 Hewlett-Packard Company @@ -25,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/twm/twm.man,v 1.13 2005/02/11 03:03:15 dawes Exp $ +.\" $XFree86: xc/programs/twm/twm.man,v 1.15 2005/07/20 00:32:38 dawes Exp $ .\" .de EX \"Begin example .ne 5 @@ -972,6 +971,11 @@ .IP "\fBf.bottomzoom\fP" 8 This function is similar to the \fBf.fullzoom\fP function, but resizes the window to fill only the bottom half of the screen. +.IP "\fBf.changelabel\fP" 8 +This function enters a mode where the user is able to change a window +or an icon title. It grabs the keyboard and ignores all other events, +so the only way to exit from this mode is to press Enter (confirm a new +title) or Escape (restore the original title) keys. .IP "\fBf.circledown\fP" 8 This function lowers the top-most window that occludes another window. .IP "\fBf.circleup\fP" 8 @@ -1070,8 +1074,9 @@ .IP "\fBf.lower\fP" 8 This function lowers the selected window. .IP "\fBf.menu\fP \fIstring\fP" 8 -This function invokes the menu specified by the argument \fIstring\fP. -Cascaded menus may be built by nesting calls to \fBf.menu\fP. +This function invokes the menu specified by the argument a\fIstring\fP. +If a string starts with a $-symbols, it will be expanded as an environment +variable. Cascaded menus may be built by nesting calls to \fBf.menu\fP. .IP "\fBf.move\fP" 8 This function drags an outline of the selected window (or the window itself if the \fBOpaqueMove\fP variable is set) until the invoking pointer button @@ -1165,6 +1170,11 @@ This function is a synonym for \fBf.leftzoom\fP. .IP "\fBf.vrzoom\fP" 8 This function is a synonym for \fBf.rightzoom\fP. +.IP "\fBf.totalzoom\fP" 8 +This function resizes the selected window to the full size of the +display or else restores the original size if the window was already +zoomed. Zoomed window covers the whole area of a screen, without even +window manager decoration. .IP "\fBf.warpring\fP \fIstring\fP" 8 This function warps the pointer to the next or previous window (as indicated by the argument \fIstring\fP, which may be \fB"next"\fP or \fB"prev"\fP) Index: xc/programs/twm/util.c diff -u xc/programs/twm/util.c:1.14 xc/programs/twm/util.c:1.15 --- xc/programs/twm/util.c:1.14 Mon Jun 7 21:17:02 2004 +++ xc/programs/twm/util.c Mon Jan 9 10:00:55 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/util.c,v 1.14 2004/06/08 01:17:02 dawes Exp $ */ +/* $XFree86: xc/programs/twm/util.c,v 1.15 2006/01/09 15:00:55 dawes Exp $ */ /*********************************************************************** * - * $Xorg: util.c,v 1.5 2001/02/09 02:05:37 xorgcvs Exp $ - * * utility routines for twm * * 28-Oct-87 Thomas E. LaStrange File created Index: xc/programs/twm/util.h diff -u xc/programs/twm/util.h:1.7 xc/programs/twm/util.h:1.8 --- xc/programs/twm/util.h:1.7 Fri Dec 14 15:01:11 2001 +++ xc/programs/twm/util.h Mon Jan 9 10:00:56 2006 @@ -48,13 +48,11 @@ /** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $XFree86: xc/programs/twm/util.h,v 1.7 2001/12/14 20:01:11 dawes Exp $ */ +/* $XFree86: xc/programs/twm/util.h,v 1.8 2006/01/09 15:00:56 dawes Exp $ */ /*********************************************************************** * - * $Xorg: util.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ - * * utility routines header file * * 28-Oct-87 Thomas E. LaStrange File created Index: xc/programs/twm/version.c diff -u xc/programs/twm/version.c:1.2 xc/programs/twm/version.c:1.3 --- xc/programs/twm/version.c:1.2 Fri Dec 14 15:01:11 2001 +++ xc/programs/twm/version.c Mon Jan 9 10:00:56 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/twm/version.c,v 1.3 2006/01/09 15:00:56 dawes Exp $ */ /*****************************************************************************/ /* @@ -49,6 +50,5 @@ /** OR PERFORMANCE OF THIS SOFTWARE. **/ /*****************************************************************************/ -/* $Xorg: version.c,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ */ -char *Version = "The Open Group, R6.3"; +char *Version = "XFree86 4.x"; Index: xc/programs/twm/version.h diff -u xc/programs/twm/version.h:1.2 xc/programs/twm/version.h:1.3 --- xc/programs/twm/version.h:1.2 Fri Dec 14 15:01:11 2001 +++ xc/programs/twm/version.h Mon Jan 9 10:00:56 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/programs/twm/version.h,v 1.3 2006/01/09 15:00:56 dawes Exp $ */ /*****************************************************************************/ /* @@ -51,8 +52,6 @@ /********************************************************************** * - * $Xorg: version.h,v 1.4 2001/02/09 02:05:37 xorgcvs Exp $ - * * TWM version externs * * 8-Apr-88 Tom LaStrange Initial Version. Index: xc/programs/viewres/Imakefile diff -u xc/programs/viewres/Imakefile:1.2 xc/programs/viewres/Imakefile:1.3 --- xc/programs/viewres/Imakefile:1.2 Wed May 28 12:02:36 2003 +++ xc/programs/viewres/Imakefile Mon Jan 9 10:00:57 2006 @@ -1,8 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.4 93/08/17 21:16:42 rws Exp $ - - - -XCOMM $XFree86: xc/programs/viewres/Imakefile,v 1.2 2003/05/28 16:02:36 tsi Exp $ +XCOMM $XFree86: xc/programs/viewres/Imakefile,v 1.3 2006/01/09 15:00:57 dawes Exp $ DEPLIBS = XawClientDepLibs LOCAL_LIBRARIES = XawClientLibs Index: xc/programs/viewres/viewres.c diff -u xc/programs/viewres/viewres.c:1.7 xc/programs/viewres/viewres.c:1.8 --- xc/programs/viewres/viewres.c:1.7 Mon Sep 8 16:49:47 2003 +++ xc/programs/viewres/viewres.c Mon Jan 9 10:00:57 2006 @@ -1,6 +1,4 @@ /* - * $XConsortium: viewres.c,v 1.74 94/04/17 20:43:24 converse Exp $ - * * Copyright (c) 1989 X Consortium @@ -27,7 +25,7 @@ * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/viewres/viewres.c,v 1.7 2003/09/08 20:49:47 herrb Exp $ */ +/* $XFree86: xc/programs/viewres/viewres.c,v 1.8 2006/01/09 15:00:57 dawes Exp $ */ #include #include Index: xc/programs/viewres/viewres.man diff -u xc/programs/viewres/viewres.man:1.5 xc/programs/viewres/viewres.man:1.6 --- xc/programs/viewres/viewres.man:1.5 Thu Feb 10 22:03:16 2005 +++ xc/programs/viewres/viewres.man Mon Jan 9 10:00:57 2006 @@ -1,4 +1,3 @@ -.\" $XConsortium: viewres.man,v 1.8 94/04/17 20:43:25 gildea Exp $ .\" Copyright (c) 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/viewres/viewres.man,v 1.5 2005/02/11 03:03:16 dawes Exp $ +.\" $XFree86: xc/programs/viewres/viewres.man,v 1.6 2006/01/09 15:00:57 dawes Exp $ .\" .TH VIEWRES 1 __vendorversion__ .SH NAME Index: xc/programs/x11perf/Imakefile diff -u xc/programs/x11perf/Imakefile:3.12 xc/programs/x11perf/Imakefile:3.13 --- xc/programs/x11perf/Imakefile:3.12 Mon Nov 17 10:18:06 2003 +++ xc/programs/x11perf/Imakefile Fri Oct 14 11:17:31 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.12 2003/11/17 15:18:06 tsi Exp $ +XCOMM $XFree86: xc/programs/x11perf/Imakefile,v 3.13 2005/10/14 15:17:31 tsi Exp $ #ifndef X11perfcompLib #define X11perfcompLib $(LIBDIR)/x11perfcomp @@ -22,7 +17,7 @@ XFTDEFS = -DXFT -DXFREE86_FT2 XFTDEPS = XftClientDepLibs XFTLIBS = XftClientLibs - XFTINCS = $(XFTINCLUDES) -I$(XBUILDINCDIR) + XFTINCS = $(XFTINCLUDES) #endif DEFINES = $(SIGNAL_DEFINES) $(SHMDEFS) $(XFTDEFS) $(XRENDERDEFS) INCLUDES = $(XFTINCS) $(XRENDERINCS) Index: xc/programs/x11perf/Xmark.sh diff -u xc/programs/x11perf/Xmark.sh:1.3 xc/programs/x11perf/Xmark.sh:1.4 --- xc/programs/x11perf/Xmark.sh:1.3 Wed Jan 17 18:45:10 2001 +++ xc/programs/x11perf/Xmark.sh Mon Jan 9 10:00:57 2006 @@ -1,6 +1,4 @@ #! /bin/sh -#$Xorg: Xmark.sh,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ -#XPC Header: Xmark,v 1.15 93/04/12 10:10:07 hmgr Exp # ############################################################ # Xmark version XPC Revision: 1.15 @@ -8,7 +6,7 @@ # Usage: Xmark datafile # ############################################################ -# $XFree86: xc/programs/x11perf/Xmark.sh,v 1.3 2001/01/17 23:45:10 dawes Exp $ +# $XFree86: xc/programs/x11perf/Xmark.sh,v 1.4 2006/01/09 15:00:57 dawes Exp $ # # # CHANGE HISTORY: Index: xc/programs/x11perf/bitmaps.c diff -u xc/programs/x11perf/bitmaps.c:1.1.1.2 xc/programs/x11perf/bitmaps.c:1.2 --- xc/programs/x11perf/bitmaps.c:1.1.1.2 Tue Jan 16 17:47:27 2001 +++ xc/programs/x11perf/bitmaps.c Mon Jan 9 10:00:57 2006 @@ -1,4 +1,4 @@ -/* $Xorg: bitmaps.c,v 1.3 2000/08/17 19:54:08 cpqbld Exp $ */ +/* $XFree86: xc/programs/x11perf/bitmaps.c,v 1.2 2006/01/09 15:00:57 dawes Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. Index: xc/programs/x11perf/bitmaps.h diff -u xc/programs/x11perf/bitmaps.h:1.4 xc/programs/x11perf/bitmaps.h:1.5 --- xc/programs/x11perf/bitmaps.h:1.4 Wed Jan 17 18:45:11 2001 +++ xc/programs/x11perf/bitmaps.h Mon Jan 9 10:00:57 2006 @@ -1,4 +1,3 @@ -/* $Xorg: bitmaps.h,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.4 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/bitmaps.h,v 1.5 2006/01/09 15:00:57 dawes Exp $ */ /* Set fill style (if any) to a bitmap or tile */ Index: xc/programs/x11perf/do_arcs.c diff -u xc/programs/x11perf/do_arcs.c:1.5 xc/programs/x11perf/do_arcs.c:1.6 --- xc/programs/x11perf/do_arcs.c:1.5 Wed Jan 17 18:45:11 2001 +++ xc/programs/x11perf/do_arcs.c Mon Jan 9 10:00:57 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_arcs.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_arcs.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_arcs.c,v 1.6 2006/01/09 15:00:57 dawes Exp $ */ #include "x11perf.h" Index: xc/programs/x11perf/do_blt.c diff -u xc/programs/x11perf/do_blt.c:1.9 xc/programs/x11perf/do_blt.c:1.10 --- xc/programs/x11perf/do_blt.c:1.9 Sat Nov 3 16:59:20 2001 +++ xc/programs/x11perf/do_blt.c Mon Jan 9 10:00:57 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_blt.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_blt.c,v 1.9 2001/11/03 21:59:20 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_blt.c,v 1.10 2006/01/09 15:00:57 dawes Exp $ */ #include "x11perf.h" #include Index: xc/programs/x11perf/do_complex.c diff -u xc/programs/x11perf/do_complex.c:1.9 xc/programs/x11perf/do_complex.c:1.10 --- xc/programs/x11perf/do_complex.c:1.9 Fri May 31 14:46:09 2002 +++ xc/programs/x11perf/do_complex.c Mon Jan 9 10:00:57 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_complex.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_complex.c,v 1.9 2002/05/31 18:46:09 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_complex.c,v 1.10 2006/01/09 15:00:57 dawes Exp $ */ #include "x11perf.h" Index: xc/programs/x11perf/do_dots.c diff -u xc/programs/x11perf/do_dots.c:1.5 xc/programs/x11perf/do_dots.c:1.6 --- xc/programs/x11perf/do_dots.c:1.5 Wed Jan 17 18:45:11 2001 +++ xc/programs/x11perf/do_dots.c Mon Jan 9 10:00:57 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_dots.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_dots.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_dots.c,v 1.6 2006/01/09 15:00:57 dawes Exp $ */ #include "x11perf.h" Index: xc/programs/x11perf/do_lines.c diff -u xc/programs/x11perf/do_lines.c:1.5 xc/programs/x11perf/do_lines.c:1.6 --- xc/programs/x11perf/do_lines.c:1.5 Wed Jan 17 18:45:11 2001 +++ xc/programs/x11perf/do_lines.c Mon Jan 9 10:00:57 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_lines.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_lines.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_lines.c,v 1.6 2006/01/09 15:00:57 dawes Exp $ */ #include "x11perf.h" Index: xc/programs/x11perf/do_movewin.c diff -u xc/programs/x11perf/do_movewin.c:1.5 xc/programs/x11perf/do_movewin.c:1.6 --- xc/programs/x11perf/do_movewin.c:1.5 Wed Jan 17 18:45:11 2001 +++ xc/programs/x11perf/do_movewin.c Mon Jan 9 10:00:57 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_movewin.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_movewin.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_movewin.c,v 1.6 2006/01/09 15:00:57 dawes Exp $ */ #include "x11perf.h" Index: xc/programs/x11perf/do_rects.c diff -u xc/programs/x11perf/do_rects.c:1.5 xc/programs/x11perf/do_rects.c:1.6 --- xc/programs/x11perf/do_rects.c:1.5 Wed Jan 17 18:45:11 2001 +++ xc/programs/x11perf/do_rects.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_rects.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_rects.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_rects.c,v 1.6 2006/01/09 15:00:58 dawes Exp $ */ #include "x11perf.h" #include "bitmaps.h" Index: xc/programs/x11perf/do_segs.c diff -u xc/programs/x11perf/do_segs.c:1.5 xc/programs/x11perf/do_segs.c:1.6 --- xc/programs/x11perf/do_segs.c:1.5 Wed Jan 17 18:45:11 2001 +++ xc/programs/x11perf/do_segs.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_segs.c,v 1.3 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_segs.c,v 1.5 2001/01/17 23:45:11 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_segs.c,v 1.6 2006/01/09 15:00:58 dawes Exp $ */ #include "x11perf.h" Index: xc/programs/x11perf/do_simple.c diff -u xc/programs/x11perf/do_simple.c:1.7 xc/programs/x11perf/do_simple.c:1.8 --- xc/programs/x11perf/do_simple.c:1.7 Tue May 27 18:26:58 2003 +++ xc/programs/x11perf/do_simple.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_simple.c,v 1.4 2000/08/17 19:54:09 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.7 2003/05/27 22:26:58 tsi Exp $ */ +/* $XFree86: xc/programs/x11perf/do_simple.c,v 1.8 2006/01/09 15:00:58 dawes Exp $ */ #ifndef VMS #include Index: xc/programs/x11perf/do_tests.c diff -u xc/programs/x11perf/do_tests.c:1.10 xc/programs/x11perf/do_tests.c:1.11 --- xc/programs/x11perf/do_tests.c:1.10 Mon May 13 02:23:35 2002 +++ xc/programs/x11perf/do_tests.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_tests.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_tests.c,v 1.10 2002/05/13 06:23:35 keithp Exp $ */ +/* $XFree86: xc/programs/x11perf/do_tests.c,v 1.11 2006/01/09 15:00:58 dawes Exp $ */ #include "x11perf.h" Index: xc/programs/x11perf/do_text.c diff -u xc/programs/x11perf/do_text.c:1.9 xc/programs/x11perf/do_text.c:1.10 --- xc/programs/x11perf/do_text.c:1.9 Wed Dec 4 05:28:08 2002 +++ xc/programs/x11perf/do_text.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_text.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_text.c,v 1.9 2002/12/04 10:28:08 eich Exp $ */ +/* $XFree86: xc/programs/x11perf/do_text.c,v 1.10 2006/01/09 15:00:58 dawes Exp $ */ #include "x11perf.h" #include Index: xc/programs/x11perf/do_traps.c diff -u xc/programs/x11perf/do_traps.c:1.10 xc/programs/x11perf/do_traps.c:1.11 --- xc/programs/x11perf/do_traps.c:1.10 Tue May 27 18:26:58 2003 +++ xc/programs/x11perf/do_traps.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_traps.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.10 2003/05/27 22:26:58 tsi Exp $ */ +/* $XFree86: xc/programs/x11perf/do_traps.c,v 1.11 2006/01/09 15:00:58 dawes Exp $ */ #include "x11perf.h" #include "bitmaps.h" Index: xc/programs/x11perf/do_tris.c diff -u xc/programs/x11perf/do_tris.c:1.5 xc/programs/x11perf/do_tris.c:1.6 --- xc/programs/x11perf/do_tris.c:1.5 Wed Jan 17 18:45:12 2001 +++ xc/programs/x11perf/do_tris.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_tris.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_tris.c,v 1.5 2001/01/17 23:45:12 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_tris.c,v 1.6 2006/01/09 15:00:58 dawes Exp $ */ #undef POLYTRIANGLE_HACK /* don't use this code */ Index: xc/programs/x11perf/do_valgc.c diff -u xc/programs/x11perf/do_valgc.c:1.5 xc/programs/x11perf/do_valgc.c:1.6 --- xc/programs/x11perf/do_valgc.c:1.5 Wed Jan 17 18:45:12 2001 +++ xc/programs/x11perf/do_valgc.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_valgc.c,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_valgc.c,v 1.5 2001/01/17 23:45:12 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_valgc.c,v 1.6 2006/01/09 15:00:58 dawes Exp $ */ #ifndef VMS #include Index: xc/programs/x11perf/do_windows.c diff -u xc/programs/x11perf/do_windows.c:1.5 xc/programs/x11perf/do_windows.c:1.6 --- xc/programs/x11perf/do_windows.c:1.5 Wed Jan 17 18:45:12 2001 +++ xc/programs/x11perf/do_windows.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: do_windows.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/do_windows.c,v 1.5 2001/01/17 23:45:12 dawes Exp $ */ +/* $XFree86: xc/programs/x11perf/do_windows.c,v 1.6 2006/01/09 15:00:58 dawes Exp $ */ #include "x11perf.h" Index: xc/programs/x11perf/x11pcomp.cpp diff -u xc/programs/x11perf/x11pcomp.cpp:1.5 xc/programs/x11perf/x11pcomp.cpp:1.6 --- xc/programs/x11perf/x11pcomp.cpp:1.5 Mon Nov 25 09:05:05 2002 +++ xc/programs/x11perf/x11pcomp.cpp Mon Jan 9 10:00:58 2006 @@ -1,6 +1,6 @@ XCOMM! /bin/sh XCOMM -XCOMM $XFree86: xc/programs/x11perf/x11pcomp.cpp,v 1.5 2002/11/25 14:05:05 eich Exp $ +XCOMM $XFree86: xc/programs/x11perf/x11pcomp.cpp,v 1.6 2006/01/09 15:00:58 dawes Exp $ XCOMM XCOMM Collects multiple outputs of x11perf. Just feed it a list of files, each XCOMM containing the output from an x11perf run, and this shell will extract the @@ -19,7 +19,6 @@ XCOMM Mark Moraes, University of Toronto XCOMM Joel McCormack, DEC Western Research Lab XCOMM -XCOMM $Xorg: x11pcomp.cpp,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ PATH=LIBPATH:.:$PATH export PATH Index: xc/programs/x11perf/x11pcomp.man diff -u xc/programs/x11perf/x11pcomp.man:1.9 xc/programs/x11perf/x11pcomp.man:1.10 --- xc/programs/x11perf/x11pcomp.man:1.9 Thu Feb 10 22:03:16 2005 +++ xc/programs/x11perf/x11pcomp.man Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: x11pcomp.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/x11perf/x11pcomp.man,v 1.9 2005/02/11 03:03:16 dawes Exp $ +.\" $XFree86: xc/programs/x11perf/x11pcomp.man,v 1.10 2006/01/09 15:00:58 dawes Exp $ .\" .TH X11PERFCOMP 1 __vendorversion__ .SH NAME Index: xc/programs/x11perf/x11perf.c diff -u xc/programs/x11perf/x11perf.c:3.8 xc/programs/x11perf/x11perf.c:3.9 --- xc/programs/x11perf/x11perf.c:3.8 Wed Dec 4 05:28:08 2002 +++ xc/programs/x11perf/x11perf.c Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: x11perf.c,v 1.4 2000/08/17 19:54:10 cpqbld Exp $ */ /**************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ****************************************************************************/ -/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.8 2002/12/04 10:28:08 eich Exp $ */ +/* $XFree86: xc/programs/x11perf/x11perf.c,v 3.9 2006/01/09 15:00:58 dawes Exp $ */ #include #include Index: xc/programs/x11perf/x11perf.h diff -u xc/programs/x11perf/x11perf.h:3.6 xc/programs/x11perf/x11perf.h:3.7 --- xc/programs/x11perf/x11perf.h:3.6 Wed Dec 4 05:28:08 2002 +++ xc/programs/x11perf/x11perf.h Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: x11perf.h,v 1.3 2000/08/17 19:54:10 cpqbld Exp $ */ /***************************************************************************** Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************************/ -/* $XFree86: xc/programs/x11perf/x11perf.h,v 3.6 2002/12/04 10:28:08 eich Exp $ */ +/* $XFree86: xc/programs/x11perf/x11perf.h,v 3.7 2006/01/09 15:00:58 dawes Exp $ */ #ifndef VMS #include Index: xc/programs/x11perf/x11perf.man diff -u xc/programs/x11perf/x11perf.man:1.10 xc/programs/x11perf/x11perf.man:1.11 --- xc/programs/x11perf/x11perf.man:1.10 Thu Feb 10 22:03:16 2005 +++ xc/programs/x11perf/x11perf.man Mon Jan 9 10:00:58 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: x11perf.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ .\" Copyright 1988, 1989 Digital Equipment Corporation. .\" Copyright 1989, 1994, 1998 The Open Group .\" @@ -24,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.10 2005/02/11 03:03:16 dawes Exp $ +.\" $XFree86: xc/programs/x11perf/x11perf.man,v 1.11 2006/01/09 15:00:58 dawes Exp $ .\" .TH X11PERF 1 __vendorversion__ .SH NAME Index: xc/programs/xauth/Imakefile diff -u xc/programs/xauth/Imakefile:3.6 xc/programs/xauth/Imakefile:3.7 --- xc/programs/xauth/Imakefile:3.6 Wed Jul 9 11:27:37 2003 +++ xc/programs/xauth/Imakefile Mon Jan 9 10:00:59 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.6 2003/07/09 15:27:37 tsi Exp $ +XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.7 2006/01/09 15:00:59 dawes Exp $ DEPLIBS = $(DEPXAUTHLIB) $(DEPXMUULIB) $(DEPXLIB) LOCAL_LIBRARIES = $(XAUTHLIB) $(XMUULIB) $(XLIB) Index: xc/programs/xauth/gethost.c diff -u xc/programs/xauth/gethost.c:3.22 xc/programs/xauth/gethost.c:3.24 --- xc/programs/xauth/gethost.c:3.22 Sat Apr 3 17:26:25 2004 +++ xc/programs/xauth/gethost.c Mon Jan 9 10:00:59 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: gethost.c,v 1.5 2001/02/09 02:05:38 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/gethost.c,v 3.22 2004/04/03 22:26:25 dawes Exp $ */ +/* $XFree86: xc/programs/xauth/gethost.c,v 3.24 2006/01/09 15:00:59 dawes Exp $ */ /* sorry, streams support does not really work yet */ #if defined(STREAMSCONN) && defined(SVR4) @@ -110,7 +109,7 @@ Xauth *auth; { static struct hostent *hp; - int af; + volatile int af; #ifdef DNETCONN struct nodeent *np; static char nodeaddr[4 + 2 * DN_MAXADDL]; Index: xc/programs/xauth/parsedpy.c diff -u xc/programs/xauth/parsedpy.c:3.8 xc/programs/xauth/parsedpy.c:3.9 --- xc/programs/xauth/parsedpy.c:3.8 Fri Jul 18 11:53:28 2003 +++ xc/programs/xauth/parsedpy.c Mon Jan 9 10:00:59 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: parsedpy.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ - * * parse_displayname - utility routine for splitting up display name strings * * @@ -29,7 +27,7 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/parsedpy.c,v 3.8 2003/07/18 15:53:28 tsi Exp $ */ +/* $XFree86: xc/programs/xauth/parsedpy.c,v 3.9 2006/01/09 15:00:59 dawes Exp $ */ #include /* for NULL */ #include /* for isascii() and isdigit() */ Index: xc/programs/xauth/process.c diff -u xc/programs/xauth/process.c:3.24 xc/programs/xauth/process.c:3.25 --- xc/programs/xauth/process.c:3.24 Wed Jan 21 18:49:40 2004 +++ xc/programs/xauth/process.c Mon Jan 9 10:00:59 2006 @@ -1,4 +1,3 @@ -/* $Xorg: process.c,v 1.6 2001/02/09 02:05:38 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xauth/process.c,v 3.24 2004/01/21 23:49:40 herrb Exp $ */ +/* $XFree86: xc/programs/xauth/process.c,v 3.25 2006/01/09 15:00:59 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/programs/xauth/xauth.c diff -u xc/programs/xauth/xauth.c:1.6 xc/programs/xauth/xauth.c:1.7 --- xc/programs/xauth/xauth.c:1.6 Wed Jul 9 11:27:37 2003 +++ xc/programs/xauth/xauth.c Mon Jan 9 10:00:59 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: xauth.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ - * * xauth - manipulate authorization file * * @@ -28,7 +26,7 @@ * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/xauth.c,v 1.6 2003/07/09 15:27:37 tsi Exp $ */ +/* $XFree86: xc/programs/xauth/xauth.c,v 1.7 2006/01/09 15:00:59 dawes Exp $ */ #include "xauth.h" Index: xc/programs/xauth/xauth.h diff -u xc/programs/xauth/xauth.h:1.7 xc/programs/xauth/xauth.h:1.8 --- xc/programs/xauth/xauth.h:1.7 Wed Jul 9 11:27:37 2003 +++ xc/programs/xauth/xauth.h Mon Jan 9 10:00:59 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: xauth.h,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xauth/xauth.h,v 1.7 2003/07/09 15:27:37 tsi Exp $ */ +/* $XFree86: xc/programs/xauth/xauth.h,v 1.8 2006/01/09 15:00:59 dawes Exp $ */ #include #include Index: xc/programs/xauth/xauth.man diff -u xc/programs/xauth/xauth.man:1.11 xc/programs/xauth/xauth.man:1.12 --- xc/programs/xauth/xauth.man:1.11 Thu Feb 10 22:03:16 2005 +++ xc/programs/xauth/xauth.man Mon Jan 9 10:00:59 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xauth.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xauth/xauth.man,v 1.11 2005/02/11 03:03:16 dawes Exp $ +.\" $XFree86: xc/programs/xauth/xauth.man,v 1.12 2006/01/09 15:00:59 dawes Exp $ .\" .TH XAUTH 1 __vendorversion__ .SH NAME Index: xc/programs/xbiff/Imakefile diff -u xc/programs/xbiff/Imakefile:1.2 xc/programs/xbiff/Imakefile:1.3 --- xc/programs/xbiff/Imakefile:1.2 Wed May 28 12:02:36 2003 +++ xc/programs/xbiff/Imakefile Mon Jan 9 10:01:00 2006 @@ -1,8 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.12 93/09/20 10:18:26 kaleb Exp $ - - - -XCOMM $XFree86: xc/programs/xbiff/Imakefile,v 1.2 2003/05/28 16:02:36 tsi Exp $ +XCOMM $XFree86: xc/programs/xbiff/Imakefile,v 1.3 2006/01/09 15:01:00 dawes Exp $ DEPLIBS = XawClientDepLibs LOCAL_LIBRARIES = XawClientLibs Index: xc/programs/xbiff/Mailbox.c diff -u xc/programs/xbiff/Mailbox.c:1.5 xc/programs/xbiff/Mailbox.c:1.7 --- xc/programs/xbiff/Mailbox.c:1.5 Sat Oct 27 23:34:25 2001 +++ xc/programs/xbiff/Mailbox.c Tue Aug 30 11:24:06 2005 @@ -1,4 +1,3 @@ -/* $XConsortium: Mailbox.c,v 1.64 94/04/17 20:43:26 rws Exp $ */ /* Copyright (c) 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xbiff/Mailbox.c,v 1.5 2001/10/28 03:34:25 tsi Exp $ */ +/* $XFree86: xc/programs/xbiff/Mailbox.c,v 1.7 2005/08/30 15:24:06 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium @@ -106,7 +105,9 @@ static char defaultTranslations[] = ": unset()"; -static void Check(), Set(), Unset(); +static void Check(Widget gw, XEvent *event, String *params, Cardinal *nparams); +static void Set(Widget gw, XEvent *event, String *params, Cardinal *nparams); +static void Unset(Widget gw, XEvent *event, String *params, Cardinal *nparams); static XtActionsRec actionsList[] = { { "check", Check }, @@ -157,10 +158,20 @@ #undef offset #undef goffset -static void GetMailFile(), CloseDown(); -static void check_mailbox(), redraw_mailbox(), beep(); -static void Initialize(), Realize(), Destroy(), Redisplay(); -static Boolean SetValues(); +static void GetMailFile(MailboxWidget w); +static void CloseDown(MailboxWidget w, int status); +static void check_mailbox(MailboxWidget w, Boolean force_redraw, Boolean reset); +static void redraw_mailbox(MailboxWidget w); +static void beep(MailboxWidget w); +static void Initialize(Widget request, Widget new, ArgList args, + Cardinal *num_args); +static void Realize(Widget gw, XtValueMask *valuemaskp, + XSetWindowAttributes *attr); +static void Destroy(Widget gw); +static void Redisplay(Widget gw, XEvent *event, Region region); +static Boolean SetValues(Widget gcurrent, Widget grequest, Widget gnew, + ArgList args, Cardinal *num_args); +static void get_tip_text(Widget w, XtPointer client_data, XtPointer call_data); MailboxClassRec mailboxClassRec = { { /* core fields */ @@ -212,8 +223,81 @@ * widget initialization */ -static GC get_mailbox_gc (w) - MailboxWidget w; +static void +get_tip_text(Widget gw, XtPointer client_data, XtPointer call_data) +{ + MailboxWidget w = (MailboxWidget) gw; + Cardinal message_count = 0; + char text[64], buf[5000], marker[] = "From ", *p; + size_t chars_read; + FILE *mbox; + + /* read the file and count new messages */ + mbox = fopen(w->mailbox.filename, "r"); + if (mbox == NULL || feof(mbox)) + return; + + /* the buffer must be big enough to hold the ending of a marker if + * it was truncated. The worst case is when the marker is + * splitted this way: "F|rom ", so we need to leave a space for at + * least 4 characters + teminating NUL. */ + while ((chars_read = fread(buf, 1, sizeof(buf) - 4 - 1, mbox)) != 0) + { + p = &buf[0]; + + /* NUL-termination for strstr function */ + p[chars_read] = '\0'; + + while ((p = strstr(p, marker)) != NULL) + { + if (p == buf || p[-1] == '\n') + message_count++; + p += sizeof(marker); + } + + /* manual search for possibly truncated marker */ + if (chars_read > 4 && + (buf[chars_read - 1] == 'F' || + (buf[chars_read - 2] == 'F' && buf[chars_read - 1] == 'r') || + (buf[chars_read - 3] == 'F' && buf[chars_read - 2] == 'r' + && buf[chars_read - 1] == 'o') || + (buf[chars_read - 4] == 'F' && buf[chars_read - 3] == 'r' + && buf[chars_read - 2] == 'o' && buf[chars_read - 1] == 'm'))) + { + /* marker might be splitted, so re-try */ + p = &buf[chars_read]; + + /* read the remaining 4 bytes which are guaranteed to fit + * into the buffer. */ + if ((chars_read = fread(p, 1, 4, mbox)) != 0) + { + /* NUL-termination for strstr function */ + p[chars_read] = '\0'; + + /* step back, so that the marker is not splitted */ + p -= 4; + + if ((p = strstr(p, marker)) != NULL && p[-1] == '\n') + { + message_count++; + } + } + } + } + + fclose(mbox); + + if (message_count == 0) + return; + + snprintf(text, sizeof(text), "%d new messag%s", message_count, + (message_count == 1 ? "e" : "es")); + + *((String*) client_data) = XtNewString(text); +} + +static GC +get_mailbox_gc(MailboxWidget w) { XtGCMask valuemask; XGCValues xgcv; @@ -228,10 +312,8 @@ /* ARGSUSED */ -static void Initialize (request, new, args, num_args) - Widget request, new; - ArgList args; - Cardinal *num_args; +static void +Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args) { MailboxWidget w = (MailboxWidget) new; int shape_event_base, shape_error_base; @@ -250,6 +332,7 @@ w->mailbox.empty.pixmap = None; w->mailbox.flag_up = FALSE; w->mailbox.last_size = 0; + XtVaSetValues((Widget) w, XtNtipCallback, &get_tip_text, NULL); if (!w->mailbox.filename) GetMailFile (w); return; } @@ -264,11 +347,8 @@ */ /* ARGSUSED */ -static void Set (gw, event, params, nparams) - Widget gw; - XEvent *event; - String *params; - Cardinal *nparams; +static void +Set(Widget gw, XEvent *event, String *params, Cardinal *nparams) { MailboxWidget w = (MailboxWidget) gw; @@ -285,11 +365,8 @@ */ /* ARGSUSED */ -static void Unset (gw, event, params, nparams) - Widget gw; - XEvent *event; - String *params; - Cardinal *nparams; +static void +Unset(Widget gw, XEvent *event, String *params, Cardinal *nparams) { MailboxWidget w = (MailboxWidget) gw; @@ -304,11 +381,8 @@ */ /* ARGSUSED */ -static void Check (gw, event, params, nparams) - Widget gw; - XEvent *event; - String *params; - Cardinal *nparams; +static void +Check(Widget gw, XEvent *event, String *params, Cardinal *nparams) { MailboxWidget w = (MailboxWidget) gw; @@ -319,9 +393,8 @@ /* ARGSUSED */ -static void clock_tic (client_data, id) - XtPointer client_data; - XtIntervalId *id; +static void +clock_tic(XtPointer client_data, XtIntervalId *id) { MailboxWidget w = (MailboxWidget) client_data; @@ -338,13 +411,9 @@ return; } -static Pixmap make_pixmap (dpy, w, bitmap, depth, flip, widthp, heightp) - Display *dpy; - MailboxWidget w; - Pixmap bitmap; - Boolean flip; - int depth; - int *widthp, *heightp; +static Pixmap +make_pixmap(Display *dpy, MailboxWidget w, Pixmap bitmap, int depth, + Boolean flip, int *widthp, int *heightp) { Window root; int x, y; @@ -367,10 +436,8 @@ width, height, depth, fore, back); } -static void Realize (gw, valuemaskp, attr) - Widget gw; - XtValueMask *valuemaskp; - XSetWindowAttributes *attr; +static void +Realize(Widget gw, XtValueMask *valuemaskp, XSetWindowAttributes *attr) { MailboxWidget w = (MailboxWidget) gw; register Display *dpy = XtDisplay (w); @@ -421,8 +488,8 @@ } -static void Destroy (gw) - Widget gw; +static void +Destroy(Widget gw) { MailboxWidget w = (MailboxWidget) gw; Display *dpy = XtDisplay (gw); @@ -443,10 +510,8 @@ } -static void Redisplay (gw, event, region) - Widget gw; - XEvent *event; - Region region; +static void +Redisplay(Widget gw, XEvent *event, Region region) { MailboxWidget w = (MailboxWidget) gw; @@ -454,9 +519,8 @@ } -static void check_mailbox (w, force_redraw, reset) - MailboxWidget w; - Boolean force_redraw, reset; +static void +check_mailbox(MailboxWidget w, Boolean force_redraw, Boolean reset) { long mailboxsize = 0; Boolean readSinceLastWrite = FALSE; @@ -541,8 +605,8 @@ * get user name for building mailbox */ -static void GetMailFile (w) - MailboxWidget w; +static void +GetMailFile(MailboxWidget w) { char *username; char *mailpath; @@ -553,8 +617,6 @@ CloseDown (w, 1); } #else - char *getlogin(); - username = getlogin (); if (!username) { struct passwd *pw = getpwuid (getuid ()); @@ -580,9 +642,8 @@ return; } -static void CloseDown (w, status) - MailboxWidget w; - int status; +static void +CloseDown(MailboxWidget w, int status) { Display *dpy = XtDisplay (w); @@ -593,10 +654,9 @@ /* ARGSUSED */ -static Boolean SetValues (gcurrent, grequest, gnew, args, num_args) - Widget gcurrent, grequest, gnew; - ArgList args; - Cardinal *num_args; +static Boolean +SetValues(Widget gcurrent, Widget grequest, Widget gnew, ArgList args, + Cardinal *num_args) { MailboxWidget current = (MailboxWidget) gcurrent; MailboxWidget new = (MailboxWidget) gnew; @@ -626,8 +686,8 @@ * drawing code */ -static void redraw_mailbox (w) - MailboxWidget w; +static void +redraw_mailbox(MailboxWidget w) { register Display *dpy = XtDisplay (w); register Window win = XtWindow (w); @@ -679,8 +739,8 @@ } -static void beep (w) - MailboxWidget w; +static void +beep(MailboxWidget w) { XBell (XtDisplay (w), w->mailbox.volume); return; Index: xc/programs/xbiff/Mailbox.h diff -u xc/programs/xbiff/Mailbox.h:1.1 xc/programs/xbiff/Mailbox.h:1.2 --- xc/programs/xbiff/Mailbox.h:1.1 Sat Feb 12 22:56:12 2000 +++ xc/programs/xbiff/Mailbox.h Mon Jan 9 10:01:00 2006 @@ -1,4 +1,4 @@ -/* $XConsortium: Mailbox.h,v 1.21 94/04/17 20:43:27 rws Exp $ */ +/* $XFree86: xc/programs/xbiff/Mailbox.h,v 1.2 2006/01/09 15:01:00 dawes Exp $ */ /* Copyright (c) 1988 X Consortium Index: xc/programs/xbiff/MailboxP.h diff -u xc/programs/xbiff/MailboxP.h:1.2 xc/programs/xbiff/MailboxP.h:1.3 --- xc/programs/xbiff/MailboxP.h:1.2 Thu Apr 19 15:54:51 2001 +++ xc/programs/xbiff/MailboxP.h Mon Jan 9 10:01:00 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: MailboxP.h,v 1.22 94/04/17 20:43:27 rws Exp $ */ /* Copyright (c) 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xbiff/MailboxP.h,v 1.2 2001/04/19 19:54:51 dawes Exp $ */ +/* $XFree86: xc/programs/xbiff/MailboxP.h,v 1.3 2006/01/09 15:01:00 dawes Exp $ */ #ifndef _XawMailboxP_h #define _XawMailboxP_h Index: xc/programs/xbiff/xbiff.c diff -u xc/programs/xbiff/xbiff.c:1.4 xc/programs/xbiff/xbiff.c:1.6 --- xc/programs/xbiff/xbiff.c:1.4 Tue May 27 18:26:59 2003 +++ xc/programs/xbiff/xbiff.c Tue Aug 30 11:24:07 2005 @@ -1,4 +1,3 @@ -/* $XConsortium: xbiff.c,v 1.19 94/04/17 20:43:28 rws Exp $ */ /* Copyright (c) 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xbiff/xbiff.c,v 1.4 2003/05/27 22:26:59 tsi Exp $ */ +/* $XFree86: xc/programs/xbiff/xbiff.c,v 1.6 2005/08/30 15:24:07 dawes Exp $ */ #include #include @@ -37,6 +36,7 @@ #include #include "Mailbox.h" #include +#include const char *ProgramName; @@ -49,11 +49,8 @@ static Atom wm_delete_window; -static void quit (w, event, params, num_params) - Widget w; - XEvent *event; - String *params; - Cardinal *num_params; +static void +quit(Widget w, XEvent *event, String *params, Cardinal *num_params) { if (event->type == ClientMessage && event->xclient.data.l[0] != wm_delete_window) { @@ -68,7 +65,8 @@ { "quit", quit }, }; -static void Usage () +static void +Usage(void) { static const char *help_message[] = { "where options include:", @@ -93,9 +91,7 @@ int -main (argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { XtAppContext xtcontext; Widget toplevel; Index: xc/programs/xbiff/xbiff.man diff -u xc/programs/xbiff/xbiff.man:1.5 xc/programs/xbiff/xbiff.man:1.6 --- xc/programs/xbiff/xbiff.man:1.5 Thu Feb 10 22:03:16 2005 +++ xc/programs/xbiff/xbiff.man Mon Jan 9 10:01:00 2006 @@ -1,4 +1,3 @@ -.\" $XConsortium: xbiff.man,v 1.22 94/04/17 20:43:28 gildea Exp $ .\" Copyright (c) 1988 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/xbiff/xbiff.man,v 1.5 2005/02/11 03:03:16 dawes Exp $ +.\" $XFree86: xc/programs/xbiff/xbiff.man,v 1.6 2006/01/09 15:01:00 dawes Exp $ .\" .TH XBIFF 1 __vendorversion__ .SH NAME Index: xc/programs/xcalc/Imakefile diff -u xc/programs/xcalc/Imakefile:1.3 xc/programs/xcalc/Imakefile:1.4 --- xc/programs/xcalc/Imakefile:1.3 Fri Oct 24 16:38:14 2003 +++ xc/programs/xcalc/Imakefile Thu Mar 24 21:22:59 2005 @@ -1,16 +1,6 @@ -XCOMM $XConsortium: Imakefile,v 1.9 93/08/17 21:17:38 rws Exp $ +XCOMM $XFree86: xc/programs/xcalc/Imakefile,v 1.4 2005/03/25 02:22:59 dawes Exp $ - - - -XCOMM $XFree86: xc/programs/xcalc/Imakefile,v 1.3 2003/10/24 20:38:14 tsi Exp $ - -#if defined(MacIIArchitecture) || defined(MotoR4Architecture) \ - || defined(OpenBSDArchitecture) - IEEE_DEFS = -DIEEE -#endif - - DEFINES = $(IEEE_DEFS) $(SIGNAL_DEFINES) + DEFINES = DEPLIBS = XawClientDepLibs LOCAL_LIBRARIES = XawClientLibs SYS_LIBRARIES = MathLibrary Index: xc/programs/xcalc/XCalc.ad diff -u xc/programs/xcalc/XCalc.ad:1.3 xc/programs/xcalc/XCalc.ad:1.4 --- xc/programs/xcalc/XCalc.ad:1.3 Fri Oct 24 16:38:14 2003 +++ xc/programs/xcalc/XCalc.ad Mon Jan 9 10:01:00 2006 @@ -1,5 +1,4 @@ -! $XConsortium: XCalc.ad,v 1.13 94/03/03 19:19:32 converse Exp $ -! $XFree86: xc/programs/xcalc/XCalc.ad,v 1.3 2003/10/24 20:38:14 tsi Exp $ +! $XFree86: xc/programs/xcalc/XCalc.ad,v 1.4 2006/01/09 15:01:00 dawes Exp $ ! XCalc application class resource file XCalc.Title: Calculator Index: xc/programs/xcalc/actions.c diff -u xc/programs/xcalc/actions.c:1.1 xc/programs/xcalc/actions.c:1.2 --- xc/programs/xcalc/actions.c:1.1 Sat Feb 12 22:26:18 2000 +++ xc/programs/xcalc/actions.c Thu Mar 24 21:22:59 2005 @@ -1,4 +1,3 @@ -/* $XConsortium: actions.c,v 1.9 94/04/17 20:43:30 converse Exp $ */ /* Copyright (c) 1989 X Consortium @@ -28,6 +27,7 @@ from the X Consortium. */ +/* $XFree86: xc/programs/xcalc/actions.c,v 1.2 2005/03/25 02:22:59 dawes Exp $ */ /* * actions.c - externally available procedures for xcalc @@ -38,26 +38,14 @@ #include #include #include "xcalc.h" -extern int rpn; -extern Atom wm_delete_window; -extern int pre_op(); -extern void post_op(), Quit(), ringbell(), do_select(); - -#ifndef IEEE -extern jmp_buf env; -extern void fail_op(); -#define XCALC_PRE_OP(keynum) { if (pre_op(keynum)) return; \ - if (setjmp (env)) {fail_op(); return;}} -#else +#include "actions.h" +#include "xcmath.h" + #define XCALC_PRE_OP(keynum) if (pre_op(keynum)) return; -#endif /*ARGSUSED*/ -void add(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +add(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kADD); rpn ? twof(kADD) : twoop(kADD); @@ -65,11 +53,8 @@ } /*ARGSUSED*/ -void back(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +back(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kBKSP); bkspf(); @@ -77,21 +62,15 @@ } /*ARGSUSED*/ -void bell(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +bell(Widget w, XEvent *e, String *vector, Cardinal *count) { ringbell(); } /*ARGSUSED*/ -void clearit(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +clearit(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kCLR); clearf(); @@ -99,11 +78,8 @@ } /*ARGSUSED*/ -void cosine(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +cosine(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kCOS); oneop(kCOS); @@ -111,11 +87,8 @@ } /*ARGSUSED*/ -void decimal(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +decimal(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kDEC); decf(); @@ -123,11 +96,8 @@ } /*ARGSUSED*/ -void degree(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +degree(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kDRG); drgf(); @@ -135,11 +105,8 @@ } /*ARGSUSED*/ -void digit(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +digit(Widget w, XEvent *e, String *vector, Cardinal *count) { switch (vector[0][0]) { @@ -158,11 +125,8 @@ } /*ARGSUSED*/ -void divide(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +divide(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kDIV); rpn ? twof(kDIV) : twoop(kDIV); @@ -170,11 +134,8 @@ } /*ARGSUSED*/ -void e(w, ev, vector, count) - Widget w; - XEvent *ev; - String *vector; - Cardinal *count; +void +e(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kE); oneop(kE); @@ -182,11 +143,8 @@ } /*ARGSUSED*/ -void enter(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +enter(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kENTR); entrf(); @@ -194,11 +152,8 @@ } /*ARGSUSED*/ -void epower(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +epower(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kEXP); oneop(kEXP); @@ -206,11 +161,8 @@ } /*ARGSUSED*/ -void equal(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +equal(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kEQU); equf(); @@ -218,11 +170,8 @@ } /*ARGSUSED*/ -void exchange(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +exchange(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kEXC); oneop(kEXC); @@ -230,11 +179,8 @@ } /*ARGSUSED*/ -void factorial(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +factorial(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kFACT); oneop(kFACT); @@ -242,11 +188,8 @@ } /*ARGSUSED*/ -void inverse(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +inverse(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kINV); invf(); @@ -254,11 +197,8 @@ } /*ARGSUSED*/ -void leftParen(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +leftParen(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kLPAR); lparf(); @@ -266,11 +206,8 @@ } /*ARGSUSED*/ -void logarithm(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +logarithm(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kLOG); oneop(kLOG); @@ -278,11 +215,8 @@ } /*ARGSUSED*/ -void multiply(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +multiply(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kMUL); rpn ? twof(kMUL) : twoop(kMUL); @@ -290,11 +224,8 @@ } /*ARGSUSED*/ -void naturalLog(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +naturalLog(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kLN); oneop(kLN); @@ -302,11 +233,8 @@ } /*ARGSUSED*/ -void negate(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +negate(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kNEG); negf(); @@ -314,21 +242,15 @@ } /*ARGSUSED*/ -void nop(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +nop(Widget w, XEvent *e, String *vector, Cardinal *count) { ringbell(); } /*ARGSUSED*/ -void off(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +off(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kOFF); offf(); @@ -336,11 +258,8 @@ } /*ARGSUSED*/ -void pi(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +pi(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kPI); oneop(kPI); @@ -348,11 +267,8 @@ } /*ARGSUSED*/ -void power(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +power(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kPOW); rpn ? twof(kPOW) : twoop(kPOW); @@ -360,11 +276,8 @@ } /*ARGSUSED*/ -void quit(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +quit(Widget w, XEvent *e, String *vector, Cardinal *count) { if (e->type == ClientMessage && e->xclient.data.l[0] != wm_delete_window) ringbell(); @@ -373,11 +286,8 @@ } /*ARGSUSED*/ -void recall(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +recall(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kRCL); rpn ? memf(kRCL) : oneop(kRCL); @@ -385,11 +295,8 @@ } /*ARGSUSED*/ -void reciprocal(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +reciprocal(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kRECIP); oneop(kRECIP); @@ -397,11 +304,8 @@ } /*ARGSUSED*/ -void rightParen(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +rightParen(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kRPAR); rparf(); @@ -409,11 +313,8 @@ } /*ARGSUSED*/ -void roll(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +roll(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kROLL); rollf(); @@ -421,11 +322,8 @@ } /*ARGSUSED*/ -void scientific(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +scientific(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kEE); eef(); @@ -433,21 +331,15 @@ } /*ARGSUSED*/ -void selection(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +selection(Widget w, XEvent *e, String *vector, Cardinal *count) { do_select(((XButtonReleasedEvent *)e)->time); } /*ARGSUSED*/ -void sine(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +sine(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kSIN); oneop(kSIN); @@ -455,11 +347,8 @@ } /*ARGSUSED*/ -void square(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +square(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kSQR); oneop(kSQR); @@ -467,11 +356,8 @@ } /*ARGSUSED*/ -void squareRoot(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +squareRoot(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kSQRT); oneop(kSQRT); @@ -479,11 +365,8 @@ } /*ARGSUSED*/ -void store(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +store(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kSTO); rpn ? memf(kSTO) : oneop(kSTO); @@ -491,11 +374,8 @@ } /*ARGSUSED*/ -void subtract(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +subtract(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kSUB); rpn ? twof(kSUB) : twoop(kSUB); @@ -503,11 +383,8 @@ } /*ARGSUSED*/ -void sum(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +sum(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kSUM); rpn ? memf(kSUM) : oneop(kSUM); @@ -515,11 +392,8 @@ } /*ARGSUSED*/ -void tangent(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +tangent(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kTAN); oneop(kTAN); @@ -527,11 +401,8 @@ } /*ARGSUSED*/ -void tenpower(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +tenpower(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(k10X); oneop(k10X); @@ -539,11 +410,8 @@ } /*ARGSUSED*/ -void XexchangeY(w, e, vector, count) - Widget w; - XEvent *e; - String *vector; - Cardinal *count; +void +XexchangeY(Widget w, XEvent *e, String *vector, Cardinal *count) { XCALC_PRE_OP(kXXY); twof(kXXY); Index: xc/programs/xcalc/actions.h diff -u xc/programs/xcalc/actions.h:1.1 xc/programs/xcalc/actions.h:1.2 --- xc/programs/xcalc/actions.h:1.1 Sat Feb 12 22:26:19 2000 +++ xc/programs/xcalc/actions.h Thu Mar 24 21:22:59 2005 @@ -1,4 +1,3 @@ -/* $XConsortium: actions.h,v 1.6 94/04/17 20:43:31 rws Exp $ */ /* Copyright (c) 1989 X Consortium @@ -28,6 +27,7 @@ from the X Consortium. */ +/* $XFree86: xc/programs/xcalc/actions.h,v 1.2 2005/03/25 02:22:59 dawes Exp $ */ /* * actions.h - action table declaring externally available procedures for xcalc @@ -35,20 +35,56 @@ * Author: Donna Converse, MIT X Consortium */ -extern void - add(), back(), bell(), clearit(), cosine(), decimal(), - degree(), digit(), divide(), e(), enter(), epower(), equal(), - exchange(), factorial(), - inverse(), leftParen(), logarithm(), multiply(), naturalLog(), - negate(), nop(), off(), pi(), power(), quit(), recall(), - reciprocal(), rightParen(), roll(), scientific(), selection(), sine(), - square(), squareRoot(), store(), subtract(), sum(), - tangent(), tenpower(), XexchangeY(); +#define CALC_PROTO(f) \ + extern void f(Widget w, XEvent *e, String *vector, Cardinal *count) + +CALC_PROTO(add); +CALC_PROTO(back); +CALC_PROTO(bell); +CALC_PROTO(clearit); +CALC_PROTO(cosine); +CALC_PROTO(decimal); +CALC_PROTO(degree); +CALC_PROTO(digit); +CALC_PROTO(divide); +CALC_PROTO(e); +CALC_PROTO(enter); +CALC_PROTO(epower); +CALC_PROTO(equal); +CALC_PROTO(exchange); +CALC_PROTO(factorial); +CALC_PROTO(inverse); +CALC_PROTO(leftParen); +CALC_PROTO(logarithm); +CALC_PROTO(multiply); +CALC_PROTO(naturalLog); +CALC_PROTO(negate); +CALC_PROTO(nop); +CALC_PROTO(off); +CALC_PROTO(pi); +CALC_PROTO(power); +CALC_PROTO(quit); +CALC_PROTO(recall); +CALC_PROTO(reciprocal); +CALC_PROTO(rightParen); +CALC_PROTO(roll); +CALC_PROTO(scientific); +CALC_PROTO(selection); +CALC_PROTO(sine); +CALC_PROTO(square); +CALC_PROTO(squareRoot); +CALC_PROTO(store); +CALC_PROTO(subtract); +CALC_PROTO(sum); +CALC_PROTO(tangent); +CALC_PROTO(tenpower); +CALC_PROTO(XexchangeY); /* * calculator action table */ +#ifdef DEFINE_ACTIONS XtActionsRec Actions[] = { {"add", add}, /* addition */ {"back", back}, /* HP-specific backspace */ @@ -92,3 +128,4 @@ {"tenpower", tenpower}, /* 10 raised to to an arbitrary power */ {"XexchangeY", XexchangeY} /* HP-specific exchange X and Y registers */ }; +#endif Index: xc/programs/xcalc/math.c diff -u xc/programs/xcalc/math.c:1.6 xc/programs/xcalc/math.c:1.7 --- xc/programs/xcalc/math.c:1.6 Tue May 27 18:26:59 2003 +++ xc/programs/xcalc/math.c Thu Mar 24 21:22:59 2005 @@ -1,5 +1,5 @@ -/* $XConsortium: math.c,v 1.17 91/07/25 17:51:34 rws Exp $ - * $XFree86: xc/programs/xcalc/math.c,v 1.6 2003/05/27 22:26:59 tsi Exp $ +/* + * $XFree86: xc/programs/xcalc/math.c,v 1.7 2005/03/25 02:22:59 dawes Exp $ * * math.c - mathematics functions for a hand calculator under X * @@ -19,12 +19,10 @@ #include #include #include -#include -#if !defined(IEEE) && defined(SVR4) -#include -#endif -#include +#include +#include #include "xcalc.h" +#include "xcmath.h" #include #include @@ -68,18 +66,6 @@ #define True 1 #define False 0 -extern int rpn; -extern char dispstr[]; -extern void draw(); -extern void ringbell(); -extern void setflag(); -extern void Quit(); - -#ifndef IEEE - jmp_buf env; -#endif - - /* This section is all of the state machine that implements the calculator * functions. Much of it is shared between the infix and rpn modes. */ @@ -126,10 +112,7 @@ */ static void -parse_double (src, fmt, dp) - char *src; - char *fmt; - double *dp; +parse_double(char *src, char *fmt, double *dp) { int olderrno = errno; @@ -140,8 +123,8 @@ /*********************************/ -int pre_op(keynum) - int keynum; +int +pre_op(int keynum) { if (keynum==-1) return(0); @@ -160,116 +143,13 @@ return(0); } -#ifndef IEEE - -/* cannot assign result of setjmp under ANSI C, use global instead */ -static int SignalKind; -static int SignalCode; - -void fail_op() -{ - if (SignalKind == SIGFPE) - switch (SignalCode) { -#ifdef SVR4 - case FPE_INTDIV: /* integer divide by zero */ - case FPE_FLTDIV: /* floating point divide by zero */ - strcpy(dispstr, "divide by 0"); - break; - case FPE_INTOVF: /* integer overflow */ - case FPE_FLTOVF: /* floating point overflow */ - strcpy(dispstr, "overflow"); - break; - case FPE_FLTUND: /* floating point underflow */ - strcpy(dispstr, "underflow"); - break; - case FPE_FLTRES: /* floating point inexact result */ - strcpy(dispstr, "inexact result"); - break; - case FPE_FLTINV: /* invalid floating point operation */ - strcpy(dispstr, "invalid op"); - break; - case FPE_FLTSUB: /* subscript out of range */ - strcpy(dispstr, "out of range"); - break; - -#endif /*SVR4*/ - -#ifdef FPE_FLTDIV_TRAP - case FPE_FLTDIV_TRAP: strcpy(dispstr,"div by zero"); break; -#endif -#ifdef FPE_FLTDIV_FAULT - case FPE_FLTDIV_FAULT: strcpy(dispstr,"div by zero"); break; -#endif -#ifdef FPE_FLTOVF_TRAP - case FPE_FLTOVF_TRAP: strcpy(dispstr,"overflow"); break; -#endif -#ifdef FPE_FLTOVF_FAULT - case FPE_FLTOVF_FAULT: strcpy(dispstr,"overflow"); break; -#endif -#ifdef FPE_FLTUND_TRAP - case FPE_FLTUND_TRAP: strcpy(dispstr,"underflow"); break; -#endif -#ifdef FPE_FLTUND_FAULT - case FPE_FLTUND_FAULT: strcpy(dispstr,"underflow"); break; -#endif - default: strcpy(dispstr,"error"); - } - else - if (SignalKind == SIGILL) - strcpy(dispstr, "illegal operand"); - - entered=3; - DrawDisplay(); - return; -} - - -/* keep SVR4 compiler from complaining about scope of arg declaration below */ -typedef struct sigcontext * sigcontextstructp; -/*ARGSUSED*/ -signal_t fperr(sig,code,scp) - int sig,code; - sigcontextstructp scp; -{ -#if defined(SYSV) || defined(SVR4) || defined(linux) - signal(SIGFPE,(signal_t (*)())fperr); -#endif - SignalKind = sig; - SignalCode = code; - longjmp(env,1); -} - -/* for VAX BSD4.3 */ -/*ARGSUSED*/ -signal_t illerr(sig,code,scp) - int sig,code; - sigcontextstructp scp; -{ - /* not reset when caught? */ - signal(SIGILL,(signal_t (*)())illerr); - - SignalKind = sig; - SignalCode = code; - longjmp(env,1); -} - -#endif /* not IEEE */ - - void post_op() { #ifdef DEBUG showstack("\0"); #endif -#ifndef IEEE - if (errno) { - strcpy(dispstr,"error"); - DrawDisplay(); - entered=3; - errno=0; - } -#endif } + /*-------------------------------------------------------------------------*/ static void DrawDisplay(void) @@ -298,8 +178,7 @@ /*-------------------------------------------------------------------------*/ void -numeric(keynum) - int keynum; +numeric(int keynum) { char st[2]; int cell = 0; Index: xc/programs/xcalc/xcalc.c diff -u xc/programs/xcalc/xcalc.c:1.2 xc/programs/xcalc/xcalc.c:1.3 --- xc/programs/xcalc/xcalc.c:1.2 Thu May 11 14:14:41 2000 +++ xc/programs/xcalc/xcalc.c Thu Mar 24 21:22:59 2005 @@ -1,4 +1,3 @@ -/* $XConsortium: xcalc.c,v 1.16 94/04/17 20:43:31 converse Exp $ */ /* Copyright (c) 1989 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xcalc/xcalc.c,v 1.2 2000/05/11 18:14:41 tsi Exp $ */ +/* $XFree86: xc/programs/xcalc/xcalc.c,v 1.3 2005/03/25 02:22:59 dawes Exp $ */ /* * xcalc.c - a hand calculator for the X Window system @@ -41,7 +40,8 @@ #include #include -#include +#include +#include #include #include #include @@ -53,18 +53,14 @@ #include #include #include "xcalc.h" +#include "xcmath.h" +#define DEFINE_ACTIONS #include "actions.h" -#ifndef IEEE -extern signal_t fperr(); -extern signal_t illerr(); -#endif - /* * global data */ int rpn = 0; /* Reverse Polish Notation (HP mode) flag */ -#define LCD_STR_LEN 32 char dispstr[LCD_STR_LEN]; /* string to show up in the LCD */ Atom wm_delete_window; /* see ICCCM section 5.2.2 */ @@ -110,18 +106,16 @@ }; #undef offset +static void Syntax(int argc, char **argv); +static void create_calculator(Widget shell); +static void create_display(Widget parent); +static void create_keypad(Widget parent); int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { Arg args[3]; - void create_calculator(); - void Quit(), Syntax(); - - XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL); toplevel = XtAppInitialize(&xtcontext, "XCalc", Options, XtNumber(Options), @@ -162,22 +156,15 @@ XtSetValues(calculator, args, ONE); } -#ifndef IEEE - signal(SIGFPE,fperr); - signal(SIGILL,illerr); -#endif ResetCalc(); XtAppMainLoop(xtcontext); return 0; } -void create_calculator(shell) - Widget shell; +static void +create_calculator(Widget shell) { - void create_display(); - void create_keypad(); - rpn = appResources.rpn; calculator = XtCreateManagedWidget(rpn ? "hp" : "ti", formWidgetClass, shell, (ArgList) NULL, ZERO); @@ -189,8 +176,8 @@ /* * Do the calculator data display widgets. */ -void create_display(parent) - Widget parent; +static void +create_display(Widget parent) { Widget bevel, screen; static Arg args[] = { @@ -242,8 +229,8 @@ * these defaults in an environment-specific resource file. */ -void create_keypad(parent) - Widget parent; +static void +create_keypad(Widget parent) { static char *Keyboard[] = { "button1", "button2", "button3", "button4", "button5", @@ -272,8 +259,8 @@ /* * called by math routines to write to the liquid crystal display. */ -void draw(string) - char *string; +void +draw(char *string) { Arg args[1]; @@ -283,9 +270,8 @@ /* * called by math routines to turn on and off the display indicators. */ -void setflag(indicator, on) - int indicator; - Boolean on; +void +setflag(int indicator, Boolean on) { if (on) XtMapWidget(ind[indicator]); else XtUnmapWidget(ind[indicator]); @@ -294,7 +280,8 @@ /* * ring the bell. */ -void ringbell() +void +ringbell() { XBell(dpy, 0); } @@ -302,9 +289,9 @@ /* * die. */ -void Quit() +void +Quit() { - extern void exit(); XtDestroyApplicationContext(xtcontext); exit(0); } @@ -312,12 +299,10 @@ /* * recite and die. */ -void Syntax(argc, argv) - int argc; - char **argv; +static void +Syntax(int argc, char **argv) { register int i; - extern void exit(); (void) fprintf(stderr, "%s: unknown options:", argv[0]); for (i=1; i #include Index: xc/programs/xclipboard/xclipboard.man diff -u xc/programs/xclipboard/xclipboard.man:1.11 xc/programs/xclipboard/xclipboard.man:1.12 --- xc/programs/xclipboard/xclipboard.man:1.11 Thu Feb 10 22:03:17 2005 +++ xc/programs/xclipboard/xclipboard.man Mon Jan 9 10:01:00 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xclipboard.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xclipboard/xclipboard.man,v 1.11 2005/02/11 03:03:17 dawes Exp $ +.\" $XFree86: xc/programs/xclipboard/xclipboard.man,v 1.12 2006/01/09 15:01:00 dawes Exp $ .\" .TH XCLIPBOARD 1 __vendorversion__ .SH NAME Index: xc/programs/xclipboard/xcutsel.c diff -u xc/programs/xclipboard/xcutsel.c:1.8 xc/programs/xclipboard/xcutsel.c:1.9 --- xc/programs/xclipboard/xcutsel.c:1.8 Fri Dec 14 15:01:16 2001 +++ xc/programs/xclipboard/xcutsel.c Mon Jan 9 10:01:00 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: xcutsel.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ * * * Author: Ralph Swick, DEC/Project Athena */ -/* $XFree86: xc/programs/xclipboard/xcutsel.c,v 1.8 2001/12/14 20:01:16 dawes Exp $ */ +/* $XFree86: xc/programs/xclipboard/xcutsel.c,v 1.9 2006/01/09 15:01:00 dawes Exp $ */ #include #include Index: xc/programs/xclipboard/xcutsel.man diff -u xc/programs/xclipboard/xcutsel.man:1.9 xc/programs/xclipboard/xcutsel.man:1.10 --- xc/programs/xclipboard/xcutsel.man:1.9 Thu Feb 10 22:03:17 2005 +++ xc/programs/xclipboard/xcutsel.man Mon Jan 9 10:01:00 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xcutsel.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xclipboard/xcutsel.man,v 1.9 2005/02/11 03:03:17 dawes Exp $ +.\" $XFree86: xc/programs/xclipboard/xcutsel.man,v 1.10 2006/01/09 15:01:00 dawes Exp $ .\" .TH XCUTSEL 1 __vendorversion__ .SH NAME Index: xc/programs/xclock/Clock.c diff -u xc/programs/xclock/Clock.c:3.27 xc/programs/xclock/Clock.c:3.29 --- xc/programs/xclock/Clock.c:3.27 Sat Oct 23 11:29:32 2004 +++ xc/programs/xclock/Clock.c Mon Jan 9 10:01:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Clock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/Clock.c,v 3.27 2004/10/23 15:29:32 dawes Exp $ */ +/* $XFree86: xc/programs/xclock/Clock.c,v 3.29 2006/01/09 15:01:01 dawes Exp $ */ #include #include @@ -441,7 +439,9 @@ tsec = time(NULL); sprintf (utime, "%10lu seconds since Epoch", (unsigned long)tsec); return utime; - } else if (*w->clock.strftime) { + } + else if (*w->clock.strftime) + { /*Note: this code is probably excessively paranoid about buffer overflow. The extra size 10 padding is also meant as a further guard against programmer @@ -467,7 +467,7 @@ Initialize (Widget request, Widget new, ArgList args, Cardinal *num_args) { ClockWidget w = (ClockWidget)new; - XtGCMask valuemask; + XtGCMask valuemask; XGCValues myXGCV; int min_height, min_width; Index: xc/programs/xclock/Clock.h diff -u xc/programs/xclock/Clock.h:1.12 xc/programs/xclock/Clock.h:1.14 --- xc/programs/xclock/Clock.h:1.12 Mon Oct 21 09:33:07 2002 +++ xc/programs/xclock/Clock.h Mon Jan 9 10:01:01 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: Clock.h,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/Clock.h,v 1.12 2002/10/21 13:33:07 alanh Exp $ */ +/* $XFree86: xc/programs/xclock/Clock.h,v 1.14 2006/01/09 15:01:01 dawes Exp $ */ #ifndef _XawClock_h #define _XawClock_h @@ -140,8 +135,8 @@ #define XtNsharp "sharp" #define XtCSharp "Sharp" -typedef struct _ClockRec *ClockWidget; /* completely defined in ClockPrivate.h */ -typedef struct _ClockClassRec *ClockWidgetClass; /* completely defined in ClockPrivate.h */ +typedef struct _ClockRec *ClockWidget; /* completely defined in ClockP.h */ +typedef struct _ClockClassRec *ClockWidgetClass; /* completely defined in ClockP.h */ extern WidgetClass clockWidgetClass; Index: xc/programs/xclock/ClockP.h diff -u xc/programs/xclock/ClockP.h:1.12 xc/programs/xclock/ClockP.h:1.13 --- xc/programs/xclock/ClockP.h:1.12 Mon Oct 21 09:33:08 2002 +++ xc/programs/xclock/ClockP.h Mon Jan 9 10:01:01 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: ClockP.h,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xclock/ClockP.h,v 1.12 2002/10/21 13:33:08 alanh Exp $ */ +/* $XFree86: xc/programs/xclock/ClockP.h,v 1.13 2006/01/09 15:01:01 dawes Exp $ */ #ifndef _XawClockP_h #define _XawClockP_h Index: xc/programs/xclock/Imakefile diff -u xc/programs/xclock/Imakefile:1.9 xc/programs/xclock/Imakefile:1.10 --- xc/programs/xclock/Imakefile:1.9 Mon Nov 17 10:18:06 2003 +++ xc/programs/xclock/Imakefile Fri Oct 14 11:17:31 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.9 2003/11/17 15:18:06 tsi Exp $ +XCOMM $XFree86: xc/programs/xclock/Imakefile,v 1.10 2005/10/14 15:17:31 tsi Exp $ #ifndef XClockUseRender #define XClockUseRender BuildRenderLibrary @@ -12,7 +8,7 @@ XRENDERDEFS = -DXRENDER -DXFREE86_FT2 XRENDERDEPS = XftClientDepLibs XRENDERLIBS = XftClientLibs MathLibrary - XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) -I$(XBUILDINCDIR) + XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) #endif DEPLIBS = $(XRENDERDEPS) XkbClientDepLibs XawClientDepLibs LOCAL_LIBRARIES = $(XRENDERLIBS) XkbClientLibs XawClientLibs Index: xc/programs/xclock/xclock.c diff -u xc/programs/xclock/xclock.c:1.17 xc/programs/xclock/xclock.c:1.20 --- xc/programs/xclock/xclock.c:1.17 Mon Dec 29 04:10:37 2003 +++ xc/programs/xclock/xclock.c Mon Jan 9 10:01:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: xclock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */ - /* * xclock -- Hacked from Tony Della Fera's much hacked clock program. * @@ -29,16 +27,18 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xclock/xclock.c,v 1.17 2003/12/29 09:10:37 herrb Exp $ */ +/* $XFree86: xc/programs/xclock/xclock.c,v 1.20 2006/01/09 15:01:01 dawes Exp $ */ #include #include +#include #include #include #include #include #include "Clock.h" #include +#include #include "clock.bit" #include "clmask.bit" @@ -103,6 +103,26 @@ } static void +get_tip_text(Widget w, XtPointer client_data, XtPointer call_data) +{ + time_t tloc; + char ctime[100 + 1]; + String strTime = NULL; + + XtVaGetValues(w, XtNstrftime, &strTime, NULL); + if (strTime == NULL || strcmp(strTime, "") == 0) + { + strTime = "%F"; + } + + time(&tloc); + if (strftime(ctime, sizeof(ctime), strTime, localtime(&tloc)) != 0) + { + *((String*) client_data) = XtNewString(ctime); + } +} + +static void die(Widget w, XtPointer client_data, XtPointer call_data) { XCloseDisplay(XtDisplayOfObject(w)); @@ -140,10 +160,11 @@ int main(int argc, char *argv[]) { - Widget toplevel; + Widget toplevel, clock; Arg arg; Pixmap icon_pixmap = None; XtAppContext app_con; + Boolean analog; toplevel = XtOpenApplication(&app_con, "XClock", options, XtNumber(options), &argc, argv, NULL, @@ -162,7 +183,6 @@ XtSetArg(arg, XtNiconPixmap, &icon_pixmap); XtGetValues(toplevel, &arg, ONE); - if (icon_pixmap == None) { arg.value = (XtArgVal)XCreateBitmapFromData(XtDisplay(toplevel), XtScreen(toplevel)->root, @@ -180,7 +200,14 @@ XtSetValues (toplevel, &arg, ONE); } - XtCreateManagedWidget ("clock", clockWidgetClass, toplevel, NULL, ZERO); + clock = XtCreateManagedWidget ("clock", clockWidgetClass, toplevel, + NULL, ZERO); + XtSetArg(arg, XtNanalog, &analog); + XtGetValues(clock, &arg, ONE); + if (analog) { + XtSetArg(arg, XtNtipCallback, &get_tip_text); + XtSetValues (clock, &arg, ONE); + } XtRealizeWidget (toplevel); wm_delete_window = XInternAtom (XtDisplay(toplevel), "WM_DELETE_WINDOW", False); Index: xc/programs/xclock/xclock.man diff -u xc/programs/xclock/xclock.man:1.17 xc/programs/xclock/xclock.man:1.18 --- xc/programs/xclock/xclock.man:1.17 Thu Feb 10 22:03:17 2005 +++ xc/programs/xclock/xclock.man Mon Jan 9 10:01:01 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xclock.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xclock/xclock.man,v 1.17 2005/02/11 03:03:17 dawes Exp $ +.\" $XFree86: xc/programs/xclock/xclock.man,v 1.18 2006/01/09 15:01:01 dawes Exp $ .\" .TH XCLOCK 1 __vendorversion__ .SH NAME Index: xc/programs/xcmsdb/Imakefile diff -u xc/programs/xcmsdb/Imakefile:1.1.1.2 xc/programs/xcmsdb/Imakefile:1.2 --- xc/programs/xcmsdb/Imakefile:1.1.1.2 Tue Jan 16 17:47:51 2001 +++ xc/programs/xcmsdb/Imakefile Fri Oct 14 11:17:32 2005 @@ -1,7 +1,6 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:12 cpqbld Exp $ +XCOMM $Free86$ SRCS = xcmsdb.c loadData.c OBJS = xcmsdb.o loadData.o -INCLUDES = -I$(XLIBSRC) DEPLIBS = $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XONLYLIB) Index: xc/programs/xcmsdb/SCCDFile.h diff -u xc/programs/xcmsdb/SCCDFile.h:1.4 xc/programs/xcmsdb/SCCDFile.h:1.5 --- xc/programs/xcmsdb/SCCDFile.h:1.4 Wed Jan 17 18:45:19 2001 +++ xc/programs/xcmsdb/SCCDFile.h Mon Jan 9 10:01:01 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SCCDFile.h,v 1.3 2000/08/17 19:54:13 cpqbld Exp $ */ /* * (c) Copyright 1990 Tektronix Inc. * All Rights Reserved @@ -28,7 +27,7 @@ * X Device Color Characterization Convention (XDCCC). * */ -/* $XFree86: xc/programs/xcmsdb/SCCDFile.h,v 1.4 2001/01/17 23:45:19 dawes Exp $ */ +/* $XFree86: xc/programs/xcmsdb/SCCDFile.h,v 1.5 2006/01/09 15:01:01 dawes Exp $ */ #ifndef SCCDFILE_H #define SCCDFILE_H Index: xc/programs/xcmsdb/loadData.c diff -u xc/programs/xcmsdb/loadData.c:3.5 xc/programs/xcmsdb/loadData.c:3.6 --- xc/programs/xcmsdb/loadData.c:3.5 Sat Oct 23 11:29:32 2004 +++ xc/programs/xcmsdb/loadData.c Mon Jan 9 10:01:02 2006 @@ -1,5 +1,3 @@ -/* $Xorg: loadData.c,v 1.4 2000/08/17 19:54:13 cpqbld Exp $ */ - /* * (c) Copyright 1990 Tektronix Inc. * All Rights Reserved @@ -31,7 +29,7 @@ * * */ -/* $XFree86: xc/programs/xcmsdb/loadData.c,v 3.5 2004/10/23 15:29:32 dawes Exp $ */ +/* $XFree86: xc/programs/xcmsdb/loadData.c,v 3.6 2006/01/09 15:01:02 dawes Exp $ */ /* * INCLUDES Index: xc/programs/xcmsdb/xcmsdb.c diff -u xc/programs/xcmsdb/xcmsdb.c:1.6 xc/programs/xcmsdb/xcmsdb.c:1.7 --- xc/programs/xcmsdb/xcmsdb.c:1.6 Sun Apr 1 10:00:19 2001 +++ xc/programs/xcmsdb/xcmsdb.c Mon Jan 9 10:01:02 2006 @@ -1,5 +1,3 @@ -/* $Xorg: xcmsdb.c,v 1.3 2000/08/17 19:54:13 cpqbld Exp $ */ - /* * (c) Copyright 1990 Tektronix Inc. * All Rights Reserved @@ -29,7 +27,7 @@ * Characterization Data from the root window of the screen. * */ -/* $XFree86: xc/programs/xcmsdb/xcmsdb.c,v 1.6 2001/04/01 14:00:19 tsi Exp $ */ +/* $XFree86: xc/programs/xcmsdb/xcmsdb.c,v 1.7 2006/01/09 15:01:02 dawes Exp $ */ /* * INCLUDES Index: xc/programs/xcmsdb/xcmsdb.man diff -u xc/programs/xcmsdb/xcmsdb.man:1.8 xc/programs/xcmsdb/xcmsdb.man:1.9 --- xc/programs/xcmsdb/xcmsdb.man:1.8 Thu Feb 10 22:03:17 2005 +++ xc/programs/xcmsdb/xcmsdb.man Mon Jan 9 10:01:02 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xcmsdb.man,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ .\" Copyright 1990, Tektronix Inc. .\" Copyright 1993, 1998 The Open Group .\" @@ -24,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86: xc/programs/xcmsdb/xcmsdb.man,v 1.8 2005/02/11 03:03:17 dawes Exp $ +.\" $XFree86: xc/programs/xcmsdb/xcmsdb.man,v 1.9 2006/01/09 15:01:02 dawes Exp $ .\" .TH XCMSDB 1 __vendorversion__ .SH NAME Index: xc/programs/xconsole/Imakefile diff -u xc/programs/xconsole/Imakefile:3.2 xc/programs/xconsole/Imakefile:3.3 --- xc/programs/xconsole/Imakefile:3.2 Wed Jan 17 18:45:19 2001 +++ xc/programs/xconsole/Imakefile Mon Jan 9 10:01:02 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:13 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xconsole/Imakefile,v 3.3 2006/01/09 15:01:02 dawes Exp $ + SRCS = xconsole.c OBJS = xconsole.o PROGRAMS = xconsole Index: xc/programs/xconsole/XConsole.ad diff -u xc/programs/xconsole/XConsole.ad:1.3 xc/programs/xconsole/XConsole.ad:1.4 --- xc/programs/xconsole/XConsole.ad:1.3 Wed Jan 17 18:45:19 2001 +++ xc/programs/xconsole/XConsole.ad Mon Jan 9 10:01:02 2006 @@ -1,9 +1,4 @@ -! $Xorg: XConsole.ad,v 1.3 2000/08/17 19:54:13 cpqbld Exp $ -! -! -! -! -! $XFree86: xc/programs/xconsole/XConsole.ad,v 1.3 2001/01/17 23:45:19 dawes Exp $ +! $XFree86: xc/programs/xconsole/XConsole.ad,v 1.4 2006/01/09 15:01:02 dawes Exp $ *allowShellResize: true XConsole.translations: #override\ Index: xc/programs/xconsole/xconsole.c diff -u xc/programs/xconsole/xconsole.c:3.33 xc/programs/xconsole/xconsole.c:3.34 --- xc/programs/xconsole/xconsole.c:3.33 Sat Apr 3 17:26:26 2004 +++ xc/programs/xconsole/xconsole.c Mon Jan 9 10:01:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: xconsole.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -26,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xconsole/xconsole.c,v 3.33 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xconsole/xconsole.c,v 3.34 2006/01/09 15:01:02 dawes Exp $ */ #include #include Index: xc/programs/xconsole/xconsole.man diff -u xc/programs/xconsole/xconsole.man:1.11 xc/programs/xconsole/xconsole.man:1.12 --- xc/programs/xconsole/xconsole.man:1.11 Thu Feb 10 22:03:17 2005 +++ xc/programs/xconsole/xconsole.man Mon Jan 9 10:01:02 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xconsole.man,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" dealing in this Software without prior written authorization from the .\" The Open Group. .\" -.\" $XFree86: xc/programs/xconsole/xconsole.man,v 1.11 2005/02/11 03:03:17 dawes Exp $ +.\" $XFree86: xc/programs/xconsole/xconsole.man,v 1.12 2006/01/09 15:01:02 dawes Exp $ .\" .TH XCONSOLE 1 __vendorversion__ .SH NAME Index: xc/programs/xditview/Dvi.c diff -u xc/programs/xditview/Dvi.c:1.4 xc/programs/xditview/Dvi.c:1.5 --- xc/programs/xditview/Dvi.c:1.4 Mon Aug 27 19:35:12 2001 +++ xc/programs/xditview/Dvi.c Mon Jan 9 10:01:02 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: Dvi.c,v 1.21 94/04/17 20:43:34 keith Exp $ */ /* Copyright (c) 1991 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xditview/Dvi.c,v 1.4 2001/08/27 23:35:12 dawes Exp $ */ +/* $XFree86: xc/programs/xditview/Dvi.c,v 1.5 2006/01/09 15:01:02 dawes Exp $ */ /* Index: xc/programs/xditview/Dvi.h diff -u xc/programs/xditview/Dvi.h:1.3 xc/programs/xditview/Dvi.h:1.4 --- xc/programs/xditview/Dvi.h:1.3 Mon Dec 4 16:01:01 2000 +++ xc/programs/xditview/Dvi.h Mon Jan 9 10:01:02 2006 @@ -1,7 +1,4 @@ -/* -* $XConsortium: Dvi.h,v 1.5 91/07/25 21:33:53 keith Exp $ -*/ -/* $XFree86: xc/programs/xditview/Dvi.h,v 1.3 2000/12/04 21:01:01 dawes Exp $ */ +/* $XFree86: xc/programs/xditview/Dvi.h,v 1.4 2006/01/09 15:01:02 dawes Exp $ */ #ifndef _XtDvi_h #define _XtDvi_h Index: xc/programs/xditview/DviChar.c diff -u xc/programs/xditview/DviChar.c:1.3 xc/programs/xditview/DviChar.c:1.4 --- xc/programs/xditview/DviChar.c:1.3 Tue Aug 28 12:48:09 2001 +++ xc/programs/xditview/DviChar.c Mon Jan 9 10:01:02 2006 @@ -1,12 +1,10 @@ -/* $XConsortium: DviChar.c,v 1.7 91/07/31 00:39:31 keith Exp $ */ - /* * DviChar.c * * Map DVI (ditrof output) character names to * font indexes and back */ -/* $XFree86: xc/programs/xditview/DviChar.c,v 1.3 2001/08/28 16:48:09 tsi Exp $ */ +/* $XFree86: xc/programs/xditview/DviChar.c,v 1.4 2006/01/09 15:01:02 dawes Exp $ */ # include # include "DviChar.h" Index: xc/programs/xditview/DviP.h diff -u xc/programs/xditview/DviP.h:1.5 xc/programs/xditview/DviP.h:1.6 --- xc/programs/xditview/DviP.h:1.5 Thu Jun 20 13:40:44 2002 +++ xc/programs/xditview/DviP.h Mon Jan 9 10:01:02 2006 @@ -1,7 +1,4 @@ -/* - * $XConsortium: DviP.h,v 1.10 92/02/11 01:27:15 keith Exp $ - */ -/* $XFree86: xc/programs/xditview/DviP.h,v 1.5 2002/06/20 17:40:44 keithp Exp $ */ +/* $XFree86: xc/programs/xditview/DviP.h,v 1.6 2006/01/09 15:01:02 dawes Exp $ */ /* * DviP.h - Private definitions for Dvi widget Index: xc/programs/xditview/Imakefile diff -u xc/programs/xditview/Imakefile:1.7 xc/programs/xditview/Imakefile:1.9 --- xc/programs/xditview/Imakefile:1.7 Mon Nov 17 10:18:07 2003 +++ xc/programs/xditview/Imakefile Mon Jan 9 10:01:02 2006 @@ -1,17 +1,11 @@ -XCOMM $XConsortium: Imakefile,v 1.15 94/04/04 21:49:55 gildea Exp $ - - - - -XCOMM $XFree86: xc/programs/xditview/Imakefile,v 1.7 2003/11/17 15:18:07 tsi Exp $ - +XCOMM $XFree86: xc/programs/xditview/Imakefile,v 1.9 2006/01/09 15:01:02 dawes Exp $ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' #if BuildXftLibrary DEPFONTLIBS = XftClientDepLibs FONTLIBS = XftClientLibs FONTDEFS = -DUSE_XFT -DXFREE86_FT2 - INCLUDES = $(XFTINCLUDES) -I$(XBUILDINCDIR) + INCLUDES = $(XFTINCLUDES) #endif #if HasMkstemp TEMPDEFS = -DHAS_MKSTEMP Index: xc/programs/xditview/Menu.h diff -u xc/programs/xditview/Menu.h:1.1 xc/programs/xditview/Menu.h:1.2 --- xc/programs/xditview/Menu.h:1.1 Wed Feb 23 15:35:29 2000 +++ xc/programs/xditview/Menu.h Mon Jan 9 10:01:02 2006 @@ -1,5 +1,5 @@ /* - * $XConsortium: Menu.h,v 1.2 89/07/21 14:22:10 jim Exp $ + * $XFree86: xc/programs/xditview/Menu.h,v 1.2 2006/01/09 15:01:02 dawes Exp $ */ #ifndef _XtMenu_h Index: xc/programs/xditview/draw.c diff -u xc/programs/xditview/draw.c:1.5 xc/programs/xditview/draw.c:1.6 --- xc/programs/xditview/draw.c:1.5 Mon Aug 27 19:35:12 2001 +++ xc/programs/xditview/draw.c Mon Jan 9 10:01:02 2006 @@ -1,6 +1,5 @@ /* - * $XConsortium: draw.c,v 1.8 94/04/17 20:43:35 gildea Exp $ - * $XFree86: xc/programs/xditview/draw.c,v 1.5 2001/08/27 23:35:12 dawes Exp $ + * $XFree86: xc/programs/xditview/draw.c,v 1.6 2006/01/09 15:01:02 dawes Exp $ * Copyright (c) 1991 X Consortium Index: xc/programs/xditview/page.c diff -u xc/programs/xditview/page.c:1.4 xc/programs/xditview/page.c:1.5 --- xc/programs/xditview/page.c:1.4 Mon Aug 27 19:35:12 2001 +++ xc/programs/xditview/page.c Mon Jan 9 10:01:02 2006 @@ -1,5 +1,4 @@ -/* $XConsortium: page.c,v 1.5 91/07/26 00:40:20 keith Exp $ */ -/* $XFree86: xc/programs/xditview/page.c,v 1.4 2001/08/27 23:35:12 dawes Exp $ */ +/* $XFree86: xc/programs/xditview/page.c,v 1.5 2006/01/09 15:01:02 dawes Exp $ */ /* * page.c Index: xc/programs/xditview/parse.c diff -u xc/programs/xditview/parse.c:1.6 xc/programs/xditview/parse.c:1.7 --- xc/programs/xditview/parse.c:1.6 Tue May 27 18:27:00 2003 +++ xc/programs/xditview/parse.c Mon Jan 9 10:01:02 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: parse.c,v 1.13 94/04/17 20:43:36 keith Exp $ */ /* Copyright (c) 1991 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xditview/parse.c,v 1.6 2003/05/27 22:27:00 tsi Exp $ */ +/* $XFree86: xc/programs/xditview/parse.c,v 1.7 2006/01/09 15:01:02 dawes Exp $ */ /* * parse.c Index: xc/programs/xditview/xditview.c diff -u xc/programs/xditview/xditview.c:1.5 xc/programs/xditview/xditview.c:1.6 --- xc/programs/xditview/xditview.c:1.5 Tue May 27 18:27:00 2003 +++ xc/programs/xditview/xditview.c Mon Jan 9 10:01:02 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: xditview.c,v 1.32 94/04/17 20:43:36 eswu Exp $ */ /* Copyright (c) 1991 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xditview/xditview.c,v 1.5 2003/05/27 22:27:00 tsi Exp $ */ +/* $XFree86: xc/programs/xditview/xditview.c,v 1.6 2006/01/09 15:01:02 dawes Exp $ */ /* * xditview -- * Index: xc/programs/xditview/xditview.man diff -u xc/programs/xditview/xditview.man:1.6 xc/programs/xditview/xditview.man:1.7 --- xc/programs/xditview/xditview.man:1.6 Thu Feb 10 22:03:18 2005 +++ xc/programs/xditview/xditview.man Mon Jan 9 10:01:02 2006 @@ -1,6 +1,4 @@ -.\" $XConsortium: xditview.man,v 1.10 94/04/17 20:43:37 gildea Exp $ -.\" -.\" $XFree86: xc/programs/xditview/xditview.man,v 1.6 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xditview/xditview.man,v 1.7 2006/01/09 15:01:02 dawes Exp $ .\" .TH XDITVIEW 1 __vendorversion__ .SH NAME Index: xc/programs/xdm/Imakefile diff -u xc/programs/xdm/Imakefile:3.72 xc/programs/xdm/Imakefile:3.73 --- xc/programs/xdm/Imakefile:3.72 Sun Jul 25 16:17:04 2004 +++ xc/programs/xdm/Imakefile Mon Jan 9 10:01:03 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:14 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.72 2004/07/25 20:17:04 dawes Exp $ +XCOMM $XFree86: xc/programs/xdm/Imakefile,v 3.73 2006/01/09 15:01:03 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' Index: xc/programs/xdm/access.c diff -u xc/programs/xdm/access.c:3.16 xc/programs/xdm/access.c:3.17 --- xc/programs/xdm/access.c:3.16 Thu Apr 1 14:18:24 2004 +++ xc/programs/xdm/access.c Mon Jan 9 10:01:03 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: access.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group Copyright 2002 Sun Microsystems, Inc. All rights reserved. @@ -27,7 +26,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xdm/access.c,v 3.16 2004/04/01 19:18:24 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/access.c,v 3.17 2006/01/09 15:01:03 dawes Exp $ */ /* * Access control for XDMCP - keep a database of allowable display addresses Index: xc/programs/xdm/auth.c diff -u xc/programs/xdm/auth.c:3.36 xc/programs/xdm/auth.c:3.38 --- xc/programs/xdm/auth.c:3.36 Sat Apr 3 17:26:26 2004 +++ xc/programs/xdm/auth.c Sun Feb 19 19:14:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: auth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/auth.c,v 3.36 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/auth.c,v 3.38 2006/02/20 00:14:38 dawes Exp $ */ /* * xdm - display manager daemon @@ -944,7 +943,6 @@ int family; register ifr_type *ifr; #ifdef USE_SIOCGLIFCONF - int n; void * bufptr = buf; size_t buflen = sizeof(buf); struct lifconf ifc; Index: xc/programs/xdm/choose.c diff -u xc/programs/xdm/choose.c:3.17 xc/programs/xdm/choose.c:3.18 --- xc/programs/xdm/choose.c:3.17 Wed Jul 9 11:27:38 2003 +++ xc/programs/xdm/choose.c Mon Jan 9 10:01:03 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: choose.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -26,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xdm/choose.c,v 3.17 2003/07/09 15:27:38 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/choose.c,v 3.18 2006/01/09 15:01:03 dawes Exp $ */ /* * choose.c Index: xc/programs/xdm/chooser.c diff -u xc/programs/xdm/chooser.c:3.29 xc/programs/xdm/chooser.c:3.30 --- xc/programs/xdm/chooser.c:3.29 Sat Apr 3 17:26:26 2004 +++ xc/programs/xdm/chooser.c Mon Jan 9 10:01:03 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: chooser.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -26,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xdm/chooser.c,v 3.29 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/chooser.c,v 3.30 2006/01/09 15:01:03 dawes Exp $ */ /* * Chooser - display a menu of names and let the user select one Index: xc/programs/xdm/daemon.c diff -u xc/programs/xdm/daemon.c:3.22 xc/programs/xdm/daemon.c:3.23 --- xc/programs/xdm/daemon.c:3.22 Sat Jan 10 19:19:30 2004 +++ xc/programs/xdm/daemon.c Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: daemon.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/daemon.c,v 3.22 2004/01/11 00:19:30 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/daemon.c,v 3.23 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/dm.c diff -u xc/programs/xdm/dm.c:3.25 xc/programs/xdm/dm.c:3.26 --- xc/programs/xdm/dm.c:3.25 Sat Apr 3 17:26:26 2004 +++ xc/programs/xdm/dm.c Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: dm.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/dm.c,v 3.25 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/dm.c,v 3.26 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/dm.h diff -u xc/programs/xdm/dm.h:3.34 xc/programs/xdm/dm.h:3.35 --- xc/programs/xdm/dm.h:3.34 Thu Dec 11 22:20:45 2003 +++ xc/programs/xdm/dm.h Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: dm.h,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/dm.h,v 3.34 2003/12/12 03:20:45 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/dm.h,v 3.35 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/dpylist.c diff -u xc/programs/xdm/dpylist.c:1.6 xc/programs/xdm/dpylist.c:1.7 --- xc/programs/xdm/dpylist.c:1.6 Wed Jul 9 11:27:38 2003 +++ xc/programs/xdm/dpylist.c Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: dpylist.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/dpylist.c,v 1.6 2003/07/09 15:27:38 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/dpylist.c,v 1.7 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/error.c diff -u xc/programs/xdm/error.c:1.7 xc/programs/xdm/error.c:1.8 --- xc/programs/xdm/error.c:1.7 Wed Oct 9 12:38:20 2002 +++ xc/programs/xdm/error.c Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: error.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/error.c,v 1.7 2002/10/09 16:38:20 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/error.c,v 1.8 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/file.c diff -u xc/programs/xdm/file.c:1.6 xc/programs/xdm/file.c:1.7 --- xc/programs/xdm/file.c:1.6 Fri Dec 14 15:01:21 2001 +++ xc/programs/xdm/file.c Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: file.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/file.c,v 1.6 2001/12/14 20:01:21 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/file.c,v 1.7 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/genauth.c diff -u xc/programs/xdm/genauth.c:3.25 xc/programs/xdm/genauth.c:3.26 --- xc/programs/xdm/genauth.c:3.25 Wed Jun 23 22:21:16 2004 +++ xc/programs/xdm/genauth.c Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: genauth.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/genauth.c,v 3.25 2004/06/24 02:21:16 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/genauth.c,v 3.26 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/greet.h diff -u xc/programs/xdm/greet.h:1.10 xc/programs/xdm/greet.h:1.11 --- xc/programs/xdm/greet.h:1.10 Sun Sep 21 09:03:03 2003 +++ xc/programs/xdm/greet.h Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: greet.h,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/greet.h,v 1.10 2003/09/21 13:03:03 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/greet.h,v 1.11 2006/01/09 15:01:03 dawes Exp $ */ /* * greet.h - interface to xdm's dynamically-loadable modular greeter Index: xc/programs/xdm/krb5auth.c diff -u xc/programs/xdm/krb5auth.c:1.4 xc/programs/xdm/krb5auth.c:1.5 --- xc/programs/xdm/krb5auth.c:1.4 Fri Dec 14 15:01:22 2001 +++ xc/programs/xdm/krb5auth.c Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: krb5auth.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/krb5auth.c,v 1.4 2001/12/14 20:01:22 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/krb5auth.c,v 1.5 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/mitauth.c diff -u xc/programs/xdm/mitauth.c:1.6 xc/programs/xdm/mitauth.c:1.7 --- xc/programs/xdm/mitauth.c:1.6 Wed Sep 17 01:48:32 2003 +++ xc/programs/xdm/mitauth.c Mon Jan 9 10:01:03 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mitauth.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/mitauth.c,v 1.6 2003/09/17 05:48:32 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/mitauth.c,v 1.7 2006/01/09 15:01:03 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/netaddr.c diff -u xc/programs/xdm/netaddr.c:3.8 xc/programs/xdm/netaddr.c:3.9 --- xc/programs/xdm/netaddr.c:3.8 Fri Jul 18 11:53:28 2003 +++ xc/programs/xdm/netaddr.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: netaddr.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/netaddr.c,v 3.8 2003/07/18 15:53:28 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/netaddr.c,v 3.9 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - X display manager Index: xc/programs/xdm/policy.c diff -u xc/programs/xdm/policy.c:3.9 xc/programs/xdm/policy.c:3.10 --- xc/programs/xdm/policy.c:3.9 Thu Jan 1 12:12:34 2004 +++ xc/programs/xdm/policy.c Fri Jun 10 21:54:53 2005 @@ -1,4 +1,3 @@ -/* $Xorg: policy.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -33,13 +32,11 @@ * * policy.c. Implement site-dependent policy for XDMCP connections */ -/* $XFree86: xc/programs/xdm/policy.c,v 3.9 2004/01/01 17:12:34 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/policy.c,v 3.10 2005/06/11 01:54:53 dawes Exp $ */ # include "dm.h" # include "dm_auth.h" -#include - #ifdef XDMCP # include @@ -140,15 +137,19 @@ if ((fd = popen(willing, "r"))) { char *s = NULL; - while(!(s = fgets(statusBuf, 256, fd)) && errno == EINTR) - ; + + while(!(s = fgets(statusBuf, sizeof(statusBuf), fd)) && + !feof(fd)) + ; if (s && strlen(statusBuf) > 0) - statusBuf[strlen(statusBuf)-1] = 0; /* chop newline */ + statusBuf[strlen(statusBuf)-1] = 0; /* chop newline */ else - snprintf (statusBuf, sizeof(statusBuf), "Willing, but %s failed",willing); + snprintf (statusBuf, sizeof(statusBuf), + "Willing, but %s failed",willing); } else - snprintf (statusBuf, sizeof(statusBuf), "Willing, but %s failed",willing); + snprintf (statusBuf, sizeof(statusBuf), + "Willing, but %s failed",willing); if (fd) pclose(fd); } else @@ -159,7 +160,7 @@ if (!status->data) status->length = 0; else - memmove( status->data, statusBuf, status->length); + memmove (status->data, statusBuf, status->length); return ret; } Index: xc/programs/xdm/prngc.c diff -u xc/programs/xdm/prngc.c:1.4 xc/programs/xdm/prngc.c:1.5 --- xc/programs/xdm/prngc.c:1.4 Tue Nov 4 15:17:04 2003 +++ xc/programs/xdm/prngc.c Thu Mar 24 21:22:59 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xdm/prngc.c,v 1.4 2003/11/04 20:17:04 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/prngc.c,v 1.5 2005/03/25 02:22:59 dawes Exp $ */ /* * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. * Copyright (c) 2001-2002 Damien Miller. All rights reserved. @@ -48,7 +48,8 @@ #define INADDR_LOOPBACK 0x7F000001U #endif -static ssize_t atomicio(ssize_t (*)(), int, void *, size_t); +typedef ssize_t (*ioproc)(int, void *, size_t); +static ssize_t atomicio(ioproc, int, void *, size_t); #ifndef offsetof # define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) @@ -135,7 +136,7 @@ msg[0] = 0x02; msg[1] = len; - if (atomicio(write, fd, msg, sizeof(msg)) != sizeof(msg)) { + if (atomicio((ioproc)write, fd, msg, sizeof(msg)) != sizeof(msg)) { if (errno == EPIPE && errors < 10) { close(fd); errors++; @@ -169,7 +170,7 @@ * ensure all of data on socket comes through. f==read || f==write */ static ssize_t -atomicio(ssize_t (*f)(), int fd, void *_s, size_t n) +atomicio(ioproc f, int fd, void *_s, size_t n) { char *s = _s; ssize_t res, pos = 0; Index: xc/programs/xdm/protodpy.c diff -u xc/programs/xdm/protodpy.c:1.5 xc/programs/xdm/protodpy.c:1.6 --- xc/programs/xdm/protodpy.c:1.5 Fri Dec 14 15:01:23 2001 +++ xc/programs/xdm/protodpy.c Mon Jan 9 10:01:04 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: protodpy.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xdm/protodpy.c,v 1.5 2001/12/14 20:01:23 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/protodpy.c,v 1.6 2006/01/09 15:01:04 dawes Exp $ */ /* * protodpy.c Index: xc/programs/xdm/reset.c diff -u xc/programs/xdm/reset.c:1.4 xc/programs/xdm/reset.c:1.5 --- xc/programs/xdm/reset.c:1.4 Fri Dec 14 15:01:23 2001 +++ xc/programs/xdm/reset.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: reset.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/reset.c,v 1.4 2001/12/14 20:01:23 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/reset.c,v 1.5 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/resource.c diff -u xc/programs/xdm/resource.c:3.13 xc/programs/xdm/resource.c:3.14 --- xc/programs/xdm/resource.c:3.13 Sun Mar 28 03:30:57 2004 +++ xc/programs/xdm/resource.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: resource.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/resource.c,v 3.13 2004/03/28 08:30:57 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/resource.c,v 3.14 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/rpcauth.c diff -u xc/programs/xdm/rpcauth.c:1.4 xc/programs/xdm/rpcauth.c:1.5 --- xc/programs/xdm/rpcauth.c:1.4 Fri Dec 14 15:01:23 2001 +++ xc/programs/xdm/rpcauth.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: rpcauth.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/rpcauth.c,v 1.4 2001/12/14 20:01:23 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/rpcauth.c,v 1.5 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/server.c diff -u xc/programs/xdm/server.c:3.14 xc/programs/xdm/server.c:3.15 --- xc/programs/xdm/server.c:3.14 Sat Apr 12 12:42:14 2003 +++ xc/programs/xdm/server.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: server.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/server.c,v 3.14 2003/04/12 16:42:14 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/server.c,v 3.15 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/session.c diff -u xc/programs/xdm/session.c:3.39 xc/programs/xdm/session.c:3.42 --- xc/programs/xdm/session.c:3.39 Sun Jul 25 16:17:04 2004 +++ xc/programs/xdm/session.c Sun Feb 19 19:14:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: session.c,v 1.8 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/session.c,v 3.39 2004/07/25 20:17:04 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/session.c,v 3.42 2006/02/20 00:14:38 dawes Exp $ */ /* * xdm - display manager daemon @@ -99,7 +98,9 @@ # ifdef linux extern void endpwent(void); # endif +# if !(defined(sun) && defined(SVR4)) extern char *crypt(CRYPT_ARGS); +# endif #endif #ifdef USE_PAM @@ -535,8 +536,10 @@ #endif #ifdef USE_PAM pam_handle_t *pamh = thepamh (); +#ifndef HAS_SETUSERCONTEXT int pam_error; #endif +#endif if (verify->argv) { Debug ("StartSession %s: ", verify->argv[0]); Index: xc/programs/xdm/sessreg.c diff -u xc/programs/xdm/sessreg.c:3.21 xc/programs/xdm/sessreg.c:3.23 --- xc/programs/xdm/sessreg.c:3.21 Tue Jan 25 23:18:53 2005 +++ xc/programs/xdm/sessreg.c Sat Feb 25 21:41:02 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: sessreg.c,v 1.5 2000/08/17 19:54:15 cpqbld Exp $ - * * Copyright 1990, 1998 The Open Group * * Permission to use, copy, modify, distribute, and sell this software and its @@ -30,7 +28,7 @@ * by Andreas Stolcke */ -/* $XFree86: xc/programs/xdm/sessreg.c,v 3.21 2005/01/26 04:18:53 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/sessreg.c,v 3.23 2006/02/26 02:41:02 dawes Exp $ */ /* * sessreg @@ -202,7 +200,7 @@ return *a; } -#ifndef SYSV +#if !defined(SYSV) && !defined(BSD_UTMPX) static int syserr (int x, char *s) { @@ -227,7 +225,7 @@ int main (int argc, char **argv) { -#ifndef SYSV +#if !defined(SYSV) && !defined(BSD_UTMPX) int utmp; #endif char *line_tmp; @@ -356,12 +354,14 @@ } #ifndef NO_LASTLOG if (aflag && !llog_none) { +# ifndef BSD_UTMPX int llog; +# endif struct passwd *pwd = getpwnam(user_name); sysnerr( pwd != NULL, "get user id"); # ifdef BSD_UTMPX - if (llog != -1) { + { struct lastlogx ll; bzero((char *)&ll, sizeof(ll)); Index: xc/programs/xdm/sessreg.man diff -u xc/programs/xdm/sessreg.man:1.9 xc/programs/xdm/sessreg.man:1.10 --- xc/programs/xdm/sessreg.man:1.9 Thu Feb 10 22:03:18 2005 +++ xc/programs/xdm/sessreg.man Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: sessreg.man,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ .\" Copyright 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xdm/sessreg.man,v 1.9 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xdm/sessreg.man,v 1.10 2006/01/09 15:01:04 dawes Exp $ .\" .TH SESSREG 1 __vendorversion__ .SH NAME Index: xc/programs/xdm/socket.c diff -u xc/programs/xdm/socket.c:3.17 xc/programs/xdm/socket.c:3.18 --- xc/programs/xdm/socket.c:3.17 Wed May 19 22:25:10 2004 +++ xc/programs/xdm/socket.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: socket.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -27,7 +26,7 @@ from the copyright holder. */ -/* $XFree86: xc/programs/xdm/socket.c,v 3.17 2004/05/20 02:25:10 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/socket.c,v 3.18 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/streams.c diff -u xc/programs/xdm/streams.c:3.8 xc/programs/xdm/streams.c:3.9 --- xc/programs/xdm/streams.c:3.8 Mon Oct 27 16:39:08 2003 +++ xc/programs/xdm/streams.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: streams.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/streams.c,v 3.8 2003/10/27 21:39:08 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/streams.c,v 3.9 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/util.c diff -u xc/programs/xdm/util.c:3.22 xc/programs/xdm/util.c:3.23 --- xc/programs/xdm/util.c:3.22 Sat Apr 3 17:26:26 2004 +++ xc/programs/xdm/util.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: util.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/util.c,v 3.22 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/util.c,v 3.23 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/xdm.man diff -u xc/programs/xdm/xdm.man:3.33 xc/programs/xdm/xdm.man:3.34 --- xc/programs/xdm/xdm.man:3.33 Thu Feb 10 22:03:18 2005 +++ xc/programs/xdm/xdm.man Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xdm.man,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xdm/xdm.man,v 3.33 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xdm/xdm.man,v 3.34 2006/01/09 15:01:04 dawes Exp $ .\" .TH XDM 1 __vendorversion__ .SH NAME Index: xc/programs/xdm/xdmauth.c diff -u xc/programs/xdm/xdmauth.c:1.8 xc/programs/xdm/xdmauth.c:1.9 --- xc/programs/xdm/xdmauth.c:1.8 Wed Jun 23 22:21:16 2004 +++ xc/programs/xdm/xdmauth.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xdmauth.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/xdmauth.c,v 1.8 2004/06/24 02:21:16 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/xdmauth.c,v 1.9 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon * Author: Keith Packard, MIT X Consortium Index: xc/programs/xdm/xdmcp.c diff -u xc/programs/xdm/xdmcp.c:3.27 xc/programs/xdm/xdmcp.c:3.28 --- xc/programs/xdm/xdmcp.c:3.27 Tue Mar 30 12:22:46 2004 +++ xc/programs/xdm/xdmcp.c Mon Jan 9 10:01:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xdmcp.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.27 2004/03/30 17:22:46 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/xdmcp.c,v 3.28 2006/01/09 15:01:04 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/xdmshell.c diff -u xc/programs/xdm/xdmshell.c:3.7 xc/programs/xdm/xdmshell.c:3.8 --- xc/programs/xdm/xdmshell.c:3.7 Fri Dec 14 15:01:26 2001 +++ xc/programs/xdm/xdmshell.c Mon Jan 9 10:01:05 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xdmshell.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* * xdmshell - simple program for running xdm from login * @@ -36,7 +35,7 @@ * bring down X when you are finished. */ -/* $XFree86: xc/programs/xdm/xdmshell.c,v 3.7 2001/12/14 20:01:26 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/xdmshell.c,v 3.8 2006/01/09 15:01:05 dawes Exp $ */ #include #include "dm.h" Index: xc/programs/xdm/config/GiveConsole diff -u xc/programs/xdm/config/GiveConsole:1.1.1.2 xc/programs/xdm/config/GiveConsole:1.2 --- xc/programs/xdm/config/GiveConsole:1.1.1.2 Tue Jan 16 17:48:49 2001 +++ xc/programs/xdm/config/GiveConsole Mon Jan 9 10:01:05 2006 @@ -1,6 +1,6 @@ #!/bin/sh # Assign ownership of the console to the invoking user -# $Xorg: GiveConsole,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ +# $XFree86: xc/programs/xdm/config/GiveConsole,v 1.2 2006/01/09 15:01:05 dawes Exp $ # # By convention, both xconsole and xterm -C check that the # console is owned by the invoking user and is readable before attaching Index: xc/programs/xdm/config/Imakefile diff -u xc/programs/xdm/config/Imakefile:1.17 xc/programs/xdm/config/Imakefile:1.18 --- xc/programs/xdm/config/Imakefile:1.17 Mon Jun 7 20:11:13 2004 +++ xc/programs/xdm/config/Imakefile Mon Jan 9 10:01:05 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.17 2004/06/08 00:11:13 dawes Exp $ +XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.18 2006/01/09 15:01:05 dawes Exp $ SERVERSTYPE = XdmServersType Index: xc/programs/xdm/config/README diff -u xc/programs/xdm/config/README:1.1.1.2 xc/programs/xdm/config/README:1.2 --- xc/programs/xdm/config/README:1.1.1.2 Tue Jan 16 17:48:52 2001 +++ xc/programs/xdm/config/README Mon Jan 9 10:01:06 2006 @@ -1,4 +1,4 @@ -$Xorg: README,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ +$XFree86: xc/programs/xdm/config/README,v 1.2 2006/01/09 15:01:06 dawes Exp $ Xdm Sample Configuration Index: xc/programs/xdm/config/TakeConsole diff -u xc/programs/xdm/config/TakeConsole:1.1.1.2 xc/programs/xdm/config/TakeConsole:1.2 --- xc/programs/xdm/config/TakeConsole:1.1.1.2 Tue Jan 16 17:48:53 2001 +++ xc/programs/xdm/config/TakeConsole Mon Jan 9 10:01:06 2006 @@ -1,7 +1,7 @@ #!/bin/sh # Reassign ownership of the console to root, this should disallow # assignment of console output to any random users's xterm -# $Xorg: TakeConsole,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ +# $XFree86: xc/programs/xdm/config/TakeConsole,v 1.2 2006/01/09 15:01:06 dawes Exp $ # chmod 622 /dev/console chown root /dev/console Index: xc/programs/xdm/config/Xaccess diff -u xc/programs/xdm/config/Xaccess:1.5 xc/programs/xdm/config/Xaccess:1.6 --- xc/programs/xdm/config/Xaccess:1.5 Fri Nov 21 23:51:03 2003 +++ xc/programs/xdm/config/Xaccess Mon Jan 9 10:01:06 2006 @@ -1,5 +1,4 @@ -# $Xorg: Xaccess,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -# $XFree86: xc/programs/xdm/config/Xaccess,v 1.5 2003/11/22 04:51:03 dawes Exp $ +# $XFree86: xc/programs/xdm/config/Xaccess,v 1.6 2006/01/09 15:01:06 dawes Exp $ # # Access control file for XDMCP connections # Index: xc/programs/xdm/config/Xres.cpp diff -u xc/programs/xdm/config/Xres.cpp:1.7 xc/programs/xdm/config/Xres.cpp:1.8 --- xc/programs/xdm/config/Xres.cpp:1.7 Fri Nov 14 22:25:22 2003 +++ xc/programs/xdm/config/Xres.cpp Mon Jan 9 10:01:06 2006 @@ -1,9 +1,4 @@ -! $Xorg: Xresources,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -! -! -! -! -! $XFree86: xc/programs/xdm/config/Xres.cpp,v 1.7 2003/11/15 03:25:22 dawes Exp $ +! $XFree86: xc/programs/xdm/config/Xres.cpp,v 1.8 2006/01/09 15:01:06 dawes Exp $ ! #define BS \ /* cpp can be trickier than m4 */ #define NLBS \n\ /* don't remove these comments */ Index: xc/programs/xdm/config/Xserv.ws.cpp diff -u xc/programs/xdm/config/Xserv.ws.cpp:1.3 xc/programs/xdm/config/Xserv.ws.cpp:1.4 --- xc/programs/xdm/config/Xserv.ws.cpp:1.3 Wed Jan 17 18:45:24 2001 +++ xc/programs/xdm/config/Xserv.ws.cpp Mon Jan 9 10:01:06 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Xserv.ws.cpp,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xdm/config/Xserv.ws.cpp,v 1.4 2006/01/09 15:01:06 dawes Exp $ XCOMM XCOMM Xservers file, workstation prototype XCOMM Index: xc/programs/xdm/config/Xservers.fs diff -u xc/programs/xdm/config/Xservers.fs:1.1.1.2 xc/programs/xdm/config/Xservers.fs:1.2 --- xc/programs/xdm/config/Xservers.fs:1.1.1.2 Tue Jan 16 17:48:59 2001 +++ xc/programs/xdm/config/Xservers.fs Mon Jan 9 10:01:06 2006 @@ -1,4 +1,4 @@ -# $Xorg: Xservers.fs,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ +# $XFree86: xc/programs/xdm/config/Xservers.fs,v 1.2 2006/01/09 15:01:06 dawes Exp $ # # Xservers file, fileserver prototype (any machine without a display) # Index: xc/programs/xdm/config/Xsession diff -u xc/programs/xdm/config/Xsession:1.3 xc/programs/xdm/config/Xsession:1.4 --- xc/programs/xdm/config/Xsession:1.3 Wed Jan 17 18:45:24 2001 +++ xc/programs/xdm/config/Xsession Mon Jan 9 10:01:06 2006 @@ -1,11 +1,6 @@ #!/bin/sh # -# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $ +# $XFree86: xc/programs/xdm/config/Xsession,v 1.4 2006/01/09 15:01:06 dawes Exp $ # redirect errors to a file in user's home directory if we can for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" Index: xc/programs/xdm/config/Xsetup_0 diff -u xc/programs/xdm/config/Xsetup_0:1.1.1.2 xc/programs/xdm/config/Xsetup_0:1.2 --- xc/programs/xdm/config/Xsetup_0:1.1.1.2 Tue Jan 16 17:49:04 2001 +++ xc/programs/xdm/config/Xsetup_0 Mon Jan 9 10:01:06 2006 @@ -1,3 +1,3 @@ #!/bin/sh -# $Xorg: Xsetup_0,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ +# $XFree86: xc/programs/xdm/config/Xsetup_0,v 1.2 2006/01/09 15:01:06 dawes Exp $ xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail Index: xc/programs/xdm/config/xdm-conf.cpp diff -u xc/programs/xdm/config/xdm-conf.cpp:1.12 xc/programs/xdm/config/xdm-conf.cpp:1.13 --- xc/programs/xdm/config/xdm-conf.cpp:1.12 Mon Jun 7 20:11:13 2004 +++ xc/programs/xdm/config/xdm-conf.cpp Mon Jan 9 10:01:06 2006 @@ -1,9 +1,4 @@ -! $Xorg: xdm-conf.cpp,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ -! -! -! -! -! $XFree86: xc/programs/xdm/config/xdm-conf.cpp,v 1.12 2004/06/08 00:11:13 dawes Exp $ +! $XFree86: xc/programs/xdm/config/xdm-conf.cpp,v 1.13 2006/01/09 15:01:06 dawes Exp $ ! DisplayManager.errorLogFile: XDMLOGDIR/xdm.log DisplayManager.pidFile: XDMPIDDIR/xdm.pid Index: xc/programs/xdm/greeter/Imakefile diff -u xc/programs/xdm/greeter/Imakefile:1.10 xc/programs/xdm/greeter/Imakefile:1.11 --- xc/programs/xdm/greeter/Imakefile:1.10 Wed Jun 9 14:53:22 2004 +++ xc/programs/xdm/greeter/Imakefile Mon Jan 9 10:01:06 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.10 2004/06/09 18:53:22 tsi Exp $ +XCOMM $XFree86: xc/programs/xdm/greeter/Imakefile,v 1.11 2006/01/09 15:01:06 dawes Exp $ #define DoNormalLib NO #define DoSharedLib YES Index: xc/programs/xdm/greeter/Login.c diff -u xc/programs/xdm/greeter/Login.c:3.18 xc/programs/xdm/greeter/Login.c:3.19 --- xc/programs/xdm/greeter/Login.c:3.18 Wed Jul 9 11:27:40 2003 +++ xc/programs/xdm/greeter/Login.c Mon Jan 9 10:01:06 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Login.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/Login.c,v 3.18 2003/07/09 15:27:40 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/Login.c,v 3.19 2006/01/09 15:01:06 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/greeter/Login.h diff -u xc/programs/xdm/greeter/Login.h:3.8 xc/programs/xdm/greeter/Login.h:3.9 --- xc/programs/xdm/greeter/Login.h:3.8 Tue Nov 18 23:44:00 2003 +++ xc/programs/xdm/greeter/Login.h Mon Jan 9 10:01:06 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Login.h,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/Login.h,v 3.8 2003/11/19 04:44:00 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/Login.h,v 3.9 2006/01/09 15:01:06 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/greeter/LoginP.h diff -u xc/programs/xdm/greeter/LoginP.h:3.8 xc/programs/xdm/greeter/LoginP.h:3.9 --- xc/programs/xdm/greeter/LoginP.h:3.8 Fri Dec 14 15:01:29 2001 +++ xc/programs/xdm/greeter/LoginP.h Mon Jan 9 10:01:06 2006 @@ -1,4 +1,3 @@ -/* $Xorg: LoginP.h,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/LoginP.h,v 3.8 2001/12/14 20:01:29 dawes Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/LoginP.h,v 3.9 2006/01/09 15:01:06 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/greeter/greet.c diff -u xc/programs/xdm/greeter/greet.c:3.17 xc/programs/xdm/greeter/greet.c:3.18 --- xc/programs/xdm/greeter/greet.c:3.17 Wed Jul 9 11:27:40 2003 +++ xc/programs/xdm/greeter/greet.c Mon Jan 9 10:01:06 2006 @@ -1,4 +1,3 @@ -/* $Xorg: greet.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.17 2003/07/09 15:27:40 tsi Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.18 2006/01/09 15:01:06 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdm/greeter/verify.c diff -u xc/programs/xdm/greeter/verify.c:3.28 xc/programs/xdm/greeter/verify.c:3.29 --- xc/programs/xdm/greeter/verify.c:3.28 Thu Oct 21 02:06:43 2004 +++ xc/programs/xdm/greeter/verify.c Mon Jan 9 10:01:06 2006 @@ -1,4 +1,3 @@ -/* $Xorg: verify.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.28 2004/10/21 06:06:43 herrb Exp $ */ +/* $XFree86: xc/programs/xdm/greeter/verify.c,v 3.29 2006/01/09 15:01:06 dawes Exp $ */ /* * xdm - display manager daemon Index: xc/programs/xdpyinfo/Imakefile diff -u xc/programs/xdpyinfo/Imakefile:3.18 xc/programs/xdpyinfo/Imakefile:3.19 --- xc/programs/xdpyinfo/Imakefile:3.18 Wed Jun 30 16:21:47 2004 +++ xc/programs/xdpyinfo/Imakefile Tue Jul 5 12:43:57 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xdpyinfo/Imakefile,v 3.18 2004/06/30 20:21:47 martin Exp $ +XCOMM $XFree86: xc/programs/xdpyinfo/Imakefile,v 3.19 2005/07/05 16:43:57 tsi Exp $ #if HasShm @@ -63,11 +58,10 @@ #endif OTHERDEFINES = $(SHMDEFINES) $(XKBDEFINES) $(XINPUTDEFINES) \ - $(MULTIBUFDEFINES) $(XIEDEFINES) $(XRENDERDEFINES) \ + $(MULTIBUFDEFINES) $(XRENDERDEFINES) \ $(XINERAMADEFINES) $(DMXDEFINES) - OTHERDEPLIBS = $(XINPUTDEPLIBS) $(XIEDEPLIBS) $(XRENDERDEPLIBS) - OTHERLIBS = $(XINPUTLIBS) $(XIELIBS) $(XRENDERLIBS) $(XINERAMALIBS) \ - $(DMXLIBS) + OTHERDEPLIBS = $(XINPUTDEPLIBS) $(XRENDERDEPLIBS) + OTHERLIBS = $(XINPUTLIBS) $(XRENDERLIBS) $(XINERAMALIBS) $(DMXLIBS) DEFINES = $(OTHERDEFINES) $(XF86DEFINES) DEPLIBS = $(DEPXTESTLIB) XkbClientDepLibs $(OTHERDEPLIBS) \ Index: xc/programs/xdpyinfo/xdpyinfo.c diff -u xc/programs/xdpyinfo/xdpyinfo.c:3.31 xc/programs/xdpyinfo/xdpyinfo.c:3.32 --- xc/programs/xdpyinfo/xdpyinfo.c:3.31 Wed Jun 30 16:21:47 2004 +++ xc/programs/xdpyinfo/xdpyinfo.c Mon Jan 9 10:01:07 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: xdpyinfo.c,v 1.5 2001/02/09 02:05:41 xorgcvs Exp $ - * * xdpyinfo - print information about X display connecton * * @@ -29,7 +27,7 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.31 2004/06/30 20:21:47 martin Exp $ */ +/* $XFree86: xc/programs/xdpyinfo/xdpyinfo.c,v 3.32 2006/01/09 15:01:07 dawes Exp $ */ #include #include Index: xc/programs/xdpyinfo/xdpyinfo.man diff -u xc/programs/xdpyinfo/xdpyinfo.man:3.9 xc/programs/xdpyinfo/xdpyinfo.man:3.10 --- xc/programs/xdpyinfo/xdpyinfo.man:3.9 Thu Feb 10 22:03:18 2005 +++ xc/programs/xdpyinfo/xdpyinfo.man Mon Jan 9 10:01:07 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xdpyinfo.man,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ .\" Copyright 1988, 1989, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.9 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xdpyinfo/xdpyinfo.man,v 3.10 2006/01/09 15:01:07 dawes Exp $ .\" .TH XDPYINFO 1 __vendorversion__ .SH NAME Index: xc/programs/xedit/Imakefile diff -u xc/programs/xedit/Imakefile:1.26 xc/programs/xedit/Imakefile:1.28 --- xc/programs/xedit/Imakefile:1.26 Tue May 20 17:44:48 2003 +++ xc/programs/xedit/Imakefile Fri Oct 14 11:17:32 2005 @@ -1,5 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.17 93/08/17 20:49:32 rws Exp $ -XCOMM $XFree86: xc/programs/xedit/Imakefile,v 1.26 2003/05/20 21:44:48 tsi Exp $ +XCOMM $XFree86: xc/programs/xedit/Imakefile,v 1.28 2005/10/14 15:17:32 tsi Exp $ #include "lisp/lisp.cf" @@ -20,7 +19,7 @@ DEPLIBS = XawClientDepLibs $(SUBDIRS) LOCAL_LIBRARIES = $(LISPLIBS) XawClientLibs $(DLLIB) SYS_LIBRARIES = MathLibrary -#if defined(LynxOSArchitecture) || defined(SVR3Architecture) || defined(LinuxArchitecture) +#if defined(LynxOSArchitecture) || defined(SVR3Architecture) RP_SRCS = realpath.c RP_OBJS = realpath.o RP_DEFINES = -DNEED_REALPATH @@ -34,7 +33,7 @@ SYS_OBJS = $(RP_OBJS) $(STRCCMP_OBJS) SYS_DEFINES = $(RP_DEFINES) $(STRCCMP_DEFINES) DEFINES = $(SIGNAL_DEFINES) $(SYS_DEFINES) - INCLUDES = -I. -Ilisp/re $(MISC_INCLUDES) + INCLUDES = -Ilisp/re $(MISC_INCLUDES) SRCS = xedit.c commands.c util.c $(SYS_SRCS) ispell.c options.c \ hook.c $(LISP_SRC) Index: xc/programs/xedit/commands.c diff -u xc/programs/xedit/commands.c:1.30 xc/programs/xedit/commands.c:1.31 --- xc/programs/xedit/commands.c:1.30 Tue May 27 18:27:01 2003 +++ xc/programs/xedit/commands.c Mon Jan 9 10:01:07 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: commands.c,v 1.33 91/10/21 14:32:18 eswu Exp $ */ - /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -24,7 +22,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xedit/commands.c,v 1.30 2003/05/27 22:27:01 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/commands.c,v 1.31 2006/01/09 15:01:07 dawes Exp $ */ #include #include Index: xc/programs/xedit/realpath.c diff -u xc/programs/xedit/realpath.c:1.6 xc/programs/xedit/realpath.c:1.7 --- xc/programs/xedit/realpath.c:1.6 Sat Feb 9 21:50:05 2002 +++ xc/programs/xedit/realpath.c Mon Jan 9 10:01:07 2006 @@ -33,11 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/xedit/realpath.c,v 1.6 2002/02/10 02:50:05 paulo Exp $ */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)realpath.c 8.1 (Berkeley) 2/16/94"; -#endif /* LIBC_SCCS and not lint */ +/* $XFree86: xc/programs/xedit/realpath.c,v 1.7 2006/01/09 15:01:07 dawes Exp $ */ #include #include Index: xc/programs/xedit/util.c diff -u xc/programs/xedit/util.c:1.27 xc/programs/xedit/util.c:1.28 --- xc/programs/xedit/util.c:1.27 Fri May 23 10:58:02 2003 +++ xc/programs/xedit/util.c Mon Jan 9 10:01:07 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: util.c,v 1.16 92/08/12 16:46:22 converse Exp $ */ - /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -24,7 +22,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xedit/util.c,v 1.27 2003/05/23 14:58:02 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/util.c,v 1.28 2006/01/09 15:01:07 dawes Exp $ */ #include #include /* for realpath() */ Index: xc/programs/xedit/xedit.c diff -u xc/programs/xedit/xedit.c:1.18 xc/programs/xedit/xedit.c:1.19 --- xc/programs/xedit/xedit.c:1.18 Sun Nov 10 18:21:57 2002 +++ xc/programs/xedit/xedit.c Mon Jan 9 10:01:07 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: xedit.c,v 1.28 94/03/26 17:06:28 rws Exp $ */ - /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -24,7 +22,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xedit/xedit.c,v 1.18 2002/11/10 23:21:57 paulo Exp $ */ +/* $XFree86: xc/programs/xedit/xedit.c,v 1.19 2006/01/09 15:01:07 dawes Exp $ */ #include #include "xedit.h" Index: xc/programs/xedit/xedit.h diff -u xc/programs/xedit/xedit.h:1.18 xc/programs/xedit/xedit.h:1.19 --- xc/programs/xedit/xedit.h:1.18 Sun Nov 10 18:21:57 2002 +++ xc/programs/xedit/xedit.h Mon Jan 9 10:01:07 2006 @@ -1,8 +1,4 @@ /* - * rcs_id[] = "$XConsortium: xedit.h,v 1.19 89/10/07 14:59:46 kit Exp $"; - */ - -/* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -26,7 +22,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xedit/xedit.h,v 1.18 2002/11/10 23:21:57 paulo Exp $ */ +/* $XFree86: xc/programs/xedit/xedit.h,v 1.19 2006/01/09 15:01:07 dawes Exp $ */ #include #include Index: xc/programs/xedit/xedit.man diff -u xc/programs/xedit/xedit.man:1.20 xc/programs/xedit/xedit.man:1.22 --- xc/programs/xedit/xedit.man:1.20 Thu Dec 30 21:39:24 2004 +++ xc/programs/xedit/xedit.man Mon Jan 9 10:01:07 2006 @@ -1,4 +1,3 @@ -.\" $XConsortium: xedit.man,v 1.23 94/04/17 20:43:39 matt Exp $ .\" Copyright (c) 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/xedit/xedit.man,v 1.20 2004/12/31 02:39:24 tsi Exp $ +.\" $XFree86: xc/programs/xedit/xedit.man,v 1.22 2006/01/09 15:01:07 dawes Exp $ .\" .TH XEDIT 1 __vendorversion__ .SH NAME @@ -440,4 +439,4 @@ .SH AUTHORS Chris D. Peterson, MIT X Consortium .br -Paulo Cesar Pereira de Andrade, The XFree86 Project +Paulo C\('esar Pereira de Andrade, The XFree86 Project Index: xc/programs/xedit/lisp/Imakefile diff -u xc/programs/xedit/lisp/Imakefile:1.26 xc/programs/xedit/lisp/Imakefile:1.28 --- xc/programs/xedit/lisp/Imakefile:1.26 Tue May 20 17:44:48 2003 +++ xc/programs/xedit/lisp/Imakefile Fri Oct 14 11:17:32 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/xedit/lisp/Imakefile,v 1.26 2003/05/20 21:44:48 tsi Exp $ +XCOMM $XFree86: xc/programs/xedit/lisp/Imakefile,v 1.28 2005/10/14 15:17:32 tsi Exp $ #include "lisp.cf" #include "lisp.rules" @@ -20,7 +20,7 @@ SNPRINTF_OBJS = snprintf.o #endif -#if defined(LynxOSArchitecture) || defined(SVR3Architecture) || defined(LinuxArchitecture) +#if defined(LynxOSArchitecture) || defined(SVR3Architecture) #ifndef UseInstalled LinkSourceFile(realpath.c, $(TOP)/programs/xedit) #endif @@ -98,6 +98,8 @@ write.o \ xedit.o +LOCAL_INCLUDES = /* Don't use -I. */ + #include AllTarget(ProgramTargetName($(SAMP))) Index: xc/programs/xedit/lisp/README diff -u xc/programs/xedit/lisp/README:1.13 xc/programs/xedit/lisp/README:1.14 --- xc/programs/xedit/lisp/README:1.13 Sun Dec 15 22:59:27 2002 +++ xc/programs/xedit/lisp/README Mon Jan 9 10:01:07 2006 @@ -1,6 +1,4 @@ -$XFree86: xc/programs/xedit/lisp/README,v 1.13 2002/12/16 03:59:27 paulo Exp $ - -LAST UPDATED: $Date: 2001/10/03 07:46:02 $ +$XFree86: xc/programs/xedit/lisp/README,v 1.14 2006/01/09 15:01:07 dawes Exp $ SUMMARY Index: xc/programs/xedit/lisp/TODO diff -u xc/programs/xedit/lisp/TODO:1.9 xc/programs/xedit/lisp/TODO:1.10 --- xc/programs/xedit/lisp/TODO:1.9 Sun Dec 15 22:59:27 2002 +++ xc/programs/xedit/lisp/TODO Mon Jan 9 10:01:08 2006 @@ -1,6 +1,4 @@ -$XFree86: xc/programs/xedit/lisp/TODO,v 1.9 2002/12/16 03:59:27 paulo Exp $ - -LAST UPDATED: $Date$ +$XFree86: xc/programs/xedit/lisp/TODO,v 1.10 2006/01/09 15:01:08 dawes Exp $ Small todo list Index: xc/programs/xedit/lisp/bytecode.c diff -u xc/programs/xedit/lisp/bytecode.c:1.19 xc/programs/xedit/lisp/bytecode.c:1.21 --- xc/programs/xedit/lisp/bytecode.c:1.19 Sat Mar 13 19:05:05 2004 +++ xc/programs/xedit/lisp/bytecode.c Tue Mar 29 13:17:01 2005 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/bytecode.c,v 1.19 2004/03/14 00:05:05 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/bytecode.c,v 1.21 2005/03/29 18:17:01 tsi Exp $ */ /* @@ -375,7 +375,7 @@ */ { GC_ENTER(); - LispObj *result, *warnings_p, *failure_p; + LispObj * volatile result, * volatile warnings_p, * volatile failure_p; LispObj *name, *definition; @@ -395,10 +395,10 @@ goto finished_compilation; else if (atom->a_function) { LispCom com; - int failed; - int lex = 0, base; + volatile int failed; + volatile int lex = 0, base; LispArgList *alist; - LispObj *lambda, *form, *arguments; + LispObj *lambda, * volatile form, * volatile arguments; lambda = atom->property->fun.function; if (definition != UNSPEC || lambda->funtype != LispFunction) @@ -1186,11 +1186,12 @@ LispObj * -LispCompileForm(LispObj *form) +LispCompileForm(LispObj *f) { GC_ENTER(); - int failed; + volatile int failed; LispCom com; + LispObj * volatile form = f; if (!CONSP(form)) /* Incorrect call or NIL */ Index: xc/programs/xedit/lisp/compile.c diff -u xc/programs/xedit/lisp/compile.c:1.16 xc/programs/xedit/lisp/compile.c:1.18 --- xc/programs/xedit/lisp/compile.c:1.16 Fri Oct 24 16:38:16 2003 +++ xc/programs/xedit/lisp/compile.c Tue Mar 29 13:17:01 2005 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/compile.c,v 1.16 2003/10/24 20:38:16 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/compile.c,v 1.18 2005/03/29 18:17:01 tsi Exp $ */ #define VARIABLE_USED 0x0001 #define VARIABLE_ARGUMENT 0x0002 @@ -2140,9 +2140,10 @@ } static LispObj * -ComMacroExpand(LispCom *com, LispObj *lambda) +ComMacroExpand(LispCom *com, LispObj *l) { LispObj *result, **presult = &result; + LispObj * volatile lambda = l; int jumped, *pjumped = &jumped, backquote, *pbackquote = &backquote; LispBlock *block; Index: xc/programs/xedit/lisp/core.c diff -u xc/programs/xedit/lisp/core.c:1.72 xc/programs/xedit/lisp/core.c:1.74 --- xc/programs/xedit/lisp/core.c:1.72 Tue May 27 18:27:01 2003 +++ xc/programs/xedit/lisp/core.c Wed Sep 14 10:23:15 2005 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/core.c,v 1.72 2003/05/27 22:27:01 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/core.c,v 1.74 2005/09/14 14:23:15 tsi Exp $ */ #include "lisp/io.h" #include "lisp/core.h" @@ -111,14 +111,14 @@ /* Call directly LispObjectCompare() if possible */ #define FCODE(predicate) \ - predicate == Oeql ? FEQL : \ + (predicate == Oeql ? FEQL : \ predicate == Oequal ? FEQUAL : \ predicate == Oeq ? FEQ : \ - predicate == Oequalp ? FEQUALP : 0 + predicate == Oequalp ? FEQUALP : 0) #define FCOMPARE(predicate, left, right, code) \ - code == FEQ ? left == right : \ + (code == FEQ ? left == right : \ code ? LispObjectCompare(left, right, code) != NIL : \ - APPLY2(predicate, left, right) != NIL + APPLY2(predicate, left, right) != NIL) #define FUNCTION_CHECK(predicate) \ if (FUNCTIONP(predicate)) \ @@ -587,7 +587,7 @@ LispObj *res, **pres = &res; LispBlock *block; - LispObj *name, *body; + LispObj *name, * volatile body; body = ARGUMENT(1); name = ARGUMENT(0); @@ -782,7 +782,7 @@ LispObj *res, **pres = &res; LispBlock *block; - LispObj *tag, *body; + LispObj *tag, * volatile body; body = ARGUMENT(1); tag = ARGUMENT(0); @@ -1937,8 +1937,9 @@ ignore-erros &rest body */ { - LispObj *result; - int i, jumped; + LispObj * volatile result; + int i; + volatile int jumped; LispBlock *block; /* interpreter state */ @@ -1949,7 +1950,7 @@ int mem_level; void **mem; - LispObj *body; + LispObj * volatile body; body = ARGUMENT(0); @@ -4044,14 +4045,15 @@ */ { GC_ENTER(); - int head = lisp__data.env.length, i, count, ostk[32], *offsets; - LispObj *result, *list, *symbol, *value; + int head = lisp__data.env.length, i, ostk[32], * volatile offsets; + volatile int count; + LispObj * volatile result, *list, *symbol, *value; int jumped; - char fstk[32], *flags; + char fstk[32], * volatile flags; LispBlock *block; LispAtom *atom; - LispObj *symbols, *values, *body; + LispObj * volatile symbols, *values, * volatile body; /* Possible states */ #define DYNAMIC_SYMBOL 1 @@ -6288,7 +6290,7 @@ { GC_ENTER(); int stack, lex, length; - LispObj *list, *body, *ptr, *tag, *labels, *map, **p_body; + LispObj *list, *body, *ptr, *tag, * volatile labels, *map, **p_body; LispBlock *block; body = ARGUMENT(0); Index: xc/programs/xedit/lisp/helper.c diff -u xc/programs/xedit/lisp/helper.c:1.52 xc/programs/xedit/lisp/helper.c:1.53 --- xc/programs/xedit/lisp/helper.c:1.52 Sat Oct 23 11:29:33 2004 +++ xc/programs/xedit/lisp/helper.c Tue Mar 22 22:11:29 2005 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/helper.c,v 1.52 2004/10/23 15:29:33 dawes Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/helper.c,v 1.53 2005/03/23 03:11:29 dawes Exp $ */ #include "lisp/helper.h" #include "lisp/pathname.h" @@ -690,8 +690,8 @@ do* init test &rest body */ { - int jumped; - LispObj *result; + volatile int jumped; + LispObj * volatile result; LispBlock *block; jumped = 1; Index: xc/programs/xedit/lisp/lisp.c diff -u xc/programs/xedit/lisp/lisp.c:1.89 xc/programs/xedit/lisp/lisp.c:1.91 --- xc/programs/xedit/lisp/lisp.c:1.89 Thu Oct 2 09:30:13 2003 +++ xc/programs/xedit/lisp/lisp.c Tue Mar 29 13:17:01 2005 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/lisp.c,v 1.89 2003/10/02 13:30:13 eich Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/lisp.c,v 1.91 2005/03/29 18:17:01 tsi Exp $ */ #include #include @@ -4861,13 +4861,14 @@ } static LispObj * -LispRunFunMac(LispObj *name, LispObj *code, int macro, int base) +LispRunFunMac(LispObj *name, LispObj * c, int macro, int base) { - LispObj *result = NIL; + LispObj * volatile result = NIL; + LispObj * volatile code = c; if (!macro) { int lex = lisp__data.env.lex; - int did_jump = 1; + volatile int did_jump = 1; LispBlock *block; block = LispBeginBlock(name, LispBlockClosure); Index: xc/programs/xedit/lisp/stream.c diff -u xc/programs/xedit/lisp/stream.c:1.22 xc/programs/xedit/lisp/stream.c:1.23 --- xc/programs/xedit/lisp/stream.c:1.22 Sun Apr 27 14:17:34 2003 +++ xc/programs/xedit/lisp/stream.c Sun Mar 27 21:51:14 2005 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/stream.c,v 1.22 2003/04/27 18:17:34 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/stream.c,v 1.23 2005/03/28 02:51:14 dawes Exp $ */ #include "lisp/read.h" #include "lisp/stream.h" @@ -62,7 +62,10 @@ #define NOEXT_CREATE 2 #define NOEXT_NOTHING 3 +#include +#ifndef _GNU_SOURCE extern char **environ; +#endif LispObj *Oopen, *Oclose, *Otruename; Index: xc/programs/xedit/lisp/modules/Imakefile diff -u xc/programs/xedit/lisp/modules/Imakefile:1.17 xc/programs/xedit/lisp/modules/Imakefile:1.18 --- xc/programs/xedit/lisp/modules/Imakefile:1.17 Thu Dec 11 11:03:30 2003 +++ xc/programs/xedit/lisp/modules/Imakefile Fri Oct 14 11:17:32 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/xedit/lisp/modules/Imakefile,v 1.17 2003/12/11 16:03:30 paulo Exp $ +XCOMM $XFree86: xc/programs/xedit/lisp/modules/Imakefile,v 1.18 2005/10/14 15:17:32 tsi Exp $ #include "../lisp.cf" #include "../lisp.rules" @@ -7,7 +7,7 @@ SRCS = x11.c xt.c xaw.c OBJS = x11.o xt.o xaw.o -INCLUDES = -I../.. -I../mp -I../re -I$(XINCLUDESRC) +INCLUDES = -I../.. -I../mp -I../re LispModuleTarget(x11, $(XLIB) $(LOCAL_LIBRARIES),) LispModuleTarget(xt, $(XTOOLLIB) $(XLIB) $(LOCAL_LIBRARIES),) Index: xc/programs/xedit/lisp/re/README diff -u xc/programs/xedit/lisp/re/README:1.4 xc/programs/xedit/lisp/re/README:1.5 --- xc/programs/xedit/lisp/re/README:1.4 Fri Nov 15 02:01:32 2002 +++ xc/programs/xedit/lisp/re/README Mon Jan 9 10:01:08 2006 @@ -1,6 +1,4 @@ -$XFree86: xc/programs/xedit/lisp/re/README,v 1.4 2002/11/15 07:01:32 paulo Exp $ - -LAST UPDATED: $Date$ +$XFree86: xc/programs/xedit/lisp/re/README,v 1.5 2006/01/09 15:01:08 dawes Exp $ This is a small regex library for fast matching tokens in text. It was built to be used by xedit and it's syntax highlight code. It is not compliant with Index: xc/programs/xev/Imakefile diff -u xc/programs/xev/Imakefile:1.1 xc/programs/xev/Imakefile:1.2 --- xc/programs/xev/Imakefile:1.1 Sat Feb 12 22:26:20 2000 +++ xc/programs/xev/Imakefile Mon Jan 9 10:01:08 2006 @@ -1,4 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.4 93/08/16 16:07:59 rws Exp $ +XCOMM $XFree86: xc/programs/xev/Imakefile,v 1.2 2006/01/09 15:01:08 dawes Exp $ + DEPLIBS = $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XONLYLIB) Index: xc/programs/xev/xev.c diff -u xc/programs/xev/xev.c:1.15 xc/programs/xev/xev.c:1.16 --- xc/programs/xev/xev.c:1.15 Sat May 8 02:00:48 2004 +++ xc/programs/xev/xev.c Mon Jan 9 10:01:08 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: xev.c,v 1.15 94/04/17 20:45:20 keith Exp $ */ /* Copyright (c) 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xev/xev.c,v 1.15 2004/05/08 06:00:48 pascal Exp $ */ +/* $XFree86: xc/programs/xev/xev.c,v 1.16 2006/01/09 15:01:08 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/programs/xev/xev.man diff -u xc/programs/xev/xev.man:1.5 xc/programs/xev/xev.man:1.6 --- xc/programs/xev/xev.man:1.5 Thu Feb 10 22:03:18 2005 +++ xc/programs/xev/xev.man Mon Jan 9 10:01:08 2006 @@ -1,6 +1,4 @@ -.\" $XConsortium: xev.man,v 1.10 94/04/17 20:45:20 gildea Exp $ -.\" -.\" $XFree86: xc/programs/xev/xev.man,v 1.5 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xev/xev.man,v 1.6 2006/01/09 15:01:08 dawes Exp $ .\" .TH XEV 1 __vendorversion__ .SH NAME Index: xc/programs/xeyes/Eyes.c diff -u xc/programs/xeyes/Eyes.c:1.5 xc/programs/xeyes/Eyes.c:1.7 --- xc/programs/xeyes/Eyes.c:1.5 Tue Dec 7 11:35:36 2004 +++ xc/programs/xeyes/Eyes.c Sun Feb 19 19:14:38 2006 @@ -1,5 +1,4 @@ -/* $XConsortium: Eyes.c,v 1.28 94/04/17 20:45:22 eswu Exp $ */ -/* $XFree86: xc/programs/xeyes/Eyes.c,v 1.5 2004/12/07 16:35:36 dawes Exp $ */ +/* $XFree86: xc/programs/xeyes/Eyes.c,v 1.7 2006/02/20 00:14:38 dawes Exp $ */ /* Copyright (c) 1991 X Consortium @@ -45,7 +44,7 @@ # include # include -#if (defined(SVR4) || defined(SYSV) && defined(i386)) +#if (defined(SVR4) || defined(SYSV) && defined(i386)) && !defined(sun) extern double hypot(double, double); #endif Index: xc/programs/xeyes/Eyes.h diff -u xc/programs/xeyes/Eyes.h:1.1 xc/programs/xeyes/Eyes.h:1.2 --- xc/programs/xeyes/Eyes.h:1.1 Sat Feb 12 22:26:21 2000 +++ xc/programs/xeyes/Eyes.h Mon Jan 9 10:01:08 2006 @@ -1,6 +1,6 @@ /* -* $XConsortium: Eyes.h,v 1.7 90/12/01 13:04:51 rws Exp $ -*/ + * $XFree86: xc/programs/xeyes/Eyes.h,v 1.2 2006/01/09 15:01:08 dawes Exp $ + */ #ifndef _XtEyes_h #define _XtEyes_h Index: xc/programs/xeyes/EyesP.h diff -u xc/programs/xeyes/EyesP.h:1.1 xc/programs/xeyes/EyesP.h:1.2 --- xc/programs/xeyes/EyesP.h:1.1 Sat Feb 12 22:26:21 2000 +++ xc/programs/xeyes/EyesP.h Mon Jan 9 10:01:08 2006 @@ -1,6 +1,6 @@ /* -* $XConsortium: EyesP.h,v 1.9 90/12/01 13:04:43 rws Exp $ -*/ + * $XFree86: xc/programs/xeyes/EyesP.h,v 1.2 2006/01/09 15:01:08 dawes Exp $ + */ #ifndef _EyesP_h #define _EyesP_h Index: xc/programs/xeyes/Imakefile diff -u xc/programs/xeyes/Imakefile:1.1 xc/programs/xeyes/Imakefile:1.2 --- xc/programs/xeyes/Imakefile:1.1 Sat Feb 12 22:26:21 2000 +++ xc/programs/xeyes/Imakefile Mon Jan 9 10:01:08 2006 @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.17 93/08/17 21:20:11 rws Exp $ +XCOMM $XFree86: xc/programs/xeyes/Imakefile,v 1.2 2006/01/09 15:01:08 dawes Exp $ SYS_LIBRARIES = MathLibrary DEPLIBS = $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) Index: xc/programs/xeyes/xeyes.c diff -u xc/programs/xeyes/xeyes.c:1.4 xc/programs/xeyes/xeyes.c:1.5 --- xc/programs/xeyes/xeyes.c:1.4 Mon Aug 27 19:35:13 2001 +++ xc/programs/xeyes/xeyes.c Mon Jan 9 10:01:08 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: xeyes.c,v 1.16 94/04/17 20:45:23 rws Exp $ */ /* Copyright (c) 1991 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xeyes/xeyes.c,v 1.4 2001/08/27 23:35:13 dawes Exp $ */ +/* $XFree86: xc/programs/xeyes/xeyes.c,v 1.5 2006/01/09 15:01:08 dawes Exp $ */ #include #include Index: xc/programs/xeyes/xeyes.man diff -u xc/programs/xeyes/xeyes.man:1.5 xc/programs/xeyes/xeyes.man:1.6 --- xc/programs/xeyes/xeyes.man:1.5 Thu Feb 10 22:03:18 2005 +++ xc/programs/xeyes/xeyes.man Mon Jan 9 10:01:08 2006 @@ -1,6 +1,4 @@ -.\" $XConsortium: xeyes.man,v 1.12 94/04/17 20:45:24 gildea Exp $ -.\" -.\" $XFree86: xc/programs/xeyes/xeyes.man,v 1.5 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xeyes/xeyes.man,v 1.6 2006/01/09 15:01:08 dawes Exp $ .\" .TH XEYES 1 __vendorversion__ .SH NAME Index: xc/programs/xfd/Imakefile diff -u xc/programs/xfd/Imakefile:1.6 xc/programs/xfd/Imakefile:1.7 --- xc/programs/xfd/Imakefile:1.6 Mon Nov 17 10:18:07 2003 +++ xc/programs/xfd/Imakefile Fri Oct 14 11:17:32 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:18 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.6 2003/11/17 15:18:07 tsi Exp $ +XCOMM $XFree86: xc/programs/xfd/Imakefile,v 1.7 2005/10/14 15:17:32 tsi Exp $ #ifndef XFdUseRender #define XFdUseRender BuildRenderLibrary @@ -12,7 +8,7 @@ XRENDERDEFS = -DXRENDER -DXFREE86_FT2 XRENDERDEPS = XftClientDepLibs XRENDERLIBS = XftClientLibs - XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) -I$(XBUILDINCDIR) + XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) #endif DEPLIBS = $(XRENDERDEPS) XawClientDepLibs XkbClientDepLibs LOCAL_LIBRARIES = $(XRENDERLIBS) XawClientLibs XkbClientLibs Index: xc/programs/xfd/Xfd.ad diff -u xc/programs/xfd/Xfd.ad:1.3 xc/programs/xfd/Xfd.ad:1.4 --- xc/programs/xfd/Xfd.ad:1.3 Mon Jul 22 21:45:41 2002 +++ xc/programs/xfd/Xfd.ad Mon Jan 9 10:01:09 2006 @@ -1,8 +1,4 @@ -! $Xorg: Xfd.ad,v 1.3 2000/08/17 19:54:18 cpqbld Exp $ - - - -! $XFree86: xc/programs/xfd/Xfd.ad,v 1.3 2002/07/23 01:45:41 tsi Exp $ +! $XFree86: xc/programs/xfd/Xfd.ad,v 1.4 2006/01/09 15:01:09 dawes Exp $ *internalBorderWidth: 0 *showGrip: false Index: xc/programs/xfd/grid.c diff -u xc/programs/xfd/grid.c:1.11 xc/programs/xfd/grid.c:1.12 --- xc/programs/xfd/grid.c:1.11 Sat Oct 23 11:29:33 2004 +++ xc/programs/xfd/grid.c Mon Jan 9 10:01:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: grid.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xfd/grid.c,v 1.11 2004/10/23 15:29:33 dawes Exp $ */ +/* $XFree86: xc/programs/xfd/grid.c,v 1.12 2006/01/09 15:01:09 dawes Exp $ */ #include Index: xc/programs/xfd/grid.h diff -u xc/programs/xfd/grid.h:1.5 xc/programs/xfd/grid.h:1.6 --- xc/programs/xfd/grid.h:1.5 Mon Nov 17 17:20:53 2003 +++ xc/programs/xfd/grid.h Mon Jan 9 10:01:09 2006 @@ -1,4 +1,3 @@ -/* $Xorg: grid.h,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xfd/grid.h,v 1.5 2003/11/17 22:20:53 dawes Exp $ */ +/* $XFree86: xc/programs/xfd/grid.h,v 1.6 2006/01/09 15:01:09 dawes Exp $ */ #ifndef _FontGrid_h_ #define _FontGrid_h_ Index: xc/programs/xfd/gridP.h diff -u xc/programs/xfd/gridP.h:1.4 xc/programs/xfd/gridP.h:1.5 --- xc/programs/xfd/gridP.h:1.4 Mon Jul 22 21:45:41 2002 +++ xc/programs/xfd/gridP.h Mon Jan 9 10:01:09 2006 @@ -1,4 +1,3 @@ -/* $Xorg: gridP.h,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xfd/gridP.h,v 1.4 2002/07/23 01:45:41 tsi Exp $ */ +/* $XFree86: xc/programs/xfd/gridP.h,v 1.5 2006/01/09 15:01:09 dawes Exp $ */ #ifndef _FontGridP_h_ #define _FontGridP_h_ Index: xc/programs/xfd/xfd.c diff -u xc/programs/xfd/xfd.c:1.9 xc/programs/xfd/xfd.c:1.10 --- xc/programs/xfd/xfd.c:1.9 Sat Apr 19 19:49:27 2003 +++ xc/programs/xfd/xfd.c Tue Jul 19 20:32:38 2005 @@ -1,6 +1,4 @@ /* - * $Xorg: xfd.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xfd/xfd.c,v 1.9 2003/04/19 23:49:27 herrb Exp $ */ +/* $XFree86: xc/programs/xfd/xfd.c,v 1.10 2005/07/20 00:32:38 dawes Exp $ */ #include #include @@ -401,7 +399,7 @@ GetFontGridCellDimensions (fontGrid, &oldstart, &ncols, &nrows); if (page) { - Dimension start = (oldstart + + long start = (oldstart + ((long) ncols) * ((long) nrows) * ((long) page)); arg.value = (XtArgVal) start; Index: xc/programs/xfd/xfd.man diff -u xc/programs/xfd/xfd.man:1.11 xc/programs/xfd/xfd.man:1.12 --- xc/programs/xfd/xfd.man:1.11 Thu Feb 10 22:03:18 2005 +++ xc/programs/xfd/xfd.man Mon Jan 9 10:01:09 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xfd.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ .\" Copyright 1989, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xfd/xfd.man,v 1.11 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xfd/xfd.man,v 1.12 2006/01/09 15:01:09 dawes Exp $ .\" .TH XFD 1 __vendorversion__ .SH NAME Index: xc/programs/xfindproxy/Imakefile diff -u xc/programs/xfindproxy/Imakefile:1.5 xc/programs/xfindproxy/Imakefile:1.6 --- xc/programs/xfindproxy/Imakefile:1.5 Tue May 27 13:58:24 2003 +++ xc/programs/xfindproxy/Imakefile Mon Jan 9 10:01:09 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xfindproxy/Imakefile,v 1.5 2003/05/27 17:58:24 tsi Exp $ +XCOMM $XFree86: xc/programs/xfindproxy/Imakefile,v 1.6 2006/01/09 15:01:09 dawes Exp $ DEPLIBS = $(DEPXTOOLLIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XTOOLLIB) $(XONLYLIB) Index: xc/programs/xfindproxy/xfindproxy.c diff -u xc/programs/xfindproxy/xfindproxy.c:1.9 xc/programs/xfindproxy/xfindproxy.c:1.10 --- xc/programs/xfindproxy/xfindproxy.c:1.9 Tue May 27 18:27:05 2003 +++ xc/programs/xfindproxy/xfindproxy.c Mon Jan 9 10:01:09 2006 @@ -1,5 +1,3 @@ -/* $Xorg: xfindproxy.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.9 2003/05/27 22:27:05 tsi Exp $ */ +/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.10 2006/01/09 15:01:09 dawes Exp $ */ #include Index: xc/programs/xfindproxy/xfindproxy.h diff -u xc/programs/xfindproxy/xfindproxy.h:1.2 xc/programs/xfindproxy/xfindproxy.h:1.3 --- xc/programs/xfindproxy/xfindproxy.h:1.2 Fri Dec 14 15:01:32 2001 +++ xc/programs/xfindproxy/xfindproxy.h Mon Jan 9 10:01:09 2006 @@ -1,5 +1,4 @@ -/* $Xorg: xfindproxy.h,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/xfindproxy/xfindproxy.h,v 1.3 2006/01/09 15:01:09 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xfindproxy/xfindproxy.man diff -u xc/programs/xfindproxy/xfindproxy.man:1.8 xc/programs/xfindproxy/xfindproxy.man:1.9 --- xc/programs/xfindproxy/xfindproxy.man:1.8 Thu Feb 10 22:03:18 2005 +++ xc/programs/xfindproxy/xfindproxy.man Mon Jan 9 10:01:09 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xfindproxy.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/xfindproxy/xfindproxy.man,v 1.8 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xfindproxy/xfindproxy.man,v 1.9 2006/01/09 15:01:09 dawes Exp $ .\" .TH XFINDPROXY 1 __vendorversion__ .SH NAME Index: xc/programs/xfontsel/Imakefile diff -u xc/programs/xfontsel/Imakefile:1.1 xc/programs/xfontsel/Imakefile:1.2 --- xc/programs/xfontsel/Imakefile:1.1 Sat Feb 12 22:26:23 2000 +++ xc/programs/xfontsel/Imakefile Mon Jan 9 10:01:09 2006 @@ -1,4 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.4 91/07/16 23:06:58 gildea Exp $ +XCOMM $XFree86: xc/programs/xfontsel/Imakefile,v 1.2 2006/01/09 15:01:09 dawes Exp $ + SRCS = xfontsel.c ULabel.c OBJS = xfontsel.o ULabel.o DEPLIBS = XawClientDepLibs Index: xc/programs/xfontsel/ULabel.c diff -u xc/programs/xfontsel/ULabel.c:1.5 xc/programs/xfontsel/ULabel.c:1.6 --- xc/programs/xfontsel/ULabel.c:1.5 Sat Apr 3 17:38:55 2004 +++ xc/programs/xfontsel/ULabel.c Mon Jan 9 10:01:09 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: Label.c,v 1.97 94/04/17 20:12:12 kaleb Exp $ */ - /*********************************************************** Copyright (c) 1987, 1988, 1994 X Consortium @@ -47,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xfontsel/ULabel.c,v 1.5 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/xfontsel/ULabel.c,v 1.6 2006/01/09 15:01:09 dawes Exp $ */ /* * ULabel.c - UCSLabel widget Index: xc/programs/xfontsel/ULabel.h diff -u xc/programs/xfontsel/ULabel.h:1.1 xc/programs/xfontsel/ULabel.h:1.2 --- xc/programs/xfontsel/ULabel.h:1.1 Sat Feb 12 22:26:24 2000 +++ xc/programs/xfontsel/ULabel.h Mon Jan 9 10:01:09 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: Label.h,v 1.34 94/04/17 20:12:13 rws Exp $ */ - /*********************************************************** Copyright (c) 1987, 1988, 1994 X Consortium @@ -47,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xfontsel/ULabel.h,v 1.1 2000/02/13 03:26:24 dawes Exp $ */ +/* $XFree86: xc/programs/xfontsel/ULabel.h,v 1.2 2006/01/09 15:01:09 dawes Exp $ */ #ifndef _XawUCSLabel_h #define _XawUCSLabel_h Index: xc/programs/xfontsel/ULabelP.h diff -u xc/programs/xfontsel/ULabelP.h:1.1 xc/programs/xfontsel/ULabelP.h:1.2 --- xc/programs/xfontsel/ULabelP.h:1.1 Sat Feb 12 22:26:24 2000 +++ xc/programs/xfontsel/ULabelP.h Mon Jan 9 10:01:09 2006 @@ -1,8 +1,3 @@ -/* -* $XConsortium: LabelP.h,v 1.29 94/04/17 20:12:14 kaleb Exp $ -*/ - - /*********************************************************** Copyright (c) 1987, 1988, 1994 X Consortium @@ -50,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xfontsel/ULabelP.h,v 1.1 2000/02/13 03:26:24 dawes Exp $ */ +/* $XFree86: xc/programs/xfontsel/ULabelP.h,v 1.2 2006/01/09 15:01:09 dawes Exp $ */ /* * ULabelP.h - Private definitions for UCSLabel widget Index: xc/programs/xfontsel/XFontSel.ad diff -u xc/programs/xfontsel/XFontSel.ad:1.2 xc/programs/xfontsel/XFontSel.ad:1.3 --- xc/programs/xfontsel/XFontSel.ad:1.2 Mon Aug 13 17:46:51 2001 +++ xc/programs/xfontsel/XFontSel.ad Mon Jan 9 10:01:09 2006 @@ -1,4 +1,3 @@ -! $XConsortium: XFontSel.ad,v 1.12 94/04/17 20:43:40 gildea Exp $ ! ! app-defaults for XFontSel ! @@ -32,7 +31,7 @@ ! Ralph R. Swick, Digital Equipment Corporation/M.I.T. Project Athena ! one weekend in November, 1989 ! -! $XFree86: xc/programs/xfontsel/XFontSel.ad,v 1.2 2001/08/13 21:46:51 dawes Exp $ +! $XFree86: xc/programs/xfontsel/XFontSel.ad,v 1.3 2006/01/09 15:01:09 dawes Exp $ *appDefaultsVersion: 1 Index: xc/programs/xfontsel/xfontsel.c diff -u xc/programs/xfontsel/xfontsel.c:1.9 xc/programs/xfontsel/xfontsel.c:1.10 --- xc/programs/xfontsel/xfontsel.c:1.9 Sat Apr 3 17:38:55 2004 +++ xc/programs/xfontsel/xfontsel.c Mon Jan 9 10:01:09 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: xfontsel.c,v 1.35 94/04/17 20:43:41 rws Exp $ */ /* Copyright (c) 1985-1989 X Consortium @@ -31,7 +30,7 @@ one weekend in November, 1989 Modified: Mark Leisher to deal with UCS sample text. */ -/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.9 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/xfontsel/xfontsel.c,v 1.10 2006/01/09 15:01:09 dawes Exp $ */ #include #include Index: xc/programs/xfontsel/xfontsel.man diff -u xc/programs/xfontsel/xfontsel.man:1.5 xc/programs/xfontsel/xfontsel.man:1.6 --- xc/programs/xfontsel/xfontsel.man:1.5 Thu Feb 10 22:03:18 2005 +++ xc/programs/xfontsel/xfontsel.man Mon Jan 9 10:01:09 2006 @@ -1,4 +1,3 @@ -.\" $XConsortium: xfontsel.man,v 1.14 94/06/10 14:39:10 gildea Exp $ .\" Copyright (c) 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/xfontsel/xfontsel.man,v 1.5 2005/02/11 03:03:18 dawes Exp $ +.\" $XFree86: xc/programs/xfontsel/xfontsel.man,v 1.6 2006/01/09 15:01:09 dawes Exp $ .de EX \"Begin example .ne 5 .if n .sp 1 Index: xc/programs/xfs/Imakefile diff -u xc/programs/xfs/Imakefile:3.26 xc/programs/xfs/Imakefile:3.27 --- xc/programs/xfs/Imakefile:3.26 Mon Aug 25 00:06:01 2003 +++ xc/programs/xfs/Imakefile Mon Jan 9 10:01:10 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xfs/Imakefile,v 3.26 2003/08/25 04:06:01 dawes Exp $ +XCOMM $XFree86: xc/programs/xfs/Imakefile,v 3.27 2006/01/09 15:01:10 dawes Exp $ #undef ServerDefines #include Index: xc/programs/xfs/README diff -u xc/programs/xfs/README:1.3 xc/programs/xfs/README:1.4 --- xc/programs/xfs/README:1.3 Wed Jan 17 18:45:27 2001 +++ xc/programs/xfs/README Mon Jan 9 10:01:10 2006 @@ -1,4 +1,4 @@ -/* $Xorg: README,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ */ +/* $XFree86: xc/programs/xfs/README,v 1.4 2006/01/09 15:01:10 dawes Exp $ */ Installation instructions for fontserver 1 - set DefaultFSConfigFile to point to the correct place, if the default Index: xc/programs/xfs/config.cpp diff -u xc/programs/xfs/config.cpp:1.3 xc/programs/xfs/config.cpp:1.4 --- xc/programs/xfs/config.cpp:1.3 Wed Jan 17 18:45:27 2001 +++ xc/programs/xfs/config.cpp Mon Jan 9 10:01:10 2006 @@ -1,5 +1,5 @@ XCOMM font server configuration file -XCOMM $Xorg: config.cpp,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xfs/config.cpp,v 1.4 2006/01/09 15:01:10 dawes Exp $ clone-self = on use-syslog = off Index: xc/programs/xfs/xfs.man diff -u xc/programs/xfs/xfs.man:3.17 xc/programs/xfs/xfs.man:3.18 --- xc/programs/xfs/xfs.man:3.17 Thu Feb 10 22:03:19 2005 +++ xc/programs/xfs/xfs.man Mon Jan 9 10:01:10 2006 @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/xfs/xfs.man,v 3.17 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xfs/xfs.man,v 3.18 2006/01/09 15:01:10 dawes Exp $ .\" .\" Copyright 1991, 1998 The Open Group .\" @@ -36,7 +36,6 @@ .\" no representations about the .\" suitability of this software for any purpose. It is provided "as is" .\" without express or implied warranty. -.\" $Xorg: xfs.man,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ .TH XFS 1 __vendorversion__ .SH NAME xfs \- X font server Index: xc/programs/xfs/difs/Imakefile diff -u xc/programs/xfs/difs/Imakefile:1.6 xc/programs/xfs/difs/Imakefile:1.7 --- xc/programs/xfs/difs/Imakefile:1.6 Tue Jul 31 20:45:04 2001 +++ xc/programs/xfs/difs/Imakefile Fri Oct 14 11:17:32 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:19 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xfs/difs/Imakefile,v 1.6 2001/08/01 00:45:04 tsi Exp $ +XCOMM $XFree86: xc/programs/xfs/difs/Imakefile,v 1.7 2005/10/14 15:17:32 tsi Exp $ #undef ServerDefines #include @@ -17,7 +12,7 @@ fonts.o difsutils.o cache.o initfonts.o atom.o -INCLUDES = -I../include -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(FONTLIBSRC)/include +INCLUDES = -I../include -I$(FONTLIBSRC)/include DEFINES = AllocateLocalDefines #if BuildLowMem LOWMEMDEFINES = -DLOWMEMFTPT Index: xc/programs/xfs/difs/atom.c diff -u xc/programs/xfs/difs/atom.c:3.5 xc/programs/xfs/difs/atom.c:3.6 --- xc/programs/xfs/difs/atom.c:3.5 Tue May 27 18:27:05 2003 +++ xc/programs/xfs/difs/atom.c Mon Jan 9 10:01:10 2006 @@ -1,4 +1,3 @@ -/* $Xorg: atom.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* * font server atom manipulations */ @@ -50,7 +49,7 @@ * @(#)atom.c 4.1 5/2/91 * */ -/* $XFree86: xc/programs/xfs/difs/atom.c,v 3.5 2003/05/27 22:27:05 tsi Exp $ */ +/* $XFree86: xc/programs/xfs/difs/atom.c,v 3.6 2006/01/09 15:01:10 dawes Exp $ */ #include "misc.h" #include "fsresource.h" Index: xc/programs/xfs/difs/cache.c diff -u xc/programs/xfs/difs/cache.c:1.7 xc/programs/xfs/difs/cache.c:1.8 --- xc/programs/xfs/difs/cache.c:1.7 Mon Oct 14 21:45:02 2002 +++ xc/programs/xfs/difs/cache.c Mon Jan 9 10:01:10 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cache.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +46,7 @@ * @(#)cache.c 4.2 91/05/02 * */ -/* $XFree86: xc/programs/xfs/difs/cache.c,v 1.7 2002/10/15 01:45:02 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/cache.c,v 1.8 2006/01/09 15:01:10 dawes Exp $ */ #include "cachestr.h" #include "misc.h" Index: xc/programs/xfs/difs/charinfo.c diff -u xc/programs/xfs/difs/charinfo.c:1.12 xc/programs/xfs/difs/charinfo.c:1.13 --- xc/programs/xfs/difs/charinfo.c:1.12 Fri Dec 14 15:01:33 2001 +++ xc/programs/xfs/difs/charinfo.c Fri Oct 14 11:17:32 2005 @@ -1,4 +1,4 @@ -/* $Xorg: charinfo.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/charinfo.c,v 1.13 2005/10/14 15:17:32 tsi Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group @@ -49,15 +49,14 @@ * This file was once on the other side of * the font library interface as util/fsfuncs.c. */ -/* $XFree86: xc/programs/xfs/difs/charinfo.c,v 1.12 2001/12/14 20:01:33 dawes Exp $ */ #include #include "misc.h" -#include "fontstruct.h" +#include #include "fontutil.h" #include "clientstr.h" #define FSMD_H -#include "FSproto.h" +#include #include "difs.h" extern void TwoByteSwap(unsigned char *, int); Index: xc/programs/xfs/difs/difsutils.c diff -u xc/programs/xfs/difs/difsutils.c:1.8 xc/programs/xfs/difs/difsutils.c:1.9 --- xc/programs/xfs/difs/difsutils.c:1.8 Sat Jan 22 11:38:41 2005 +++ xc/programs/xfs/difs/difsutils.c Fri Oct 14 11:17:32 2005 @@ -1,4 +1,4 @@ -/* $Xorg: difsutils.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/difsutils.c,v 1.9 2005/10/14 15:17:32 tsi Exp $ */ /* * misc utility routines */ @@ -46,7 +46,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/difsutils.c,v 1.8 2005/01/22 16:38:41 tsi Exp $ */ #define XK_LATIN1 @@ -58,7 +57,7 @@ #include "globals.h" #include "clientstr.h" #include "accstr.h" -#include "fontstruct.h" +#include #include #include "authstr.h" Index: xc/programs/xfs/difs/dispatch.c diff -u xc/programs/xfs/difs/dispatch.c:3.13 xc/programs/xfs/difs/dispatch.c:3.14 --- xc/programs/xfs/difs/dispatch.c:3.13 Mon Oct 14 21:45:02 2002 +++ xc/programs/xfs/difs/dispatch.c Fri Oct 14 11:17:32 2005 @@ -1,4 +1,4 @@ -/* $Xorg: dispatch.c,v 1.6 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/dispatch.c,v 3.14 2005/10/14 15:17:32 tsi Exp $ */ /* * protocol dispatcher */ @@ -46,15 +46,14 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/dispatch.c,v 3.13 2002/10/15 01:45:02 dawes Exp $ */ #include #include "dispatch.h" #include "swapreq.h" #include "swaprep.h" -#include "FS.h" -#include "FSproto.h" +#include +#include #include "clientstr.h" #include "authstr.h" #include "osstruct.h" @@ -62,7 +61,7 @@ #include "globals.h" #include "fsresource.h" #include "difsfnst.h" -#include "fontstruct.h" +#include #include "site.h" #include "fsevents.h" #include "cache.h" Index: xc/programs/xfs/difs/events.c diff -u xc/programs/xfs/difs/events.c:3.8 xc/programs/xfs/difs/events.c:3.9 --- xc/programs/xfs/difs/events.c:3.8 Fri May 23 11:03:11 2003 +++ xc/programs/xfs/difs/events.c Fri Oct 14 11:17:32 2005 @@ -1,4 +1,4 @@ -/* $Xorg: events.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/events.c,v 3.9 2005/10/14 15:17:32 tsi Exp $ */ /* * event handling stuff */ @@ -46,12 +46,11 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/events.c,v 3.8 2003/05/23 15:03:11 tsi Exp $ */ #include #include "clientstr.h" -#include "FSproto.h" +#include #include "globals.h" #include "fsevents.h" #include "dispatch.h" Index: xc/programs/xfs/difs/extensions.c diff -u xc/programs/xfs/difs/extensions.c:1.7 xc/programs/xfs/difs/extensions.c:1.8 --- xc/programs/xfs/difs/extensions.c:1.7 Fri Dec 14 15:01:34 2001 +++ xc/programs/xfs/difs/extensions.c Fri Oct 14 11:17:32 2005 @@ -1,4 +1,4 @@ -/* $Xorg: extensions.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/extensions.c,v 1.8 2005/10/14 15:17:32 tsi Exp $ */ /* * font server extensions */ @@ -46,9 +46,8 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/extensions.c,v 1.7 2001/12/14 20:01:34 dawes Exp $ */ -#include "FSproto.h" +#include #include "misc.h" #include "clientstr.h" #include "extentst.h" Index: xc/programs/xfs/difs/fontinfo.c diff -u xc/programs/xfs/difs/fontinfo.c:1.11 xc/programs/xfs/difs/fontinfo.c:1.12 --- xc/programs/xfs/difs/fontinfo.c:1.11 Mon Oct 14 21:45:02 2002 +++ xc/programs/xfs/difs/fontinfo.c Fri Oct 14 11:17:32 2005 @@ -1,4 +1,4 @@ -/* $Xorg: fontinfo.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.12 2005/10/14 15:17:32 tsi Exp $ */ /* * font data query */ @@ -46,15 +46,14 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/fontinfo.c,v 1.11 2002/10/15 01:45:02 dawes Exp $ */ -#include "FS.h" -#include "FSproto.h" +#include +#include #include #include #include "clientstr.h" #include "difsfnst.h" -#include "fontstruct.h" +#include #include "closestr.h" #include "globals.h" #include "difs.h" Index: xc/programs/xfs/difs/fonts.c diff -u xc/programs/xfs/difs/fonts.c:3.15 xc/programs/xfs/difs/fonts.c:3.16 --- xc/programs/xfs/difs/fonts.c:3.15 Tue Mar 30 05:34:07 2004 +++ xc/programs/xfs/difs/fonts.c Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: fonts.c,v 1.5 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.16 2005/10/14 15:17:33 tsi Exp $ */ /* * font control */ @@ -46,17 +46,16 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.15 2004/03/30 10:34:07 eich Exp $ */ /*#define DEBUG*/ -#include "FS.h" -#include "FSproto.h" +#include +#include #include #include #include #include "clientstr.h" #include "fsresource.h" #include "difsfnst.h" -#include "fontstruct.h" +#include #include "closestr.h" #include "globals.h" #include "difs.h" Index: xc/programs/xfs/difs/globals.c diff -u xc/programs/xfs/difs/globals.c:1.2 xc/programs/xfs/difs/globals.c:1.3 --- xc/programs/xfs/difs/globals.c:1.2 Fri Dec 14 15:01:34 2001 +++ xc/programs/xfs/difs/globals.c Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: globals.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/globals.c,v 1.3 2005/10/14 15:17:33 tsi Exp $ */ /* * various font server globals */ @@ -50,7 +50,7 @@ * @(#)globals.c 4.3 5/3/91 * */ -#include "FSproto.h" +#include #include "clientstr.h" #include "misc.h" #include "site.h" Index: xc/programs/xfs/difs/initfonts.c diff -u xc/programs/xfs/difs/initfonts.c:1.7 xc/programs/xfs/difs/initfonts.c:1.8 --- xc/programs/xfs/difs/initfonts.c:1.7 Fri Dec 14 15:01:34 2001 +++ xc/programs/xfs/difs/initfonts.c Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: initfonts.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/initfonts.c,v 1.8 2005/10/14 15:17:33 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,9 +47,8 @@ * %W% %E% * */ -/* $XFree86: xc/programs/xfs/difs/initfonts.c,v 1.7 2001/12/14 20:01:34 dawes Exp $ */ -#include "font.h" +#include #include "difs.h" #ifdef FONTCACHE #include "misc.h" Index: xc/programs/xfs/difs/main.c diff -u xc/programs/xfs/difs/main.c:3.13 xc/programs/xfs/difs/main.c:3.14 --- xc/programs/xfs/difs/main.c:3.13 Sat Apr 3 05:50:05 2004 +++ xc/programs/xfs/difs/main.c Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: main.c,v 1.5 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/main.c,v 3.14 2005/10/14 15:17:33 tsi Exp $ */ /* * Font server main routine */ @@ -46,13 +46,12 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/main.c,v 3.13 2004/04/03 10:50:05 herrb Exp $ */ #include #include #include -#include "FS.h" -#include "FSproto.h" +#include +#include #include "clientstr.h" #include "fsresource.h" #include "misc.h" Index: xc/programs/xfs/difs/resource.c diff -u xc/programs/xfs/difs/resource.c:3.9 xc/programs/xfs/difs/resource.c:3.10 --- xc/programs/xfs/difs/resource.c:3.9 Tue May 27 18:27:06 2003 +++ xc/programs/xfs/difs/resource.c Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: resource.c,v 1.4 2001/02/09 02:05:42 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/resource.c,v 3.10 2005/10/14 15:17:33 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +47,6 @@ * %W% %G% * */ -/* $XFree86: xc/programs/xfs/difs/resource.c,v 3.9 2003/05/27 22:27:06 tsi Exp $ */ /* * a resource is a 32 bit quantity. the upper 12 bits are client id. * client provides a 19 bit resource id. this is "hashed" by me by @@ -65,7 +64,7 @@ * 1 - allocated color to be freed when the client dies */ -#include "FS.h" +#include #include "misc.h" #include "os.h" #include "fsresource.h" Index: xc/programs/xfs/difs/swaprep.c diff -u xc/programs/xfs/difs/swaprep.c:1.5 xc/programs/xfs/difs/swaprep.c:1.6 --- xc/programs/xfs/difs/swaprep.c:1.5 Fri Dec 14 15:01:35 2001 +++ xc/programs/xfs/difs/swaprep.c Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: swaprep.c,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/swaprep.c,v 1.6 2005/10/14 15:17:33 tsi Exp $ */ /* * font server reply swapping */ @@ -46,12 +46,11 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/swaprep.c,v 1.5 2001/12/14 20:01:35 dawes Exp $ */ #include #include -#include "FSproto.h" +#include #include "clientstr.h" static void SwapConnSetupAccept(fsConnSetupAccept *pConnSetup, fsConnSetupAccept *pConnSetupT); Index: xc/programs/xfs/difs/swapreq.c diff -u xc/programs/xfs/difs/swapreq.c:1.7 xc/programs/xfs/difs/swapreq.c:1.8 --- xc/programs/xfs/difs/swapreq.c:1.7 Fri Dec 14 15:01:35 2001 +++ xc/programs/xfs/difs/swapreq.c Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: swapreq.c,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/difs/swapreq.c,v 1.8 2005/10/14 15:17:33 tsi Exp $ */ /* * swapped requests */ @@ -46,11 +46,10 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/swapreq.c,v 1.7 2001/12/14 20:01:35 dawes Exp $ */ #include -#include "FSproto.h" +#include #include "clientstr.h" #include "globals.h" #include "dispatch.h" Index: xc/programs/xfs/difs/tables.c diff -u xc/programs/xfs/difs/tables.c:1.6 xc/programs/xfs/difs/tables.c:1.7 --- xc/programs/xfs/difs/tables.c:1.6 Fri Dec 14 15:01:35 2001 +++ xc/programs/xfs/difs/tables.c Mon Jan 9 10:01:10 2006 @@ -1,4 +1,3 @@ -/* $Xorg: tables.c,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* * all the dispatch, error, event and reply vectors */ @@ -46,7 +45,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/tables.c,v 1.6 2001/12/14 20:01:35 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/tables.c,v 1.7 2006/01/09 15:01:10 dawes Exp $ */ #include #include Index: xc/programs/xfs/include/access.h diff -u xc/programs/xfs/include/access.h:1.5 xc/programs/xfs/include/access.h:1.6 --- xc/programs/xfs/include/access.h:1.5 Fri Dec 14 15:01:36 2001 +++ xc/programs/xfs/include/access.h Mon Jan 9 10:01:10 2006 @@ -1,4 +1,3 @@ -/* $Xorg: access.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +46,7 @@ * @(#)access.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/access.h,v 1.5 2001/12/14 20:01:36 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/access.h,v 1.6 2006/01/09 15:01:10 dawes Exp $ */ #ifndef _ACCESS_H_ #define _ACCESS_H_ Index: xc/programs/xfs/include/accstr.h diff -u xc/programs/xfs/include/accstr.h:1.7 xc/programs/xfs/include/accstr.h:1.8 --- xc/programs/xfs/include/accstr.h:1.7 Fri Dec 14 15:01:36 2001 +++ xc/programs/xfs/include/accstr.h Mon Jan 9 10:01:10 2006 @@ -1,4 +1,3 @@ -/* $Xorg: accstr.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -48,7 +47,7 @@ * @(#)accstr.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/accstr.h,v 1.7 2001/12/14 20:01:36 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/accstr.h,v 1.8 2006/01/09 15:01:10 dawes Exp $ */ #ifndef _ACCSTR_H_ #define _ACCSTR_H_ Index: xc/programs/xfs/include/assert.h diff -u xc/programs/xfs/include/assert.h:1.2 xc/programs/xfs/include/assert.h:1.3 --- xc/programs/xfs/include/assert.h:1.2 Fri Dec 14 15:01:36 2001 +++ xc/programs/xfs/include/assert.h Mon Jan 9 10:01:10 2006 @@ -1,4 +1,4 @@ -/* $Xorg: assert.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/assert.h,v 1.3 2006/01/09 15:01:10 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/programs/xfs/include/auth.h diff -u xc/programs/xfs/include/auth.h:1.6 xc/programs/xfs/include/auth.h:1.7 --- xc/programs/xfs/include/auth.h:1.6 Fri Dec 14 15:01:36 2001 +++ xc/programs/xfs/include/auth.h Mon Jan 9 10:01:10 2006 @@ -1,4 +1,3 @@ -/* $Xorg: auth.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +46,7 @@ * @(#)auth.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/auth.h,v 1.6 2001/12/14 20:01:36 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/auth.h,v 1.7 2006/01/09 15:01:10 dawes Exp $ */ #ifndef _AUTH_H_ #define _AUTH_H_ Index: xc/programs/xfs/include/authstr.h diff -u xc/programs/xfs/include/authstr.h:1.2 xc/programs/xfs/include/authstr.h:1.3 --- xc/programs/xfs/include/authstr.h:1.2 Fri Dec 14 15:01:37 2001 +++ xc/programs/xfs/include/authstr.h Mon Jan 9 10:01:10 2006 @@ -1,4 +1,4 @@ -/* $Xorg: authstr.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/authstr.h,v 1.3 2006/01/09 15:01:10 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/programs/xfs/include/cache.h diff -u xc/programs/xfs/include/cache.h:1.5 xc/programs/xfs/include/cache.h:1.6 --- xc/programs/xfs/include/cache.h:1.5 Fri Dec 14 15:01:37 2001 +++ xc/programs/xfs/include/cache.h Mon Jan 9 10:01:10 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cache.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +46,7 @@ * @(#)cache.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/cache.h,v 1.5 2001/12/14 20:01:37 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/cache.h,v 1.6 2006/01/09 15:01:10 dawes Exp $ */ #ifndef _CACHE_H_ #define _CACHE_H_ Index: xc/programs/xfs/include/cachestr.h diff -u xc/programs/xfs/include/cachestr.h:1.2 xc/programs/xfs/include/cachestr.h:1.3 --- xc/programs/xfs/include/cachestr.h:1.2 Fri Dec 14 15:01:37 2001 +++ xc/programs/xfs/include/cachestr.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,4 @@ -/* $Xorg: cachestr.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/cachestr.h,v 1.3 2006/01/09 15:01:11 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/programs/xfs/include/client.h diff -u xc/programs/xfs/include/client.h:1.7 xc/programs/xfs/include/client.h:1.8 --- xc/programs/xfs/include/client.h:1.7 Fri Dec 14 15:01:37 2001 +++ xc/programs/xfs/include/client.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,3 @@ -/* $Xorg: client.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/client.h,v 1.7 2001/12/14 20:01:37 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/client.h,v 1.8 2006/01/09 15:01:11 dawes Exp $ */ #ifndef _CLIENT_H_ #define _CLIENT_H_ Index: xc/programs/xfs/include/clientstr.h diff -u xc/programs/xfs/include/clientstr.h:1.7 xc/programs/xfs/include/clientstr.h:1.8 --- xc/programs/xfs/include/clientstr.h:1.7 Fri Dec 14 15:01:37 2001 +++ xc/programs/xfs/include/clientstr.h Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: clientstr.h,v 1.4 2001/02/09 02:05:43 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/clientstr.h,v 1.8 2005/10/14 15:17:33 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,12 +44,11 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/clientstr.h,v 1.7 2001/12/14 20:01:37 dawes Exp $ */ #ifndef _CLIENTSTR_H_ #define _CLIENTSTR_H_ -#include "FS.h" +#include #include "client.h" #include "auth.h" #include "misc.h" Index: xc/programs/xfs/include/closestr.h diff -u xc/programs/xfs/include/closestr.h:1.2 xc/programs/xfs/include/closestr.h:1.4 --- xc/programs/xfs/include/closestr.h:1.2 Fri Dec 14 15:01:37 2001 +++ xc/programs/xfs/include/closestr.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,4 @@ -/* $Xorg: closestr.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/closestr.h,v 1.4 2006/01/09 15:01:11 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,17 +44,15 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $NCDXorg: @(#)closestr.h,v 4.1 1991/05/02 04:15:46 lemke Exp $ - * */ #ifndef CLOSESTR_H #define CLOSESTR_H -#include "FSproto.h" +#include #include "closure.h" #include "misc.h" -#include "font.h" +#include /* closure structures */ Index: xc/programs/xfs/include/closure.h diff -u xc/programs/xfs/include/closure.h:1.2 xc/programs/xfs/include/closure.h:1.3 --- xc/programs/xfs/include/closure.h:1.2 Fri Dec 14 15:01:37 2001 +++ xc/programs/xfs/include/closure.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,4 @@ -/* $Xorg: closure.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/closure.h,v 1.3 2006/01/09 15:01:11 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/programs/xfs/include/difs.h diff -u xc/programs/xfs/include/difs.h:1.5 xc/programs/xfs/include/difs.h:1.6 --- xc/programs/xfs/include/difs.h:1.5 Fri Feb 13 18:58:53 2004 +++ xc/programs/xfs/include/difs.h Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xfs/include/difs.h,v 1.5 2004/02/13 23:58:53 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/difs.h,v 1.6 2005/10/14 15:17:33 tsi Exp $ */ /* * Copyright (C) 1999 The XFree86 Project, Inc. * All rights reserved. @@ -50,7 +50,7 @@ #include "difsfn.h" #include "globals.h" -#include "fontstruct.h" +#include typedef int (*InitialFunc)(ClientPtr); typedef int (*ProcFunc)(ClientPtr); Index: xc/programs/xfs/include/difsfn.h diff -u xc/programs/xfs/include/difsfn.h:1.5 xc/programs/xfs/include/difsfn.h:1.6 --- xc/programs/xfs/include/difsfn.h:1.5 Fri Dec 14 15:01:37 2001 +++ xc/programs/xfs/include/difsfn.h Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: difsfn.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/difsfn.h,v 1.6 2005/10/14 15:17:33 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,12 +44,11 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/difsfn.h,v 1.5 2001/12/14 20:01:37 dawes Exp $ */ #ifndef _DIFSFONT_H_ #define _DIFSFONT_H_ #include "misc.h" -#include "font.h" +#include typedef struct _ClientFont *ClientFontPtr; typedef struct _FontIDList *FontIDListPtr; Index: xc/programs/xfs/include/difsfnst.h diff -u xc/programs/xfs/include/difsfnst.h:1.5 xc/programs/xfs/include/difsfnst.h:1.6 --- xc/programs/xfs/include/difsfnst.h:1.5 Fri Dec 14 15:01:38 2001 +++ xc/programs/xfs/include/difsfnst.h Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: difsfnst.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/difsfnst.h,v 1.6 2005/10/14 15:17:33 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,13 +44,12 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/difsfnst.h,v 1.5 2001/12/14 20:01:38 dawes Exp $ */ #ifndef _DIFSFONTST_H_ #define _DIFSFONTST_H_ #include "difsfn.h" -#include "font.h" +#include #include "misc.h" /* has per-client info about the font */ Index: xc/programs/xfs/include/difsutils.h diff -u xc/programs/xfs/include/difsutils.h:1.6 xc/programs/xfs/include/difsutils.h:1.7 --- xc/programs/xfs/include/difsutils.h:1.6 Sat Jan 22 11:38:41 2005 +++ xc/programs/xfs/include/difsutils.h Fri Oct 14 11:17:33 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/programs/xfs/include/difsutils.h,v 1.6 2005/01/22 16:38:41 tsi Exp $ + * $XFree86: xc/programs/xfs/include/difsutils.h,v 1.7 2005/10/14 15:17:33 tsi Exp $ */ /************************************************************ @@ -32,9 +32,9 @@ #include #include -#include +#include #include -#include +#include typedef void (*DifsWakeupFunc)(pointer data, int result, unsigned long * pReadmask); typedef Bool (*DifsWorkFunc) (ClientPtr, pointer); Index: xc/programs/xfs/include/extentst.h diff -u xc/programs/xfs/include/extentst.h:1.7 xc/programs/xfs/include/extentst.h:1.8 --- xc/programs/xfs/include/extentst.h:1.7 Tue Jul 15 21:39:17 2003 +++ xc/programs/xfs/include/extentst.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,3 @@ -/* $Xorg: extentst.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +46,7 @@ * @(#)extentst.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.7 2003/07/16 01:39:17 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/extentst.h,v 1.8 2006/01/09 15:01:11 dawes Exp $ */ #ifndef _EXTENTST_H_ #define _EXTENTST_H_ Index: xc/programs/xfs/include/fsevents.h diff -u xc/programs/xfs/include/fsevents.h:1.3 xc/programs/xfs/include/fsevents.h:1.5 --- xc/programs/xfs/include/fsevents.h:1.3 Sun Oct 25 07:48:04 1998 +++ xc/programs/xfs/include/fsevents.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: events.h,v 1.5 94/04/17 19:55:57 dpw Exp $ */ /* Copyright (c) 1987 X Consortium @@ -48,13 +47,13 @@ * @(#)events.h 4.2 91/05/03 * */ -/* $XFree86: xc/programs/xfs/include/fsevents.h,v 1.3 1998/10/25 12:48:04 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/fsevents.h,v 1.5 2006/01/09 15:01:11 dawes Exp $ */ #ifndef _EVENTS_H_ #define _EVENTS_H_ #include -#include "FS.h" +#include extern int ProcGetEventMask(ClientPtr client); extern int ProcSetEventMask(ClientPtr client); Index: xc/programs/xfs/include/fsresource.h diff -u xc/programs/xfs/include/fsresource.h:1.4 xc/programs/xfs/include/fsresource.h:1.5 --- xc/programs/xfs/include/fsresource.h:1.4 Sun Mar 7 06:41:01 1999 +++ xc/programs/xfs/include/fsresource.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: resource.h,v 1.4 94/04/17 19:56:00 dpw Exp $ */ /* Copyright (c) 1987 X Consortium @@ -48,7 +47,7 @@ * @(#)resource.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/fsresource.h,v 1.4 1999/03/07 11:41:01 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/fsresource.h,v 1.5 2006/01/09 15:01:11 dawes Exp $ */ #ifndef _RESOURCE_H_ #define _RESOURCE_H_ Index: xc/programs/xfs/include/globals.h diff -u xc/programs/xfs/include/globals.h:1.2 xc/programs/xfs/include/globals.h:1.3 --- xc/programs/xfs/include/globals.h:1.2 Fri Dec 14 15:01:38 2001 +++ xc/programs/xfs/include/globals.h Fri Oct 14 11:17:33 2005 @@ -1,4 +1,4 @@ -/* $Xorg: globals.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/globals.h,v 1.3 2005/10/14 15:17:33 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -51,7 +51,7 @@ #ifndef _GLOBALS_H_ #define _GLOBALS_H_ -#include "FSproto.h" /* for fsResolution */ +#include /* for fsResolution */ extern long TimeOutValue; extern long ReapClientTime; Index: xc/programs/xfs/include/misc.h diff -u xc/programs/xfs/include/misc.h:3.9 xc/programs/xfs/include/misc.h:3.10 --- xc/programs/xfs/include/misc.h:3.9 Fri Dec 14 15:01:38 2001 +++ xc/programs/xfs/include/misc.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,3 @@ -/* $Xorg: misc.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/misc.h,v 3.9 2001/12/14 20:01:38 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/misc.h,v 3.10 2006/01/09 15:01:11 dawes Exp $ */ #ifndef _MISC_H_ #define _MISC_H_ Index: xc/programs/xfs/include/os.h diff -u xc/programs/xfs/include/os.h:3.15 xc/programs/xfs/include/os.h:3.17 --- xc/programs/xfs/include/os.h:3.15 Tue Jan 6 22:47:35 2004 +++ xc/programs/xfs/include/os.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,4 @@ -/* $Xorg: os.h,v 1.5 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/os.h,v 3.17 2006/01/09 15:01:11 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,10 +44,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $NCDXorg: @(#)os.h,v 4.2 1991/05/10 07:59:16 lemke Exp $ - * */ -/* $XFree86: xc/programs/xfs/include/os.h,v 3.15 2004/01/07 03:47:35 dawes Exp $ */ #ifndef _OS_H_ #define _OS_H_ @@ -56,7 +53,7 @@ typedef struct _alt_server *AlternateServerPtr; typedef struct _auth *AuthPtr; -#include "FSproto.h" +#include #include "client.h" #include "misc.h" Index: xc/programs/xfs/include/osstruct.h diff -u xc/programs/xfs/include/osstruct.h:1.4 xc/programs/xfs/include/osstruct.h:1.5 --- xc/programs/xfs/include/osstruct.h:1.4 Fri Dec 14 15:01:38 2001 +++ xc/programs/xfs/include/osstruct.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,3 @@ -/* $Xorg: osstruct.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +46,7 @@ * @(#)osstruct.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/include/osstruct.h,v 1.4 2001/12/14 20:01:38 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/osstruct.h,v 1.5 2006/01/09 15:01:11 dawes Exp $ */ #ifndef _OSSTRUCT_H_ #define _OSSTRUCT_H_ Index: xc/programs/xfs/include/servermd.h diff -u xc/programs/xfs/include/servermd.h:1.5 xc/programs/xfs/include/servermd.h:1.6 --- xc/programs/xfs/include/servermd.h:1.5 Wed Dec 19 16:37:35 2001 +++ xc/programs/xfs/include/servermd.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,3 @@ -/* $Xorg: servermd.h,v 1.6 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,7 +43,7 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/include/servermd.h,v 1.5 2001/12/19 21:37:35 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/include/servermd.h,v 1.6 2006/01/09 15:01:11 dawes Exp $ */ #ifndef _SERVERMD_H_ #define _SERVERMD_H_ Index: xc/programs/xfs/include/site.h diff -u xc/programs/xfs/include/site.h:1.2 xc/programs/xfs/include/site.h:1.3 --- xc/programs/xfs/include/site.h:1.2 Fri Dec 14 15:01:39 2001 +++ xc/programs/xfs/include/site.h Mon Jan 9 10:01:11 2006 @@ -1,4 +1,4 @@ -/* $Xorg: site.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/include/site.h,v 1.3 2006/01/09 15:01:11 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/programs/xfs/os/Imakefile diff -u xc/programs/xfs/os/Imakefile:3.10 xc/programs/xfs/os/Imakefile:3.12 --- xc/programs/xfs/os/Imakefile:3.10 Wed Jun 2 18:43:06 2004 +++ xc/programs/xfs/os/Imakefile Sun Feb 19 10:51:32 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/programs/xfs/os/Imakefile,v 3.10 2004/06/02 22:43:06 dawes Exp $ +XCOMM $XFree86: xc/programs/xfs/os/Imakefile,v 3.12 2006/02/19 15:51:32 tsi Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -63,8 +63,7 @@ OBJS = connection.o waitfor.o daemon.o io.o utils.o osinit.o \ config.o access.o osglue.o error.o $(OBJS1) -INCLUDES = -I../include -I$(FONTINCSRC) -I$(EXTINCSRC) \ - -I$(FONTLIBSRC)/include -I$(FONTLIBSRC)/bitmap +INCLUDES = -I../include -I$(FONTLIBSRC)/include -I$(FONTLIBSRC)/bitmap CONN_DEFINES = $(CONNECTION_FLAGS) -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN @@ -93,6 +92,8 @@ #endif PID_DEFINES = -DXFSPIDDIR=\"$(XFSPIDDIR)\" +DEFINES = $(FONTCACHE_DEFINES) + NormalLibraryObjectRule() NormalLibraryTarget(os,$(OBJS)) @@ -108,6 +109,6 @@ SpecialCObjectRule(osglue,$(ICONFIGFILES),$(CONN_DEFINES) $(OS_DEFINES)) -SpecialCObjectRule(config,$(ICONFIGFILES),$(CONN_DEFINES) $(FONTCACHE_DEFINES) $(SNF_DEFINES)) +SpecialCObjectRule(config,$(ICONFIGFILES),$(CONN_DEFINES) $(SNF_DEFINES)) DependTarget() Index: xc/programs/xfs/os/access.c diff -u xc/programs/xfs/os/access.c:3.8 xc/programs/xfs/os/access.c:3.9 --- xc/programs/xfs/os/access.c:3.8 Wed Jul 9 11:27:40 2003 +++ xc/programs/xfs/os/access.c Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: access.c,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/access.c,v 3.8 2003/07/09 15:27:40 tsi Exp $ */ +/* $XFree86: xc/programs/xfs/os/access.c,v 3.9 2006/01/09 15:01:12 dawes Exp $ */ #include #ifndef Lynx Index: xc/programs/xfs/os/config.c diff -u xc/programs/xfs/os/config.c:3.17 xc/programs/xfs/os/config.c:3.18 --- xc/programs/xfs/os/config.c:3.17 Wed Jun 2 18:43:06 2004 +++ xc/programs/xfs/os/config.c Mon Jan 9 10:01:12 2006 @@ -43,10 +43,8 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $NCDXorg: @(#)config.c,v 4.6 1991/07/09 14:08:09 lemke Exp $ - * */ -/* $XFree86: xc/programs/xfs/os/config.c,v 3.17 2004/06/02 22:43:06 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/config.c,v 3.18 2006/01/09 15:01:12 dawes Exp $ */ /* * Copyright (c) 1996-2004 by The XFree86 Project, Inc. * All rights reserved. Index: xc/programs/xfs/os/config.h diff -u xc/programs/xfs/os/config.h:1.2 xc/programs/xfs/os/config.h:1.3 --- xc/programs/xfs/os/config.h:1.2 Fri Dec 14 15:01:40 2001 +++ xc/programs/xfs/os/config.h Mon Jan 9 10:01:12 2006 @@ -1,4 +1,4 @@ -/* $Xorg: config.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/os/config.h,v 1.3 2006/01/09 15:01:12 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/programs/xfs/os/configstr.h diff -u xc/programs/xfs/os/configstr.h:1.5 xc/programs/xfs/os/configstr.h:1.6 --- xc/programs/xfs/os/configstr.h:1.5 Fri Dec 14 15:01:41 2001 +++ xc/programs/xfs/os/configstr.h Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: configstr.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +46,7 @@ * @(#)configstr.h 4.1 91/05/02 * */ -/* $XFree86: xc/programs/xfs/os/configstr.h,v 1.5 2001/12/14 20:01:41 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/configstr.h,v 1.6 2006/01/09 15:01:12 dawes Exp $ */ #ifndef _CONFIGSTR_H_ #define _CONFIGSTR_H_ #include "config.h" Index: xc/programs/xfs/os/connection.c diff -u xc/programs/xfs/os/connection.c:3.26 xc/programs/xfs/os/connection.c:3.28 --- xc/programs/xfs/os/connection.c:3.26 Wed Jul 9 11:27:40 2003 +++ xc/programs/xfs/os/connection.c Fri Oct 21 11:08:04 2005 @@ -1,4 +1,4 @@ -/* $Xorg: connection.c,v 1.5 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/os/connection.c,v 3.28 2005/10/21 15:08:04 tsi Exp $ */ /* * handles connections */ @@ -67,11 +67,9 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/connection.c,v 3.26 2003/07/09 15:27:40 tsi Exp $ */ #include #include -#include #include "misc.h" #include #include @@ -88,8 +86,8 @@ #endif #include -#include "FS.h" -#include "FSproto.h" +#include +#include #include "clientstr.h" #include "X11/Xpoll.h" #include "osdep.h" Index: xc/programs/xfs/os/error.c diff -u xc/programs/xfs/os/error.c:1.13 xc/programs/xfs/os/error.c:1.14 --- xc/programs/xfs/os/error.c:1.13 Sat Apr 3 05:50:05 2004 +++ xc/programs/xfs/os/error.c Mon Jun 27 22:33:55 2005 @@ -1,4 +1,3 @@ -/* $Xorg: error.c,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* * error message handling */ @@ -44,7 +43,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/error.c,v 1.13 2004/04/03 10:50:05 herrb Exp $ */ +/* $XFree86: xc/programs/xfs/os/error.c,v 1.14 2005/06/28 02:33:55 dawes Exp $ */ #include #include @@ -198,7 +197,6 @@ #ifdef USE_SYSLOG if (UseSyslog) { vsyslog(LOG_ERR, f, args); - return; } #else fprintf(stderr, "%s fatal error: ", progname); Index: xc/programs/xfs/os/io.c diff -u xc/programs/xfs/os/io.c:3.19 xc/programs/xfs/os/io.c:3.20 --- xc/programs/xfs/os/io.c:3.19 Fri May 31 14:46:12 2002 +++ xc/programs/xfs/os/io.c Fri Oct 14 11:17:34 2005 @@ -1,4 +1,4 @@ -/* $Xorg: io.c,v 1.5 2001/02/09 02:05:44 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfs/os/io.c,v 3.20 2005/10/14 15:17:34 tsi Exp $ */ /* * i/o functions */ @@ -46,7 +46,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/io.c,v 3.19 2002/05/31 18:46:12 dawes Exp $ */ #include #include @@ -61,7 +60,7 @@ #include #endif -#include "FSproto.h" +#include #include "clientstr.h" #include "X11/Xpoll.h" #include "osdep.h" Index: xc/programs/xfs/os/osdep.h diff -u xc/programs/xfs/os/osdep.h:3.13 xc/programs/xfs/os/osdep.h:3.14 --- xc/programs/xfs/os/osdep.h:3.13 Sat Apr 3 17:26:26 2004 +++ xc/programs/xfs/os/osdep.h Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: osdep.h,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -47,7 +46,7 @@ * @(#)osdep.h 4.1 5/2/91 * */ -/* $XFree86: xc/programs/xfs/os/osdep.h,v 3.13 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/osdep.h,v 3.14 2006/01/09 15:01:12 dawes Exp $ */ #ifndef _OSDEP_H_ #define _OSDEP_H_ Index: xc/programs/xfs/os/osglue.c diff -u xc/programs/xfs/os/osglue.c:3.19 xc/programs/xfs/os/osglue.c:3.20 --- xc/programs/xfs/os/osglue.c:3.19 Sat Oct 19 16:04:20 2002 +++ xc/programs/xfs/os/osglue.c Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: osglue.c,v 1.4 2001/02/09 02:05:44 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -44,10 +43,8 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $NCDXorg: @(#)osglue.c,v 4.6 1991/07/09 14:07:30 lemke Exp $ - * */ -/* $XFree86: xc/programs/xfs/os/osglue.c,v 3.19 2002/10/19 20:04:20 herrb Exp $ */ +/* $XFree86: xc/programs/xfs/os/osglue.c,v 3.20 2006/01/09 15:01:12 dawes Exp $ */ /* * this is miscellaneous OS specific stuff. Index: xc/programs/xfs/os/osinit.c diff -u xc/programs/xfs/os/osinit.c:1.5 xc/programs/xfs/os/osinit.c:1.6 --- xc/programs/xfs/os/osinit.c:1.5 Fri Dec 14 15:01:41 2001 +++ xc/programs/xfs/os/osinit.c Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* * os init code */ @@ -50,7 +49,7 @@ * @(#)osinit.c 4.3 5/7/91 * */ -/* $XFree86: xc/programs/xfs/os/osinit.c,v 1.5 2001/12/14 20:01:41 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/osinit.c,v 1.6 2006/01/09 15:01:12 dawes Exp $ */ #include "os.h" Index: xc/programs/xfs/os/utils.c diff -u xc/programs/xfs/os/utils.c:3.22 xc/programs/xfs/os/utils.c:3.23 --- xc/programs/xfs/os/utils.c:3.22 Sat Apr 3 05:50:36 2004 +++ xc/programs/xfs/os/utils.c Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: utils.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* * misc os utilities */ @@ -46,7 +45,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/os/utils.c,v 3.22 2004/04/03 10:50:36 herrb Exp $ */ +/* $XFree86: xc/programs/xfs/os/utils.c,v 3.23 2006/01/09 15:01:12 dawes Exp $ */ #include #include Index: xc/programs/xfs/os/waitfor.c diff -u xc/programs/xfs/os/waitfor.c:3.16 xc/programs/xfs/os/waitfor.c:3.17 --- xc/programs/xfs/os/waitfor.c:3.16 Fri May 31 14:46:12 2002 +++ xc/programs/xfs/os/waitfor.c Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: waitfor.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* * waits for input */ @@ -47,10 +46,8 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $NCDXorg: @(#)waitfor.c,v 4.5 1991/06/24 11:59:20 lemke Exp $ - * */ -/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.16 2002/05/31 18:46:12 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/os/waitfor.c,v 3.17 2006/01/09 15:01:12 dawes Exp $ */ #include /* strings, time, etc */ Index: xc/programs/xfsinfo/Imakefile diff -u xc/programs/xfsinfo/Imakefile:1.3 xc/programs/xfsinfo/Imakefile:1.4 --- xc/programs/xfsinfo/Imakefile:1.3 Tue Aug 28 12:48:09 2001 +++ xc/programs/xfsinfo/Imakefile Mon Jan 9 10:01:12 2006 @@ -1,8 +1,4 @@ -XCOMM $XConsortium: Imakefile /main/8 1996/09/28 17:16:50 rws $ - - - -XCOMM $XFree86: xc/programs/xfsinfo/Imakefile,v 1.3 2001/08/28 16:48:09 tsi Exp $ +XCOMM $XFree86: xc/programs/xfsinfo/Imakefile,v 1.4 2006/01/09 15:01:12 dawes Exp $ LOCAL_LIBRARIES = $(FSLIB) DEPLIBS = $(DEPFSLIB) Index: xc/programs/xfsinfo/xfsinfo.c diff -u xc/programs/xfsinfo/xfsinfo.c:1.4 xc/programs/xfsinfo/xfsinfo.c:1.5 --- xc/programs/xfsinfo/xfsinfo.c:1.4 Fri Dec 14 15:01:42 2001 +++ xc/programs/xfsinfo/xfsinfo.c Mon Jan 9 10:01:12 2006 @@ -2,7 +2,6 @@ * xfsinfo -- report info about a font server */ -/* $TOG: fsinfo.c /main/7 1998/02/09 13:43:08 kaleb $ */ /* Portions Copyright 1987, 1998 The Open Group @@ -30,7 +29,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.4 2001/12/14 20:01:42 dawes Exp $ */ +/* $XFree86: xc/programs/xfsinfo/xfsinfo.c,v 1.5 2006/01/09 15:01:12 dawes Exp $ */ /* * Copyright 1990 Network Computing Devices; Index: xc/programs/xfsinfo/xfsinfo.man diff -u xc/programs/xfsinfo/xfsinfo.man:1.6 xc/programs/xfsinfo/xfsinfo.man:1.7 --- xc/programs/xfsinfo/xfsinfo.man:1.6 Thu Feb 10 22:03:19 2005 +++ xc/programs/xfsinfo/xfsinfo.man Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -.\" $TOG: fsinfo.man /main/10 1998/02/09 13:43:12 kaleb $ .\" Copyright 1991, Network Computing Devices, Inc .\" Copyright 1993, 1998 The Open Group .\" @@ -24,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.6 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xfsinfo/xfsinfo.man,v 1.7 2006/01/09 15:01:12 dawes Exp $ .\" .TH XFSINFO 1 __vendorversion__ .SH NAME Index: xc/programs/xfwp/Imakefile diff -u xc/programs/xfwp/Imakefile:1.6 xc/programs/xfwp/Imakefile:1.7 --- xc/programs/xfwp/Imakefile:1.6 Wed Jan 17 18:45:34 2001 +++ xc/programs/xfwp/Imakefile Mon Jan 9 10:01:12 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:23 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xfwp/Imakefile,v 1.7 2006/01/09 15:01:12 dawes Exp $ DEPLIBS = $(DEPICELIB) LOCAL_LIBRARIES = $(ICELIB) Index: xc/programs/xfwp/io.c diff -u xc/programs/xfwp/io.c:1.11 xc/programs/xfwp/io.c:1.12 --- xc/programs/xfwp/io.c:1.11 Fri Dec 14 15:01:43 2001 +++ xc/programs/xfwp/io.c Mon Jan 9 10:01:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: io.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* Copyright "1986-1997, 1998 The Open Group @@ -29,7 +28,7 @@ X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/io.c,v 1.11 2001/12/14 20:01:43 dawes Exp $ */ +/* $XFree86: xc/programs/xfwp/io.c,v 1.12 2006/01/09 15:01:12 dawes Exp $ */ #include #include Index: xc/programs/xfwp/io.h diff -u xc/programs/xfwp/io.h:1.4 xc/programs/xfwp/io.h:1.5 --- xc/programs/xfwp/io.h:1.4 Fri Dec 14 15:01:43 2001 +++ xc/programs/xfwp/io.h Mon Jan 9 10:01:12 2006 @@ -1,4 +1,4 @@ -/* $Xorg: io.h,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfwp/io.h,v 1.5 2006/01/09 15:01:12 dawes Exp $ */ /* Copyright "1986-1997, 1998 The Open Group Index: xc/programs/xfwp/misc.c diff -u xc/programs/xfwp/misc.c:1.7 xc/programs/xfwp/misc.c:1.8 --- xc/programs/xfwp/misc.c:1.7 Fri Dec 14 15:01:43 2001 +++ xc/programs/xfwp/misc.c Mon Jan 9 10:01:12 2006 @@ -1,5 +1,3 @@ -/* $Xorg: misc.c,v 1.6 2001/02/09 02:05:45 xorgcvs Exp $ */ - /* Copyright "1986-1997, 1998 The Open Group @@ -28,7 +26,7 @@ X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/misc.c,v 1.7 2001/12/14 20:01:43 dawes Exp $ */ +/* $XFree86: xc/programs/xfwp/misc.c,v 1.8 2006/01/09 15:01:12 dawes Exp $ */ #include #include Index: xc/programs/xfwp/misc.h diff -u xc/programs/xfwp/misc.h:1.4 xc/programs/xfwp/misc.h:1.5 --- xc/programs/xfwp/misc.h:1.4 Fri Dec 14 15:01:43 2001 +++ xc/programs/xfwp/misc.h Mon Jan 9 10:01:12 2006 @@ -1,4 +1,4 @@ -/* $Xorg: misc.h,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfwp/misc.h,v 1.5 2006/01/09 15:01:12 dawes Exp $ */ /* Copyright "1986-1997, 1998 The Open Group Index: xc/programs/xfwp/pm.c diff -u xc/programs/xfwp/pm.c:1.10 xc/programs/xfwp/pm.c:1.11 --- xc/programs/xfwp/pm.c:1.10 Thu Dec 30 21:56:03 2004 +++ xc/programs/xfwp/pm.c Mon Jan 9 10:01:13 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pm.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* Copyright "1986-1997, 1998 The Open Group @@ -29,7 +28,7 @@ X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/pm.c,v 1.10 2004/12/31 02:56:03 tsi Exp $ */ +/* $XFree86: xc/programs/xfwp/pm.c,v 1.11 2006/01/09 15:01:13 dawes Exp $ */ #include #include Index: xc/programs/xfwp/pm.h diff -u xc/programs/xfwp/pm.h:1.5 xc/programs/xfwp/pm.h:1.6 --- xc/programs/xfwp/pm.h:1.5 Fri Dec 14 15:01:43 2001 +++ xc/programs/xfwp/pm.h Mon Jan 9 10:01:13 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pm.h,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* Copyright "1986-1997, 1998 The Open Group @@ -29,7 +28,7 @@ X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/pm.h,v 1.5 2001/12/14 20:01:43 dawes Exp $ */ +/* $XFree86: xc/programs/xfwp/pm.h,v 1.6 2006/01/09 15:01:13 dawes Exp $ */ #ifndef _PM_H #define _PM_H Index: xc/programs/xfwp/transport.c diff -u xc/programs/xfwp/transport.c:1.7 xc/programs/xfwp/transport.c:1.8 --- xc/programs/xfwp/transport.c:1.7 Fri Dec 14 15:01:43 2001 +++ xc/programs/xfwp/transport.c Mon Jan 9 10:01:13 2006 @@ -1,4 +1,3 @@ -/* $Xorg: transport.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ /* Copyright "1986-1997, 1998 The Open Group @@ -29,7 +28,7 @@ X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/programs/xfwp/transport.c,v 1.7 2001/12/14 20:01:43 dawes Exp $ */ +/* $XFree86: xc/programs/xfwp/transport.c,v 1.8 2006/01/09 15:01:13 dawes Exp $ */ #include #include Index: xc/programs/xfwp/transport.h diff -u xc/programs/xfwp/transport.h:1.4 xc/programs/xfwp/transport.h:1.5 --- xc/programs/xfwp/transport.h:1.4 Fri Dec 14 15:01:44 2001 +++ xc/programs/xfwp/transport.h Mon Jan 9 10:01:13 2006 @@ -1,4 +1,4 @@ -/* $Xorg: transport.h,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xfwp/transport.h,v 1.5 2006/01/09 15:01:13 dawes Exp $ */ /* Copyright "1986-1997, 1998 The Open Group Index: xc/programs/xfwp/xfwp.c diff -u xc/programs/xfwp/xfwp.c:1.12 xc/programs/xfwp/xfwp.c:1.13 --- xc/programs/xfwp/xfwp.c:1.12 Fri Dec 14 15:01:44 2001 +++ xc/programs/xfwp/xfwp.c Mon Jan 9 10:01:13 2006 @@ -1,5 +1,4 @@ -/* $Xorg: xfwp.c,v 1.4 2001/02/09 02:05:45 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/xfwp/xfwp.c,v 1.13 2006/01/09 15:01:13 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xfwp/xfwp.h diff -u xc/programs/xfwp/xfwp.h:1.11 xc/programs/xfwp/xfwp.h:1.12 --- xc/programs/xfwp/xfwp.h:1.11 Thu Dec 30 21:56:03 2004 +++ xc/programs/xfwp/xfwp.h Mon Jan 9 10:01:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: xfwp.h,v 1.6 2001/02/09 02:05:46 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xfwp/xfwp.h,v 1.11 2004/12/31 02:56:03 tsi Exp $ */ +/* $XFree86: xc/programs/xfwp/xfwp.h,v 1.12 2006/01/09 15:01:13 dawes Exp $ */ #ifndef _XFWP_H #define _XFWP_H Index: xc/programs/xfwp/xfwp.man diff -u xc/programs/xfwp/xfwp.man:1.9 xc/programs/xfwp/xfwp.man:1.10 --- xc/programs/xfwp/xfwp.man:1.9 Thu Feb 10 22:03:19 2005 +++ xc/programs/xfwp/xfwp.man Mon Jan 9 10:01:13 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xfwp.man,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/xfwp/xfwp.man,v 1.9 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xfwp/xfwp.man,v 1.10 2006/01/09 15:01:13 dawes Exp $ .\" .nh .TH XFWP 1 __vendorversion__ Index: xc/programs/xgc/Imakefile diff -u xc/programs/xgc/Imakefile:1.3 xc/programs/xgc/Imakefile:1.4 --- xc/programs/xgc/Imakefile:1.3 Wed May 7 17:17:06 2003 +++ xc/programs/xgc/Imakefile Mon Jan 9 10:01:13 2006 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.12 93/08/25 10:13:31 rws Exp $ -XCOMM $XFree86: xc/programs/xgc/Imakefile,v 1.3 2003/05/07 21:17:06 herrb Exp $ +XCOMM $XFree86: xc/programs/xgc/Imakefile,v 1.4 2006/01/09 15:01:13 dawes Exp $ + #if HasSnprintf SNPDEFINES = -DHAS_SNPRINTF #endif Index: xc/programs/xgc/lex.l diff -u xc/programs/xgc/lex.l:1.4 xc/programs/xgc/lex.l:1.8 --- xc/programs/xgc/lex.l:1.4 Fri May 31 14:46:13 2002 +++ xc/programs/xgc/lex.l Sun Apr 23 15:45:20 2006 @@ -1,5 +1,4 @@ -/* $XConsortium: lex.l,v 1.8 94/03/31 20:40:44 rws Exp $ */ -/* $XFree86: xc/programs/xgc/lex.l,v 1.4 2002/05/31 18:46:13 dawes Exp $ */ +/* $XFree86: xc/programs/xgc/lex.l,v 1.8 2006/04/23 19:45:20 dawes Exp $ */ /* ** lex file for xgc syntax */ @@ -11,6 +10,7 @@ #include #include "gram.h" #include "constants.h" +#include "lexstuff.h" #if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__) int yylineno = 0; #endif @@ -18,10 +18,11 @@ %p 4000 %a 3000 +%o 4000 number [0-9]+ -word [^\n\t ]+ -string \"([^"]|\\.)*\" +word [^\n\t "]+ +string \"([^\"]|\\.)*\" %% Index: xc/programs/xgc/lexstuff.h diff -u /dev/null xc/programs/xgc/lexstuff.h:1.3 --- /dev/null Tue May 9 21:58:33 2006 +++ xc/programs/xgc/lexstuff.h Sat Feb 25 21:41:02 2006 @@ -0,0 +1,12 @@ +/* $XFree86: xc/programs/xgc/lexstuff.h,v 1.3 2006/02/26 02:41:02 dawes Exp $ */ + +#ifdef NEED_YYIN +extern FILE *yyin; +#endif + +extern void yyerror(const char *); +#if !defined(YYBISON) && !(defined(YYBYACC) && defined(__NetBSD__)) +extern int yyparse(void); +#endif +extern int yylex(void); + Index: xc/programs/xgc/main.c diff -u xc/programs/xgc/main.c:1.7 xc/programs/xgc/main.c:1.8 --- xc/programs/xgc/main.c:1.7 Tue May 27 18:27:06 2003 +++ xc/programs/xgc/main.c Mon Jan 9 10:01:13 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: main.c,v 1.22 94/04/17 20:45:30 rws Exp $ */ /* Copyright (c) 1991 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xgc/main.c,v 1.7 2003/05/27 22:27:06 tsi Exp $ */ +/* $XFree86: xc/programs/xgc/main.c,v 1.8 2006/01/09 15:01:13 dawes Exp $ */ /* xgc ** Index: xc/programs/xgc/tests.c diff -u xc/programs/xgc/tests.c:1.12 xc/programs/xgc/tests.c:1.13 --- xc/programs/xgc/tests.c:1.12 Fri Oct 24 16:38:18 2003 +++ xc/programs/xgc/tests.c Mon Jan 9 10:01:13 2006 @@ -1,6 +1,5 @@ /* -** $XConsortium: tests.c,v 1.20 91/06/08 18:57:07 rws Exp $ -** $XFree86: xc/programs/xgc/tests.c,v 1.12 2003/10/24 20:38:18 tsi Exp $ +** $XFree86: xc/programs/xgc/tests.c,v 1.13 2006/01/09 15:01:13 dawes Exp $ ** */ Index: xc/programs/xgc/xgc.h diff -u xc/programs/xgc/xgc.h:1.6 xc/programs/xgc/xgc.h:1.7 --- xc/programs/xgc/xgc.h:1.6 Sat Sep 13 17:33:11 2003 +++ xc/programs/xgc/xgc.h Thu Mar 24 21:22:59 2005 @@ -3,9 +3,11 @@ ** ** xgc.h */ -/* $XFree86: xc/programs/xgc/xgc.h,v 1.6 2003/09/13 21:33:11 dawes Exp $ */ +/* $XFree86: xc/programs/xgc/xgc.h,v 1.7 2005/03/25 02:22:59 dawes Exp $ */ #include "constants.h" +#define NEED_YYIN +#include "lexstuff.h" typedef struct { Display *dpy; /* the display! */ @@ -100,7 +102,6 @@ extern int fildes[2]; extern FILE *outend; -extern FILE *yyin; /************/ @@ -159,10 +160,5 @@ extern void update_dashlist(int); extern void update_planemask(long); extern void update_slider(int); -extern void yyerror(const char *); -extern int yylex(void); -extern int yyparse(void); -extern void yyrestart(FILE *); -extern int yywrap(void); Index: xc/programs/xgc/xgc.man diff -u xc/programs/xgc/xgc.man:1.4 xc/programs/xgc/xgc.man:1.5 --- xc/programs/xgc/xgc.man:1.4 Thu Feb 10 22:03:19 2005 +++ xc/programs/xgc/xgc.man Mon Jan 9 10:01:13 2006 @@ -1,6 +1,4 @@ -.\" $XConsortium: xgc.man,v 1.6 94/04/17 20:45:31 gildea Exp $ -.\" -.\" $XFree86: xc/programs/xgc/xgc.man,v 1.4 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xgc/xgc.man,v 1.5 2006/01/09 15:01:13 dawes Exp $ .\" .TH XGC 1 __vendorversion__ .SH NAME Index: xc/programs/xhost/Imakefile diff -u xc/programs/xhost/Imakefile:1.7 xc/programs/xhost/Imakefile:1.8 --- xc/programs/xhost/Imakefile:1.7 Sun Jul 27 10:05:45 2003 +++ xc/programs/xhost/Imakefile Mon Jan 9 10:01:14 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:24 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xhost/Imakefile,v 1.7 2003/07/27 14:05:45 herrb Exp $ +XCOMM $XFree86: xc/programs/xhost/Imakefile,v 1.8 2006/01/09 15:01:14 dawes Exp $ #if HasSecureRPC RPC_DEFINES = -DSECURE_RPC Index: xc/programs/xhost/xhost.c diff -u xc/programs/xhost/xhost.c:3.28 xc/programs/xhost/xhost.c:3.29 --- xc/programs/xhost/xhost.c:3.28 Thu May 6 17:10:58 2004 +++ xc/programs/xhost/xhost.c Mon Jan 9 10:01:14 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xhost.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1987, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xhost/xhost.c,v 3.28 2004/05/06 21:10:58 herrb Exp $ */ +/* $XFree86: xc/programs/xhost/xhost.c,v 3.29 2006/01/09 15:01:14 dawes Exp $ */ #if defined(TCPCONN) || defined(STREAMSCONN) #define NEEDSOCKETS Index: xc/programs/xhost/xhost.man diff -u xc/programs/xhost/xhost.man:1.10 xc/programs/xhost/xhost.man:1.11 --- xc/programs/xhost/xhost.man:1.10 Thu Feb 10 22:03:19 2005 +++ xc/programs/xhost/xhost.man Mon Jan 9 10:01:14 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xhost.man,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xhost/xhost.man,v 1.10 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xhost/xhost.man,v 1.11 2006/01/09 15:01:14 dawes Exp $ .\" .TH XHOST 1 __vendorversion__ .SH NAME Index: xc/programs/xinit/Imakefile diff -u xc/programs/xinit/Imakefile:3.18 xc/programs/xinit/Imakefile:3.20 --- xc/programs/xinit/Imakefile:3.18 Tue Nov 11 19:10:31 2003 +++ xc/programs/xinit/Imakefile Mon Mar 6 11:06:23 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xinit/Imakefile,v 3.18 2003/11/12 00:10:31 dawes Exp $ +XCOMM $XFree86: xc/programs/xinit/Imakefile,v 3.20 2006/03/06 16:06:23 dawes Exp $ #if HasVFork VFORK_DEFINES = -DHAS_VFORK @@ -15,7 +10,7 @@ DEFFILE = xinit.def #endif DEFINES = $(CONNECTION_FLAGS) $(VFORK_DEFINES) $(SIGNAL_DEFINES) \ - -DBINDIR=\"$(BINDIR)\" $(OS_DEFS) + -DBINDIR=\"$(BINDIR)\" $(OS_DEFS) -DDONTKILL DEPLIBS = $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XONLYLIB) SRCS1 = xinit.c Index: xc/programs/xinit/startx.cpp diff -u xc/programs/xinit/startx.cpp:3.18 xc/programs/xinit/startx.cpp:3.19 --- xc/programs/xinit/startx.cpp:3.18 Fri Aug 22 15:27:33 2003 +++ xc/programs/xinit/startx.cpp Mon Jan 9 10:01:14 2006 @@ -1,6 +1,5 @@ XCOMM!/bin/sh -XCOMM $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $ XCOMM XCOMM This is just a sample implementation of a slightly less primitive XCOMM interface than xinit. It looks for user .xinitrc and .xserverrc @@ -11,7 +10,7 @@ XCOMM XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM -XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.18 2003/08/22 19:27:33 eich Exp $ +XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.19 2006/01/09 15:01:14 dawes Exp $ #ifdef SCO Index: xc/programs/xinit/startx.man diff -u xc/programs/xinit/startx.man:1.9 xc/programs/xinit/startx.man:1.10 --- xc/programs/xinit/startx.man:1.9 Thu Feb 10 22:03:19 2005 +++ xc/programs/xinit/startx.man Mon Jan 9 10:01:14 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: startx.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ .\" Copyright 1993, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xinit/startx.man,v 1.9 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xinit/startx.man,v 1.10 2006/01/09 15:01:14 dawes Exp $ .\" .TH STARTX 1 __vendorversion__ .SH NAME Index: xc/programs/xinit/xinit.c diff -u xc/programs/xinit/xinit.c:3.34 xc/programs/xinit/xinit.c:3.35 --- xc/programs/xinit/xinit.c:3.34 Fri Jan 28 19:22:02 2005 +++ xc/programs/xinit/xinit.c Mon Mar 6 11:06:23 2006 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xinit/xinit.c,v 3.34 2005/01/29 00:22:02 dawes Exp $ */ +/* $XFree86: xc/programs/xinit/xinit.c,v 3.35 2006/03/06 16:06:23 dawes Exp $ */ #include #include @@ -742,6 +742,7 @@ return; } +#ifndef DONTKILL fprintf(stderr, "\r\n%s: X server slow to shut down, sending KILL signal.\r\n", program); @@ -755,6 +756,23 @@ fprintf (stderr, "\r\n"); Fatal("Can't kill server\r\n"); } +#else + fprintf(stderr, + "\r\n%s: X server slow to shut down, sending interrupt signal.\r\n", + program); + fflush(stderr); + errno = 0; + if (killpg(serverpid, SIGINT) < 0) { + if (errno == ESRCH) + return; + } + if (!processTimeout(10, "server to die")) { + fprintf (stderr, "\r\n"); + return; + } + fprintf(stderr, + "\r\n%s: X server slow to shut down. Exiting.\r\n", program); +#endif fprintf (stderr, "\r\n"); return; } Index: xc/programs/xinit/xinit.def diff -u xc/programs/xinit/xinit.def:3.4 xc/programs/xinit/xinit.def:3.5 --- xc/programs/xinit/xinit.def:3.4 Sun Feb 6 20:38:25 2005 +++ xc/programs/xinit/xinit.def Sat Apr 8 14:30:26 2006 @@ -1,4 +1,4 @@ NAME xinit NOTWINDOWCOMPAT -DESCRIPTION "@#XFREE86:4.5.0#@ $XFree86: xc/programs/xinit/xinit.def,v 3.4 2005/02/07 01:38:25 tsi Exp $" +DESCRIPTION "@#XFREE86:4.6.0#@ $XFree86: xc/programs/xinit/xinit.def,v 3.5 2006/04/08 18:30:26 dawes Exp $" PROTMODE EXETYPE OS2 Index: xc/programs/xinit/xinit.man diff -u xc/programs/xinit/xinit.man:3.11 xc/programs/xinit/xinit.man:3.12 --- xc/programs/xinit/xinit.man:3.11 Thu Feb 10 22:03:19 2005 +++ xc/programs/xinit/xinit.man Mon Jan 9 10:01:14 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xinit.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xinit/xinit.man,v 3.11 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xinit/xinit.man,v 3.12 2006/01/09 15:01:14 dawes Exp $ .\" .TH XINIT 1 __vendorversion__ .SH NAME Index: xc/programs/xinit/xinitrc.cpp diff -u xc/programs/xinit/xinitrc.cpp:1.1.1.2 xc/programs/xinit/xinitrc.cpp:1.2 --- xc/programs/xinit/xinitrc.cpp:1.1.1.2 Tue Jan 16 17:54:39 2001 +++ xc/programs/xinit/xinitrc.cpp Mon Jan 9 10:01:14 2006 @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xinit/xinitrc.cpp,v 1.2 2006/01/09 15:01:14 dawes Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap Index: xc/programs/xkbcomp/Imakefile diff -u xc/programs/xkbcomp/Imakefile:3.22 xc/programs/xkbcomp/Imakefile:3.23 --- xc/programs/xkbcomp/Imakefile:3.22 Tue May 27 13:58:24 2003 +++ xc/programs/xkbcomp/Imakefile Fri Oct 14 11:17:34 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/Imakefile,v 3.22 2003/05/27 17:58:24 tsi Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/Imakefile,v 3.23 2005/10/14 15:17:34 tsi Exp $ #define IHaveSubdirs #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' @@ -27,8 +22,6 @@ ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\" -INCLUDES = -I$(EXTINCSRC) - all:: SpecialCObjectRule(xkbpath,$(ICONFIGFILES),$(ROOT_DEFINES)) Index: xc/programs/xkbcomp/action.c diff -u xc/programs/xkbcomp/action.c:3.11 xc/programs/xkbcomp/action.c:3.12 --- xc/programs/xkbcomp/action.c:3.11 Fri Nov 22 17:56:04 2002 +++ xc/programs/xkbcomp/action.c Mon Jan 9 10:01:14 2006 @@ -1,4 +1,3 @@ -/* $Xorg: action.c,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/action.c,v 3.11 2002/11/22 22:56:04 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/action.c,v 3.12 2006/01/09 15:01:14 dawes Exp $ */ #include "xkbcomp.h" #include "tokens.h" Index: xc/programs/xkbcomp/action.h diff -u xc/programs/xkbcomp/action.h:3.3 xc/programs/xkbcomp/action.h:3.4 --- xc/programs/xkbcomp/action.h:3.3 Sun Jun 30 22:26:00 2002 +++ xc/programs/xkbcomp/action.h Mon Jan 9 10:01:14 2006 @@ -1,4 +1,3 @@ -/* $Xorg: action.h,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/action.h,v 3.3 2002/07/01 02:26:00 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/action.h,v 3.4 2006/01/09 15:01:14 dawes Exp $ */ #ifndef ACTION_H #define ACTION_H 1 Index: xc/programs/xkbcomp/alias.c diff -u xc/programs/xkbcomp/alias.c:1.5 xc/programs/xkbcomp/alias.c:1.6 --- xc/programs/xkbcomp/alias.c:1.5 Sun Jun 30 22:26:00 2002 +++ xc/programs/xkbcomp/alias.c Mon Jan 9 10:01:14 2006 @@ -1,4 +1,3 @@ -/* $Xorg: alias.c,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/alias.c,v 1.5 2002/07/01 02:26:00 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/alias.c,v 1.6 2006/01/09 15:01:14 dawes Exp $ */ #include "xkbcomp.h" #include "misc.h" Index: xc/programs/xkbcomp/alias.h diff -u xc/programs/xkbcomp/alias.h:1.3 xc/programs/xkbcomp/alias.h:1.4 --- xc/programs/xkbcomp/alias.h:1.3 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/alias.h Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: alias.h,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/alias.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/alias.h,v 1.4 2006/01/09 15:01:15 dawes Exp $ */ #ifndef ALIAS_H #define ALIAS_H 1 Index: xc/programs/xkbcomp/compat.c diff -u xc/programs/xkbcomp/compat.c:3.4 xc/programs/xkbcomp/compat.c:3.5 --- xc/programs/xkbcomp/compat.c:3.4 Tue Jun 4 20:00:37 2002 +++ xc/programs/xkbcomp/compat.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: compat.c,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/compat.c,v 3.4 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/compat.c,v 3.5 2006/01/09 15:01:15 dawes Exp $ */ #include #include "xkbcomp.h" Index: xc/programs/xkbcomp/expr.c diff -u xc/programs/xkbcomp/expr.c:3.8 xc/programs/xkbcomp/expr.c:3.9 --- xc/programs/xkbcomp/expr.c:3.8 Thu Dec 18 09:14:37 2003 +++ xc/programs/xkbcomp/expr.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.8 2003/12/18 14:14:37 pascal Exp $ */ +/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.9 2006/01/09 15:01:15 dawes Exp $ */ #include "xkbcomp.h" #include "tokens.h" Index: xc/programs/xkbcomp/expr.h diff -u xc/programs/xkbcomp/expr.h:3.3 xc/programs/xkbcomp/expr.h:3.4 --- xc/programs/xkbcomp/expr.h:3.3 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/expr.h Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: expr.h,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/expr.h,v 3.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/expr.h,v 3.4 2006/01/09 15:01:15 dawes Exp $ */ #ifndef EXPR_H #define EXPR_H 1 Index: xc/programs/xkbcomp/geometry.c diff -u xc/programs/xkbcomp/geometry.c:1.6 xc/programs/xkbcomp/geometry.c:1.7 --- xc/programs/xkbcomp/geometry.c:1.6 Mon Dec 22 12:48:13 2003 +++ xc/programs/xkbcomp/geometry.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: geometry.c,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/geometry.c,v 1.6 2003/12/22 17:48:13 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/geometry.c,v 1.7 2006/01/09 15:01:15 dawes Exp $ */ #include "xkbcomp.h" #include "tokens.h" Index: xc/programs/xkbcomp/indicators.c diff -u xc/programs/xkbcomp/indicators.c:1.5 xc/programs/xkbcomp/indicators.c:1.6 --- xc/programs/xkbcomp/indicators.c:1.5 Tue Jun 4 20:00:37 2002 +++ xc/programs/xkbcomp/indicators.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: indicators.c,v 1.3 2000/08/17 19:54:31 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/indicators.c,v 1.5 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/indicators.c,v 1.6 2006/01/09 15:01:15 dawes Exp $ */ #include "xkbcomp.h" #include "misc.h" Index: xc/programs/xkbcomp/indicators.h diff -u xc/programs/xkbcomp/indicators.h:1.3 xc/programs/xkbcomp/indicators.h:1.4 --- xc/programs/xkbcomp/indicators.h:1.3 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/indicators.h Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: indicators.h,v 1.3 2000/08/17 19:54:32 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/indicators.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/indicators.h,v 1.4 2006/01/09 15:01:15 dawes Exp $ */ #ifndef INDICATORS_H #define INDICATORS_H 1 Index: xc/programs/xkbcomp/keycodes.c diff -u xc/programs/xkbcomp/keycodes.c:3.5 xc/programs/xkbcomp/keycodes.c:3.6 --- xc/programs/xkbcomp/keycodes.c:3.5 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/keycodes.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: keycodes.c,v 1.4 2000/08/17 19:54:32 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/keycodes.c,v 3.5 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/keycodes.c,v 3.6 2006/01/09 15:01:15 dawes Exp $ */ #include "xkbcomp.h" #include "tokens.h" Index: xc/programs/xkbcomp/keycodes.h diff -u xc/programs/xkbcomp/keycodes.h:1.3 xc/programs/xkbcomp/keycodes.h:1.4 --- xc/programs/xkbcomp/keycodes.h:1.3 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/keycodes.h Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: keycodes.h,v 1.3 2000/08/17 19:54:32 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/keycodes.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/keycodes.h,v 1.4 2006/01/09 15:01:15 dawes Exp $ */ #ifndef KEYCODES_H #define KEYCODES_H 1 Index: xc/programs/xkbcomp/keymap.c diff -u xc/programs/xkbcomp/keymap.c:1.3 xc/programs/xkbcomp/keymap.c:1.4 --- xc/programs/xkbcomp/keymap.c:1.3 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/keymap.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: keymap.c,v 1.3 2000/08/17 19:54:32 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/keymap.c,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/keymap.c,v 1.4 2006/01/09 15:01:15 dawes Exp $ */ #include "xkbcomp.h" #include "tokens.h" Index: xc/programs/xkbcomp/keytypes.c diff -u xc/programs/xkbcomp/keytypes.c:1.5 xc/programs/xkbcomp/keytypes.c:1.6 --- xc/programs/xkbcomp/keytypes.c:1.5 Tue Jun 4 20:00:37 2002 +++ xc/programs/xkbcomp/keytypes.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: keytypes.c,v 1.3 2000/08/17 19:54:32 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/keytypes.c,v 1.5 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/keytypes.c,v 1.6 2006/01/09 15:01:15 dawes Exp $ */ #include "xkbcomp.h" #include "tokens.h" Index: xc/programs/xkbcomp/listing.c diff -u xc/programs/xkbcomp/listing.c:3.10 xc/programs/xkbcomp/listing.c:3.11 --- xc/programs/xkbcomp/listing.c:3.10 Tue Jun 4 20:00:37 2002 +++ xc/programs/xkbcomp/listing.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: listing.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */ /************************************************************ Copyright 1996 by Silicon Graphics Computer Systems, Inc. @@ -70,7 +69,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.10 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.11 2006/01/09 15:01:15 dawes Exp $ */ #include Index: xc/programs/xkbcomp/misc.c diff -u xc/programs/xkbcomp/misc.c:3.6 xc/programs/xkbcomp/misc.c:3.7 --- xc/programs/xkbcomp/misc.c:3.6 Fri Dec 20 15:18:33 2002 +++ xc/programs/xkbcomp/misc.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: misc.c,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/misc.c,v 3.6 2002/12/20 20:18:33 paulo Exp $ */ +/* $XFree86: xc/programs/xkbcomp/misc.c,v 3.7 2006/01/09 15:01:15 dawes Exp $ */ #include "xkbcomp.h" #include "xkbpath.h" Index: xc/programs/xkbcomp/misc.h diff -u xc/programs/xkbcomp/misc.h:1.5 xc/programs/xkbcomp/misc.h:1.6 --- xc/programs/xkbcomp/misc.h:1.5 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/misc.h Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: misc.h,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/misc.h,v 1.5 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/misc.h,v 1.6 2006/01/09 15:01:15 dawes Exp $ */ #ifndef MISC_H #define MISC_H 1 Index: xc/programs/xkbcomp/parseutils.c diff -u xc/programs/xkbcomp/parseutils.c:1.5 xc/programs/xkbcomp/parseutils.c:1.6 --- xc/programs/xkbcomp/parseutils.c:1.5 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/parseutils.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: parseutils.c,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/parseutils.c,v 1.5 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/parseutils.c,v 1.6 2006/01/09 15:01:15 dawes Exp $ */ #define DEBUG_VAR_NOT_LOCAL #define DEBUG_VAR parseDebug Index: xc/programs/xkbcomp/parseutils.h diff -u xc/programs/xkbcomp/parseutils.h:1.5 xc/programs/xkbcomp/parseutils.h:1.7 --- xc/programs/xkbcomp/parseutils.h:1.5 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/parseutils.h Sat Feb 25 21:41:02 2006 @@ -1,4 +1,3 @@ -/* $Xorg: parseutils.h,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/parseutils.h,v 1.5 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/parseutils.h,v 1.7 2006/02/26 02:41:02 dawes Exp $ */ #ifndef XKBPARSE_H #define XKBPARSE_H 1 @@ -236,7 +235,9 @@ ); extern int yylex(void); +#if !defined(YYBISON) && !(defined(YYBYACC) && defined(__NetBSD__)) extern int yyparse(void); +#endif extern int setScanState( char * /* file */, Index: xc/programs/xkbcomp/symbols.c diff -u xc/programs/xkbcomp/symbols.c:3.16 xc/programs/xkbcomp/symbols.c:3.17 --- xc/programs/xkbcomp/symbols.c:3.16 Fri Oct 31 09:32:04 2003 +++ xc/programs/xkbcomp/symbols.c Mon Jan 9 10:01:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: symbols.c,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/symbols.c,v 3.16 2003/10/31 14:32:04 pascal Exp $ */ +/* $XFree86: xc/programs/xkbcomp/symbols.c,v 3.17 2006/01/09 15:01:15 dawes Exp $ */ #include "xkbcomp.h" #include "tokens.h" Index: xc/programs/xkbcomp/tokens.h diff -u xc/programs/xkbcomp/tokens.h:3.3 xc/programs/xkbcomp/tokens.h:3.4 --- xc/programs/xkbcomp/tokens.h:3.3 Wed Jan 17 18:45:44 2001 +++ xc/programs/xkbcomp/tokens.h Mon Jan 9 10:01:15 2006 @@ -1,4 +1,4 @@ -/* $Xorg: tokens.h,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ +/* $XFree86: xc/programs/xkbcomp/tokens.h,v 3.4 2006/01/09 15:01:15 dawes Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. Index: xc/programs/xkbcomp/utils.c diff -u xc/programs/xkbcomp/utils.c:3.7 xc/programs/xkbcomp/utils.c:3.8 --- xc/programs/xkbcomp/utils.c:3.7 Tue Jun 4 20:00:37 2002 +++ xc/programs/xkbcomp/utils.c Mon Jan 9 10:01:16 2006 @@ -1,6 +1,5 @@ /*\ - * $Xorg: utils.c,v 1.4 2000/08/17 19:54:33 cpqbld Exp $ * * COPYRIGHT 1990 * DIGITAL EQUIPMENT CORPORATION @@ -25,7 +24,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbcomp/utils.c,v 3.7 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/utils.c,v 3.8 2006/01/09 15:01:16 dawes Exp $ */ #include "utils.h" #include Index: xc/programs/xkbcomp/utils.h diff -u xc/programs/xkbcomp/utils.h:3.6 xc/programs/xkbcomp/utils.h:3.7 --- xc/programs/xkbcomp/utils.h:3.6 Tue Dec 24 12:43:00 2002 +++ xc/programs/xkbcomp/utils.h Mon Jan 9 10:01:16 2006 @@ -2,7 +2,6 @@ #define UTILS_H 1 /*\ - * $Xorg: utils.h,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ * * COPYRIGHT 1990 * DIGITAL EQUIPMENT CORPORATION @@ -27,7 +26,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbcomp/utils.h,v 3.6 2002/12/24 17:43:00 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/utils.h,v 3.7 2006/01/09 15:01:16 dawes Exp $ */ /***====================================================================***/ Index: xc/programs/xkbcomp/vmod.c diff -u xc/programs/xkbcomp/vmod.c:3.4 xc/programs/xkbcomp/vmod.c:3.5 --- xc/programs/xkbcomp/vmod.c:3.4 Tue Jun 4 20:00:37 2002 +++ xc/programs/xkbcomp/vmod.c Mon Jan 9 10:01:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: vmod.c,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/vmod.c,v 3.4 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/vmod.c,v 3.5 2006/01/09 15:01:16 dawes Exp $ */ #define DEBUG_VAR_NOT_LOCAL #define DEBUG_VAR debugFlags Index: xc/programs/xkbcomp/vmod.h diff -u xc/programs/xkbcomp/vmod.h:1.3 xc/programs/xkbcomp/vmod.h:1.4 --- xc/programs/xkbcomp/vmod.h:1.3 Sun Jun 30 22:26:01 2002 +++ xc/programs/xkbcomp/vmod.h Mon Jan 9 10:01:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: vmod.h,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/vmod.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/vmod.h,v 1.4 2006/01/09 15:01:16 dawes Exp $ */ #ifndef VMOD_H #define VMOD_H 1 Index: xc/programs/xkbcomp/xkbcomp.c diff -u xc/programs/xkbcomp/xkbcomp.c:3.21 xc/programs/xkbcomp/xkbcomp.c:3.22 --- xc/programs/xkbcomp/xkbcomp.c:3.21 Wed Oct 8 07:13:03 2003 +++ xc/programs/xkbcomp/xkbcomp.c Mon Jan 9 10:01:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbcomp.c,v 1.4 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbcomp.c,v 3.21 2003/10/08 11:13:03 eich Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbcomp.c,v 3.22 2006/01/09 15:01:16 dawes Exp $ */ #include #include Index: xc/programs/xkbcomp/xkbcomp.h diff -u xc/programs/xkbcomp/xkbcomp.h:3.9 xc/programs/xkbcomp/xkbcomp.h:3.10 --- xc/programs/xkbcomp/xkbcomp.h:3.9 Tue Jun 4 20:00:38 2002 +++ xc/programs/xkbcomp/xkbcomp.h Mon Jan 9 10:01:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbcomp.h,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.9 2002/06/05 00:00:38 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.10 2006/01/09 15:01:16 dawes Exp $ */ #ifndef XKBCOMP_H #define XKBCOMP_H 1 Index: xc/programs/xkbcomp/xkbcomp.man diff -u xc/programs/xkbcomp/xkbcomp.man:1.13 xc/programs/xkbcomp/xkbcomp.man:1.14 --- xc/programs/xkbcomp/xkbcomp.man:1.13 Thu Feb 10 22:03:19 2005 +++ xc/programs/xkbcomp/xkbcomp.man Mon Jan 9 10:01:16 2006 @@ -1,9 +1,4 @@ -.\" $Xorg: xkbcomp.man,v 1.3 2000/08/17 19:54:33 cpqbld Exp $ -.\" -.\" -.\" -.\" -.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.13 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.14 2006/01/09 15:01:16 dawes Exp $ .\" .TH XKBCOMP 1 __vendorversion__ .SH NAME Index: xc/programs/xkbcomp/xkbparse.y diff -u xc/programs/xkbcomp/xkbparse.y:3.12 xc/programs/xkbcomp/xkbparse.y:3.13 --- xc/programs/xkbcomp/xkbparse.y:3.12 Wed Oct 16 17:33:04 2002 +++ xc/programs/xkbcomp/xkbparse.y Mon Jan 9 10:01:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbparse.y,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.12 2002/10/16 21:33:04 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.13 2006/01/09 15:01:16 dawes Exp $ */ %token END_OF_FILE 0 Index: xc/programs/xkbcomp/xkbpath.c diff -u xc/programs/xkbcomp/xkbpath.c:3.8 xc/programs/xkbcomp/xkbpath.c:3.9 --- xc/programs/xkbcomp/xkbpath.c:3.8 Thu Nov 14 22:14:12 2002 +++ xc/programs/xkbcomp/xkbpath.c Mon Jan 9 10:01:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbpath.c,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbpath.c,v 3.8 2002/11/15 03:14:12 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbpath.c,v 3.9 2006/01/09 15:01:16 dawes Exp $ */ #include #include Index: xc/programs/xkbcomp/xkbpath.h diff -u xc/programs/xkbcomp/xkbpath.h:1.4 xc/programs/xkbcomp/xkbpath.h:1.5 --- xc/programs/xkbcomp/xkbpath.h:1.4 Thu Nov 14 22:14:12 2002 +++ xc/programs/xkbcomp/xkbpath.h Mon Jan 9 10:01:16 2006 @@ -1,4 +1,3 @@ -/* $XConsortium $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbpath.h,v 1.4 2002/11/15 03:14:12 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbpath.h,v 1.5 2006/01/09 15:01:16 dawes Exp $ */ #ifndef _XKBPATH_H_ #define _XKBPATH_H_ 1 Index: xc/programs/xkbcomp/xkbscan.c diff -u xc/programs/xkbcomp/xkbscan.c:3.12 xc/programs/xkbcomp/xkbscan.c:3.13 --- xc/programs/xkbcomp/xkbscan.c:3.12 Wed Aug 6 10:04:05 2003 +++ xc/programs/xkbcomp/xkbscan.c Mon Jan 9 10:01:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbscan.c,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbscan.c,v 3.12 2003/08/06 14:04:05 eich Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbscan.c,v 3.13 2006/01/09 15:01:16 dawes Exp $ */ #include #include Index: xc/programs/xkbcomp/compat/Imakefile diff -u xc/programs/xkbcomp/compat/Imakefile:3.10 xc/programs/xkbcomp/compat/Imakefile:3.11 --- xc/programs/xkbcomp/compat/Imakefile:3.10 Sat Feb 15 17:22:43 2003 +++ xc/programs/xkbcomp/compat/Imakefile Mon Jan 9 10:01:17 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/compat/Imakefile,v 3.10 2003/02/15 22:22:43 dawes Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/compat/Imakefile,v 3.11 2006/01/09 15:01:17 dawes Exp $ DATAFILES = README accessx basic complete default group_led iso9995 japan \ keypad misc mousekeys norepeat pc pc98 xtest leds xfree86 Index: xc/programs/xkbcomp/compat/accessx diff -u xc/programs/xkbcomp/compat/accessx:1.1.1.2 xc/programs/xkbcomp/compat/accessx:1.2 --- xc/programs/xkbcomp/compat/accessx:1.1.1.2 Tue Jan 16 17:55:53 2001 +++ xc/programs/xkbcomp/compat/accessx Mon Jan 9 10:01:17 2006 @@ -1,4 +1,4 @@ -// $Xorg: accessx,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/accessx,v 1.2 2006/01/09 15:01:17 dawes Exp $ default partial xkb_compatibility "basic" { interpret AccessX_Enable { Index: xc/programs/xkbcomp/compat/basic diff -u xc/programs/xkbcomp/compat/basic:1.3 xc/programs/xkbcomp/compat/basic:1.4 --- xc/programs/xkbcomp/compat/basic:1.3 Wed Jan 17 18:45:47 2001 +++ xc/programs/xkbcomp/compat/basic Mon Jan 9 10:01:17 2006 @@ -1,11 +1,9 @@ -// $Xorg: basic,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ - // Minimal set of symbol interpretations to provide // reasonable default behavior (Num lock, shift and // caps lock and mode switch) and set up the // automatic updating of common keyboard LEDs. -// $XFree86: xc/programs/xkbcomp/compat/basic,v 1.3 2001/01/17 23:45:47 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/compat/basic,v 1.4 2006/01/09 15:01:17 dawes Exp $ default xkb_compatibility "basic" { virtual_modifiers NumLock,AltGr; Index: xc/programs/xkbcomp/compat/complete diff -u xc/programs/xkbcomp/compat/complete:1.2 xc/programs/xkbcomp/compat/complete:1.3 --- xc/programs/xkbcomp/compat/complete:1.2 Mon Feb 10 21:51:10 2003 +++ xc/programs/xkbcomp/compat/complete Mon Jan 9 10:01:17 2006 @@ -1,4 +1,4 @@ -// $Xorg: complete,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/complete,v 1.3 2006/01/09 15:01:17 dawes Exp $ default xkb_compatibility "complete" { include "basic" augment "iso9995" Index: xc/programs/xkbcomp/compat/default diff -u xc/programs/xkbcomp/compat/default:1.2 xc/programs/xkbcomp/compat/default:1.3 --- xc/programs/xkbcomp/compat/default:1.2 Mon Feb 10 21:51:10 2003 +++ xc/programs/xkbcomp/compat/default Mon Jan 9 10:01:17 2006 @@ -1,4 +1,4 @@ -// $Xorg: default,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/default,v 1.3 2006/01/09 15:01:17 dawes Exp $ default xkb_compatibility "default" { include "basic" augment "mousekeys" Index: xc/programs/xkbcomp/compat/iso9995 diff -u xc/programs/xkbcomp/compat/iso9995:1.4 xc/programs/xkbcomp/compat/iso9995:1.5 --- xc/programs/xkbcomp/compat/iso9995:1.4 Thu May 15 09:31:57 2003 +++ xc/programs/xkbcomp/compat/iso9995 Mon Jan 9 10:01:17 2006 @@ -1,9 +1,7 @@ -// $Xorg: iso9995,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ - // Fairly complete set of symbol interpretations // to provide reasonable default behavior -// $XFree86: xc/programs/xkbcomp/compat/iso9995,v 1.4 2003/05/15 13:31:57 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/compat/iso9995,v 1.5 2006/01/09 15:01:17 dawes Exp $ default partial xkb_compatibility "default" { virtual_modifiers LevelThree,AltGr; Index: xc/programs/xkbcomp/compat/japan diff -u xc/programs/xkbcomp/compat/japan:1.1.1.2 xc/programs/xkbcomp/compat/japan:1.2 --- xc/programs/xkbcomp/compat/japan:1.1.1.2 Tue Jan 16 17:56:06 2001 +++ xc/programs/xkbcomp/compat/japan Mon Jan 9 10:01:17 2006 @@ -1,4 +1,4 @@ -// $Xorg: japan,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/japan,v 1.2 2006/01/09 15:01:17 dawes Exp $ // Japanese keyboards need Eisu and Kana shift and // lock keys, which are typically bound to the Index: xc/programs/xkbcomp/compat/keypad diff -u xc/programs/xkbcomp/compat/keypad:3.2 xc/programs/xkbcomp/compat/keypad:3.3 --- xc/programs/xkbcomp/compat/keypad:3.2 Wed Jan 17 18:45:47 2001 +++ xc/programs/xkbcomp/compat/keypad Mon Jan 9 10:01:17 2006 @@ -1,4 +1,4 @@ -// $Xorg: keypad,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/keypad,v 3.3 2006/01/09 15:01:17 dawes Exp $ // Interpretations needed to implement the numeric keypad // as an overlay instead of a modifier. Index: xc/programs/xkbcomp/compat/misc diff -u xc/programs/xkbcomp/compat/misc:1.5 xc/programs/xkbcomp/compat/misc:1.6 --- xc/programs/xkbcomp/compat/misc:1.5 Tue Dec 2 08:13:07 2003 +++ xc/programs/xkbcomp/compat/misc Mon Jan 9 10:01:17 2006 @@ -1,8 +1,4 @@ -// $Xorg: misc,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ -// -// -// -// $XFree86: xc/programs/xkbcomp/compat/misc,v 1.5 2003/12/02 13:13:07 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/compat/misc,v 1.6 2006/01/09 15:01:17 dawes Exp $ default partial xkb_compatibility "misc" { Index: xc/programs/xkbcomp/compat/mousekeys diff -u xc/programs/xkbcomp/compat/mousekeys:1.1.1.3 xc/programs/xkbcomp/compat/mousekeys:1.2 --- xc/programs/xkbcomp/compat/mousekeys:1.1.1.3 Tue Jan 16 17:56:13 2001 +++ xc/programs/xkbcomp/compat/mousekeys Mon Jan 9 10:01:17 2006 @@ -1,5 +1,5 @@ -// $Xorg: mousekeys,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/mousekeys,v 1.2 2006/01/09 15:01:17 dawes Exp $ // Interpretations for arrow keys and a bunch of other // common keysyms which make it possible to bind "mouse" Index: xc/programs/xkbcomp/compat/norepeat diff -u xc/programs/xkbcomp/compat/norepeat:1.1.1.2 xc/programs/xkbcomp/compat/norepeat:1.2 --- xc/programs/xkbcomp/compat/norepeat:1.1.1.2 Tue Jan 16 17:56:15 2001 +++ xc/programs/xkbcomp/compat/norepeat Mon Jan 9 10:01:17 2006 @@ -1,4 +1,4 @@ -// $Xorg: norepeat,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/norepeat,v 1.2 2006/01/09 15:01:17 dawes Exp $ // Put any otherwise normal keys that you don't want to repeat in // this file Index: xc/programs/xkbcomp/compat/pc diff -u xc/programs/xkbcomp/compat/pc:1.1.1.2 xc/programs/xkbcomp/compat/pc:1.2 --- xc/programs/xkbcomp/compat/pc:1.1.1.2 Tue Jan 16 17:56:17 2001 +++ xc/programs/xkbcomp/compat/pc Mon Jan 9 10:01:17 2006 @@ -1,4 +1,4 @@ -// $Xorg: pc,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/pc,v 1.2 2006/01/09 15:01:17 dawes Exp $ default partial xkb_compatibility "pc" { // Sets the "Alt" virtual modifier Index: xc/programs/xkbcomp/compat/pc98 diff -u xc/programs/xkbcomp/compat/pc98:3.2 xc/programs/xkbcomp/compat/pc98:3.3 --- xc/programs/xkbcomp/compat/pc98:3.2 Wed Jan 17 18:45:47 2001 +++ xc/programs/xkbcomp/compat/pc98 Mon Jan 9 10:01:18 2006 @@ -1,9 +1,4 @@ -// $Xorg: pc98,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/compat/pc98,v 3.2 2001/01/17 23:45:47 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/compat/pc98,v 3.3 2006/01/09 15:01:18 dawes Exp $ // Minimal set of symbol interpretations to provide // reasonable default behavior (Num lock, shift and Index: xc/programs/xkbcomp/compat/xtest diff -u xc/programs/xkbcomp/compat/xtest:1.1.1.2 xc/programs/xkbcomp/compat/xtest:1.2 --- xc/programs/xkbcomp/compat/xtest:1.1.1.2 Tue Jan 16 17:56:20 2001 +++ xc/programs/xkbcomp/compat/xtest Mon Jan 9 10:01:18 2006 @@ -1,4 +1,4 @@ -// $Xorg: xtest,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/compat/xtest,v 1.2 2006/01/09 15:01:18 dawes Exp $ default xkb_compatibility "xtest" { // Minimal set of symbol interpretations to provide Index: xc/programs/xkbcomp/compiled/Imakefile diff -u xc/programs/xkbcomp/compiled/Imakefile:1.1.1.2 xc/programs/xkbcomp/compiled/Imakefile:1.2 --- xc/programs/xkbcomp/compiled/Imakefile:1.1.1.2 Tue Jan 16 17:57:33 2001 +++ xc/programs/xkbcomp/compiled/Imakefile Mon Jan 9 10:01:18 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:35 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/compiled/Imakefile,v 1.2 2006/01/09 15:01:18 dawes Exp $ DATAFILES = README Index: xc/programs/xkbcomp/cross/Imakefile diff -u xc/programs/xkbcomp/cross/Imakefile:1.4 xc/programs/xkbcomp/cross/Imakefile:1.5 --- xc/programs/xkbcomp/cross/Imakefile:1.4 Tue May 27 13:58:24 2003 +++ xc/programs/xkbcomp/cross/Imakefile Fri Oct 14 11:17:34 2005 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ -XCOMM $XFree86: xc/programs/xkbcomp/cross/Imakefile,v 1.4 2003/05/27 17:58:24 tsi Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/cross/Imakefile,v 1.5 2005/10/14 15:17:34 tsi Exp $ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' @@ -17,7 +16,7 @@ ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\" -INCLUDES = -I.. -I$(EXTINCSRC) +INCLUDES = -I.. YaccFile(xkbparse,$(YFLAGS)) Index: xc/programs/xkbcomp/geometry/Imakefile diff -u xc/programs/xkbcomp/geometry/Imakefile:3.16 xc/programs/xkbcomp/geometry/Imakefile:3.17 --- xc/programs/xkbcomp/geometry/Imakefile:3.16 Mon Aug 4 00:22:13 2003 +++ xc/programs/xkbcomp/geometry/Imakefile Mon Jan 9 10:01:18 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:35 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/geometry/Imakefile,v 3.16 2003/08/04 04:22:13 dawes Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/geometry/Imakefile,v 3.17 2006/01/09 15:01:18 dawes Exp $ #define IHaveSubdirs Index: xc/programs/xkbcomp/geometry/amiga diff -u xc/programs/xkbcomp/geometry/amiga:3.3 xc/programs/xkbcomp/geometry/amiga:3.4 --- xc/programs/xkbcomp/geometry/amiga:3.3 Wed Jan 17 18:45:49 2001 +++ xc/programs/xkbcomp/geometry/amiga Mon Jan 9 10:01:18 2006 @@ -1,8 +1,4 @@ -// $Xorg: amiga,v 1.3 2000/08/17 19:54:35 cpqbld Exp $ - - - -// $XFree86: xc/programs/xkbcomp/geometry/amiga,v 3.3 2001/01/17 23:45:49 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/amiga,v 3.4 2006/01/09 15:01:18 dawes Exp $ default xkb_geometry "usa1" { Index: xc/programs/xkbcomp/geometry/ataritt diff -u xc/programs/xkbcomp/geometry/ataritt:3.3 xc/programs/xkbcomp/geometry/ataritt:3.4 --- xc/programs/xkbcomp/geometry/ataritt:3.3 Wed Jan 17 18:45:49 2001 +++ xc/programs/xkbcomp/geometry/ataritt Mon Jan 9 10:01:18 2006 @@ -1,8 +1,4 @@ -// $Xorg: ataritt,v 1.3 2000/08/17 19:54:35 cpqbld Exp $ - - - -// $XFree86: xc/programs/xkbcomp/geometry/ataritt,v 3.3 2001/01/17 23:45:49 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/ataritt,v 3.4 2006/01/09 15:01:18 dawes Exp $ default xkb_geometry "us" { Index: xc/programs/xkbcomp/geometry/dell diff -u xc/programs/xkbcomp/geometry/dell:3.7 xc/programs/xkbcomp/geometry/dell:3.8 --- xc/programs/xkbcomp/geometry/dell:3.7 Fri Oct 24 16:38:19 2003 +++ xc/programs/xkbcomp/geometry/dell Mon Jan 9 10:01:18 2006 @@ -1,5 +1,3 @@ -// $Xorg: dell,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/geometry/dell,v 3.7 2003/10/24 20:38:19 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/dell,v 3.8 2006/01/09 15:01:18 dawes Exp $ // default xkb_geometry "dell101" { Index: xc/programs/xkbcomp/geometry/everex diff -u xc/programs/xkbcomp/geometry/everex:1.3 xc/programs/xkbcomp/geometry/everex:1.4 --- xc/programs/xkbcomp/geometry/everex:1.3 Fri Oct 24 16:38:19 2003 +++ xc/programs/xkbcomp/geometry/everex Mon Jan 9 10:01:18 2006 @@ -1,6 +1,4 @@ -// $Xorg: everex,v 1.3 2000/08/17 19:54:35 cpqbld Exp $ -// -// $XFree86: xc/programs/xkbcomp/geometry/everex,v 1.3 2003/10/24 20:38:19 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/everex,v 1.4 2006/01/09 15:01:18 dawes Exp $ // default xkb_geometry "STEPnote" { Index: xc/programs/xkbcomp/geometry/fujitsu diff -u xc/programs/xkbcomp/geometry/fujitsu:1.2 xc/programs/xkbcomp/geometry/fujitsu:1.3 --- xc/programs/xkbcomp/geometry/fujitsu:1.2 Fri Dec 14 15:01:57 2001 +++ xc/programs/xkbcomp/geometry/fujitsu Mon Jan 9 10:01:18 2006 @@ -1,4 +1,4 @@ -// $Xorg: fujitsu,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/fujitsu,v 1.3 2006/01/09 15:01:18 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/geometry/hp diff -u xc/programs/xkbcomp/geometry/hp:1.9 xc/programs/xkbcomp/geometry/hp:1.10 --- xc/programs/xkbcomp/geometry/hp:1.9 Sat Sep 27 09:31:57 2003 +++ xc/programs/xkbcomp/geometry/hp Mon Jan 9 10:01:19 2006 @@ -1,5 +1,3 @@ -// $Xorg: hp,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/geometry/hp,v 1.9 2003/09/27 13:31:57 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/hp,v 1.10 2006/01/09 15:01:19 dawes Exp $ default xkb_geometry "pc101" { Index: xc/programs/xkbcomp/geometry/keytronic diff -u xc/programs/xkbcomp/geometry/keytronic:1.4 xc/programs/xkbcomp/geometry/keytronic:1.5 --- xc/programs/xkbcomp/geometry/keytronic:1.4 Fri Oct 24 16:38:19 2003 +++ xc/programs/xkbcomp/geometry/keytronic Mon Jan 9 10:01:19 2006 @@ -1,5 +1,3 @@ -// $Xorg: keytronic,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/geometry/keytronic,v 1.4 2003/10/24 20:38:19 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/keytronic,v 1.5 2006/01/09 15:01:19 dawes Exp $ // default xkb_geometry "FlexPro" { Index: xc/programs/xkbcomp/geometry/kinesis diff -u xc/programs/xkbcomp/geometry/kinesis:3.4 xc/programs/xkbcomp/geometry/kinesis:3.5 --- xc/programs/xkbcomp/geometry/kinesis:3.4 Fri Oct 24 16:38:19 2003 +++ xc/programs/xkbcomp/geometry/kinesis Mon Jan 9 10:01:19 2006 @@ -1,6 +1,4 @@ -// $Xorg: kinesis,v 1.3 2000/08/17 19:54:35 cpqbld Exp $ -// -// $XFree86: xc/programs/xkbcomp/geometry/kinesis,v 3.4 2003/10/24 20:38:19 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/kinesis,v 3.5 2006/01/09 15:01:19 dawes Exp $ // default xkb_geometry "model100" { Index: xc/programs/xkbcomp/geometry/microsoft diff -u xc/programs/xkbcomp/geometry/microsoft:3.4 xc/programs/xkbcomp/geometry/microsoft:3.5 --- xc/programs/xkbcomp/geometry/microsoft:3.4 Fri Oct 24 16:38:19 2003 +++ xc/programs/xkbcomp/geometry/microsoft Mon Jan 9 10:01:19 2006 @@ -1,6 +1,4 @@ -// $Xorg: microsoft,v 1.3 2000/08/17 19:54:35 cpqbld Exp $ -// -// $XFree86: xc/programs/xkbcomp/geometry/microsoft,v 3.4 2003/10/24 20:38:19 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/microsoft,v 3.5 2006/01/09 15:01:19 dawes Exp $ // default xkb_geometry "natural" { Index: xc/programs/xkbcomp/geometry/nec diff -u xc/programs/xkbcomp/geometry/nec:3.5 xc/programs/xkbcomp/geometry/nec:3.6 --- xc/programs/xkbcomp/geometry/nec:3.5 Fri Dec 14 15:01:58 2001 +++ xc/programs/xkbcomp/geometry/nec Mon Jan 9 10:01:19 2006 @@ -1,5 +1,3 @@ -// $Xorg: nec,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/geometry/nec,v 3.5 2001/12/14 20:01:58 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/nec,v 3.6 2006/01/09 15:01:19 dawes Exp $ default xkb_geometry "pc98" { Index: xc/programs/xkbcomp/geometry/northgate diff -u xc/programs/xkbcomp/geometry/northgate:1.3 xc/programs/xkbcomp/geometry/northgate:1.4 --- xc/programs/xkbcomp/geometry/northgate:1.3 Fri Oct 24 16:38:19 2003 +++ xc/programs/xkbcomp/geometry/northgate Mon Jan 9 10:01:19 2006 @@ -1,6 +1,4 @@ -// $Xorg: northgate,v 1.3 2000/08/17 19:54:36 cpqbld Exp $ -// -// $XFree86: xc/programs/xkbcomp/geometry/northgate,v 1.3 2003/10/24 20:38:19 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/northgate,v 1.4 2006/01/09 15:01:19 dawes Exp $ // default xkb_geometry "omnikey101" { Index: xc/programs/xkbcomp/geometry/pc diff -u xc/programs/xkbcomp/geometry/pc:3.17 xc/programs/xkbcomp/geometry/pc:3.18 --- xc/programs/xkbcomp/geometry/pc:3.17 Fri Jun 25 09:23:25 2004 +++ xc/programs/xkbcomp/geometry/pc Mon Jan 9 10:01:19 2006 @@ -1,5 +1,3 @@ -// $Xorg: pc,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/geometry/pc,v 3.17 2004/06/25 13:23:25 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/pc,v 3.18 2006/01/09 15:01:19 dawes Exp $ default xkb_geometry "pc101" { Index: xc/programs/xkbcomp/geometry/sony diff -u xc/programs/xkbcomp/geometry/sony:1.2 xc/programs/xkbcomp/geometry/sony:1.3 --- xc/programs/xkbcomp/geometry/sony:1.2 Fri Dec 14 15:01:58 2001 +++ xc/programs/xkbcomp/geometry/sony Mon Jan 9 10:01:19 2006 @@ -1,4 +1,4 @@ -// $Xorg: sony,v 1.4 2001/02/09 02:05:51 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/sony,v 1.3 2006/01/09 15:01:19 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/geometry/sun diff -u xc/programs/xkbcomp/geometry/sun:1.7 xc/programs/xkbcomp/geometry/sun:1.8 --- xc/programs/xkbcomp/geometry/sun:1.7 Sat Aug 9 10:30:47 2003 +++ xc/programs/xkbcomp/geometry/sun Mon Jan 9 10:01:19 2006 @@ -1,5 +1,3 @@ -// $Xorg: sun,v 1.4 2001/02/09 02:05:51 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/geometry/sun,v 1.7 2003/08/09 14:30:47 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/sun,v 1.8 2006/01/09 15:01:19 dawes Exp $ // xkb_geometry "type4" { Index: xc/programs/xkbcomp/geometry/winbook diff -u xc/programs/xkbcomp/geometry/winbook:1.1.1.2 xc/programs/xkbcomp/geometry/winbook:1.2 --- xc/programs/xkbcomp/geometry/winbook:1.1.1.2 Tue Jan 16 17:58:04 2001 +++ xc/programs/xkbcomp/geometry/winbook Mon Jan 9 10:01:19 2006 @@ -1,4 +1,4 @@ -// $Xorg: winbook,v 1.3 2000/08/17 19:54:36 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/winbook,v 1.2 2006/01/09 15:01:19 dawes Exp $ default xkb_geometry "XP5" { description= "WinBook XP5"; Index: xc/programs/xkbcomp/geometry/digital/Imakefile diff -u xc/programs/xkbcomp/geometry/digital/Imakefile:1.1.1.2 xc/programs/xkbcomp/geometry/digital/Imakefile:1.2 --- xc/programs/xkbcomp/geometry/digital/Imakefile:1.1.1.2 Tue Jan 16 17:58:06 2001 +++ xc/programs/xkbcomp/geometry/digital/Imakefile Mon Jan 9 10:01:19 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:36 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/geometry/digital/Imakefile,v 1.2 2006/01/09 15:01:19 dawes Exp $ #undef lk #undef pc Index: xc/programs/xkbcomp/geometry/digital/lk diff -u xc/programs/xkbcomp/geometry/digital/lk:3.3 xc/programs/xkbcomp/geometry/digital/lk:3.4 --- xc/programs/xkbcomp/geometry/digital/lk:3.3 Wed Jan 17 18:45:50 2001 +++ xc/programs/xkbcomp/geometry/digital/lk Mon Jan 9 10:01:20 2006 @@ -1,4 +1,4 @@ -// $Xorg: lk,v 1.3 2000/08/17 19:54:36 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/digital/lk,v 3.4 2006/01/09 15:01:20 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/geometry/digital/pc diff -u xc/programs/xkbcomp/geometry/digital/pc:3.3 xc/programs/xkbcomp/geometry/digital/pc:3.4 --- xc/programs/xkbcomp/geometry/digital/pc:3.3 Wed Jan 17 18:45:50 2001 +++ xc/programs/xkbcomp/geometry/digital/pc Mon Jan 9 10:01:20 2006 @@ -1,4 +1,4 @@ -// $Xorg: pc,v 1.3 2000/08/17 19:54:36 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/digital/pc,v 3.4 2006/01/09 15:01:20 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/geometry/digital/unix diff -u xc/programs/xkbcomp/geometry/digital/unix:3.2 xc/programs/xkbcomp/geometry/digital/unix:3.3 --- xc/programs/xkbcomp/geometry/digital/unix:3.2 Wed Jan 17 18:45:50 2001 +++ xc/programs/xkbcomp/geometry/digital/unix Mon Jan 9 10:01:20 2006 @@ -1,4 +1,4 @@ -// $Xorg: unix,v 1.3 2000/08/17 19:54:36 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/digital/unix,v 3.3 2006/01/09 15:01:20 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/geometry/sgi/Imakefile diff -u xc/programs/xkbcomp/geometry/sgi/Imakefile:1.3 xc/programs/xkbcomp/geometry/sgi/Imakefile:1.4 --- xc/programs/xkbcomp/geometry/sgi/Imakefile:1.3 Wed Jan 17 18:45:50 2001 +++ xc/programs/xkbcomp/geometry/sgi/Imakefile Mon Jan 9 10:01:20 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:36 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/geometry/sgi/Imakefile,v 1.4 2006/01/09 15:01:20 dawes Exp $ DATAFILES = indy indigo O2 Index: xc/programs/xkbcomp/geometry/sgi/O2 diff -u xc/programs/xkbcomp/geometry/sgi/O2:3.4 xc/programs/xkbcomp/geometry/sgi/O2:3.5 --- xc/programs/xkbcomp/geometry/sgi/O2:3.4 Fri Oct 24 16:38:19 2003 +++ xc/programs/xkbcomp/geometry/sgi/O2 Mon Jan 9 10:01:20 2006 @@ -1,5 +1,3 @@ -// $Xorg: O2,v 1.3 2000/08/17 19:54:36 cpqbld Exp $ -// // Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. // // Permission to use, copy, modify, and distribute this @@ -23,7 +21,7 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH // THE USE OR PERFORMANCE OF THIS SOFTWARE. // -// $XFree86: xc/programs/xkbcomp/geometry/sgi/O2,v 3.4 2003/10/24 20:38:19 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/sgi/O2,v 3.5 2006/01/09 15:01:20 dawes Exp $ // default xkb_geometry "pc101" { Index: xc/programs/xkbcomp/geometry/sgi/indigo diff -u xc/programs/xkbcomp/geometry/sgi/indigo:3.4 xc/programs/xkbcomp/geometry/sgi/indigo:3.5 --- xc/programs/xkbcomp/geometry/sgi/indigo:3.4 Fri Oct 24 16:38:20 2003 +++ xc/programs/xkbcomp/geometry/sgi/indigo Mon Jan 9 10:01:20 2006 @@ -1,5 +1,3 @@ -// $Xorg: indigo,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ -// // Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. // // Permission to use, copy, modify, and distribute this @@ -23,7 +21,7 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH // THE USE OR PERFORMANCE OF THIS SOFTWARE. // -// $XFree86: xc/programs/xkbcomp/geometry/sgi/indigo,v 3.4 2003/10/24 20:38:20 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/sgi/indigo,v 3.5 2006/01/09 15:01:20 dawes Exp $ // default xkb_geometry "pc101" { Index: xc/programs/xkbcomp/geometry/sgi/indy diff -u xc/programs/xkbcomp/geometry/sgi/indy:3.5 xc/programs/xkbcomp/geometry/sgi/indy:3.6 --- xc/programs/xkbcomp/geometry/sgi/indy:3.5 Fri Oct 24 16:38:20 2003 +++ xc/programs/xkbcomp/geometry/sgi/indy Mon Jan 9 10:01:20 2006 @@ -1,5 +1,3 @@ -// $Xorg: indy,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ -// // Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. // // Permission to use, copy, modify, and distribute this @@ -23,7 +21,7 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH // THE USE OR PERFORMANCE OF THIS SOFTWARE. // -// $XFree86: xc/programs/xkbcomp/geometry/sgi/indy,v 3.5 2003/10/24 20:38:20 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/geometry/sgi/indy,v 3.6 2006/01/09 15:01:20 dawes Exp $ // default xkb_geometry "pc101" { Index: xc/programs/xkbcomp/keycodes/Imakefile diff -u xc/programs/xkbcomp/keycodes/Imakefile:3.16 xc/programs/xkbcomp/keycodes/Imakefile:3.17 --- xc/programs/xkbcomp/keycodes/Imakefile:3.16 Sat Feb 15 17:22:44 2003 +++ xc/programs/xkbcomp/keycodes/Imakefile Mon Jan 9 10:01:20 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/keycodes/Imakefile,v 3.16 2003/02/15 22:22:44 dawes Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/keycodes/Imakefile,v 3.17 2006/01/09 15:01:20 dawes Exp $ #define IHaveSubdirs Index: xc/programs/xkbcomp/keycodes/amiga diff -u xc/programs/xkbcomp/keycodes/amiga:3.3 xc/programs/xkbcomp/keycodes/amiga:3.4 --- xc/programs/xkbcomp/keycodes/amiga:3.3 Wed Jan 17 18:45:51 2001 +++ xc/programs/xkbcomp/keycodes/amiga Mon Jan 9 10:01:20 2006 @@ -1,8 +1,4 @@ -// $Xorg: amiga,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ - - - -// $XFree86: xc/programs/xkbcomp/keycodes/amiga,v 3.3 2001/01/17 23:45:51 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/amiga,v 3.4 2006/01/09 15:01:20 dawes Exp $ default xkb_keycodes "usa1" { Index: xc/programs/xkbcomp/keycodes/ataritt diff -u xc/programs/xkbcomp/keycodes/ataritt:3.2 xc/programs/xkbcomp/keycodes/ataritt:3.3 --- xc/programs/xkbcomp/keycodes/ataritt:3.2 Wed Jan 17 18:45:51 2001 +++ xc/programs/xkbcomp/keycodes/ataritt Mon Jan 9 10:01:20 2006 @@ -1,8 +1,4 @@ -// $Xorg: ataritt,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ - - - -// $XFree86: xc/programs/xkbcomp/keycodes/ataritt,v 3.2 2001/01/17 23:45:51 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/ataritt,v 3.3 2006/01/09 15:01:20 dawes Exp $ default xkb_keycodes "us" { Index: xc/programs/xkbcomp/keycodes/fujitsu diff -u xc/programs/xkbcomp/keycodes/fujitsu:1.2 xc/programs/xkbcomp/keycodes/fujitsu:1.3 --- xc/programs/xkbcomp/keycodes/fujitsu:1.2 Fri Dec 14 15:01:59 2001 +++ xc/programs/xkbcomp/keycodes/fujitsu Mon Jan 9 10:01:20 2006 @@ -1,4 +1,4 @@ -// $Xorg: fujitsu,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/fujitsu,v 1.3 2006/01/09 15:01:20 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/keycodes/hp diff -u xc/programs/xkbcomp/keycodes/hp:1.5 xc/programs/xkbcomp/keycodes/hp:1.6 --- xc/programs/xkbcomp/keycodes/hp:1.5 Fri Dec 14 15:02:00 2001 +++ xc/programs/xkbcomp/keycodes/hp Mon Jan 9 10:01:20 2006 @@ -1,4 +1,4 @@ -// $Xorg: hp,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/hp,v 1.6 2006/01/09 15:01:20 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/keycodes/ibm diff -u xc/programs/xkbcomp/keycodes/ibm:1.2 xc/programs/xkbcomp/keycodes/ibm:1.3 --- xc/programs/xkbcomp/keycodes/ibm:1.2 Fri Dec 14 15:02:00 2001 +++ xc/programs/xkbcomp/keycodes/ibm Mon Jan 9 10:01:20 2006 @@ -1,4 +1,4 @@ -// $Xorg: ibm,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/ibm,v 1.3 2006/01/09 15:01:20 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/keycodes/macintosh diff -u xc/programs/xkbcomp/keycodes/macintosh:1.5 xc/programs/xkbcomp/keycodes/macintosh:1.6 --- xc/programs/xkbcomp/keycodes/macintosh:1.5 Wed Oct 3 03:44:22 2001 +++ xc/programs/xkbcomp/keycodes/macintosh Mon Jan 9 10:01:20 2006 @@ -1,4 +1,3 @@ -// $XConsortium: macintosh /main/10 1996/01/24 12:17:35 kaleb $ // //Copyright (c) 1996 X Consortium // @@ -26,7 +25,7 @@ //other dealings in this Software without prior written authorization //from the X Consortium. // -// $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.5 2001/10/03 07:44:22 alanh Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.6 2006/01/09 15:01:20 dawes Exp $ // default xkb_keycodes "macintosh" { Index: xc/programs/xkbcomp/keycodes/powerpcps2 diff -u xc/programs/xkbcomp/keycodes/powerpcps2:1.1 xc/programs/xkbcomp/keycodes/powerpcps2:1.2 --- xc/programs/xkbcomp/keycodes/powerpcps2:1.1 Tue Sep 19 08:46:23 2000 +++ xc/programs/xkbcomp/keycodes/powerpcps2 Mon Jan 9 10:01:20 2006 @@ -1,5 +1,4 @@ -// $XConsortium: xfree86 /main/4 1996/08/31 12:16:59 kaleb $ -// $XFree86: xc/programs/xkbcomp/keycodes/powerpcps2,v 1.1 2000/09/19 12:46:23 eich Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/powerpcps2,v 1.2 2006/01/09 15:01:20 dawes Exp $ default xkb_keycodes "powerpcps2" { minimum= 8; Index: xc/programs/xkbcomp/keycodes/sony diff -u xc/programs/xkbcomp/keycodes/sony:1.2 xc/programs/xkbcomp/keycodes/sony:1.3 --- xc/programs/xkbcomp/keycodes/sony:1.2 Fri Dec 14 15:02:00 2001 +++ xc/programs/xkbcomp/keycodes/sony Mon Jan 9 10:01:20 2006 @@ -1,4 +1,4 @@ -// $Xorg: sony,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/sony,v 1.3 2006/01/09 15:01:20 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/keycodes/sun diff -u xc/programs/xkbcomp/keycodes/sun:3.6 xc/programs/xkbcomp/keycodes/sun:3.7 --- xc/programs/xkbcomp/keycodes/sun:3.6 Sat Aug 9 10:30:48 2003 +++ xc/programs/xkbcomp/keycodes/sun Mon Jan 9 10:01:20 2006 @@ -1,5 +1,3 @@ -// $Xorg: sun,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keycodes/sun,v 3.6 2003/08/09 14:30:48 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/sun,v 3.7 2006/01/09 15:01:20 dawes Exp $ // default xkb_keycodes "type4" { Index: xc/programs/xkbcomp/keycodes/xfree86 diff -u xc/programs/xkbcomp/keycodes/xfree86:3.31 xc/programs/xkbcomp/keycodes/xfree86:3.32 --- xc/programs/xkbcomp/keycodes/xfree86:3.31 Tue Oct 26 23:12:03 2004 +++ xc/programs/xkbcomp/keycodes/xfree86 Mon Jan 9 10:01:20 2006 @@ -1,9 +1,4 @@ -// $Xorg: xfree86,v 1.3 2000/08/17 19:54:37 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.31 2004/10/27 03:12:03 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.32 2006/01/09 15:01:20 dawes Exp $ // "standard" XFree86 codes // It seems that the "default" must be the first entry in the file. Index: xc/programs/xkbcomp/keycodes/xfree98 diff -u xc/programs/xkbcomp/keycodes/xfree98:3.7 xc/programs/xkbcomp/keycodes/xfree98:3.8 --- xc/programs/xkbcomp/keycodes/xfree98:3.7 Fri Dec 14 15:02:00 2001 +++ xc/programs/xkbcomp/keycodes/xfree98 Mon Jan 9 10:01:20 2006 @@ -1,5 +1,3 @@ -// $Xorg: xfree98,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keycodes/xfree98,v 3.7 2001/12/14 20:02:00 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/xfree98,v 3.8 2006/01/09 15:01:20 dawes Exp $ // default xkb_keycodes "pc98" { Index: xc/programs/xkbcomp/keycodes/digital/Imakefile diff -u xc/programs/xkbcomp/keycodes/digital/Imakefile:1.1.1.2 xc/programs/xkbcomp/keycodes/digital/Imakefile:1.2 --- xc/programs/xkbcomp/keycodes/digital/Imakefile:1.1.1.2 Tue Jan 16 17:58:40 2001 +++ xc/programs/xkbcomp/keycodes/digital/Imakefile Mon Jan 9 10:01:21 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:38 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/keycodes/digital/Imakefile,v 1.2 2006/01/09 15:01:21 dawes Exp $ #undef lk #undef pc Index: xc/programs/xkbcomp/keycodes/digital/lk diff -u xc/programs/xkbcomp/keycodes/digital/lk:3.2 xc/programs/xkbcomp/keycodes/digital/lk:3.3 --- xc/programs/xkbcomp/keycodes/digital/lk:3.2 Wed Jan 17 18:45:52 2001 +++ xc/programs/xkbcomp/keycodes/digital/lk Mon Jan 9 10:01:21 2006 @@ -1,4 +1,4 @@ -// $Xorg: lk,v 1.3 2000/08/17 19:54:38 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/digital/lk,v 3.3 2006/01/09 15:01:21 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/keycodes/digital/pc diff -u xc/programs/xkbcomp/keycodes/digital/pc:3.2 xc/programs/xkbcomp/keycodes/digital/pc:3.3 --- xc/programs/xkbcomp/keycodes/digital/pc:3.2 Wed Jan 17 18:45:52 2001 +++ xc/programs/xkbcomp/keycodes/digital/pc Mon Jan 9 10:01:21 2006 @@ -1,4 +1,4 @@ -// $Xorg: pc,v 1.3 2000/08/17 19:54:38 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/digital/pc,v 3.3 2006/01/09 15:01:21 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/keycodes/sgi/Imakefile diff -u xc/programs/xkbcomp/keycodes/sgi/Imakefile:3.2 xc/programs/xkbcomp/keycodes/sgi/Imakefile:3.3 --- xc/programs/xkbcomp/keycodes/sgi/Imakefile:3.2 Wed Jan 17 18:45:52 2001 +++ xc/programs/xkbcomp/keycodes/sgi/Imakefile Mon Jan 9 10:01:21 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/keycodes/sgi/Imakefile,v 3.3 2006/01/09 15:01:21 dawes Exp $ #undef indy #undef indigo Index: xc/programs/xkbcomp/keycodes/sgi/indigo diff -u xc/programs/xkbcomp/keycodes/sgi/indigo:3.2 xc/programs/xkbcomp/keycodes/sgi/indigo:3.3 --- xc/programs/xkbcomp/keycodes/sgi/indigo:3.2 Wed Jan 17 18:45:52 2001 +++ xc/programs/xkbcomp/keycodes/sgi/indigo Mon Jan 9 10:01:21 2006 @@ -1,4 +1,4 @@ -// $Xorg: indigo,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/sgi/indigo,v 3.3 2006/01/09 15:01:21 dawes Exp $ default xkb_keycodes "pc101" { minimum= 10; maximum= 118; Index: xc/programs/xkbcomp/keycodes/sgi/indy diff -u xc/programs/xkbcomp/keycodes/sgi/indy:3.3 xc/programs/xkbcomp/keycodes/sgi/indy:3.4 --- xc/programs/xkbcomp/keycodes/sgi/indy:3.3 Wed Jan 17 18:45:52 2001 +++ xc/programs/xkbcomp/keycodes/sgi/indy Mon Jan 9 10:01:21 2006 @@ -1,4 +1,4 @@ -// $Xorg: indy,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/sgi/indy,v 3.4 2006/01/09 15:01:21 dawes Exp $ default xkb_keycodes "universal" { minimum= 15; maximum= 149; Index: xc/programs/xkbcomp/keycodes/sgi/iris diff -u xc/programs/xkbcomp/keycodes/sgi/iris:3.2 xc/programs/xkbcomp/keycodes/sgi/iris:3.3 --- xc/programs/xkbcomp/keycodes/sgi/iris:3.2 Wed Jan 17 18:45:52 2001 +++ xc/programs/xkbcomp/keycodes/sgi/iris Mon Jan 9 10:01:21 2006 @@ -1,4 +1,4 @@ -// $Xorg: iris,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keycodes/sgi/iris,v 3.3 2006/01/09 15:01:21 dawes Exp $ default xkb_keycodes "iris" { include "sgi/indigo(pc101)" indicator 1 = "L1"; Index: xc/programs/xkbcomp/keymap/Imakefile diff -u xc/programs/xkbcomp/keymap/Imakefile:3.10 xc/programs/xkbcomp/keymap/Imakefile:3.11 --- xc/programs/xkbcomp/keymap/Imakefile:3.10 Sat Feb 15 17:22:44 2003 +++ xc/programs/xkbcomp/keymap/Imakefile Mon Jan 9 10:01:21 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/keymap/Imakefile,v 3.10 2003/02/15 22:22:44 dawes Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/keymap/Imakefile,v 3.11 2006/01/09 15:01:21 dawes Exp $ #define IHaveSubdirs Index: xc/programs/xkbcomp/keymap/amiga diff -u xc/programs/xkbcomp/keymap/amiga:3.3 xc/programs/xkbcomp/keymap/amiga:3.4 --- xc/programs/xkbcomp/keymap/amiga:3.3 Wed Jan 17 18:45:53 2001 +++ xc/programs/xkbcomp/keymap/amiga Mon Jan 9 10:01:21 2006 @@ -1,9 +1,4 @@ -// $Xorg: amiga,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/keymap/amiga,v 3.3 2001/01/17 23:45:53 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/amiga,v 3.4 2006/01/09 15:01:21 dawes Exp $ default xkb_keymap "usa1" { xkb_keycodes { include "amiga(usa1)" }; Index: xc/programs/xkbcomp/keymap/ataritt diff -u xc/programs/xkbcomp/keymap/ataritt:3.2 xc/programs/xkbcomp/keymap/ataritt:3.3 --- xc/programs/xkbcomp/keymap/ataritt:3.2 Wed Jan 17 18:45:53 2001 +++ xc/programs/xkbcomp/keymap/ataritt Mon Jan 9 10:01:22 2006 @@ -1,9 +1,4 @@ -// $Xorg: ataritt,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/keymap/ataritt,v 3.2 2001/01/17 23:45:53 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/ataritt,v 3.3 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "us" { xkb_keycodes { include "ataritt(us)" }; Index: xc/programs/xkbcomp/keymap/macintosh diff -u xc/programs/xkbcomp/keymap/macintosh:1.2 xc/programs/xkbcomp/keymap/macintosh:1.3 --- xc/programs/xkbcomp/keymap/macintosh:1.2 Mon Mar 5 15:18:25 2001 +++ xc/programs/xkbcomp/keymap/macintosh Mon Jan 9 10:01:22 2006 @@ -1,5 +1,4 @@ -// $XConsortium: macintosh /main/11 1996/03/07 13:42:13 kaleb $ -// $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.2 2001/03/05 20:18:25 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.3 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "macintosh" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sony diff -u xc/programs/xkbcomp/keymap/sony:3.4 xc/programs/xkbcomp/keymap/sony:3.5 --- xc/programs/xkbcomp/keymap/sony:3.4 Fri Dec 14 15:02:01 2001 +++ xc/programs/xkbcomp/keymap/sony Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: sony,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sony,v 3.5 2006/01/09 15:01:22 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/keymap/xfree98 diff -u xc/programs/xkbcomp/keymap/xfree98:3.7 xc/programs/xkbcomp/keymap/xfree98:3.8 --- xc/programs/xkbcomp/keymap/xfree98:3.7 Fri Dec 14 15:02:01 2001 +++ xc/programs/xkbcomp/keymap/xfree98 Mon Jan 9 10:01:22 2006 @@ -1,5 +1,3 @@ -// $Xorg: xfree98,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/xfree98,v 3.7 2001/12/14 20:02:01 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/xfree98,v 3.8 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "jp" { xkb_keycodes { include "xfree98" }; Index: xc/programs/xkbcomp/keymap/digital/Imakefile diff -u xc/programs/xkbcomp/keymap/digital/Imakefile:1.1.1.2 xc/programs/xkbcomp/keymap/digital/Imakefile:1.2 --- xc/programs/xkbcomp/keymap/digital/Imakefile:1.1.1.2 Tue Jan 16 17:56:33 2001 +++ xc/programs/xkbcomp/keymap/digital/Imakefile Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/keymap/digital/Imakefile,v 1.2 2006/01/09 15:01:22 dawes Exp $ DATAFILES = us Index: xc/programs/xkbcomp/keymap/digital/us diff -u xc/programs/xkbcomp/keymap/digital/us:3.3 xc/programs/xkbcomp/keymap/digital/us:3.4 --- xc/programs/xkbcomp/keymap/digital/us:3.3 Wed Jan 17 18:45:53 2001 +++ xc/programs/xkbcomp/keymap/digital/us Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: us,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/digital/us,v 3.4 2006/01/09 15:01:22 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/keymap/sgi/Imakefile diff -u xc/programs/xkbcomp/keymap/sgi/Imakefile:3.5 xc/programs/xkbcomp/keymap/sgi/Imakefile:3.6 --- xc/programs/xkbcomp/keymap/sgi/Imakefile:3.5 Fri May 18 22:05:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/Imakefile Mon Jan 9 10:01:22 2006 @@ -1,10 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ - - - - - -XCOMM $XFree86: xc/programs/xkbcomp/keymap/sgi/Imakefile,v 3.5 2001/05/19 02:05:55 dawes Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/keymap/sgi/Imakefile,v 3.6 2006/01/09 15:01:22 dawes Exp $ DATAFILES = be bg ca cz cz_qwerty de de_CH dk dvorak en_US es fi fr fr_CH \ gb hu it jp no pl pt ru se sk sk_qwerty th us Index: xc/programs/xkbcomp/keymap/sgi/be diff -u xc/programs/xkbcomp/keymap/sgi/be:3.3 xc/programs/xkbcomp/keymap/sgi/be:3.4 --- xc/programs/xkbcomp/keymap/sgi/be:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/be Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: be,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/be,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/bg diff -u xc/programs/xkbcomp/keymap/sgi/bg:3.3 xc/programs/xkbcomp/keymap/sgi/bg:3.4 --- xc/programs/xkbcomp/keymap/sgi/bg:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/bg Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: bg,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/bg,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/ca diff -u xc/programs/xkbcomp/keymap/sgi/ca:3.3 xc/programs/xkbcomp/keymap/sgi/ca:3.4 --- xc/programs/xkbcomp/keymap/sgi/ca:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/ca Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: ca,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/ca,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/cz diff -u xc/programs/xkbcomp/keymap/sgi/cz:1.2 xc/programs/xkbcomp/keymap/sgi/cz:1.3 --- xc/programs/xkbcomp/keymap/sgi/cz:1.2 Fri May 18 22:05:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/cz Mon Jan 9 10:01:22 2006 @@ -1,8 +1,4 @@ -// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ -// -// -// -// $XFree86: xc/programs/xkbcomp/keymap/sgi/cz,v 1.2 2001/05/19 02:05:55 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/cz,v 1.3 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; Index: xc/programs/xkbcomp/keymap/sgi/cz_qwerty diff -u xc/programs/xkbcomp/keymap/sgi/cz_qwerty:1.2 xc/programs/xkbcomp/keymap/sgi/cz_qwerty:1.3 --- xc/programs/xkbcomp/keymap/sgi/cz_qwerty:1.2 Fri May 18 22:05:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/cz_qwerty Mon Jan 9 10:01:22 2006 @@ -1,8 +1,4 @@ -// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ -// -// -// -// $XFree86: xc/programs/xkbcomp/keymap/sgi/cz_qwerty,v 1.2 2001/05/19 02:05:55 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/cz_qwerty,v 1.3 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; Index: xc/programs/xkbcomp/keymap/sgi/de diff -u xc/programs/xkbcomp/keymap/sgi/de:3.3 xc/programs/xkbcomp/keymap/sgi/de:3.4 --- xc/programs/xkbcomp/keymap/sgi/de:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/de Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: de,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/de,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/de_CH diff -u xc/programs/xkbcomp/keymap/sgi/de_CH:3.3 xc/programs/xkbcomp/keymap/sgi/de_CH:3.4 --- xc/programs/xkbcomp/keymap/sgi/de_CH:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/de_CH Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/de_CH,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/dk diff -u xc/programs/xkbcomp/keymap/sgi/dk:3.3 xc/programs/xkbcomp/keymap/sgi/dk:3.4 --- xc/programs/xkbcomp/keymap/sgi/dk:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/dk Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: dk,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/dk,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/dvorak diff -u xc/programs/xkbcomp/keymap/sgi/dvorak:3.3 xc/programs/xkbcomp/keymap/sgi/dvorak:3.4 --- xc/programs/xkbcomp/keymap/sgi/dvorak:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/dvorak Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: dvorak,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/dvorak,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/en_US diff -u xc/programs/xkbcomp/keymap/sgi/en_US:3.3 xc/programs/xkbcomp/keymap/sgi/en_US:3.4 --- xc/programs/xkbcomp/keymap/sgi/en_US:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/en_US Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: en_US,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/en_US,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/es diff -u xc/programs/xkbcomp/keymap/sgi/es:3.3 xc/programs/xkbcomp/keymap/sgi/es:3.4 --- xc/programs/xkbcomp/keymap/sgi/es:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/es Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: es,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/es,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/fi diff -u xc/programs/xkbcomp/keymap/sgi/fi:3.3 xc/programs/xkbcomp/keymap/sgi/fi:3.4 --- xc/programs/xkbcomp/keymap/sgi/fi:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/fi Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: fi,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/fi,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/fr diff -u xc/programs/xkbcomp/keymap/sgi/fr:3.3 xc/programs/xkbcomp/keymap/sgi/fr:3.4 --- xc/programs/xkbcomp/keymap/sgi/fr:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/fr Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: fr,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/fr,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/fr_CH diff -u xc/programs/xkbcomp/keymap/sgi/fr_CH:3.3 xc/programs/xkbcomp/keymap/sgi/fr_CH:3.4 --- xc/programs/xkbcomp/keymap/sgi/fr_CH:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/fr_CH Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: fr_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/fr_CH,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/gb diff -u xc/programs/xkbcomp/keymap/sgi/gb:3.3 xc/programs/xkbcomp/keymap/sgi/gb:3.4 --- xc/programs/xkbcomp/keymap/sgi/gb:3.3 Wed Jan 17 18:45:54 2001 +++ xc/programs/xkbcomp/keymap/sgi/gb Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: gb,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/gb,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/hu diff -u xc/programs/xkbcomp/keymap/sgi/hu:1.2 xc/programs/xkbcomp/keymap/sgi/hu:1.3 --- xc/programs/xkbcomp/keymap/sgi/hu:1.2 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/hu Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: hu,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/hu,v 1.3 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/it diff -u xc/programs/xkbcomp/keymap/sgi/it:3.3 xc/programs/xkbcomp/keymap/sgi/it:3.4 --- xc/programs/xkbcomp/keymap/sgi/it:3.3 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/it Mon Jan 9 10:01:22 2006 @@ -1,4 +1,4 @@ -// $Xorg: it,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/it,v 3.4 2006/01/09 15:01:22 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/jp diff -u xc/programs/xkbcomp/keymap/sgi/jp:1.2 xc/programs/xkbcomp/keymap/sgi/jp:1.3 --- xc/programs/xkbcomp/keymap/sgi/jp:1.2 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/jp Mon Jan 9 10:01:23 2006 @@ -1,4 +1,4 @@ -// $Xorg: jp,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/jp,v 1.3 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(jp106)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/no diff -u xc/programs/xkbcomp/keymap/sgi/no:3.3 xc/programs/xkbcomp/keymap/sgi/no:3.4 --- xc/programs/xkbcomp/keymap/sgi/no:3.3 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/no Mon Jan 9 10:01:23 2006 @@ -1,4 +1,4 @@ -// $Xorg: no,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/no,v 3.4 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/pl diff -u xc/programs/xkbcomp/keymap/sgi/pl:3.3 xc/programs/xkbcomp/keymap/sgi/pl:3.4 --- xc/programs/xkbcomp/keymap/sgi/pl:3.3 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/pl Mon Jan 9 10:01:23 2006 @@ -1,4 +1,4 @@ -// $Xorg: pl,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/pl,v 3.4 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/pt diff -u xc/programs/xkbcomp/keymap/sgi/pt:3.3 xc/programs/xkbcomp/keymap/sgi/pt:3.4 --- xc/programs/xkbcomp/keymap/sgi/pt:3.3 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/pt Mon Jan 9 10:01:23 2006 @@ -1,4 +1,4 @@ -// $Xorg: pt,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/pt,v 3.4 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/ru diff -u xc/programs/xkbcomp/keymap/sgi/ru:3.3 xc/programs/xkbcomp/keymap/sgi/ru:3.4 --- xc/programs/xkbcomp/keymap/sgi/ru:3.3 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/ru Mon Jan 9 10:01:23 2006 @@ -1,4 +1,4 @@ -// $Xorg: ru,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/ru,v 3.4 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/se diff -u xc/programs/xkbcomp/keymap/sgi/se:3.3 xc/programs/xkbcomp/keymap/sgi/se:3.4 --- xc/programs/xkbcomp/keymap/sgi/se:3.3 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/se Mon Jan 9 10:01:23 2006 @@ -1,4 +1,4 @@ -// $Xorg: se,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/se,v 3.4 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/sk diff -u xc/programs/xkbcomp/keymap/sgi/sk:1.2 xc/programs/xkbcomp/keymap/sgi/sk:1.3 --- xc/programs/xkbcomp/keymap/sgi/sk:1.2 Fri May 18 22:05:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/sk Mon Jan 9 10:01:23 2006 @@ -1,8 +1,4 @@ -// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ -// -// -// -// $XFree86: xc/programs/xkbcomp/keymap/sgi/sk,v 1.2 2001/05/19 02:05:55 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/sk,v 1.3 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; Index: xc/programs/xkbcomp/keymap/sgi/sk_qwerty diff -u xc/programs/xkbcomp/keymap/sgi/sk_qwerty:1.2 xc/programs/xkbcomp/keymap/sgi/sk_qwerty:1.3 --- xc/programs/xkbcomp/keymap/sgi/sk_qwerty:1.2 Fri May 18 22:05:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/sk_qwerty Mon Jan 9 10:01:23 2006 @@ -1,8 +1,4 @@ -// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $ -// -// -// -// $XFree86: xc/programs/xkbcomp/keymap/sgi/sk_qwerty,v 1.2 2001/05/19 02:05:55 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/sk_qwerty,v 1.3 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; Index: xc/programs/xkbcomp/keymap/sgi/th diff -u xc/programs/xkbcomp/keymap/sgi/th:3.3 xc/programs/xkbcomp/keymap/sgi/th:3.4 --- xc/programs/xkbcomp/keymap/sgi/th:3.3 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/th Mon Jan 9 10:01:23 2006 @@ -1,4 +1,4 @@ -// $Xorg: th,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/th,v 3.4 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sgi/us diff -u xc/programs/xkbcomp/keymap/sgi/us:3.3 xc/programs/xkbcomp/keymap/sgi/us:3.4 --- xc/programs/xkbcomp/keymap/sgi/us:3.3 Wed Jan 17 18:45:55 2001 +++ xc/programs/xkbcomp/keymap/sgi/us Mon Jan 9 10:01:23 2006 @@ -1,4 +1,4 @@ -// $Xorg: us,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sgi/us,v 3.4 2006/01/09 15:01:23 dawes Exp $ default xkb_keymap "indy" { xkb_keycodes { include "sgi/indy(universal)" }; xkb_types { include "default" }; Index: xc/programs/xkbcomp/keymap/sun/Imakefile diff -u xc/programs/xkbcomp/keymap/sun/Imakefile:3.5 xc/programs/xkbcomp/keymap/sun/Imakefile:3.6 --- xc/programs/xkbcomp/keymap/sun/Imakefile:3.5 Wed Jan 17 18:45:56 2001 +++ xc/programs/xkbcomp/keymap/sun/Imakefile Mon Jan 9 10:01:23 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/keymap/sun/Imakefile,v 3.5 2001/01/17 23:45:56 dawes Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/keymap/sun/Imakefile,v 3.6 2006/01/09 15:01:23 dawes Exp $ DATAFILES = de es fi fr no pl ru se uk us Index: xc/programs/xkbcomp/keymap/sun/de diff -u xc/programs/xkbcomp/keymap/sun/de:3.5 xc/programs/xkbcomp/keymap/sun/de:3.6 --- xc/programs/xkbcomp/keymap/sun/de:3.5 Fri Dec 14 15:02:01 2001 +++ xc/programs/xkbcomp/keymap/sun/de Mon Jan 9 10:01:24 2006 @@ -1,4 +1,4 @@ -// $Xorg: de,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/de,v 3.6 2006/01/09 15:01:24 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/keymap/sun/es diff -u xc/programs/xkbcomp/keymap/sun/es:1.3 xc/programs/xkbcomp/keymap/sun/es:1.4 --- xc/programs/xkbcomp/keymap/sun/es:1.3 Fri Dec 14 15:02:01 2001 +++ xc/programs/xkbcomp/keymap/sun/es Mon Jan 9 10:01:24 2006 @@ -1,4 +1,3 @@ -// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $ // //Copyright 1996, 1998 The Open Group // @@ -24,7 +23,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/es,v 1.3 2001/12/14 20:02:01 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/es,v 1.4 2006/01/09 15:01:24 dawes Exp $ // xkb_keymap "type4_es" { xkb_keycodes { include "sun(type4_euro)" }; Index: xc/programs/xkbcomp/keymap/sun/fi diff -u xc/programs/xkbcomp/keymap/sun/fi:1.3 xc/programs/xkbcomp/keymap/sun/fi:1.4 --- xc/programs/xkbcomp/keymap/sun/fi:1.3 Fri Dec 14 15:02:02 2001 +++ xc/programs/xkbcomp/keymap/sun/fi Mon Jan 9 10:01:24 2006 @@ -1,4 +1,3 @@ -// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $ // //Copyright 1996, 1998 The Open Group // @@ -24,7 +23,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/fi,v 1.3 2001/12/14 20:02:02 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/fi,v 1.4 2006/01/09 15:01:24 dawes Exp $ // xkb_keymap "type4_fi" { xkb_keycodes { include "sun(type4_euro)" }; Index: xc/programs/xkbcomp/keymap/sun/fr diff -u xc/programs/xkbcomp/keymap/sun/fr:1.3 xc/programs/xkbcomp/keymap/sun/fr:1.4 --- xc/programs/xkbcomp/keymap/sun/fr:1.3 Fri Dec 14 15:02:02 2001 +++ xc/programs/xkbcomp/keymap/sun/fr Mon Jan 9 10:01:24 2006 @@ -1,4 +1,3 @@ -// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $ // //Copyright 1996, 1998 The Open Group // @@ -24,7 +23,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/fr,v 1.3 2001/12/14 20:02:02 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/fr,v 1.4 2006/01/09 15:01:24 dawes Exp $ // xkb_keymap "type4_fr" { xkb_keycodes { include "sun(type4_euro)" }; Index: xc/programs/xkbcomp/keymap/sun/no diff -u xc/programs/xkbcomp/keymap/sun/no:1.3 xc/programs/xkbcomp/keymap/sun/no:1.4 --- xc/programs/xkbcomp/keymap/sun/no:1.3 Fri Dec 14 15:02:02 2001 +++ xc/programs/xkbcomp/keymap/sun/no Mon Jan 9 10:01:24 2006 @@ -1,4 +1,3 @@ -// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $ // //Copyright 1996, 1998 The Open Group // @@ -24,7 +23,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/no,v 1.3 2001/12/14 20:02:02 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/no,v 1.4 2006/01/09 15:01:24 dawes Exp $ // xkb_keymap "type4_no" { xkb_keycodes { include "sun(type4_euro)" }; Index: xc/programs/xkbcomp/keymap/sun/pl diff -u xc/programs/xkbcomp/keymap/sun/pl:1.3 xc/programs/xkbcomp/keymap/sun/pl:1.4 --- xc/programs/xkbcomp/keymap/sun/pl:1.3 Fri Dec 14 15:02:02 2001 +++ xc/programs/xkbcomp/keymap/sun/pl Mon Jan 9 10:01:24 2006 @@ -1,4 +1,3 @@ -// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $ // //Copyright 1996, 1998 The Open Group // @@ -24,7 +23,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/pl,v 1.3 2001/12/14 20:02:02 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/pl,v 1.4 2006/01/09 15:01:24 dawes Exp $ // xkb_keymap "type4_pl" { xkb_keycodes { include "sun(type4_euro)" }; Index: xc/programs/xkbcomp/keymap/sun/ru diff -u xc/programs/xkbcomp/keymap/sun/ru:1.3 xc/programs/xkbcomp/keymap/sun/ru:1.4 --- xc/programs/xkbcomp/keymap/sun/ru:1.3 Fri Dec 14 15:02:02 2001 +++ xc/programs/xkbcomp/keymap/sun/ru Mon Jan 9 10:01:24 2006 @@ -1,4 +1,3 @@ -// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $ // //Copyright 1996, 1998 The Open Group // @@ -24,7 +23,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/ru,v 1.3 2001/12/14 20:02:02 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/ru,v 1.4 2006/01/09 15:01:24 dawes Exp $ // xkb_keymap "type4_ru" { xkb_keycodes { include "sun(type4_euro)" }; Index: xc/programs/xkbcomp/keymap/sun/uk diff -u xc/programs/xkbcomp/keymap/sun/uk:1.3 xc/programs/xkbcomp/keymap/sun/uk:1.4 --- xc/programs/xkbcomp/keymap/sun/uk:1.3 Fri Dec 14 15:02:02 2001 +++ xc/programs/xkbcomp/keymap/sun/uk Mon Jan 9 10:01:24 2006 @@ -1,4 +1,3 @@ -// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $ // //Copyright 1996, 1998 The Open Group // @@ -24,7 +23,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/keymap/sun/uk,v 1.3 2001/12/14 20:02:02 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/uk,v 1.4 2006/01/09 15:01:24 dawes Exp $ // xkb_keymap "type4_uk" { xkb_keycodes { include "sun(type4_euro)" }; Index: xc/programs/xkbcomp/keymap/sun/us diff -u xc/programs/xkbcomp/keymap/sun/us:3.4 xc/programs/xkbcomp/keymap/sun/us:3.5 --- xc/programs/xkbcomp/keymap/sun/us:3.4 Fri Dec 14 15:02:02 2001 +++ xc/programs/xkbcomp/keymap/sun/us Mon Jan 9 10:01:24 2006 @@ -1,4 +1,4 @@ -// $Xorg: us,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/keymap/sun/us,v 3.5 2006/01/09 15:01:24 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/rules/Imakefile diff -u xc/programs/xkbcomp/rules/Imakefile:3.5 xc/programs/xkbcomp/rules/Imakefile:3.6 --- xc/programs/xkbcomp/rules/Imakefile:3.5 Sat Feb 15 17:22:44 2003 +++ xc/programs/xkbcomp/rules/Imakefile Mon Jan 9 10:01:24 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/rules/Imakefile,v 3.6 2006/01/09 15:01:24 dawes Exp $ DATAFILES = README sgi xfree86 sun LISTFILES = sgi.lst xfree86.lst xfree86-it.lst sun.lst xfree86.xml Index: xc/programs/xkbcomp/rules/sgi diff -u xc/programs/xkbcomp/rules/sgi:3.2 xc/programs/xkbcomp/rules/sgi:3.3 --- xc/programs/xkbcomp/rules/sgi:3.2 Wed Jan 17 18:45:57 2001 +++ xc/programs/xkbcomp/rules/sgi Mon Jan 9 10:01:24 2006 @@ -1,4 +1,4 @@ -// $Xorg: sgi,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/rules/sgi,v 3.3 2006/01/09 15:01:24 dawes Exp $ ! option = symbols grp:switch = +group(switch) Index: xc/programs/xkbcomp/rules/sgi.lst diff -u xc/programs/xkbcomp/rules/sgi.lst:3.7 xc/programs/xkbcomp/rules/sgi.lst:3.8 --- xc/programs/xkbcomp/rules/sgi.lst:3.7 Wed May 23 12:03:51 2001 +++ xc/programs/xkbcomp/rules/sgi.lst Mon Jan 9 10:01:24 2006 @@ -1,9 +1,4 @@ -// $Xorg: sgi.lst,v 1.3 2000/08/17 19:54:41 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/rules/sgi.lst,v 3.7 2001/05/23 16:03:51 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/rules/sgi.lst,v 3.8 2006/01/09 15:01:24 dawes Exp $ ! model indy SGI O2, Indigo^2 or Indy Index: xc/programs/xkbcomp/rules/xfree86 diff -u xc/programs/xkbcomp/rules/xfree86:3.85 xc/programs/xkbcomp/rules/xfree86:3.86 --- xc/programs/xkbcomp/rules/xfree86:3.85 Thu Nov 18 16:26:18 2004 +++ xc/programs/xkbcomp/rules/xfree86 Mon Jan 9 10:01:24 2006 @@ -1,11 +1,9 @@ -// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - // // Rules for resolving XKB components for use with XFree86 // Copyright 1996 by Joseph Moss // // 2002 Modifier: Ivan Pascal The XFree86 Project -// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.85 2004/11/18 21:26:18 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.86 2006/01/09 15:01:24 dawes Exp $ // // Layouts that still need be composed by old rules Index: xc/programs/xkbcomp/rules/xfree86-it.lst diff -u xc/programs/xkbcomp/rules/xfree86-it.lst:1.7 xc/programs/xkbcomp/rules/xfree86-it.lst:1.8 --- xc/programs/xkbcomp/rules/xfree86-it.lst:1.7 Mon Nov 25 09:05:06 2002 +++ xc/programs/xkbcomp/rules/xfree86-it.lst Mon Jan 9 10:01:24 2006 @@ -1,10 +1,8 @@ -// $Xorg: xfree86-it.lst,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - // // Elenco dei modelli e dei lingauggi // Copyright 1996 by Joseph Moss // -// $XFree86: xc/programs/xkbcomp/rules/xfree86-it.lst,v 1.7 2002/11/25 14:05:06 eich Exp $ +// $XFree86: xc/programs/xkbcomp/rules/xfree86-it.lst,v 1.8 2006/01/09 15:01:24 dawes Exp $ ! model microsoft Microsoft Natural Index: xc/programs/xkbcomp/rules/xfree86.lst diff -u xc/programs/xkbcomp/rules/xfree86.lst:3.87 xc/programs/xkbcomp/rules/xfree86.lst:3.88 --- xc/programs/xkbcomp/rules/xfree86.lst:3.87 Fri Feb 25 13:25:36 2005 +++ xc/programs/xkbcomp/rules/xfree86.lst Fri Jun 10 22:02:03 2005 @@ -1,10 +1,8 @@ -// $Xorg: xfree86.lst,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - +// $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.88 2005/06/11 02:02:03 dawes Exp $ // // Rules descriptions for XFree86 // Copyright 1996 by Joseph Moss // -// $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.87 2005/02/25 18:25:36 dawes Exp $ ! model pc101 Generic 101-key PC @@ -42,7 +40,7 @@ presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard ipaq Compaq iPaq Keyboard dell Dell - inspiron Laptop/notebook Dell Inspiron 8xxx + inspiron Laptop/notebook Dell Inspiron 6xxx, 8xxx dexxa Dexxa Wireless Desktop Keyboard diamond Diamond 9801 / 9802 series dtk2000 DTK2000 Index: xc/programs/xkbcomp/semantics/Imakefile diff -u xc/programs/xkbcomp/semantics/Imakefile:1.1.1.2 xc/programs/xkbcomp/semantics/Imakefile:1.2 --- xc/programs/xkbcomp/semantics/Imakefile:1.1.1.2 Tue Jan 16 17:59:02 2001 +++ xc/programs/xkbcomp/semantics/Imakefile Mon Jan 9 10:01:24 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/semantics/Imakefile,v 1.2 2006/01/09 15:01:24 dawes Exp $ DATAFILES = basic complete default xtest Index: xc/programs/xkbcomp/semantics/basic diff -u xc/programs/xkbcomp/semantics/basic:1.1.1.3 xc/programs/xkbcomp/semantics/basic:1.2 --- xc/programs/xkbcomp/semantics/basic:1.1.1.3 Tue Jan 16 17:59:05 2001 +++ xc/programs/xkbcomp/semantics/basic Mon Jan 9 10:01:24 2006 @@ -1,4 +1,4 @@ -// $Xorg: basic,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/semantics/basic,v 1.2 2006/01/09 15:01:24 dawes Exp $ default xkb_semantics "basic" { xkb_types { include "basic" }; Index: xc/programs/xkbcomp/semantics/complete diff -u xc/programs/xkbcomp/semantics/complete:1.1.1.3 xc/programs/xkbcomp/semantics/complete:1.2 --- xc/programs/xkbcomp/semantics/complete:1.1.1.3 Tue Jan 16 17:59:07 2001 +++ xc/programs/xkbcomp/semantics/complete Mon Jan 9 10:01:24 2006 @@ -1,4 +1,4 @@ -// $Xorg: complete,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/semantics/complete,v 1.2 2006/01/09 15:01:24 dawes Exp $ default xkb_semantics "complete" { xkb_types { include "complete" }; Index: xc/programs/xkbcomp/semantics/default diff -u xc/programs/xkbcomp/semantics/default:1.1.1.3 xc/programs/xkbcomp/semantics/default:1.2 --- xc/programs/xkbcomp/semantics/default:1.1.1.3 Tue Jan 16 17:59:09 2001 +++ xc/programs/xkbcomp/semantics/default Mon Jan 9 10:01:25 2006 @@ -1,4 +1,4 @@ -// $Xorg: default,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/semantics/default,v 1.2 2006/01/09 15:01:25 dawes Exp $ default xkb_semantics "default" { xkb_types { include "default" }; Index: xc/programs/xkbcomp/semantics/xtest diff -u xc/programs/xkbcomp/semantics/xtest:1.1.1.2 xc/programs/xkbcomp/semantics/xtest:1.2 --- xc/programs/xkbcomp/semantics/xtest:1.1.1.2 Tue Jan 16 17:59:10 2001 +++ xc/programs/xkbcomp/semantics/xtest Mon Jan 9 10:01:25 2006 @@ -1,4 +1,4 @@ -// $Xorg: xtest,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/semantics/xtest,v 1.2 2006/01/09 15:01:25 dawes Exp $ default xkb_semantics "xtest" { xkb_types { include "basic" }; Index: xc/programs/xkbcomp/symbols/Imakefile diff -u xc/programs/xkbcomp/symbols/Imakefile:3.65 xc/programs/xkbcomp/symbols/Imakefile:3.66 --- xc/programs/xkbcomp/symbols/Imakefile:3.65 Fri Feb 25 13:25:36 2005 +++ xc/programs/xkbcomp/symbols/Imakefile Fri Dec 16 20:07:23 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/symbols/Imakefile,v 3.65 2005/02/25 18:25:36 dawes Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/Imakefile,v 3.66 2005/12/17 01:07:23 dawes Exp $ #define IHaveSubdirs @@ -13,7 +8,7 @@ be ben bg br bs by \ ca ca_enhanced compose ctrl \ czsk cz cz_qwerty \ - de de_CH dev dk dvorak \ + de de_CH dev dk dvorak dvorak_intl \ ee el en_US es \ fi fo fr fr_CH \ gb ge_la ge_ru group guj gur \ Index: xc/programs/xkbcomp/symbols/am diff -u xc/programs/xkbcomp/symbols/am:1.5 xc/programs/xkbcomp/symbols/am:1.6 --- xc/programs/xkbcomp/symbols/am:1.5 Thu May 29 08:41:58 2003 +++ xc/programs/xkbcomp/symbols/am Mon Jan 9 10:01:25 2006 @@ -1,6 +1,4 @@ -// $XConsortium: am /main/3 1997/12/18 12:40:12 rch $ -// -// $XFree86: xc/programs/xkbcomp/symbols/am,v 1.5 2003/05/29 12:41:58 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/am,v 1.6 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/ar diff -u xc/programs/xkbcomp/symbols/ar:1.2 xc/programs/xkbcomp/symbols/ar:1.3 --- xc/programs/xkbcomp/symbols/ar:1.2 Wed Jan 16 13:20:12 2002 +++ xc/programs/xkbcomp/symbols/ar Mon Jan 9 10:01:25 2006 @@ -1,5 +1,4 @@ -// $XConsortium: th /main/3 1996/08/31 12:20:18 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/ar,v 1.2 2002/01/16 18:20:12 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/ar,v 1.3 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { name[Group2]= "Arabic"; Index: xc/programs/xkbcomp/symbols/az diff -u xc/programs/xkbcomp/symbols/az:1.2 xc/programs/xkbcomp/symbols/az:1.3 --- xc/programs/xkbcomp/symbols/az:1.2 Wed Nov 21 17:28:52 2001 +++ xc/programs/xkbcomp/symbols/az Mon Jan 9 10:01:25 2006 @@ -1,9 +1,7 @@ -// $TOG: us /main/12 1997/06/14 06:37:07 kaleb $ - // // symbols definition for a very simple Azerbaidjani keyboard layout. -// $XFree86: xc/programs/xkbcomp/symbols/az,v 1.2 2001/11/21 22:28:52 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/az,v 1.3 2006/01/09 15:01:25 dawes Exp $ // both latin and cyrillic layouts are available. // the cyrillic layout uses the corresponding latin letters in group2; // so it is useful to type in latin for people accostumed to cyrillic layout Index: xc/programs/xkbcomp/symbols/be diff -u xc/programs/xkbcomp/symbols/be:3.5 xc/programs/xkbcomp/symbols/be:3.6 --- xc/programs/xkbcomp/symbols/be:3.5 Wed Jan 17 18:45:57 2001 +++ xc/programs/xkbcomp/symbols/be Mon Jan 9 10:01:25 2006 @@ -1,9 +1,4 @@ -// $Xorg: be,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/be,v 3.5 2001/01/17 23:45:57 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/be,v 3.6 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/ben diff -u xc/programs/xkbcomp/symbols/ben:1.3 xc/programs/xkbcomp/symbols/ben:1.4 --- xc/programs/xkbcomp/symbols/ben:1.3 Wed Sep 15 11:42:38 2004 +++ xc/programs/xkbcomp/symbols/ben Mon Jan 9 10:01:25 2006 @@ -1,5 +1,4 @@ -// $XConsortium: th /main/3 1996/08/31 12:20:18 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/ben,v 1.3 2004/09/15 15:42:38 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/ben,v 1.4 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { name[Group2]= "Bengali"; Index: xc/programs/xkbcomp/symbols/bg diff -u xc/programs/xkbcomp/symbols/bg:3.3 xc/programs/xkbcomp/symbols/bg:3.4 --- xc/programs/xkbcomp/symbols/bg:3.3 Wed Jan 17 18:45:57 2001 +++ xc/programs/xkbcomp/symbols/bg Mon Jan 9 10:01:25 2006 @@ -1,5 +1,3 @@ -// $Xorg: ca,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - ////////////////////////////////////////////////////////////////////////// // Copyright (C) 1999, 2000 by Anton Zinoviev // @@ -12,7 +10,7 @@ // ////////////////////////////////////////////////////////////////////////// -// $XFree86: xc/programs/xkbcomp/symbols/bg,v 3.3 2001/01/17 23:45:57 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/bg,v 3.4 2006/01/09 15:01:25 dawes Exp $ // Version 1.6r1 Index: xc/programs/xkbcomp/symbols/ca diff -u xc/programs/xkbcomp/symbols/ca:3.8 xc/programs/xkbcomp/symbols/ca:3.9 --- xc/programs/xkbcomp/symbols/ca:3.8 Fri May 18 19:35:35 2001 +++ xc/programs/xkbcomp/symbols/ca Mon Jan 9 10:01:25 2006 @@ -1,9 +1,4 @@ -// $Xorg: ca,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/ca,v 3.8 2001/05/18 23:35:35 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/ca,v 3.9 2006/01/09 15:01:25 dawes Exp $ default partial alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/de diff -u xc/programs/xkbcomp/symbols/de:3.15 xc/programs/xkbcomp/symbols/de:3.16 --- xc/programs/xkbcomp/symbols/de:3.15 Sat Sep 27 09:31:59 2003 +++ xc/programs/xkbcomp/symbols/de Mon Jan 9 10:01:25 2006 @@ -1,9 +1,4 @@ -// $Xorg: de,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/de,v 3.15 2003/09/27 13:31:59 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/de,v 3.16 2006/01/09 15:01:25 dawes Exp $ default partial alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/de_CH diff -u xc/programs/xkbcomp/symbols/de_CH:3.7 xc/programs/xkbcomp/symbols/de_CH:3.8 --- xc/programs/xkbcomp/symbols/de_CH:3.7 Sat Apr 3 08:43:42 2004 +++ xc/programs/xkbcomp/symbols/de_CH Mon Jan 9 10:01:25 2006 @@ -1,9 +1,4 @@ -// $Xorg: de_CH,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/de_CH,v 3.7 2004/04/03 13:43:42 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/de_CH,v 3.8 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/dev diff -u xc/programs/xkbcomp/symbols/dev:1.2 xc/programs/xkbcomp/symbols/dev:1.3 --- xc/programs/xkbcomp/symbols/dev:1.2 Sat Apr 3 08:43:42 2004 +++ xc/programs/xkbcomp/symbols/dev Mon Jan 9 10:01:25 2006 @@ -1,5 +1,4 @@ -// $XConsortium: th /main/3 1996/08/31 12:20:18 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/dev,v 1.2 2004/04/03 13:43:42 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/dev,v 1.3 2006/01/09 15:01:25 dawes Exp $ // Updated by David Holl partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/dk diff -u xc/programs/xkbcomp/symbols/dk:3.7 xc/programs/xkbcomp/symbols/dk:3.8 --- xc/programs/xkbcomp/symbols/dk:3.7 Wed Dec 18 20:07:54 2002 +++ xc/programs/xkbcomp/symbols/dk Mon Jan 9 10:01:25 2006 @@ -1,9 +1,4 @@ -// $Xorg: dk,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/dk,v 3.7 2002/12/19 01:07:54 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/dk,v 3.8 2006/01/09 15:01:25 dawes Exp $ partial alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/dvorak diff -u xc/programs/xkbcomp/symbols/dvorak:3.11 xc/programs/xkbcomp/symbols/dvorak:3.12 --- xc/programs/xkbcomp/symbols/dvorak:3.11 Thu Dec 18 09:14:38 2003 +++ xc/programs/xkbcomp/symbols/dvorak Mon Jan 9 10:01:25 2006 @@ -1,12 +1,10 @@ -// $Xorg: dvorak,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - // symbols definition for a very simple dvorak layout. // It has basically the alphanumeric keys, punctuation, // one shift key, one control key and caps lock. It // uses the punctuation keys configurations common on PC // keyboards (e.g. key is { [ period greater ] }) -// $XFree86: xc/programs/xkbcomp/symbols/dvorak,v 3.11 2003/12/18 14:14:38 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/dvorak,v 3.12 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/dvorak_intl diff -u /dev/null xc/programs/xkbcomp/symbols/dvorak_intl:1.1 --- /dev/null Tue May 9 21:58:37 2006 +++ xc/programs/xkbcomp/symbols/dvorak_intl Fri Dec 16 20:07:23 2005 @@ -0,0 +1,78 @@ +// +// $XFree86: xc/programs/xkbcomp/symbols/dvorak_intl,v 1.1 2005/12/17 01:07:23 dawes Exp $ +// +// Based on symbols/us_intl keyboard map: +// remapped from us to dvorak by Conrad Schuler +// (conrad_schuler@yahoo.com) +// +// Dead-keys definition for a very simple US/ASCII layout. +// by Conectiva (http://www.conectiva.com.br) +// modified by Ricardo Y. Igarashi (iga@that.com.br) + +// Added the following deadkeys, to make it truly international: +// +// dead_macron: on AltGr-minus +// dead_breve: on AltGr-parenleft +// dead_abovedot: on AltGr-period +// dead_abovering: on AltGr-0 +// dead_doubleacute: on AltGr-equal (as quotedbl is already used) +// dead_caron: on AltGr-less (AltGr-shift-comma) +// dead_cedilla: on AltGr-comma +// dead_ogonek: on AltGr-semicolon +// dead_belowdot: on AltGr-underscore (AltGr-shift-minus) +// dead_hook: on AltGr-question +// dead_horn: on AltGr-plus (AltGr-shift-equal) +// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon) +// +// those were already there: +// dead_grave +// dead_acute +// dead_circumflex +// dead_tilde +// dead_diaeresis +// +// Conrad Schuler conrad_schuler@yahoo.com +// added Eszett (ssharp) on AltGr-s + +partial default alphanumeric_keys +xkb_symbols "basic" { + + name[Group1]= "Dvorak"; + + // Alphanumeric section + key { [ dead_grave, dead_tilde ], + [ grave, asciitilde ] }; + key { [ 5, percent ], + [ EuroSign ] }; + key { [ 6, dead_circumflex ], + [ asciicircum, asciicircum ] }; + key { [ 9, parenleft ], + [ dead_breve, dead_breve ] }; + key { [ 0, parenright ], + [dead_abovering, dead_abovering ] }; + + key { [ dead_acute, dead_diaeresis ], + [ apostrophe, quotedbl ] }; + key { [ comma, less ], + [ dead_cedilla, dead_caron ] }; + key { [ period, greater ], + [ dead_abovedot,dead_circumflex ] }; + key { [ slash, question ], + [ dead_hook, dead_hook ] }; + key { [ equal, plus ], + [ dead_doubleacute, dead_horn ] }; + + key { [ e, E ], + [ EuroSign, cent ] }; + key { [ s, S ], + [ ssharp ] }; + key { [ minus, underscore ], + [ dead_macron, dead_belowdot ] }; + + key { [ semicolon, colon ], + [ dead_ogonek, dead_diaeresis ] }; + + key { [ Mode_switch, Multi_key ] }; + + // End alphanumeric section +}; Index: xc/programs/xkbcomp/symbols/en_US diff -u xc/programs/xkbcomp/symbols/en_US:3.6 xc/programs/xkbcomp/symbols/en_US:3.7 --- xc/programs/xkbcomp/symbols/en_US:3.6 Sat Oct 27 23:34:35 2001 +++ xc/programs/xkbcomp/symbols/en_US Mon Jan 9 10:01:25 2006 @@ -1,5 +1,4 @@ -// $Xorg: en_US,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ -// $XFree86: xc/programs/xkbcomp/symbols/en_US,v 3.6 2001/10/28 03:34:35 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/en_US,v 3.7 2006/01/09 15:01:25 dawes Exp $ partial hidden alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/es diff -u xc/programs/xkbcomp/symbols/es:3.5 xc/programs/xkbcomp/symbols/es:3.6 --- xc/programs/xkbcomp/symbols/es:3.5 Wed Jan 17 18:45:58 2001 +++ xc/programs/xkbcomp/symbols/es Mon Jan 9 10:01:25 2006 @@ -1,9 +1,5 @@ -// $Xorg: es,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - // Modified for a real Spanish Keyboard by Jon Tombs -// $XFree86: xc/programs/xkbcomp/symbols/es,v 3.5 2001/01/17 23:45:58 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/es,v 3.6 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/fi diff -u xc/programs/xkbcomp/symbols/fi:3.10 xc/programs/xkbcomp/symbols/fi:3.11 --- xc/programs/xkbcomp/symbols/fi:3.10 Sat Jan 25 21:48:28 2003 +++ xc/programs/xkbcomp/symbols/fi Mon Jan 9 10:01:25 2006 @@ -1,7 +1,4 @@ -// $Xorg: fi,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - -// $XFree86: xc/programs/xkbcomp/symbols/fi,v 3.10 2003/01/26 02:48:28 dawes Exp $ - +// $XFree86: xc/programs/xkbcomp/symbols/fi,v 3.11 2006/01/09 15:01:25 dawes Exp $ partial alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/fr diff -u xc/programs/xkbcomp/symbols/fr:3.6 xc/programs/xkbcomp/symbols/fr:3.7 --- xc/programs/xkbcomp/symbols/fr:3.6 Wed Jan 17 18:45:58 2001 +++ xc/programs/xkbcomp/symbols/fr Mon Jan 9 10:01:25 2006 @@ -1,9 +1,4 @@ -// $Xorg: fr,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/fr,v 3.6 2001/01/17 23:45:58 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/fr,v 3.7 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/fr_CH diff -u xc/programs/xkbcomp/symbols/fr_CH:3.5 xc/programs/xkbcomp/symbols/fr_CH:3.6 --- xc/programs/xkbcomp/symbols/fr_CH:3.5 Wed Jan 17 18:45:58 2001 +++ xc/programs/xkbcomp/symbols/fr_CH Mon Jan 9 10:01:25 2006 @@ -1,9 +1,4 @@ -// $Xorg: fr_CH,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/fr_CH,v 3.5 2001/01/17 23:45:58 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/fr_CH,v 3.6 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/gb diff -u xc/programs/xkbcomp/symbols/gb:3.8 xc/programs/xkbcomp/symbols/gb:3.9 --- xc/programs/xkbcomp/symbols/gb:3.8 Sat Apr 3 08:43:42 2004 +++ xc/programs/xkbcomp/symbols/gb Mon Jan 9 10:01:25 2006 @@ -1,9 +1,4 @@ -// $Xorg: gb,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/gb,v 3.8 2004/04/03 13:43:42 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/gb,v 3.9 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/group diff -u xc/programs/xkbcomp/symbols/group:3.10 xc/programs/xkbcomp/symbols/group:3.11 --- xc/programs/xkbcomp/symbols/group:3.10 Sat May 8 03:26:54 2004 +++ xc/programs/xkbcomp/symbols/group Mon Jan 9 10:01:25 2006 @@ -1,8 +1,7 @@ -// $Xorg: group,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ // using the group(switch) map, the right alt key temporarily chooses // the second keyboard group (until it is released). // -// $XFree86: xc/programs/xkbcomp/symbols/group,v 3.10 2004/05/08 07:26:54 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/group,v 3.11 2006/01/09 15:01:25 dawes Exp $ partial modifier_keys xkb_symbols "switch" { key { Index: xc/programs/xkbcomp/symbols/guj diff -u xc/programs/xkbcomp/symbols/guj:1.1 xc/programs/xkbcomp/symbols/guj:1.2 --- xc/programs/xkbcomp/symbols/guj:1.1 Wed Nov 21 17:28:52 2001 +++ xc/programs/xkbcomp/symbols/guj Mon Jan 9 10:01:25 2006 @@ -1,5 +1,4 @@ -// $XConsortium: th /main/3 1996/08/31 12:20:18 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/guj,v 1.1 2001/11/21 22:28:52 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/guj,v 1.2 2006/01/09 15:01:25 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { name[Group2]= "Gujarati"; Index: xc/programs/xkbcomp/symbols/gur diff -u xc/programs/xkbcomp/symbols/gur:1.1 xc/programs/xkbcomp/symbols/gur:1.2 --- xc/programs/xkbcomp/symbols/gur:1.1 Wed Nov 21 17:28:52 2001 +++ xc/programs/xkbcomp/symbols/gur Mon Jan 9 10:01:26 2006 @@ -1,5 +1,4 @@ -// $XConsortium: th /main/3 1996/08/31 12:20:18 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/gur,v 1.1 2001/11/21 22:28:52 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/gur,v 1.2 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { name[Group2]= "Gurmukhi"; Index: xc/programs/xkbcomp/symbols/il diff -u xc/programs/xkbcomp/symbols/il:1.3 xc/programs/xkbcomp/symbols/il:1.4 --- xc/programs/xkbcomp/symbols/il:1.3 Mon Feb 12 13:25:59 2001 +++ xc/programs/xkbcomp/symbols/il Mon Jan 9 10:01:26 2006 @@ -1,6 +1,4 @@ -// $XConsortium: il /main/3 1997/12/18 12:40:12 rch $ -// -// $XFree86: xc/programs/xkbcomp/symbols/il,v 1.3 2001/02/12 18:25:59 paulo Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/il,v 1.4 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys Index: xc/programs/xkbcomp/symbols/il_phonetic diff -u xc/programs/xkbcomp/symbols/il_phonetic:1.2 xc/programs/xkbcomp/symbols/il_phonetic:1.3 --- xc/programs/xkbcomp/symbols/il_phonetic:1.2 Fri Oct 27 20:34:07 2000 +++ xc/programs/xkbcomp/symbols/il_phonetic Mon Jan 9 10:01:26 2006 @@ -1,6 +1,4 @@ -// $XConsortium: il_phonetic /main/3 1997/12/18 12:40:12 rch $ -// -// $XFree86: xc/programs/xkbcomp/symbols/il_phonetic,v 1.2 2000/10/28 00:34:07 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/il_phonetic,v 1.3 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/inet diff -u xc/programs/xkbcomp/symbols/inet:1.41 xc/programs/xkbcomp/symbols/inet:1.42 --- xc/programs/xkbcomp/symbols/inet:1.41 Tue Oct 26 23:12:03 2004 +++ xc/programs/xkbcomp/symbols/inet Fri Jun 10 22:02:03 2005 @@ -1,4 +1,4 @@ - // $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.41 2004/10/27 03:12:03 dawes Exp $ + // $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.42 2005/06/11 02:02:03 dawes Exp $ // EAK (Easy Access, Internet, Multimedia, PDA) keyboards // Copyright (C) 2002 Stanislav Brabec @@ -500,12 +500,19 @@ partial alphanumeric_keys xkb_symbols "inspiron" { - name[Group1]= "Laptop/notebook Dell Inspiron 8xxx"; + name[Group1]= "Laptop/notebook Dell Inspiron 6xxx, 8xxx"; + // 8xxx key { [ XF86AudioPlay, XF86AudioPause ] }; key { [ XF86AudioPrev ] }; key { [ XF86AudioNext ] }; key { [ XF86AudioStop ] }; + // 6xxx + key { [ XF86AudioPlay, XF86AudioPause ] }; + key { [ XF86AudioPrev ] }; + key { [ XF86AudioNext ] }; + key { [ XF86AudioStop ] }; + // 6xxx, 8xxx key { [ XF86AudioRaiseVolume ] }; key { [ XF86AudioLowerVolume ] }; key { [ XF86AudioMute ] }; Index: xc/programs/xkbcomp/symbols/ir diff -u xc/programs/xkbcomp/symbols/ir:1.2 xc/programs/xkbcomp/symbols/ir:1.3 --- xc/programs/xkbcomp/symbols/ir:1.2 Thu Dec 12 23:18:03 2002 +++ xc/programs/xkbcomp/symbols/ir Mon Jan 9 10:01:26 2006 @@ -1,5 +1,4 @@ -// $XConsortium: -// $XFree86: +// $XFree86: xc/programs/xkbcomp/symbols/ir,v 1.3 2006/01/09 15:01:26 dawes Exp $ // // Iranian keymap, by Robert Brady // Data supplied by Roozbeh Pournader Index: xc/programs/xkbcomp/symbols/is diff -u xc/programs/xkbcomp/symbols/is:3.8 xc/programs/xkbcomp/symbols/is:3.9 --- xc/programs/xkbcomp/symbols/is:3.8 Mon Jan 20 16:58:55 2003 +++ xc/programs/xkbcomp/symbols/is Mon Jan 9 10:01:26 2006 @@ -1,7 +1,6 @@ -// $Xorg: is,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ // XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is // fixes by Olafur Osvaldsson - oli@isnic.is -// $XFree86: xc/programs/xkbcomp/symbols/is,v 3.8 2003/01/20 21:58:55 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/is,v 3.9 2006/01/09 15:01:26 dawes Exp $ default partial alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/iso9995-3 diff -u xc/programs/xkbcomp/symbols/iso9995-3:3.2 xc/programs/xkbcomp/symbols/iso9995-3:3.3 --- xc/programs/xkbcomp/symbols/iso9995-3:3.2 Wed Jan 17 18:45:58 2001 +++ xc/programs/xkbcomp/symbols/iso9995-3 Mon Jan 9 10:01:26 2006 @@ -1,4 +1,4 @@ -// $Xorg: iso9995-3,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/iso9995-3,v 3.3 2006/01/09 15:01:26 dawes Exp $ partial alphanumeric_keys alternate_group xkb_symbols "basic101" { // Part 3 of ISO9995 specifies a common alternate character set Index: xc/programs/xkbcomp/symbols/it diff -u xc/programs/xkbcomp/symbols/it:3.6 xc/programs/xkbcomp/symbols/it:3.7 --- xc/programs/xkbcomp/symbols/it:3.6 Sat Apr 12 08:32:23 2003 +++ xc/programs/xkbcomp/symbols/it Mon Jan 9 10:01:26 2006 @@ -1,9 +1,4 @@ -// $Xorg: it,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/it,v 3.6 2003/04/12 12:32:23 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/it,v 3.7 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/jp diff -u xc/programs/xkbcomp/symbols/jp:3.11 xc/programs/xkbcomp/symbols/jp:3.12 --- xc/programs/xkbcomp/symbols/jp:3.11 Thu Nov 13 21:45:24 2003 +++ xc/programs/xkbcomp/symbols/jp Mon Jan 9 10:01:26 2006 @@ -1,9 +1,6 @@ -// $Xorg: jp,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ - - // symbols for a Japanese 106 keyboard(by tsuka@kawalab.dnj.ynu.ac.jp) -// $XFree86: xc/programs/xkbcomp/symbols/jp,v 3.11 2003/11/14 02:45:24 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/jp,v 3.12 2006/01/09 15:01:26 dawes Exp $ default xkb_symbols "jp106" { include "srvr_ctrl(xfree86)" Index: xc/programs/xkbcomp/symbols/keypad diff -u xc/programs/xkbcomp/symbols/keypad:3.2 xc/programs/xkbcomp/symbols/keypad:3.3 --- xc/programs/xkbcomp/symbols/keypad:3.2 Wed Jan 17 18:45:59 2001 +++ xc/programs/xkbcomp/symbols/keypad Mon Jan 9 10:01:26 2006 @@ -1,4 +1,4 @@ -// $Xorg: keypad,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/keypad,v 3.3 2006/01/09 15:01:26 dawes Exp $ partial hidden keypad_keys xkb_symbols "overlay" { Index: xc/programs/xkbcomp/symbols/la diff -u xc/programs/xkbcomp/symbols/la:1.2 xc/programs/xkbcomp/symbols/la:1.3 --- xc/programs/xkbcomp/symbols/la:1.2 Tue Jun 4 18:50:58 2002 +++ xc/programs/xkbcomp/symbols/la Mon Jan 9 10:01:26 2006 @@ -1,5 +1,4 @@ -// $XConsortium: es /main/3 1996/08/31 12:19:38 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/la,v 1.2 2002/06/04 22:50:58 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/la,v 1.3 2006/01/09 15:01:26 dawes Exp $ // Modified for a real Latin American Keyboard by Fabian Mandelbaum partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/lo diff -u xc/programs/xkbcomp/symbols/lo:1.1 xc/programs/xkbcomp/symbols/lo:1.2 --- xc/programs/xkbcomp/symbols/lo:1.1 Sat Jan 25 21:38:14 2003 +++ xc/programs/xkbcomp/symbols/lo Mon Jan 9 10:01:26 2006 @@ -1,11 +1,7 @@ -// $XConsortium: lo 2002/11/28 $ -// -// $XFree86: xc/programs/xkbcomp/symbols/lo,v 1.1 2003/01/26 02:38:14 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/lo,v 1.2 2006/01/09 15:01:26 dawes Exp $ // // Lao keymap, by Anousak Souphavanh // -// -// partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/lock diff -u xc/programs/xkbcomp/symbols/lock:3.4 xc/programs/xkbcomp/symbols/lock:3.5 --- xc/programs/xkbcomp/symbols/lock:3.4 Wed Jan 17 18:45:59 2001 +++ xc/programs/xkbcomp/symbols/lock Mon Jan 9 10:01:26 2006 @@ -1,9 +1,4 @@ -// $Xorg: lock,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/lock,v 3.4 2001/01/17 23:45:59 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/lock,v 3.5 2006/01/09 15:01:26 dawes Exp $ partial hidden modifier_keys xkb_symbols "shift" { Index: xc/programs/xkbcomp/symbols/lt_a diff -u xc/programs/xkbcomp/symbols/lt_a:1.1 xc/programs/xkbcomp/symbols/lt_a:1.2 --- xc/programs/xkbcomp/symbols/lt_a:1.1 Wed Nov 21 17:28:52 2001 +++ xc/programs/xkbcomp/symbols/lt_a Mon Jan 9 10:01:26 2006 @@ -1,4 +1,4 @@ -// $XConsortium: lt /main/3 1997/12/18 12:40:12 rch $ +// $XFree86: xc/programs/xkbcomp/symbols/lt_a,v 1.2 2006/01/09 15:01:26 dawes Exp $ partial alphanumeric_keys modifier_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/lt_p diff -u xc/programs/xkbcomp/symbols/lt_p:1.3 xc/programs/xkbcomp/symbols/lt_p:1.4 --- xc/programs/xkbcomp/symbols/lt_p:1.3 Tue Nov 28 14:09:38 2000 +++ xc/programs/xkbcomp/symbols/lt_p Mon Jan 9 10:01:26 2006 @@ -1,6 +1,4 @@ -// $XConsortium: lt_p /main/3 1997/12/18 12:40:12 rch $ -// -// $XFree86: xc/programs/xkbcomp/symbols/lt_p,v 1.3 2000/11/28 19:09:38 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/lt_p,v 1.4 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys modifier_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/mm diff -u xc/programs/xkbcomp/symbols/mm:1.1 xc/programs/xkbcomp/symbols/mm:1.2 --- xc/programs/xkbcomp/symbols/mm:1.1 Wed Nov 21 17:28:52 2001 +++ xc/programs/xkbcomp/symbols/mm Mon Jan 9 10:01:26 2006 @@ -1,5 +1,4 @@ -// $XConsortium: th /main/3 1996/08/31 12:20:18 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/mm,v 1.1 2001/11/21 22:28:52 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/mm,v 1.2 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { name[Group2]= "Burmese"; Index: xc/programs/xkbcomp/symbols/no diff -u xc/programs/xkbcomp/symbols/no:3.10 xc/programs/xkbcomp/symbols/no:3.11 --- xc/programs/xkbcomp/symbols/no:3.10 Wed Dec 18 20:07:54 2002 +++ xc/programs/xkbcomp/symbols/no Mon Jan 9 10:01:26 2006 @@ -1,9 +1,4 @@ -// $Xorg: no,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/no,v 3.10 2002/12/19 01:07:54 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/no,v 3.11 2006/01/09 15:01:26 dawes Exp $ partial alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/pc104 diff -u xc/programs/xkbcomp/symbols/pc104:3.5 xc/programs/xkbcomp/symbols/pc104:3.6 --- xc/programs/xkbcomp/symbols/pc104:3.5 Fri Aug 17 09:27:58 2001 +++ xc/programs/xkbcomp/symbols/pc104 Mon Jan 9 10:01:26 2006 @@ -1,9 +1,4 @@ -// $Xorg: pc104,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/pc104,v 3.5 2001/08/17 13:27:58 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/pc104,v 3.6 2006/01/09 15:01:26 dawes Exp $ // Use "Alt_*" for both alt keys, "Meta_*" for both windows keys, and Menu for // the menu key Index: xc/programs/xkbcomp/symbols/pl diff -u xc/programs/xkbcomp/symbols/pl:3.6 xc/programs/xkbcomp/symbols/pl:3.7 --- xc/programs/xkbcomp/symbols/pl:3.6 Tue Jun 17 08:32:53 2003 +++ xc/programs/xkbcomp/symbols/pl Mon Jan 9 10:01:26 2006 @@ -1,9 +1,4 @@ -// $Xorg: pl,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/pl,v 3.6 2003/06/17 12:32:53 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/pl,v 3.7 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/pl2 diff -u xc/programs/xkbcomp/symbols/pl2:1.2 xc/programs/xkbcomp/symbols/pl2:1.3 --- xc/programs/xkbcomp/symbols/pl2:1.2 Wed Jan 29 17:30:21 2003 +++ xc/programs/xkbcomp/symbols/pl2 Mon Jan 9 10:01:26 2006 @@ -1,4 +1,3 @@ -// $XConsortium: pl2 /main/3 1996/08/31 12:20:05 kaleb $ // $XFree86: xc/programs/xkbcomp/symbols/pl2,v 3.4 1999/08/30 02:34:28 dawes Exp // $ partial default alphanumeric_keys Index: xc/programs/xkbcomp/symbols/pt diff -u xc/programs/xkbcomp/symbols/pt:3.6 xc/programs/xkbcomp/symbols/pt:3.7 --- xc/programs/xkbcomp/symbols/pt:3.6 Wed Jan 17 18:45:59 2001 +++ xc/programs/xkbcomp/symbols/pt Mon Jan 9 10:01:26 2006 @@ -1,9 +1,4 @@ -// $Xorg: pt,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/pt,v 3.6 2001/01/17 23:45:59 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/pt,v 3.7 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/ru diff -u xc/programs/xkbcomp/symbols/ru:3.10 xc/programs/xkbcomp/symbols/ru:3.11 --- xc/programs/xkbcomp/symbols/ru:3.10 Sat Feb 15 17:27:05 2003 +++ xc/programs/xkbcomp/symbols/ru Mon Jan 9 10:01:26 2006 @@ -1,9 +1,7 @@ -// $Xorg: ru,v 1.3 2000/08/17 19:54:43 cpqbld Exp $ -// // russian standard keyboard // AEN // Last Changes 2001/12/23 by Leon Kanter -// $XFree86: xc/programs/xkbcomp/symbols/ru,v 3.10 2003/02/15 22:27:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/ru,v 3.11 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/se diff -u xc/programs/xkbcomp/symbols/se:3.11 xc/programs/xkbcomp/symbols/se:3.12 --- xc/programs/xkbcomp/symbols/se:3.11 Thu May 29 08:41:58 2003 +++ xc/programs/xkbcomp/symbols/se Mon Jan 9 10:01:26 2006 @@ -1,9 +1,4 @@ -// $Xorg: se,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/se,v 3.11 2003/05/29 12:41:58 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/se,v 3.12 2006/01/09 15:01:26 dawes Exp $ partial alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/th diff -u xc/programs/xkbcomp/symbols/th:3.5 xc/programs/xkbcomp/symbols/th:3.6 --- xc/programs/xkbcomp/symbols/th:3.5 Thu Apr 3 11:34:50 2003 +++ xc/programs/xkbcomp/symbols/th Mon Jan 9 10:01:26 2006 @@ -1,9 +1,4 @@ -// $Xorg: th,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ - - - - -// $XFree86: xc/programs/xkbcomp/symbols/th,v 3.5 2003/04/03 16:34:50 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/th,v 3.6 2006/01/09 15:01:26 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/tml diff -u xc/programs/xkbcomp/symbols/tml:1.2 xc/programs/xkbcomp/symbols/tml:1.3 --- xc/programs/xkbcomp/symbols/tml:1.2 Sat May 24 07:32:52 2003 +++ xc/programs/xkbcomp/symbols/tml Mon Jan 9 10:01:26 2006 @@ -1,5 +1,4 @@ -// $XConsortium: th /main/3 1996/08/31 12:20:18 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/tml,v 1.2 2003/05/24 11:32:52 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/tml,v 1.3 2006/01/09 15:01:26 dawes Exp $ default partial alphanumeric_keys xkb_symbols "TSCII" { Index: xc/programs/xkbcomp/symbols/us diff -u xc/programs/xkbcomp/symbols/us:3.15 xc/programs/xkbcomp/symbols/us:3.16 --- xc/programs/xkbcomp/symbols/us:3.15 Fri Oct 31 09:32:04 2003 +++ xc/programs/xkbcomp/symbols/us Mon Jan 9 10:01:26 2006 @@ -1,12 +1,10 @@ -// $Xorg: us,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ - // symbols definition for a very simple US/ASCII layout. // It has basically the alphanumeric keys, punctuation, // one shift key, one control key and caps lock. It // uses the punctuation keys configurations common on PC // keyboards (e.g. key is { [ period greater ] }) -// $XFree86: xc/programs/xkbcomp/symbols/us,v 3.15 2003/10/31 14:32:04 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/us,v 3.16 2006/01/09 15:01:26 dawes Exp $ partial hidden alphanumeric_keys modifier_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/us_group2 diff -u xc/programs/xkbcomp/symbols/us_group2:1.3 xc/programs/xkbcomp/symbols/us_group2:1.4 --- xc/programs/xkbcomp/symbols/us_group2:1.3 Tue Nov 19 23:49:03 2002 +++ xc/programs/xkbcomp/symbols/us_group2 Mon Jan 9 10:01:27 2006 @@ -1,5 +1,3 @@ -// $Xorg: us,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ - // symbols definition for a very simple US/ASCII layout. // It has basically the alphanumeric keys, punctuation, // one shift key, one control key and caps lock. It @@ -10,7 +8,7 @@ // use mainly in cz* and sk* keyboards. // Modified by Jan Holesovsky , 2001 -// $XFree86: xc/programs/xkbcomp/symbols/us_group2,v 1.3 2002/11/20 04:49:03 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/us_group2,v 1.4 2006/01/09 15:01:27 dawes Exp $ partial hidden alphanumeric_keys modifier_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/us_group3 diff -u xc/programs/xkbcomp/symbols/us_group3:1.4 xc/programs/xkbcomp/symbols/us_group3:1.5 --- xc/programs/xkbcomp/symbols/us_group3:1.4 Mon Nov 25 09:05:06 2002 +++ xc/programs/xkbcomp/symbols/us_group3 Mon Jan 9 10:01:27 2006 @@ -4,11 +4,10 @@ // so that the US keyboard would show as Group 3 on the keymap. // I am reachable at eric_moreau@compuserve.com // -// $XFree86: xc/programs/xkbcomp/symbols/us_group3,v 1.4 2002/11/25 14:05:06 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/us_group3,v 1.5 2006/01/09 15:01:27 dawes Exp $ // // Original Header follows: // -// $TOG: us /main/12 1997/06/14 06:37:07 kaleb $ // symbols definition for a very simple US/ASCII layout. // It has basically the alphanumeric keys, punctuation, Index: xc/programs/xkbcomp/symbols/us_intl diff -u xc/programs/xkbcomp/symbols/us_intl:1.8 xc/programs/xkbcomp/symbols/us_intl:1.9 --- xc/programs/xkbcomp/symbols/us_intl:1.8 Thu Dec 18 17:10:41 2003 +++ xc/programs/xkbcomp/symbols/us_intl Fri Dec 16 20:07:23 2005 @@ -1,5 +1,5 @@ // -// $XFree86: xc/programs/xkbcomp/symbols/us_intl,v 1.8 2003/12/18 22:10:41 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/us_intl,v 1.9 2005/12/17 01:07:23 dawes Exp $ // // Dead-keys definition for a very simple US/ASCII layout. // by Conectiva (http://www.conectiva.com.br) @@ -26,6 +26,9 @@ // dead_circumflex // dead_tilde // dead_diaeresis +// +// Conrad Schuler conrad_schuler@yahoo.com +// added Eszett (ssharp) on AltGr-s partial default alphanumeric_keys xkb_symbols "basic" { @@ -51,6 +54,8 @@ key { [ e, E ], [ EuroSign, cent ] }; + key { [ s, S ], + [ ssharp ] }; key { [ semicolon, colon ], [ dead_ogonek, dead_diaeresis ] }; key { [ dead_acute, dead_diaeresis ], Index: xc/programs/xkbcomp/symbols/digital/Imakefile diff -u xc/programs/xkbcomp/symbols/digital/Imakefile:1.1.1.2 xc/programs/xkbcomp/symbols/digital/Imakefile:1.2 --- xc/programs/xkbcomp/symbols/digital/Imakefile:1.1.1.2 Tue Jan 16 17:59:44 2001 +++ xc/programs/xkbcomp/symbols/digital/Imakefile Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/digital/Imakefile,v 1.2 2006/01/09 15:01:28 dawes Exp $ #undef lk #undef pc Index: xc/programs/xkbcomp/symbols/digital/lk diff -u xc/programs/xkbcomp/symbols/digital/lk:3.2 xc/programs/xkbcomp/symbols/digital/lk:3.3 --- xc/programs/xkbcomp/symbols/digital/lk:3.2 Wed Jan 17 18:46:01 2001 +++ xc/programs/xkbcomp/symbols/digital/lk Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -// $Xorg: lk,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/digital/lk,v 3.3 2006/01/09 15:01:28 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/symbols/digital/pc diff -u xc/programs/xkbcomp/symbols/digital/pc:3.2 xc/programs/xkbcomp/symbols/digital/pc:3.3 --- xc/programs/xkbcomp/symbols/digital/pc:3.2 Wed Jan 17 18:46:01 2001 +++ xc/programs/xkbcomp/symbols/digital/pc Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -// $Xorg: pc,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/digital/pc,v 3.3 2006/01/09 15:01:28 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/symbols/digital/us diff -u xc/programs/xkbcomp/symbols/digital/us:3.2 xc/programs/xkbcomp/symbols/digital/us:3.3 --- xc/programs/xkbcomp/symbols/digital/us:3.2 Wed Jan 17 18:46:02 2001 +++ xc/programs/xkbcomp/symbols/digital/us Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -// $Xorg: us,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/digital/us,v 3.3 2006/01/09 15:01:28 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/symbols/digital/vt diff -u xc/programs/xkbcomp/symbols/digital/vt:3.2 xc/programs/xkbcomp/symbols/digital/vt:3.3 --- xc/programs/xkbcomp/symbols/digital/vt:3.2 Wed Jan 17 18:46:02 2001 +++ xc/programs/xkbcomp/symbols/digital/vt Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -// $Xorg: vt,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/digital/vt,v 3.3 2006/01/09 15:01:28 dawes Exp $ // //Copyright (c) 1996 Digital Equipment Corporation // Index: xc/programs/xkbcomp/symbols/fujitsu/Imakefile diff -u xc/programs/xkbcomp/symbols/fujitsu/Imakefile:1.1.1.2 xc/programs/xkbcomp/symbols/fujitsu/Imakefile:1.2 --- xc/programs/xkbcomp/symbols/fujitsu/Imakefile:1.1.1.2 Tue Jan 16 17:59:50 2001 +++ xc/programs/xkbcomp/symbols/fujitsu/Imakefile Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:44 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/fujitsu/Imakefile,v 1.2 2006/01/09 15:01:28 dawes Exp $ DATAFILES = jp us Index: xc/programs/xkbcomp/symbols/fujitsu/jp diff -u xc/programs/xkbcomp/symbols/fujitsu/jp:1.2 xc/programs/xkbcomp/symbols/fujitsu/jp:1.3 --- xc/programs/xkbcomp/symbols/fujitsu/jp:1.2 Fri Dec 14 15:02:03 2001 +++ xc/programs/xkbcomp/symbols/fujitsu/jp Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -// $Xorg: jp,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/fujitsu/jp,v 1.3 2006/01/09 15:01:28 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/symbols/fujitsu/us diff -u xc/programs/xkbcomp/symbols/fujitsu/us:1.2 xc/programs/xkbcomp/symbols/fujitsu/us:1.3 --- xc/programs/xkbcomp/symbols/fujitsu/us:1.2 Fri Dec 14 15:02:03 2001 +++ xc/programs/xkbcomp/symbols/fujitsu/us Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/fujitsu/us,v 1.3 2006/01/09 15:01:28 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/symbols/hp/Imakefile diff -u xc/programs/xkbcomp/symbols/hp/Imakefile:1.2 xc/programs/xkbcomp/symbols/hp/Imakefile:1.3 --- xc/programs/xkbcomp/symbols/hp/Imakefile:1.2 Wed Jan 17 18:46:02 2001 +++ xc/programs/xkbcomp/symbols/hp/Imakefile Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:45 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/hp/Imakefile,v 1.3 2006/01/09 15:01:28 dawes Exp $ DATAFILES = us Index: xc/programs/xkbcomp/symbols/hp/us diff -u xc/programs/xkbcomp/symbols/hp/us:1.4 xc/programs/xkbcomp/symbols/hp/us:1.5 --- xc/programs/xkbcomp/symbols/hp/us:1.4 Fri Dec 14 15:02:03 2001 +++ xc/programs/xkbcomp/symbols/hp/us Mon Jan 9 10:01:28 2006 @@ -1,4 +1,4 @@ -// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/hp/us,v 1.5 2006/01/09 15:01:28 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/symbols/macintosh/Imakefile diff -u xc/programs/xkbcomp/symbols/macintosh/Imakefile:1.3 xc/programs/xkbcomp/symbols/macintosh/Imakefile:1.4 --- xc/programs/xkbcomp/symbols/macintosh/Imakefile:1.3 Sun Oct 1 22:32:17 2000 +++ xc/programs/xkbcomp/symbols/macintosh/Imakefile Mon Jan 9 10:01:28 2006 @@ -1,7 +1,4 @@ -XCOMM $XConsortium: Imakefile /main/1 1996/01/23 06:59:52 kaleb $ -XCOMM -XCOMM -XCOMM $XFree86: xc/programs/xkbcomp/symbols/macintosh/Imakefile,v 1.3 2000/10/02 02:32:17 tsi Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/macintosh/Imakefile,v 1.4 2006/01/09 15:01:28 dawes Exp $ DATAFILES = de de_CH dk es fi fr fr_CH gb it nl no pt se us Index: xc/programs/xkbcomp/symbols/macintosh/de diff -u xc/programs/xkbcomp/symbols/macintosh/de:1.1 xc/programs/xkbcomp/symbols/macintosh/de:1.2 --- xc/programs/xkbcomp/symbols/macintosh/de:1.1 Tue Sep 19 08:46:25 2000 +++ xc/programs/xkbcomp/symbols/macintosh/de Mon Jan 9 10:01:29 2006 @@ -1,5 +1,4 @@ -// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/de,v 1.1 2000/09/19 12:46:25 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/de,v 1.2 2006/01/09 15:01:29 dawes Exp $ // olh@suse.de very close to MacOS map Index: xc/programs/xkbcomp/symbols/macintosh/dk diff -u xc/programs/xkbcomp/symbols/macintosh/dk:1.1 xc/programs/xkbcomp/symbols/macintosh/dk:1.2 --- xc/programs/xkbcomp/symbols/macintosh/dk:1.1 Tue Sep 19 08:46:25 2000 +++ xc/programs/xkbcomp/symbols/macintosh/dk Mon Jan 9 10:01:29 2006 @@ -1,5 +1,4 @@ -// $XConsortium: dk /main/3 1996/08/31 12:19:29 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/dk,v 1.1 2000/09/19 12:46:25 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/dk,v 1.2 2006/01/09 15:01:29 dawes Exp $ partial alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/macintosh/fr diff -u xc/programs/xkbcomp/symbols/macintosh/fr:1.2 xc/programs/xkbcomp/symbols/macintosh/fr:1.3 --- xc/programs/xkbcomp/symbols/macintosh/fr:1.2 Tue Sep 26 11:57:25 2000 +++ xc/programs/xkbcomp/symbols/macintosh/fr Tue Apr 12 19:27:19 2005 @@ -1,101 +1,220 @@ -// $XConsortium: macintosh /main/10 1996/01/29 19:54:54 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/fr,v 1.2 2000/09/26 15:57:25 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/fr,v 1.3 2005/04/12 23:27:19 dawes Exp $ // +// Marc.Shapiro@inria.fr 19-sep-1998 +// modifications : Etienne Herlent june 2000 +// adapted to the new input layer : +// Martin Costabel 3-jan-2001 +// adapted for Latin9 alphabet (ISO-8859-15): +// Etienne Herlent march 2005 + +// This map is an almost-complete mapping of the standard French +// MacIntosh keyboard under Xwindows. I tried to remain as faithful +// as possible to the Mac meaning of each key. I did this entirely by +// hand and by intuition, relying on the Clavier (Keyboard?) Desktop +// Accessory for the Mac meaning of keys, and on reading keysymdef.h +// to intuit the corresponding X names. Lacking proper documentation, +// I may have made some mistakes. + +// Entries marked CHECK are particularly uncertain + +// Entries marked MISSING mark Mac characters for which I was unable +// to find a corresponding keysym. (Some for sure don't: e.g. the +// Apple mark and the oe/OE character; others I may have simply not +// found.) xkb_symbols "extended" { name[Group1]= "FR-1"; + key { [ Escape ] }; // Alphanumeric section - key { [ less, greater ] }; - key { [ at, numbersign ], - [ periodcentered ] }; - key { [ ampersand, 1 ], - [ dead_acute, dead_acute] }; - key { [ eacute, 2 ] }; - key { [ quotedbl, 3 ] }; - key { [ quoteright, 4 ], - [ quoteleft ] }; - key { [ parenleft, 5 ], - [ braceleft, bracketleft ] }; - key { [ section, 6 ], - [ paragraph ] }; - key { [ egrave, 7 ], - [ guillemotleft, guillemotright ] }; - key { [ exclam, 8 ], - [ exclamdown, Ucircumflex ] }; - key { [ ccedilla, 9 ], - [ Ccedilla, Aacute ] }; - key { [ agrave, 0 ], - [ oslash, Ooblique ] }; - key { [ parenright, degree ], - [ braceright, bracketright ] }; - key { [ minus, underscore ] }; - - key { [ a, A ], - [ ae, AE ] }; + key { [ at, numbersign ], + [periodcentered, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 + key { [ KP_Enter ] }; + key { [ ampersand, 1 ], + [ VoidSymbol, dead_acute ] }; // MISSING: Apple + key { [ eacute, 2 ], + [ ediaeresis, Eacute ] }; + key { [ quotedbl, 3 ], + [ VoidSymbol, VoidSymbol ] }; // CHECK all quotemarks + key { [ apostrophe, 4 ], + [ VoidSymbol, VoidSymbol ] }; + key { [ parenleft, 5 ], + [ braceleft, bracketleft ] }; + key { [ section, 6 ], // CHECK section + [ paragraph, aring ] }; + key { [ egrave, 7 ], + [guillemotleft, guillemotright] }; + key { [ exclam, 8 ], + [ exclamdown, Ucircumflex ] }; + key { [ ccedilla, 9 ], + [ Ccedilla, Aacute ] }; + key { [ agrave, 0 ], + [ oslash, VoidSymbol ] }; // MISSING: Oslash + key { [ parenright, degree ], + [ braceright, bracketright ] }; + key { [ minus, underscore ], + [ emdash, endash ] }; // CHECK dashes + key { [ BackSpace, VoidSymbol ], + [ Delete, VoidSymbol ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ a, A ], + [ ae, AE ] }; key { [ z, Z ], - [ Acircumflex, Aring ] }; + [ Acircumflex, Aring ] }; key { [ e, E ], - [ ecircumflex, Ecircumflex ] }; + [ ecircumflex, Ecircumflex ] }; key { [ r, R ], - [ registered, currency ] }; - key { [ t, T ] }; + [ registered, currency ] }; + key { [ t, T ], + [ VoidSymbol, VoidSymbol ] }; key { [ y, Y ], - [ Uacute, ydiaeresis ] }; - key { [ u, U ] }; + [ Uacute, Ydiaeresis ] }; // MISSING: Ydiaeresis; eherlent : ok in Latin9 + key { [ u, U ], + [ VoidSymbol, ordfeminine ] }; // MISSING: ordmasculine? key { [ i, I ], - [ icircumflex, idiaeresis ] }; - key { [ o, O ] }; - key { [ p, P ] }; - key { [ dead_circumflex, dead_diaeresis ], - [ ocircumflex, Ocircumflex ] }; - key { [ dollar, asterisk ], - [ comma, yen ] }; - key { [ dead_grave, sterling ], - [ at, numbersign ] }; - - key { [ q, Q ] , - [ acircumflex, Acircumflex ] }; + [ icircumflex, idiaeresis ] }; + key { [ o, O ], + [ oe, OE ] }; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9 + key { [ p, P ], + [ VoidSymbol, VoidSymbol ] }; + key { [dead_circumflex,dead_diaeresis ], + [ ocircumflex, Ocircumflex ] }; + key { [ dollar, asterisk ], + [ EuroSign, yen ] }; // eherlent : EuroSign in Latin9 + + key { [ Caps_Lock ] }; + key { [ q, Q ], + [acircumflex, Agrave ] }; key { [ s, S ], - [ Ograve, S ] }; - key { [ d, D ] }; + [ Ograve, VoidSymbol ] }; + key { [ d, D ], + [VoidSymbol, VoidSymbol ] }; key { [ f, F ], - [ f, periodcentered ] }; - key { [ g, G ] }; + [VoidSymbol, periodcentered ] }; // MISSING: oblong script f?? + key { [ g, G ], + [VoidSymbol, VoidSymbol ] }; // MISSING: kerned fi, fl key { [ h, H ], - [ Igrave, Icircumflex ] }; + [ Igrave, Icircumflex ] }; key { [ j, J ], - [ Idiaeresis, Iacute ] }; + [Idiaeresis, Iacute ] }; key { [ k, K ], - [ Egrave, Ediaeresis ] }; + [ Egrave, Ediaeresis ] }; key { [ l, L ], - [ ssharp, bar ] }; - key { [ m, M ], - [ mu, Oacute ] }; - key { [ ugrave, percent ], - [ Ugrave, ucircumflex ] }; - key { [ Return, Return ], - [ hyphen, hyphen ] }; - - key { [ w, W ] }; - key { [ x, X ] }; + [ notsign, bar ] }; + key { [ m, M ], + [ mu, Oacute ] }; + key { [ ugrave, percent ], + [ Ugrave, ucircumflex ] }; // MISSING: per-mille + key { [ dead_grave, sterling ], + [ at, numbersign ] }; + key { [ Return ] }; + + key { [ less, greater ], + [VoidSymbol, VoidSymbol ] }; + key { [ w, W ], + [VoidSymbol, VoidSymbol ] }; // MISSING: half-guillemot (single angle bracket) + key { [ x, X ], + [VoidSymbol, VoidSymbol ] }; // CHECK similarequal; MISSING: extra-slanted slash key { [ c, C ], - [ copyright, copyright ] }; - key { [ v, V ] }; - key { [ b, B ] }; + [ copyright, cent ] }; + key { [ v, V ], + [ diamond, leftradical ] }; // CHECK diamond, leftradical + key { [ b, B ], + [ ssharp, VoidSymbol ] }; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s key { [ n, N ], - [ dead_tilde ] }; + [ dead_tilde, asciitilde ] }; key { [ comma, question ], - [ at, questiondown ] }; - key { [ semicolon, period ] }; - key { [ colon, slash ], - [ division, backslash ] }; - key { [ equal, plus ], - [ macron, plusminus ] }; + [VoidSymbol, questiondown ] }; + key { [ semicolon, period ], + [VoidSymbol, periodcentered ] }; + key { [ colon, slash ], + [ division, backslash ] }; + key { [ equal, plus ], + [VoidSymbol, plusminus ] }; + key { [ space, space ], + [nobreakspace, nobreakspace ] }; // End alphanumeric section - key { [ KP_Separator , KP_Delete ] }; + // Begin modifier mappings + key { [ Alt_L, Meta_L ] }; + key { [ Shift_L ] }; + key { [ Control_L ] }; + key { [ Mode_switch ] }; + key { [ Meta_R ] }; + key { [ Shift_R ] }; + key { [ Control_R ] }; + key { [ script_switch ] }; + // End modifier mappings + + // Begin "Function" section + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + key { [ F13, Print ] }; + key { [ F14, Scroll_Lock ] }; + key { [ F15, Pause ] }; + // End "Function" section + + // Begin "Editing" section + key { [ Insert ] }; + key { [ Home ] }; + key { [ Prior ] }; + key { [ Delete ] }; + key { [ End ] }; + key { [ Next ] }; + + key { [ Up ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Right ] }; + // End "Editing" section + + // Begin "Keypad" section + key { [ Clear ] }; + key { [ KP_Equal ] }; + key { [ KP_Divide ] }; + key { [ KP_Multiply ] }; + + key { [ KP_7 ] }; + key { [ KP_8 ] }; + key { [ KP_9 ] }; + key { [ KP_Subtract ] }; + + key { [ KP_4 ] }; + key { [ KP_5 ] }; + key { [ KP_6 ] }; + key { [ KP_Add ] }; + + key { [ KP_1 ] }; + key { [ KP_2 ] }; + key { [ KP_3 ] }; + key { [ KP_Enter ] }; + + key { [ KP_0 ] }; + key { [ comma,KP_Decimal ] }; + // End "Keypad" section + + + // begin modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Alt_L, Alt_R }; + modifier_map Mod3 { Mode_switch }; + // end modifier mappings }; + Index: xc/programs/xkbcomp/symbols/macintosh/fr_CH diff -u xc/programs/xkbcomp/symbols/macintosh/fr_CH:1.2 xc/programs/xkbcomp/symbols/macintosh/fr_CH:1.3 --- xc/programs/xkbcomp/symbols/macintosh/fr_CH:1.2 Wed Dec 6 17:00:46 2000 +++ xc/programs/xkbcomp/symbols/macintosh/fr_CH Mon Jan 9 10:01:29 2006 @@ -1,5 +1,4 @@ -// $XConsortium: fr_CH /main/3 1996/08/31 12:19:48 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/fr_CH,v 1.2 2000/12/06 22:00:46 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/fr_CH,v 1.3 2006/01/09 15:01:29 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/macintosh/gb diff -u xc/programs/xkbcomp/symbols/macintosh/gb:1.1 xc/programs/xkbcomp/symbols/macintosh/gb:1.2 --- xc/programs/xkbcomp/symbols/macintosh/gb:1.1 Tue Sep 19 08:46:25 2000 +++ xc/programs/xkbcomp/symbols/macintosh/gb Mon Jan 9 10:01:29 2006 @@ -1,5 +1,4 @@ -// $XConsortium: gb /main/3 1996/08/31 12:19:51 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/gb,v 1.1 2000/09/19 12:46:25 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/gb,v 1.2 2006/01/09 15:01:29 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/macintosh/no diff -u xc/programs/xkbcomp/symbols/macintosh/no:1.1 xc/programs/xkbcomp/symbols/macintosh/no:1.2 --- xc/programs/xkbcomp/symbols/macintosh/no:1.1 Tue Sep 19 08:46:25 2000 +++ xc/programs/xkbcomp/symbols/macintosh/no Mon Jan 9 10:01:29 2006 @@ -1,5 +1,4 @@ -// $XConsortium: no /main/3 1996/08/31 12:20:02 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/no,v 1.1 2000/09/19 12:46:25 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/no,v 1.2 2006/01/09 15:01:29 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/macintosh/pt diff -u xc/programs/xkbcomp/symbols/macintosh/pt:1.1 xc/programs/xkbcomp/symbols/macintosh/pt:1.2 --- xc/programs/xkbcomp/symbols/macintosh/pt:1.1 Tue Sep 19 08:46:25 2000 +++ xc/programs/xkbcomp/symbols/macintosh/pt Mon Jan 9 10:01:29 2006 @@ -1,5 +1,4 @@ -// $XConsortium: pt /main/3 1996/08/31 12:20:08 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/pt,v 1.1 2000/09/19 12:46:25 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/pt,v 1.2 2006/01/09 15:01:29 dawes Exp $ // mac version from Ricardo Cabral partial default alphanumeric_keys Index: xc/programs/xkbcomp/symbols/macintosh/se diff -u xc/programs/xkbcomp/symbols/macintosh/se:1.2 xc/programs/xkbcomp/symbols/macintosh/se:1.3 --- xc/programs/xkbcomp/symbols/macintosh/se:1.2 Tue Dec 5 16:18:39 2000 +++ xc/programs/xkbcomp/symbols/macintosh/se Mon Jan 9 10:01:29 2006 @@ -1,5 +1,4 @@ -// $XConsortium: se /main/3 1996/08/31 12:20:15 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/se,v 1.2 2000/12/05 21:18:39 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/se,v 1.3 2006/01/09 15:01:29 dawes Exp $ partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/macintosh/us diff -u xc/programs/xkbcomp/symbols/macintosh/us:1.10 xc/programs/xkbcomp/symbols/macintosh/us:1.11 --- xc/programs/xkbcomp/symbols/macintosh/us:1.10 Mon Sep 8 10:25:32 2003 +++ xc/programs/xkbcomp/symbols/macintosh/us Mon Jan 9 10:01:29 2006 @@ -1,5 +1,4 @@ -// $XConsortium: macintosh /main/10 1996/01/29 19:54:54 kaleb $ -// $XFree86: xc/programs/xkbcomp/symbols/macintosh/us,v 1.10 2003/09/08 14:25:32 eich Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/macintosh/us,v 1.11 2006/01/09 15:01:29 dawes Exp $ // symbols definition for a Macintosh "Extended" keyboard Index: xc/programs/xkbcomp/symbols/nec/Imakefile diff -u xc/programs/xkbcomp/symbols/nec/Imakefile:3.2 xc/programs/xkbcomp/symbols/nec/Imakefile:3.3 --- xc/programs/xkbcomp/symbols/nec/Imakefile:3.2 Wed Jan 17 18:46:03 2001 +++ xc/programs/xkbcomp/symbols/nec/Imakefile Mon Jan 9 10:01:29 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:45 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/nec/Imakefile,v 3.3 2006/01/09 15:01:29 dawes Exp $ DATAFILES = jp Index: xc/programs/xkbcomp/symbols/nec/jp diff -u xc/programs/xkbcomp/symbols/nec/jp:3.10 xc/programs/xkbcomp/symbols/nec/jp:3.11 --- xc/programs/xkbcomp/symbols/nec/jp:3.10 Fri Dec 14 15:02:04 2001 +++ xc/programs/xkbcomp/symbols/nec/jp Mon Jan 9 10:01:29 2006 @@ -1,5 +1,3 @@ -// $Xorg: jp,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/symbols/nec/jp,v 3.10 2001/12/14 20:02:04 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/nec/jp,v 3.11 2006/01/09 15:01:29 dawes Exp $ // // symbols for a NEC PC98 keyboard default xkb_symbols "pc98" { Index: xc/programs/xkbcomp/symbols/pc/Imakefile diff -u xc/programs/xkbcomp/symbols/pc/Imakefile:1.22 xc/programs/xkbcomp/symbols/pc/Imakefile:1.24 --- xc/programs/xkbcomp/symbols/pc/Imakefile:1.22 Fri Feb 25 13:25:36 2005 +++ xc/programs/xkbcomp/symbols/pc/Imakefile Tue Jan 24 23:46:00 2006 @@ -1,17 +1,15 @@ -XCOMM -XCOMM $XFree86: xc/programs/xkbcomp/symbols/pc/Imakefile,v 1.22 2005/02/25 18:25:36 dawes Exp $ -XCOMM +XCOMM $XFree86: xc/programs/xkbcomp/symbols/pc/Imakefile,v 1.24 2006/01/25 04:46:00 dawes Exp $ DATAFILES = al am ar \ be ben bg br by \ cz cz_qwerty \ - de dev dk dvorak dz \ + de dev dk dvorak dvorak_intl dz \ ee el en_US es \ fi fo fr fr-latin9 \ gb ge_la ge_ru guj gur \ hr hsb hu \ ie il il_phonetic ir is it iu \ - kan ky \ + kan kh ky \ la latin lo lt lv lat\ mk ml mm mt mt_us \ nl no \ Index: xc/programs/xkbcomp/symbols/pc/dvorak_intl diff -u /dev/null xc/programs/xkbcomp/symbols/pc/dvorak_intl:1.1 --- /dev/null Tue May 9 21:58:41 2006 +++ xc/programs/xkbcomp/symbols/pc/dvorak_intl Fri Dec 16 20:07:23 2005 @@ -0,0 +1,63 @@ +// $XFree86: xc/programs/xkbcomp/symbols/pc/dvorak_intl,v 1.1 2005/12/17 01:07:23 dawes Exp $ + +// Based on symbols/pc/us_intl keyboard map: +// remapped from us to dvorak by Conrad Schuler +// (conrad_schuler@yahoo.com) +// + +// Based on symbols/us_intl keyboard map: +// Dead-keys definition for a very simple US/ASCII layout. +// by Conectiva (http://www.conectiva.com.br) +// modified by Ricardo Y. Igarashi (iga@that.com.br) + +// Added the following deadkeys, to make it truly international: +// +// dead_macron: on AltGr-minus +// dead_breve: on AltGr-parenleft +// dead_abovedot: on AltGr-period +// dead_abovering: on AltGr-0 +// dead_doubleacute: on AltGr-equal (as quotedbl is already used) +// dead_caron: on AltGr-less (AltGr-shift-comma) +// dead_cedilla: on AltGr-comma +// dead_ogonek: on AltGr-semicolon +// dead_belowdot: on AltGr-underscore (AltGr-shift-minus) +// dead_hook: on AltGr-question +// dead_horn: on AltGr-plus (AltGr-shift-equal) +// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon) +// +// those were already there: +// dead_grave +// dead_acute +// dead_circumflex +// dead_tilde +// dead_diaeresis +// +// Conrad Schuler conrad_schuler@yahoo.com +// added Eszett (ssharp) on AltGr-s + +partial default alphanumeric_keys +xkb_symbols "basic" { + + name[Group1]= "US/ASCII"; + include "pc/us" + + key { [ dead_grave, dead_tilde, grave, asciitilde ] }; + key { [ 5, percent, EuroSign ] }; + key { [ 6, dead_circumflex, asciicircum, asciicircum ] }; + key { [ 9, parenleft, dead_breve, dead_breve ] }; + key { [ 0, parenright, dead_abovering, dead_abovering] }; + + key { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] }; + key { [ comma, less, dead_cedilla, dead_caron ] }; + key { [ period, greater, dead_abovedot, dead_circumflex ] }; + key { [ slash, question, dead_hook, dead_hook ] }; + key { [ equal, plus, dead_doubleacute, dead_horn ] }; + + key { [ e, E, EuroSign, cent ] }; + key { [ s, S, ssharp ] }; + key { [ minus, underscore, dead_macron, dead_belowdot ] }; + + key { [ semicolon, colon, dead_ogonek, dead_diaeresis ] }; + + include "level3(ralt_switch_multikey)" +}; Index: xc/programs/xkbcomp/symbols/pc/dz diff -u xc/programs/xkbcomp/symbols/pc/dz:1.2 xc/programs/xkbcomp/symbols/pc/dz:1.3 --- xc/programs/xkbcomp/symbols/pc/dz:1.2 Fri Aug 27 12:30:15 2004 +++ xc/programs/xkbcomp/symbols/pc/dz Mon Mar 28 23:00:31 2005 @@ -1,3 +1,4 @@ +// $XFree86: xc/programs/xkbcomp/symbols/pc/dz,v 1.3 2005/03/29 04:00:31 tsi Exp $ // // Dzongkha / Tibetan layout for Bhutanese keyboard // Index: xc/programs/xkbcomp/symbols/pc/kh diff -u /dev/null xc/programs/xkbcomp/symbols/pc/kh:1.1 --- /dev/null Tue May 9 21:58:41 2006 +++ xc/programs/xkbcomp/symbols/pc/kh Tue Jan 24 23:46:00 2006 @@ -0,0 +1,100 @@ +// $XFree86: xc/programs/xkbcomp/symbols/pc/kh,v 1.1 2006/01/25 04:46:00 dawes Exp $ +// +// khmer unicode keyboard for XFree86 4.3 or XOrg +// (might work with older versions, not tested) +// +// layout defined by National Information Communications Technology Development Authority (NiDA) +// http://www.nida.gov.kh +// +// version: 1.0.1 +// +// date: 14.09.2005 +// +// author: Jens Herden (jens at khmeros.info) +// +// +// understanding the symbols: +// +// 0x100yyyy = unicode, yyyy is hexcode +// codes that are not assigned in unicode (0x10017fb-0x10017ff), +// are used to make compositions for special vowels +// +// voidsymbol = no symbol for this combination +// +// all other symbol are defined in: /usr/X11/include/X11/keysymdef.h +// but with a leading 'XK_' +// + +partial default alphanumeric_keys +xkb_symbols "basic" { + name[Group1]= "Khmer (unicode)"; + +// include "us(generic101)" + +// there are four levels defined: +// +// normal shift right-alt right-alt + shift +// + +// keys: `1234567890-=\ + key { [ guillemotleft, guillemotright, 0x100200d, voidsymbol ] }; + key { [ 0x10017e1, exclam, 0x100200c, 0x10017f1 ] }; + key { [ 0x10017e2, 0x10017d7, at, 0x10017f2 ] }; + key { [ 0x10017e3, quotedbl, 0x10017d1, 0x10017f3 ] }; + key { [ 0x10017e4, 0x10017db, dollar, 0x10017f4 ] }; + key { [ 0x10017e5, percent, EuroSign, 0x10017f5 ] }; + key { [ 0x10017e6, 0x10017cd, 0x10017d9, 0x10017f6 ] }; + key { [ 0x10017e7, 0x10017d0, 0x10017da, 0x10017f7 ] }; + key { [ 0x10017e8, 0x10017cf, asterisk, 0x10017f8 ] }; + key { [ 0x10017e9, parenleft, braceleft, 0x10017f9 ] }; + key { [ 0x10017e0, parenright, braceright, 0x10017f0 ] }; + key { [ 0x10017a5, 0x10017cc, x, voidsymbol ] }; + key { [ 0x10017b2, equal, 0x10017ce, voidsymbol ] }; + key { [ 0x10017ae, 0x10017ad, backslash, voidsymbol ] }; + +// keys: qwertyuiop[] + key { [ 0x1001786, 0x1001788, 0x10017dc, 0x10019e0 ] }; + key { [ 0x10017b9, 0x10017ba, 0x10017dd, 0x10019e1 ] }; + key { [ 0x10017c1, 0x10017c2, 0x10017af, 0x10019e2 ] }; + key { [ 0x100179a, 0x10017ac, 0x10017ab, 0x10019e3 ] }; + key { [ 0x100178f, 0x1001791, 0x10017a8, 0x10019e4 ] }; + key { [ 0x1001799, 0x10017bd, voidsymbol, 0x10019e5 ] }; + key { [ 0x10017bb, 0x10017bc, voidsymbol, 0x10019e6 ] }; + key { [ 0x10017b7, 0x10017b8, 0x10017a6, 0x10019e7 ] }; + key { [ 0x10017c4, 0x10017c5, 0x10017b1, 0x10019e8 ] }; + key { [ 0x1001795, 0x1001797, 0x10017b0, 0x10019e9 ] }; + key { [ 0x10017c0, 0x10017bf, 0x10017a9, 0x10019ea ] }; + key { [ 0x10017aa, 0x10017a7, 0x10017b3, 0x10019eb ] }; + +// keys: asdfghjkl;' + key { [ 0x10017b6, 0x10017ff, voidsymbol, 0x10019ec ] }; + key { [ 0x100179f, 0x10017c3, voidsymbol, 0x10019ed ] }; + key { [ 0x100178a, 0x100178c, voidsymbol, 0x10019ee ] }; + key { [ 0x1001790, 0x1001792, voidsymbol, 0x10019ef ] }; + key { [ 0x1001784, 0x10017a2, voidsymbol, 0x10019f0 ] }; + key { [ 0x10017a0, 0x10017c7, voidsymbol, 0x10019f1 ] }; + key { [ 0x10017d2, 0x1001789, voidsymbol, 0x10019f2 ] }; + key { [ 0x1001780, 0x1001782, 0x100179d, 0x10019f3 ] }; + key { [ 0x100179b, 0x10017a1, voidsymbol, 0x10019f4 ] }; + key { [ 0x10017be, 0x10017fe, 0x10017d6, 0x10019f5 ] }; + key { [ 0x10017cb, 0x10017c9, 0x10017c8, 0x10019f6 ] }; + +// keys: zxcvbnm,./ + key { [ 0x100178b, 0x100178d, voidsymbol, 0x10019f7 ] }; + key { [ 0x1001781, 0x1001783, voidsymbol, 0x10019f8 ] }; + key { [ 0x1001785, 0x1001787, voidsymbol, 0x10019f9 ] }; + key { [ 0x100179c, 0x10017fd, voidsymbol, 0x10019fa ] }; + key { [ 0x1001794, 0x1001796, 0x100179e, 0x10019fb ] }; + key { [ 0x1001793, 0x100178e, voidsymbol, 0x10019fc ] }; + key { [ 0x1001798, 0x10017c6, voidsymbol, 0x10019fd ] }; + key { [ 0x10017fc, 0x10017fb, comma, 0x10019fe ] }; + key { [ 0x10017d4, 0x10017d5, period, 0x10019ff ] }; + key { [ 0x10017ca, question, slash, voidsymbol ] }; + + key { [ 0x100200b, space, 0x10000a0, voidsymbol ] }; + key { [ Alt_R ] }; + +// third level with right-Alt + include "level3(ralt_switch)" + +}; Index: xc/programs/xkbcomp/symbols/pc/lo diff -u xc/programs/xkbcomp/symbols/pc/lo:1.1 xc/programs/xkbcomp/symbols/pc/lo:1.2 --- xc/programs/xkbcomp/symbols/pc/lo:1.1 Sat Jan 25 21:38:14 2003 +++ xc/programs/xkbcomp/symbols/pc/lo Mon Jan 9 10:01:29 2006 @@ -1,11 +1,7 @@ -// $XConsortium: lo 2002/11/28 $ -// -// $XFree86: xc/programs/xkbcomp/symbols/pc/lo,v 1.1 2003/01/26 02:38:14 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/pc/lo,v 1.2 2006/01/09 15:01:29 dawes Exp $ // // Lao keymap, by Anousak Souphavanh // -// -// partial default alphanumeric_keys xkb_symbols "basic" { Index: xc/programs/xkbcomp/symbols/pc/us_intl diff -u xc/programs/xkbcomp/symbols/pc/us_intl:1.1 xc/programs/xkbcomp/symbols/pc/us_intl:1.2 --- xc/programs/xkbcomp/symbols/pc/us_intl:1.1 Sat Oct 4 06:25:14 2003 +++ xc/programs/xkbcomp/symbols/pc/us_intl Fri Dec 16 20:07:23 2005 @@ -1,4 +1,4 @@ -// $XFree86: xc/programs/xkbcomp/symbols/pc/us_intl,v 1.1 2003/10/04 10:25:14 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/pc/us_intl,v 1.2 2005/12/17 01:07:23 dawes Exp $ // Based on symbols/us_intl keyboard map: // Dead-keys definition for a very simple US/ASCII layout. @@ -26,6 +26,9 @@ // dead_circumflex // dead_tilde // dead_diaeresis +// +// Conrad Schuler conrad_schuler@yahoo.com +// added Eszett (ssharp) on AltGr-s partial default alphanumeric_keys xkb_symbols "basic" { @@ -43,6 +46,7 @@ key { [ e, E, EuroSign, cent ] }; + key { [ s, S, ssharp ] }; key { [ semicolon, colon, dead_ogonek, dead_diaeresis ] }; key { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] }; Index: xc/programs/xkbcomp/symbols/sgi/Imakefile diff -u xc/programs/xkbcomp/symbols/sgi/Imakefile:1.2 xc/programs/xkbcomp/symbols/sgi/Imakefile:1.3 --- xc/programs/xkbcomp/symbols/sgi/Imakefile:1.2 Wed Jan 17 18:46:04 2001 +++ xc/programs/xkbcomp/symbols/sgi/Imakefile Mon Jan 9 10:01:29 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:45 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/sgi/Imakefile,v 1.3 2006/01/09 15:01:29 dawes Exp $ DATAFILES = jp Index: xc/programs/xkbcomp/symbols/sgi/jp diff -u xc/programs/xkbcomp/symbols/sgi/jp:1.2 xc/programs/xkbcomp/symbols/sgi/jp:1.3 --- xc/programs/xkbcomp/symbols/sgi/jp:1.2 Wed Jan 17 18:46:04 2001 +++ xc/programs/xkbcomp/symbols/sgi/jp Mon Jan 9 10:01:29 2006 @@ -1,4 +1,4 @@ -// $Xorg: jp,v 1.3 2000/08/17 19:54:45 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/sgi/jp,v 1.3 2006/01/09 15:01:29 dawes Exp $ xkb_symbols "jp106" { name[group1]="Japan/ASCII"; Index: xc/programs/xkbcomp/symbols/sony/Imakefile diff -u xc/programs/xkbcomp/symbols/sony/Imakefile:1.1.1.2 xc/programs/xkbcomp/symbols/sony/Imakefile:1.2 --- xc/programs/xkbcomp/symbols/sony/Imakefile:1.1.1.2 Tue Jan 16 18:00:01 2001 +++ xc/programs/xkbcomp/symbols/sony/Imakefile Mon Jan 9 10:01:30 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:45 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/sony/Imakefile,v 1.2 2006/01/09 15:01:30 dawes Exp $ DATAFILES = us Index: xc/programs/xkbcomp/symbols/sony/us diff -u xc/programs/xkbcomp/symbols/sony/us:1.2 xc/programs/xkbcomp/symbols/sony/us:1.3 --- xc/programs/xkbcomp/symbols/sony/us:1.2 Fri Dec 14 15:02:04 2001 +++ xc/programs/xkbcomp/symbols/sony/us Mon Jan 9 10:01:30 2006 @@ -1,4 +1,4 @@ -// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/sony/us,v 1.3 2006/01/09 15:01:30 dawes Exp $ // //Copyright 1996, 1998 The Open Group // Index: xc/programs/xkbcomp/symbols/sun/Imakefile diff -u xc/programs/xkbcomp/symbols/sun/Imakefile:1.6 xc/programs/xkbcomp/symbols/sun/Imakefile:1.7 --- xc/programs/xkbcomp/symbols/sun/Imakefile:1.6 Thu Oct 9 07:45:27 2003 +++ xc/programs/xkbcomp/symbols/sun/Imakefile Mon Jan 9 10:01:30 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:46 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/symbols/sun/Imakefile,v 1.6 2003/10/09 11:45:27 pascal Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/sun/Imakefile,v 1.7 2006/01/09 15:01:30 dawes Exp $ DATAFILES = se us usb Index: xc/programs/xkbcomp/symbols/sun/us diff -u xc/programs/xkbcomp/symbols/sun/us:1.7 xc/programs/xkbcomp/symbols/sun/us:1.8 --- xc/programs/xkbcomp/symbols/sun/us:1.7 Sat Aug 9 10:30:49 2003 +++ xc/programs/xkbcomp/symbols/sun/us Mon Jan 9 10:01:30 2006 @@ -1,5 +1,3 @@ -// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ -// //Copyright 1996, 1998 The Open Group // //Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +22,7 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/symbols/sun/us,v 1.7 2003/08/09 14:30:49 pascal Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/sun/us,v 1.8 2006/01/09 15:01:30 dawes Exp $ // // US/ASCII layout for a Type 4 Sun keyboard xkb_symbols "sun4" { Index: xc/programs/xkbcomp/symbols/xfree68/Imakefile diff -u xc/programs/xkbcomp/symbols/xfree68/Imakefile:1.2 xc/programs/xkbcomp/symbols/xfree68/Imakefile:1.3 --- xc/programs/xkbcomp/symbols/xfree68/Imakefile:1.2 Wed Jan 17 18:46:05 2001 +++ xc/programs/xkbcomp/symbols/xfree68/Imakefile Mon Jan 9 10:01:30 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:46 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/symbols/xfree68/Imakefile,v 1.3 2006/01/09 15:01:30 dawes Exp $ DATAFILES = amiga ataritt Index: xc/programs/xkbcomp/symbols/xfree68/amiga diff -u xc/programs/xkbcomp/symbols/xfree68/amiga:1.3 xc/programs/xkbcomp/symbols/xfree68/amiga:1.4 --- xc/programs/xkbcomp/symbols/xfree68/amiga:1.3 Wed Jan 17 18:46:05 2001 +++ xc/programs/xkbcomp/symbols/xfree68/amiga Mon Jan 9 10:01:30 2006 @@ -1,8 +1,4 @@ -// $Xorg: amiga,v 1.3 2000/08/17 19:54:46 cpqbld Exp $ - - - -// $XFree86: xc/programs/xkbcomp/symbols/xfree68/amiga,v 1.3 2001/01/17 23:46:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/xfree68/amiga,v 1.4 2006/01/09 15:01:30 dawes Exp $ default xkb_symbols "usa1" { Index: xc/programs/xkbcomp/symbols/xfree68/ataritt diff -u xc/programs/xkbcomp/symbols/xfree68/ataritt:1.3 xc/programs/xkbcomp/symbols/xfree68/ataritt:1.4 --- xc/programs/xkbcomp/symbols/xfree68/ataritt:1.3 Wed Jan 17 18:46:05 2001 +++ xc/programs/xkbcomp/symbols/xfree68/ataritt Mon Jan 9 10:01:30 2006 @@ -1,8 +1,4 @@ -// $Xorg: ataritt,v 1.3 2000/08/17 19:54:46 cpqbld Exp $ - - - -// $XFree86: xc/programs/xkbcomp/symbols/xfree68/ataritt,v 1.3 2001/01/17 23:46:05 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/symbols/xfree68/ataritt,v 1.4 2006/01/09 15:01:30 dawes Exp $ default xkb_symbols "us" { Index: xc/programs/xkbcomp/torture/indicator diff -u xc/programs/xkbcomp/torture/indicator:1.1.1.2 xc/programs/xkbcomp/torture/indicator:1.2 --- xc/programs/xkbcomp/torture/indicator:1.1.1.2 Tue Jan 16 18:00:10 2001 +++ xc/programs/xkbcomp/torture/indicator Mon Jan 9 10:01:30 2006 @@ -1,4 +1,4 @@ -// $Xorg: indicator,v 1.3 2000/08/17 19:54:46 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/indicator,v 1.2 2006/01/09 15:01:30 dawes Exp $ xkb_compatibility "torture" virtual_modifiers NumLock,AltGr; Index: xc/programs/xkbcomp/torture/indicator1 diff -u xc/programs/xkbcomp/torture/indicator1:1.1.1.2 xc/programs/xkbcomp/torture/indicator1:1.2 --- xc/programs/xkbcomp/torture/indicator1:1.1.1.2 Tue Jan 16 18:00:11 2001 +++ xc/programs/xkbcomp/torture/indicator1 Mon Jan 9 10:01:30 2006 @@ -1,4 +1,4 @@ -// $Xorg: indicator1,v 1.3 2000/08/17 19:54:47 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/indicator1,v 1.2 2006/01/09 15:01:30 dawes Exp $ xkb_compatibility "torture1" indicator "Mod1" { Index: xc/programs/xkbcomp/torture/indicator2 diff -u xc/programs/xkbcomp/torture/indicator2:1.1.1.2 xc/programs/xkbcomp/torture/indicator2:1.2 --- xc/programs/xkbcomp/torture/indicator2:1.1.1.2 Tue Jan 16 18:00:11 2001 +++ xc/programs/xkbcomp/torture/indicator2 Mon Jan 9 10:01:30 2006 @@ -1,4 +1,4 @@ -// $Xorg: indicator2,v 1.3 2000/08/17 19:54:47 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/indicator2,v 1.2 2006/01/09 15:01:30 dawes Exp $ xkb_compatibility "torture2" indicator "Num Lock" { Index: xc/programs/xkbcomp/torture/indicator3 diff -u xc/programs/xkbcomp/torture/indicator3:1.1.1.2 xc/programs/xkbcomp/torture/indicator3:1.2 --- xc/programs/xkbcomp/torture/indicator3:1.1.1.2 Tue Jan 16 18:00:12 2001 +++ xc/programs/xkbcomp/torture/indicator3 Mon Jan 9 10:01:30 2006 @@ -1,4 +1,4 @@ -// $Xorg: indicator3,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/indicator3,v 1.2 2006/01/09 15:01:30 dawes Exp $ xkb_compatibility "torture3" indicator "Mouse Keys" { Index: xc/programs/xkbcomp/torture/mod_compat diff -u xc/programs/xkbcomp/torture/mod_compat:1.1.1.2 xc/programs/xkbcomp/torture/mod_compat:1.2 --- xc/programs/xkbcomp/torture/mod_compat:1.1.1.2 Tue Jan 16 18:00:13 2001 +++ xc/programs/xkbcomp/torture/mod_compat Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: mod_compat,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/mod_compat,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture" virtual_modifiers NumLock,AltGr; Index: xc/programs/xkbcomp/torture/mod_compat1 diff -u xc/programs/xkbcomp/torture/mod_compat1:1.1.1.2 xc/programs/xkbcomp/torture/mod_compat1:1.2 --- xc/programs/xkbcomp/torture/mod_compat1:1.1.1.2 Tue Jan 16 18:00:14 2001 +++ xc/programs/xkbcomp/torture/mod_compat1 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: mod_compat1,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/mod_compat1,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture1" modifier Shift { mods= Shift; }; Index: xc/programs/xkbcomp/torture/mod_compat2 diff -u xc/programs/xkbcomp/torture/mod_compat2:1.1.1.2 xc/programs/xkbcomp/torture/mod_compat2:1.2 --- xc/programs/xkbcomp/torture/mod_compat2:1.1.1.2 Tue Jan 16 18:00:16 2001 +++ xc/programs/xkbcomp/torture/mod_compat2 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: mod_compat2,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/mod_compat2,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture2" modifier Control { groups= 0x4; mods= Mod1; }; Index: xc/programs/xkbcomp/torture/mod_compat3 diff -u xc/programs/xkbcomp/torture/mod_compat3:1.1.1.2 xc/programs/xkbcomp/torture/mod_compat3:1.2 --- xc/programs/xkbcomp/torture/mod_compat3:1.1.1.2 Tue Jan 16 18:00:16 2001 +++ xc/programs/xkbcomp/torture/mod_compat3 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: mod_compat3,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/mod_compat3,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture3" modifier Mod2 { mods= Mod3; }; Index: xc/programs/xkbcomp/torture/mod_compat4 diff -u xc/programs/xkbcomp/torture/mod_compat4:1.1.1.2 xc/programs/xkbcomp/torture/mod_compat4:1.2 --- xc/programs/xkbcomp/torture/mod_compat4:1.1.1.2 Tue Jan 16 18:00:17 2001 +++ xc/programs/xkbcomp/torture/mod_compat4 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: mod_compat4,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/mod_compat4,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture4" modifier Mod4 { mods= Mod5; }; Index: xc/programs/xkbcomp/torture/sym_interp diff -u xc/programs/xkbcomp/torture/sym_interp:1.1.1.2 xc/programs/xkbcomp/torture/sym_interp:1.2 --- xc/programs/xkbcomp/torture/sym_interp:1.1.1.2 Tue Jan 16 18:00:18 2001 +++ xc/programs/xkbcomp/torture/sym_interp Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: sym_interp,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/sym_interp,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture" virtual_modifiers NumLock,AltGr; Index: xc/programs/xkbcomp/torture/sym_interp1 diff -u xc/programs/xkbcomp/torture/sym_interp1:1.1.1.2 xc/programs/xkbcomp/torture/sym_interp1:1.2 --- xc/programs/xkbcomp/torture/sym_interp1:1.1.1.2 Tue Jan 16 18:00:20 2001 +++ xc/programs/xkbcomp/torture/sym_interp1 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: sym_interp1,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/sym_interp1,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture1" interpret Control_L { Index: xc/programs/xkbcomp/torture/sym_interp2 diff -u xc/programs/xkbcomp/torture/sym_interp2:1.1.1.2 xc/programs/xkbcomp/torture/sym_interp2:1.2 --- xc/programs/xkbcomp/torture/sym_interp2:1.1.1.2 Tue Jan 16 18:00:21 2001 +++ xc/programs/xkbcomp/torture/sym_interp2 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: sym_interp2,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/sym_interp2,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture2" interpret ISO_Next_Group { Index: xc/programs/xkbcomp/torture/sym_interp3 diff -u xc/programs/xkbcomp/torture/sym_interp3:1.1.1.2 xc/programs/xkbcomp/torture/sym_interp3:1.2 --- xc/programs/xkbcomp/torture/sym_interp3:1.1.1.2 Tue Jan 16 18:00:23 2001 +++ xc/programs/xkbcomp/torture/sym_interp3 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: sym_interp3,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/sym_interp3,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture3" interpret ISO_Prev_Group { Index: xc/programs/xkbcomp/torture/sym_interp4 diff -u xc/programs/xkbcomp/torture/sym_interp4:1.1.1.2 xc/programs/xkbcomp/torture/sym_interp4:1.2 --- xc/programs/xkbcomp/torture/sym_interp4:1.1.1.2 Tue Jan 16 18:00:25 2001 +++ xc/programs/xkbcomp/torture/sym_interp4 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: sym_interp4,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/torture/sym_interp4,v 1.2 2006/01/09 15:01:31 dawes Exp $ xkb_compatibility "torture4" virtual_modifiers NumLock,AltGr; Index: xc/programs/xkbcomp/torture/types diff -u xc/programs/xkbcomp/torture/types:1.1.1.1 xc/programs/xkbcomp/torture/types:1.2 --- xc/programs/xkbcomp/torture/types:1.1.1.1 Wed Jan 3 02:40:44 1996 +++ xc/programs/xkbcomp/torture/types Mon Jan 9 10:01:31 2006 @@ -1,4 +1,5 @@ -// $XConsortium $ +// $XFree86: xc/programs/xkbcomp/torture/types,v 1.2 2006/01/09 15:01:31 dawes Exp $ + xkb_types "Common" virtual_modifiers Alt; Index: xc/programs/xkbcomp/types/Imakefile diff -u xc/programs/xkbcomp/types/Imakefile:3.8 xc/programs/xkbcomp/types/Imakefile:3.9 --- xc/programs/xkbcomp/types/Imakefile:3.8 Sat Aug 9 10:30:49 2003 +++ xc/programs/xkbcomp/types/Imakefile Mon Jan 9 10:01:31 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbcomp/types/Imakefile,v 3.8 2003/08/09 14:30:49 pascal Exp $ +XCOMM $XFree86: xc/programs/xkbcomp/types/Imakefile,v 3.9 2006/01/09 15:01:31 dawes Exp $ DATAFILES = README basic caps complete default mousekeys iso9995 \ Index: xc/programs/xkbcomp/types/basic diff -u xc/programs/xkbcomp/types/basic:1.3 xc/programs/xkbcomp/types/basic:1.4 --- xc/programs/xkbcomp/types/basic:1.3 Mon Nov 3 00:36:35 2003 +++ xc/programs/xkbcomp/types/basic Mon Jan 9 10:01:31 2006 @@ -1,5 +1,4 @@ -// $Xorg: basic,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ -// $XFree86: xc/programs/xkbcomp/types/basic,v 1.3 2003/11/03 05:36:35 tsi Exp $ +// $XFree86: xc/programs/xkbcomp/types/basic,v 1.4 2006/01/09 15:01:31 dawes Exp $ default xkb_types "basic" { // Fairly standard definitions for Index: xc/programs/xkbcomp/types/cancel diff -u xc/programs/xkbcomp/types/cancel:1.1.1.3 xc/programs/xkbcomp/types/cancel:1.2 --- xc/programs/xkbcomp/types/cancel:1.1.1.3 Tue Jan 16 18:00:30 2001 +++ xc/programs/xkbcomp/types/cancel Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: cancel,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/types/cancel,v 1.2 2006/01/09 15:01:31 dawes Exp $ partial default xkb_types "Shift_Cancels_Caps" { override type "TWO_LEVEL" { Index: xc/programs/xkbcomp/types/complete diff -u xc/programs/xkbcomp/types/complete:1.3 xc/programs/xkbcomp/types/complete:1.4 --- xc/programs/xkbcomp/types/complete:1.3 Mon Aug 13 13:46:06 2001 +++ xc/programs/xkbcomp/types/complete Mon Jan 9 10:01:31 2006 @@ -1,9 +1,4 @@ -// $Xorg: complete,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ -// -// -// -// -// $XFree86: xc/programs/xkbcomp/types/complete,v 1.3 2001/08/13 17:46:06 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/types/complete,v 1.4 2006/01/09 15:01:31 dawes Exp $ default xkb_types "complete" { include "basic" Index: xc/programs/xkbcomp/types/default diff -u xc/programs/xkbcomp/types/default:1.2 xc/programs/xkbcomp/types/default:1.3 --- xc/programs/xkbcomp/types/default:1.2 Fri May 18 19:35:35 2001 +++ xc/programs/xkbcomp/types/default Mon Jan 9 10:01:31 2006 @@ -1,9 +1,4 @@ -// $Xorg: default,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ -// -// -// -// -// $XFree86: xc/programs/xkbcomp/types/default,v 1.2 2001/05/18 23:35:35 dawes Exp $ +// $XFree86: xc/programs/xkbcomp/types/default,v 1.3 2006/01/09 15:01:31 dawes Exp $ default xkb_types "default" { include "basic" Index: xc/programs/xkbcomp/types/iso9995 diff -u xc/programs/xkbcomp/types/iso9995:1.1.1.4 xc/programs/xkbcomp/types/iso9995:1.2 --- xc/programs/xkbcomp/types/iso9995:1.1.1.4 Tue Jan 16 18:00:35 2001 +++ xc/programs/xkbcomp/types/iso9995 Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: iso9995,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/types/iso9995,v 1.2 2006/01/09 15:01:31 dawes Exp $ partial default xkb_types "default" { // Definition for a key type which Index: xc/programs/xkbcomp/types/mousekeys diff -u xc/programs/xkbcomp/types/mousekeys:1.1.1.2 xc/programs/xkbcomp/types/mousekeys:1.2 --- xc/programs/xkbcomp/types/mousekeys:1.1.1.2 Tue Jan 16 18:00:36 2001 +++ xc/programs/xkbcomp/types/mousekeys Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: mousekeys,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/types/mousekeys,v 1.2 2006/01/09 15:01:31 dawes Exp $ // partial default xkb_types "default" { virtual_modifiers Alt; Index: xc/programs/xkbcomp/types/pc diff -u xc/programs/xkbcomp/types/pc:1.1.1.3 xc/programs/xkbcomp/types/pc:1.2 --- xc/programs/xkbcomp/types/pc:1.1.1.3 Tue Jan 16 18:00:40 2001 +++ xc/programs/xkbcomp/types/pc Mon Jan 9 10:01:31 2006 @@ -1,4 +1,4 @@ -// $Xorg: pc,v 1.3 2000/08/17 19:54:48 cpqbld Exp $ +// $XFree86: xc/programs/xkbcomp/types/pc,v 1.2 2006/01/09 15:01:31 dawes Exp $ // partial default xkb_types "default" { Index: xc/programs/xkbevd/Imakefile diff -u xc/programs/xkbevd/Imakefile:3.3 xc/programs/xkbevd/Imakefile:3.4 --- xc/programs/xkbevd/Imakefile:3.3 Tue May 27 13:58:24 2003 +++ xc/programs/xkbevd/Imakefile Fri Oct 14 11:17:34 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xkbevd/Imakefile,v 3.3 2003/05/27 17:58:24 tsi Exp $ +XCOMM $XFree86: xc/programs/xkbevd/Imakefile,v 3.4 2005/10/14 15:17:34 tsi Exp $ SRCS = xkbevd.c cfgscan.c cfgparse.c \ evargs.c printev.c utils.c @@ -13,8 +9,6 @@ ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\" -INCLUDES = -I$(EXTINCSRC) - all:: YaccFile(cfgparse,/**/) Index: xc/programs/xkbevd/cfgparse.y diff -u xc/programs/xkbevd/cfgparse.y:1.5 xc/programs/xkbevd/cfgparse.y:1.6 --- xc/programs/xkbevd/cfgparse.y:1.5 Wed Oct 16 00:53:17 2002 +++ xc/programs/xkbevd/cfgparse.y Mon Jan 9 10:01:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cfgparse.y,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbevd/cfgparse.y,v 1.5 2002/10/16 04:53:17 tsi Exp $ */ +/* $XFree86: xc/programs/xkbevd/cfgparse.y,v 1.6 2006/01/09 15:01:32 dawes Exp $ */ %token END_OF_FILE 0 Index: xc/programs/xkbevd/cfgscan.c diff -u xc/programs/xkbevd/cfgscan.c:3.7 xc/programs/xkbevd/cfgscan.c:3.8 --- xc/programs/xkbevd/cfgscan.c:3.7 Tue Jul 31 20:45:05 2001 +++ xc/programs/xkbevd/cfgscan.c Mon Jan 9 10:01:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cfgscan.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbevd/cfgscan.c,v 3.7 2001/08/01 00:45:05 tsi Exp $ */ +/* $XFree86: xc/programs/xkbevd/cfgscan.c,v 3.8 2006/01/09 15:01:32 dawes Exp $ */ #include #include Index: xc/programs/xkbevd/evargs.c diff -u xc/programs/xkbevd/evargs.c:1.4 xc/programs/xkbevd/evargs.c:1.5 --- xc/programs/xkbevd/evargs.c:1.4 Wed Jan 17 18:46:08 2001 +++ xc/programs/xkbevd/evargs.c Mon Jan 9 10:01:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: evargs.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbevd/evargs.c,v 1.4 2001/01/17 23:46:08 dawes Exp $ */ +/* $XFree86: xc/programs/xkbevd/evargs.c,v 1.5 2006/01/09 15:01:32 dawes Exp $ */ #define DEBUG_VAR evargsDebug #include "xkbevd.h" Index: xc/programs/xkbevd/example.cf diff -u xc/programs/xkbevd/example.cf:1.1.1.2 xc/programs/xkbevd/example.cf:1.2 --- xc/programs/xkbevd/example.cf:1.1.1.2 Tue Jan 16 18:00:46 2001 +++ xc/programs/xkbevd/example.cf Mon Jan 9 10:01:32 2006 @@ -1,4 +1,4 @@ -//$Xorg: example.cf,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ +// $XFree86: xc/programs/xkbevd/example.cf,v 1.2 2006/01/09 15:01:32 dawes Exp $ soundDirectory = "/space/erik/.xkb/sounds/" Bell() "ss/08.ting.aifc" Index: xc/programs/xkbevd/printev.c diff -u xc/programs/xkbevd/printev.c:3.4 xc/programs/xkbevd/printev.c:3.5 --- xc/programs/xkbevd/printev.c:3.4 Wed Jan 17 18:46:08 2001 +++ xc/programs/xkbevd/printev.c Mon Jan 9 10:01:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: printev.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbevd/printev.c,v 3.4 2001/01/17 23:46:08 dawes Exp $ */ +/* $XFree86: xc/programs/xkbevd/printev.c,v 3.5 2006/01/09 15:01:32 dawes Exp $ */ #define DEBUG_VAR printevDebug #include "xkbevd.h" Index: xc/programs/xkbevd/tokens.h diff -u xc/programs/xkbevd/tokens.h:1.1.1.2 xc/programs/xkbevd/tokens.h:1.2 --- xc/programs/xkbevd/tokens.h:1.1.1.2 Tue Jan 16 18:00:49 2001 +++ xc/programs/xkbevd/tokens.h Mon Jan 9 10:01:32 2006 @@ -1,4 +1,4 @@ -/* $Xorg: tokens.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */ +/* $XFree86: xc/programs/xkbevd/tokens.h,v 1.2 2006/01/09 15:01:32 dawes Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. Index: xc/programs/xkbevd/utils.c diff -u xc/programs/xkbevd/utils.c:3.6 xc/programs/xkbevd/utils.c:3.7 --- xc/programs/xkbevd/utils.c:3.6 Mon Jan 14 13:30:11 2002 +++ xc/programs/xkbevd/utils.c Mon Jan 9 10:01:32 2006 @@ -1,6 +1,5 @@ - +/* $XFree86: xc/programs/xkbevd/utils.c,v 3.7 2006/01/09 15:01:32 dawes Exp $ */ /*\ - * $XFree86: xc/programs/xkbevd/utils.c,v 3.6 2002/01/14 18:30:11 dawes Exp $ * * COPYRIGHT 1990 * DIGITAL EQUIPMENT CORPORATION @@ -25,7 +24,6 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $Xorg: utils.c,v 1.5 2000/08/17 19:54:49 cpqbld Exp $ */ #define DEBUG_VAR_LOCAL #include "utils.h" Index: xc/programs/xkbevd/utils.h diff -u xc/programs/xkbevd/utils.h:1.7 xc/programs/xkbevd/utils.h:1.8 --- xc/programs/xkbevd/utils.h:1.7 Mon Nov 17 17:20:53 2003 +++ xc/programs/xkbevd/utils.h Mon Jan 9 10:01:32 2006 @@ -2,8 +2,6 @@ #define UTILS_H 1 /*\ - * $Xorg: utils.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ - * * COPYRIGHT 1990 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -27,7 +25,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbevd/utils.h,v 1.7 2003/11/17 22:20:53 dawes Exp $ */ +/* $XFree86: xc/programs/xkbevd/utils.h,v 1.8 2006/01/09 15:01:32 dawes Exp $ */ /***====================================================================***/ Index: xc/programs/xkbevd/xkbevd.c diff -u xc/programs/xkbevd/xkbevd.c:3.11 xc/programs/xkbevd/xkbevd.c:3.12 --- xc/programs/xkbevd/xkbevd.c:3.11 Fri Dec 17 11:38:03 2004 +++ xc/programs/xkbevd/xkbevd.c Mon Jan 9 10:01:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbevd.c,v 1.4 2000/08/17 19:54:49 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbevd/xkbevd.c,v 3.11 2004/12/17 16:38:03 tsi Exp $ */ +/* $XFree86: xc/programs/xkbevd/xkbevd.c,v 3.12 2006/01/09 15:01:32 dawes Exp $ */ #define DEBUG_VAR xkbevdDebug #include Index: xc/programs/xkbevd/xkbevd.h diff -u xc/programs/xkbevd/xkbevd.h:3.5 xc/programs/xkbevd/xkbevd.h:3.7 --- xc/programs/xkbevd/xkbevd.h:3.5 Mon Nov 17 17:20:53 2003 +++ xc/programs/xkbevd/xkbevd.h Sat Feb 25 21:41:02 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbevd.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbevd/xkbevd.h,v 3.5 2003/11/17 22:20:53 dawes Exp $ */ +/* $XFree86: xc/programs/xkbevd/xkbevd.h,v 3.7 2006/02/26 02:41:02 dawes Exp $ */ #ifndef XKBEVD_H #define XKBEVD_H 1 @@ -99,7 +98,9 @@ extern int CFGParseFile ( FILE *file ); extern int yylex(void); +#if !defined(YYBISON) && !(defined(YYBYACC) && defined(__NetBSD__)) extern int yyparse(void); +#endif extern int yyerror(char *s); extern int yywrap(void); #endif /* XKBEVD_H */ Index: xc/programs/xkbevd/xkbevd.man diff -u xc/programs/xkbevd/xkbevd.man:1.9 xc/programs/xkbevd/xkbevd.man:1.10 --- xc/programs/xkbevd/xkbevd.man:1.9 Thu Feb 10 22:03:19 2005 +++ xc/programs/xkbevd/xkbevd.man Mon Jan 9 10:01:32 2006 @@ -1,6 +1,4 @@ -.\" $Xorg: xkbevd.man,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ -.\" -.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.9 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.10 2006/01/09 15:01:32 dawes Exp $ .\" .TH XKBCOMP 1 __vendorversion__ .SH NAME Index: xc/programs/xkbprint/Imakefile diff -u xc/programs/xkbprint/Imakefile:1.2 xc/programs/xkbprint/Imakefile:1.3 --- xc/programs/xkbprint/Imakefile:1.2 Tue May 27 13:58:25 2003 +++ xc/programs/xkbprint/Imakefile Fri Oct 14 11:17:34 2005 @@ -1,16 +1,10 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xkbprint/Imakefile,v 1.2 2003/05/27 17:58:25 tsi Exp $ +XCOMM $XFree86: xc/programs/xkbprint/Imakefile,v 1.3 2005/10/14 15:17:34 tsi Exp $ SRCS = xkbprint.c utils.c psgeom.c OBJS = xkbprint.o utils.o psgeom.o DEPLIBS = $(DEPXKBFILELIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XKBFILELIB) $(XONLYLIB) -EXTRA_INCLUDES = -I$(EXTINCSRC) - #ifdef SGIArchitecture EXTRA_LIBRARIES = -lmalloc #endif Index: xc/programs/xkbprint/isokeys.h diff -u xc/programs/xkbprint/isokeys.h:1.1.1.2 xc/programs/xkbprint/isokeys.h:1.2 --- xc/programs/xkbprint/isokeys.h:1.1.1.2 Tue Jan 16 18:00:59 2001 +++ xc/programs/xkbprint/isokeys.h Mon Jan 9 10:01:32 2006 @@ -1,7 +1,7 @@ #ifndef _ISOKEYS_H_ #define _ISOKEYS_H_ 1 -/* $Xorg: isokeys.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */ +/* $XFree86: xc/programs/xkbprint/isokeys.h,v 1.2 2006/01/09 15:01:32 dawes Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. Index: xc/programs/xkbprint/psgeom.c diff -u xc/programs/xkbprint/psgeom.c:1.6 xc/programs/xkbprint/psgeom.c:1.8 --- xc/programs/xkbprint/psgeom.c:1.6 Tue Apr 22 10:01:49 2003 +++ xc/programs/xkbprint/psgeom.c Mon Jan 9 10:01:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: psgeom.c,v 1.4 2000/08/17 19:54:50 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbprint/psgeom.c,v 1.6 2003/04/22 14:01:49 pascal Exp $ */ +/* $XFree86: xc/programs/xkbprint/psgeom.c,v 1.8 2006/01/09 15:01:32 dawes Exp $ */ #define XK_TECHNICAL #define XK_PUBLISHING @@ -1386,7 +1385,7 @@ else sprintf((char *)buf,"%c",(char)sym); top->font[(g*2)+l]= FONT_LATIN1; top->size[(g*2)+l]= SZ_MEDIUM; - switch (buf[0]) { + switch ((char)buf[0]) { case '.': case ':': case ',': case ';': case '\'': case '"': case '`': case '~': case '^': case '\250': case '\270': case '\267': Index: xc/programs/xkbprint/utils.c diff -u xc/programs/xkbprint/utils.c:3.5 xc/programs/xkbprint/utils.c:3.6 --- xc/programs/xkbprint/utils.c:3.5 Wed Jul 25 11:05:25 2001 +++ xc/programs/xkbprint/utils.c Mon Jan 9 10:01:32 2006 @@ -1,6 +1,5 @@ /*\ - * $Xorg: utils.c,v 1.5 2000/08/17 19:54:50 cpqbld Exp $ * * COPYRIGHT 1990 * DIGITAL EQUIPMENT CORPORATION @@ -25,7 +24,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbprint/utils.c,v 3.5 2001/07/25 15:05:25 dawes Exp $ */ +/* $XFree86: xc/programs/xkbprint/utils.c,v 3.6 2006/01/09 15:01:32 dawes Exp $ */ #include "utils.h" #include Index: xc/programs/xkbprint/utils.h diff -u xc/programs/xkbprint/utils.h:1.6 xc/programs/xkbprint/utils.h:1.7 --- xc/programs/xkbprint/utils.h:1.6 Mon Nov 17 17:20:53 2003 +++ xc/programs/xkbprint/utils.h Mon Jan 9 10:01:32 2006 @@ -2,7 +2,6 @@ #define UTILS_H 1 /*\ - * $Xorg: utils.h,v 1.3 2000/08/17 19:54:50 cpqbld Exp $ * * COPYRIGHT 1990 * DIGITAL EQUIPMENT CORPORATION @@ -27,7 +26,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbprint/utils.h,v 1.6 2003/11/17 22:20:53 dawes Exp $ */ +/* $XFree86: xc/programs/xkbprint/utils.h,v 1.7 2006/01/09 15:01:32 dawes Exp $ */ /***====================================================================***/ Index: xc/programs/xkbprint/xkbprint.c diff -u xc/programs/xkbprint/xkbprint.c:3.11 xc/programs/xkbprint/xkbprint.c:3.12 --- xc/programs/xkbprint/xkbprint.c:3.11 Tue Sep 23 22:43:38 2003 +++ xc/programs/xkbprint/xkbprint.c Mon Jan 9 10:01:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbprint.c,v 1.4 2000/08/17 19:54:50 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbprint/xkbprint.c,v 3.11 2003/09/24 02:43:38 dawes Exp $ */ +/* $XFree86: xc/programs/xkbprint/xkbprint.c,v 3.12 2006/01/09 15:01:32 dawes Exp $ */ #include #include Index: xc/programs/xkbprint/xkbprint.h diff -u xc/programs/xkbprint/xkbprint.h:1.2 xc/programs/xkbprint/xkbprint.h:1.3 --- xc/programs/xkbprint/xkbprint.h:1.2 Mon Nov 17 17:20:53 2003 +++ xc/programs/xkbprint/xkbprint.h Mon Jan 9 10:01:33 2006 @@ -1,7 +1,6 @@ #ifndef _XKBPRINT_H_ #define _XKBPRINT_H_ 1 -/* $Xorg: xkbprint.h,v 1.3 2000/08/17 19:54:50 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -27,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbprint/xkbprint.h,v 1.2 2003/11/17 22:20:53 dawes Exp $ */ +/* $XFree86: xc/programs/xkbprint/xkbprint.h,v 1.3 2006/01/09 15:01:33 dawes Exp $ */ #define LABEL_AUTO -1 #define LABEL_NONE 0 Index: xc/programs/xkbprint/xkbprint.man diff -u xc/programs/xkbprint/xkbprint.man:1.9 xc/programs/xkbprint/xkbprint.man:1.10 --- xc/programs/xkbprint/xkbprint.man:1.9 Thu Feb 10 22:03:19 2005 +++ xc/programs/xkbprint/xkbprint.man Mon Jan 9 10:01:33 2006 @@ -1,6 +1,4 @@ -.\" $Xorg: xkbprint.man,v 1.3 2000/08/17 19:54:50 cpqbld Exp $ -.\" -.\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.9 2005/02/11 03:03:19 dawes Exp $ +.\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.10 2006/01/09 15:01:33 dawes Exp $ .\" .TH XKBPRINT 1 __vendorversion__ .SH NAME Index: xc/programs/xkbutils/Imakefile diff -u xc/programs/xkbutils/Imakefile:3.3 xc/programs/xkbutils/Imakefile:3.4 --- xc/programs/xkbutils/Imakefile:3.3 Wed May 28 11:59:58 2003 +++ xc/programs/xkbutils/Imakefile Fri Oct 14 11:17:34 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:51 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkbutils/Imakefile,v 3.3 2003/05/28 15:59:58 tsi Exp $ +XCOMM $XFree86: xc/programs/xkbutils/Imakefile,v 3.4 2005/10/14 15:17:34 tsi Exp $ VLED_SRCS = xkbvleds.c LED.c utils.c VLED_OBJS = xkbvleds.o LED.o utils.o @@ -21,8 +16,6 @@ BELLLIBS = $(XONLYLIB) DEFINES = -DXKB -EXTRA_INCLUDES = -I$(EXTINCSRC) - #ifdef SGIArchitecture EXTRA_LIBRARIES = -lmalloc #endif Index: xc/programs/xkbutils/LED.c diff -u xc/programs/xkbutils/LED.c:1.5 xc/programs/xkbutils/LED.c:1.6 --- xc/programs/xkbutils/LED.c:1.5 Wed Jul 25 11:05:25 2001 +++ xc/programs/xkbutils/LED.c Mon Jan 9 10:01:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: LED.c,v 1.3 2000/08/17 19:54:51 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbutils/LED.c,v 1.5 2001/07/25 15:05:25 dawes Exp $ */ +/* $XFree86: xc/programs/xkbutils/LED.c,v 1.6 2006/01/09 15:01:33 dawes Exp $ */ #include #include Index: xc/programs/xkbutils/LED.h diff -u xc/programs/xkbutils/LED.h:1.1.1.2 xc/programs/xkbutils/LED.h:1.2 --- xc/programs/xkbutils/LED.h:1.1.1.2 Tue Jan 16 18:01:13 2001 +++ xc/programs/xkbutils/LED.h Mon Jan 9 10:01:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: LED.h,v 1.3 2000/08/17 19:54:51 cpqbld Exp $ */ +/* $XFree86: xc/programs/xkbutils/LED.h,v 1.2 2006/01/09 15:01:33 dawes Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. Index: xc/programs/xkbutils/LEDP.h diff -u xc/programs/xkbutils/LEDP.h:1.1.1.2 xc/programs/xkbutils/LEDP.h:1.2 --- xc/programs/xkbutils/LEDP.h:1.1.1.2 Tue Jan 16 18:01:14 2001 +++ xc/programs/xkbutils/LEDP.h Mon Jan 9 10:01:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: LEDP.h,v 1.3 2000/08/17 19:54:51 cpqbld Exp $ */ +/* $XFree86: xc/programs/xkbutils/LEDP.h,v 1.2 2006/01/09 15:01:33 dawes Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. Index: xc/programs/xkbutils/utils.c diff -u xc/programs/xkbutils/utils.c:3.5 xc/programs/xkbutils/utils.c:3.6 --- xc/programs/xkbutils/utils.c:3.5 Wed Jul 25 11:05:25 2001 +++ xc/programs/xkbutils/utils.c Mon Jan 9 10:01:33 2006 @@ -1,6 +1,5 @@ /*\ - * $Xorg: utils.c,v 1.6 2000/08/17 19:54:51 cpqbld Exp $ * * COPYRIGHT 1990 * DIGITAL EQUIPMENT CORPORATION @@ -25,7 +24,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbutils/utils.c,v 3.5 2001/07/25 15:05:25 dawes Exp $ */ +/* $XFree86: xc/programs/xkbutils/utils.c,v 3.6 2006/01/09 15:01:33 dawes Exp $ */ #include "utils.h" #include Index: xc/programs/xkbutils/utils.h diff -u xc/programs/xkbutils/utils.h:1.6 xc/programs/xkbutils/utils.h:1.7 --- xc/programs/xkbutils/utils.h:1.6 Mon Nov 17 17:20:53 2003 +++ xc/programs/xkbutils/utils.h Mon Jan 9 10:01:33 2006 @@ -2,7 +2,6 @@ #define UTILS_H 1 /*\ - * $Xorg: utils.h,v 1.3 2000/08/17 19:54:51 cpqbld Exp $ * * COPYRIGHT 1990 * DIGITAL EQUIPMENT CORPORATION @@ -27,7 +26,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbutils/utils.h,v 1.6 2003/11/17 22:20:53 dawes Exp $ */ +/* $XFree86: xc/programs/xkbutils/utils.h,v 1.7 2006/01/09 15:01:33 dawes Exp $ */ /***====================================================================***/ Index: xc/programs/xkbutils/xkbbell.c diff -u xc/programs/xkbutils/xkbbell.c:1.5 xc/programs/xkbutils/xkbbell.c:1.6 --- xc/programs/xkbutils/xkbbell.c:1.5 Sun Apr 1 10:00:22 2001 +++ xc/programs/xkbutils/xkbbell.c Mon Jan 9 10:01:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbbell.c,v 1.4 2000/08/17 19:54:51 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbutils/xkbbell.c,v 1.5 2001/04/01 14:00:22 tsi Exp $ */ +/* $XFree86: xc/programs/xkbutils/xkbbell.c,v 1.6 2006/01/09 15:01:33 dawes Exp $ */ #include #include Index: xc/programs/xkbutils/xkbvleds.c diff -u xc/programs/xkbutils/xkbvleds.c:3.6 xc/programs/xkbutils/xkbvleds.c:3.7 --- xc/programs/xkbutils/xkbvleds.c:3.6 Sat Oct 23 11:29:33 2004 +++ xc/programs/xkbutils/xkbvleds.c Mon Jan 9 10:01:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbvleds.c,v 1.4 2000/08/17 19:54:51 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbutils/xkbvleds.c,v 3.6 2004/10/23 15:29:33 dawes Exp $ */ +/* $XFree86: xc/programs/xkbutils/xkbvleds.c,v 3.7 2006/01/09 15:01:33 dawes Exp $ */ #include #include Index: xc/programs/xkbutils/xkbwatch.c diff -u xc/programs/xkbutils/xkbwatch.c:3.6 xc/programs/xkbutils/xkbwatch.c:3.7 --- xc/programs/xkbutils/xkbwatch.c:3.6 Sat Oct 23 11:29:33 2004 +++ xc/programs/xkbutils/xkbwatch.c Mon Jan 9 10:01:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbwatch.c,v 1.4 2000/08/17 19:54:51 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbutils/xkbwatch.c,v 3.6 2004/10/23 15:29:33 dawes Exp $ */ +/* $XFree86: xc/programs/xkbutils/xkbwatch.c,v 3.7 2006/01/09 15:01:33 dawes Exp $ */ #include #include Index: xc/programs/xkill/Imakefile diff -u xc/programs/xkill/Imakefile:1.4 xc/programs/xkill/Imakefile:1.5 --- xc/programs/xkill/Imakefile:1.4 Tue May 27 13:58:25 2003 +++ xc/programs/xkill/Imakefile Mon Jan 9 10:01:34 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:51 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xkill/Imakefile,v 1.4 2003/05/27 17:58:25 tsi Exp $ +XCOMM $XFree86: xc/programs/xkill/Imakefile,v 1.5 2006/01/09 15:01:34 dawes Exp $ DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB) Index: xc/programs/xkill/xkill.c diff -u xc/programs/xkill/xkill.c:1.6 xc/programs/xkill/xkill.c:1.7 --- xc/programs/xkill/xkill.c:1.6 Fri Dec 14 15:02:06 2001 +++ xc/programs/xkill/xkill.c Mon Jan 9 10:01:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkill.c,v 1.5 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xkill/xkill.c,v 1.6 2001/12/14 20:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/xkill/xkill.c,v 1.7 2006/01/09 15:01:34 dawes Exp $ */ /* * xkill - simple program for destroying unwanted clients Index: xc/programs/xkill/xkill.man diff -u xc/programs/xkill/xkill.man:1.10 xc/programs/xkill/xkill.man:1.11 --- xc/programs/xkill/xkill.man:1.10 Thu Feb 10 22:03:20 2005 +++ xc/programs/xkill/xkill.man Mon Jan 9 10:01:34 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xkill.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xkill/xkill.man,v 1.10 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xkill/xkill.man,v 1.11 2006/01/09 15:01:34 dawes Exp $ .\" .TH XKILL 1 __vendorversion__ .SH NAME Index: xc/programs/xload/Imakefile diff -u xc/programs/xload/Imakefile:1.8 xc/programs/xload/Imakefile:1.9 --- xc/programs/xload/Imakefile:1.8 Fri Oct 24 16:38:21 2003 +++ xc/programs/xload/Imakefile Mon Jan 9 10:01:34 2006 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile /main/30 1996/03/09 09:37:57 kaleb $ -XCOMM $XFree86: xc/programs/xload/Imakefile,v 1.8 2003/10/24 20:38:21 tsi Exp $ +XCOMM $XFree86: xc/programs/xload/Imakefile,v 1.9 2006/01/09 15:01:34 dawes Exp $ + DEPLIBS = XawClientDepLibs LOCAL_LIBRARIES = XawClientLibs Index: xc/programs/xload/get_load.c diff -u xc/programs/xload/get_load.c:1.22 xc/programs/xload/get_load.c:1.23 --- xc/programs/xload/get_load.c:1.22 Mon Dec 22 12:48:13 2003 +++ xc/programs/xload/get_load.c Mon Jan 9 10:01:34 2006 @@ -1,5 +1,4 @@ -/* $XConsortium: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */ -/* $XFree86: xc/programs/xload/get_load.c,v 1.22 2003/12/22 17:48:13 tsi Exp $ */ +/* $XFree86: xc/programs/xload/get_load.c,v 1.23 2006/01/09 15:01:34 dawes Exp $ */ /* Copyright (c) 1989 X Consortium Index: xc/programs/xload/xload.c diff -u xc/programs/xload/xload.c:1.7 xc/programs/xload/xload.c:1.8 --- xc/programs/xload/xload.c:1.7 Wed Sep 18 13:11:57 2002 +++ xc/programs/xload/xload.c Mon Jan 9 10:01:34 2006 @@ -1,5 +1,4 @@ -/* $XConsortium: xload.c,v 1.37 94/04/17 20:43:44 converse Exp $ */ -/* $XFree86: xc/programs/xload/xload.c,v 1.7 2002/09/18 17:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/xload/xload.c,v 1.8 2006/01/09 15:01:34 dawes Exp $ */ /* Copyright (c) 1989 X Consortium Index: xc/programs/xload/xload.man diff -u xc/programs/xload/xload.man:1.6 xc/programs/xload/xload.man:1.7 --- xc/programs/xload/xload.man:1.6 Thu Feb 10 22:03:20 2005 +++ xc/programs/xload/xload.man Mon Jan 9 10:01:34 2006 @@ -1,6 +1,4 @@ -.\" $XConsortium: xload.man,v 1.29 94/04/17 20:43:44 matt Exp $ -.\" -.\" $XFree86: xc/programs/xload/xload.man,v 1.6 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xload/xload.man,v 1.7 2006/01/09 15:01:34 dawes Exp $ .\" .TH XLOAD 1 __vendorversion__ .SH NAME Index: xc/programs/xlogo/Imakefile diff -u xc/programs/xlogo/Imakefile:1.6 xc/programs/xlogo/Imakefile:1.7 --- xc/programs/xlogo/Imakefile:1.6 Mon Nov 17 10:18:07 2003 +++ xc/programs/xlogo/Imakefile Fri Oct 14 11:17:34 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.6 2003/11/17 15:18:07 tsi Exp $ +XCOMM $XFree86: xc/programs/xlogo/Imakefile,v 1.7 2005/10/14 15:17:34 tsi Exp $ #ifndef XLogoUseRender #define XLogoUseRender BuildRenderLibrary @@ -12,7 +8,7 @@ XRENDERDEFS = -DXRENDER -DXFREE86_FT2 XRENDERDEPS = XftClientDepLibs XRENDERLIBS = XftClientLibs - XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) -I$(XBUILDINCDIR) + XRENDERINCS = $(XFTINCLUDES) $(XRENDERINCLUDES) #endif DEPLIBS = $(XRENDERDEPS) XawClientDepLibs XkbClientDepLibs Index: xc/programs/xlogo/Logo.c diff -u xc/programs/xlogo/Logo.c:1.8 xc/programs/xlogo/Logo.c:1.9 --- xc/programs/xlogo/Logo.c:1.8 Sat Oct 23 11:29:33 2004 +++ xc/programs/xlogo/Logo.c Mon Jan 9 10:01:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Logo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1988, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xlogo/Logo.c,v 1.8 2004/10/23 15:29:33 dawes Exp $ */ +/* $XFree86: xc/programs/xlogo/Logo.c,v 1.9 2006/01/09 15:01:34 dawes Exp $ */ #include #include Index: xc/programs/xlogo/Logo.h diff -u xc/programs/xlogo/Logo.h:1.4 xc/programs/xlogo/Logo.h:1.5 --- xc/programs/xlogo/Logo.h:1.4 Sun Jun 30 22:26:04 2002 +++ xc/programs/xlogo/Logo.h Mon Jan 9 10:01:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Logo.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1988, 1990, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xlogo/Logo.h,v 1.4 2002/07/01 02:26:04 tsi Exp $ */ +/* $XFree86: xc/programs/xlogo/Logo.h,v 1.5 2006/01/09 15:01:34 dawes Exp $ */ #ifndef _XawLogo_h #define _XawLogo_h Index: xc/programs/xlogo/LogoP.h diff -u xc/programs/xlogo/LogoP.h:1.4 xc/programs/xlogo/LogoP.h:1.5 --- xc/programs/xlogo/LogoP.h:1.4 Sun Jun 30 22:26:04 2002 +++ xc/programs/xlogo/LogoP.h Mon Jan 9 10:01:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: LogoP.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1988, 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xlogo/LogoP.h,v 1.4 2002/07/01 02:26:04 tsi Exp $ */ +/* $XFree86: xc/programs/xlogo/LogoP.h,v 1.5 2006/01/09 15:01:34 dawes Exp $ */ #ifndef _XawLogoP_h #define _XawLogoP_h Index: xc/programs/xlogo/RenderLogo.c diff -u xc/programs/xlogo/RenderLogo.c:1.4 xc/programs/xlogo/RenderLogo.c:1.5 --- xc/programs/xlogo/RenderLogo.c:1.4 Thu May 29 11:20:57 2003 +++ xc/programs/xlogo/RenderLogo.c Mon Jan 9 10:01:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: DrawLogo.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xlogo/RenderLogo.c,v 1.4 2003/05/29 15:20:57 tsi Exp $ */ +/* $XFree86: xc/programs/xlogo/RenderLogo.c,v 1.5 2006/01/09 15:01:34 dawes Exp $ */ #include Index: xc/programs/xlogo/RenderLogo.h diff -u xc/programs/xlogo/RenderLogo.h:1.2 xc/programs/xlogo/RenderLogo.h:1.3 --- xc/programs/xlogo/RenderLogo.h:1.2 Sun Jun 30 22:26:04 2002 +++ xc/programs/xlogo/RenderLogo.h Mon Jan 9 10:01:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Logo.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1988, 1990, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xlogo/RenderLogo.h,v 1.2 2002/07/01 02:26:04 tsi Exp $ */ +/* $XFree86: xc/programs/xlogo/RenderLogo.h,v 1.3 2006/01/09 15:01:34 dawes Exp $ */ #ifndef _RenderLogo_h #define _RenderLogo_h Index: xc/programs/xlogo/XLogo-co.ad diff -u xc/programs/xlogo/XLogo-co.ad:1.1.1.2 xc/programs/xlogo/XLogo-co.ad:1.2 --- xc/programs/xlogo/XLogo-co.ad:1.1.1.2 Tue Jan 16 18:01:28 2001 +++ xc/programs/xlogo/XLogo-co.ad Mon Jan 9 10:01:34 2006 @@ -1,4 +1,4 @@ -! $Xorg: XLogo-co.ad,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ +! $XFree86: xc/programs/xlogo/XLogo-co.ad,v 1.2 2006/01/09 15:01:34 dawes Exp $ #include "XLogo" ! MIT colors are Cardinal Red (Pantone 201c) and Silver Grey (Pantone 421c) XLogo*background: rgb:d2/22/32 Index: xc/programs/xlogo/xlogo.c diff -u xc/programs/xlogo/xlogo.c:3.9 xc/programs/xlogo/xlogo.c:3.10 --- xc/programs/xlogo/xlogo.c:3.9 Thu May 23 19:53:59 2002 +++ xc/programs/xlogo/xlogo.c Mon Jan 9 10:01:34 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: xlogo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * */ -/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.9 2002/05/23 23:53:59 keithp Exp $ */ +/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.10 2006/01/09 15:01:34 dawes Exp $ */ #include #include Index: xc/programs/xlogo/xlogo.man diff -u xc/programs/xlogo/xlogo.man:1.12 xc/programs/xlogo/xlogo.man:1.13 --- xc/programs/xlogo/xlogo.man:1.12 Thu Feb 10 22:03:20 2005 +++ xc/programs/xlogo/xlogo.man Mon Jan 9 10:01:34 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xlogo.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.12 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.13 2006/01/09 15:01:34 dawes Exp $ .\" .TH XLOGO 1 __vendorversion__ .SH NAME Index: xc/programs/xlsatoms/Imakefile diff -u xc/programs/xlsatoms/Imakefile:1.4 xc/programs/xlsatoms/Imakefile:1.5 --- xc/programs/xlsatoms/Imakefile:1.4 Tue May 27 13:58:25 2003 +++ xc/programs/xlsatoms/Imakefile Mon Jan 9 10:01:35 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:52 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xlsatoms/Imakefile,v 1.4 2003/05/27 17:58:25 tsi Exp $ +XCOMM $XFree86: xc/programs/xlsatoms/Imakefile,v 1.5 2006/01/09 15:01:35 dawes Exp $ DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB) Index: xc/programs/xlsatoms/xlsatoms.c diff -u xc/programs/xlsatoms/xlsatoms.c:1.6 xc/programs/xlsatoms/xlsatoms.c:1.7 --- xc/programs/xlsatoms/xlsatoms.c:1.6 Fri Dec 14 15:02:08 2001 +++ xc/programs/xlsatoms/xlsatoms.c Mon Jan 9 10:01:35 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: xlsatoms.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.6 2001/12/14 20:02:08 dawes Exp $ */ +/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.7 2006/01/09 15:01:35 dawes Exp $ */ #include #include Index: xc/programs/xlsatoms/xlsatoms.man diff -u xc/programs/xlsatoms/xlsatoms.man:1.9 xc/programs/xlsatoms/xlsatoms.man:1.10 --- xc/programs/xlsatoms/xlsatoms.man:1.9 Thu Feb 10 22:03:20 2005 +++ xc/programs/xlsatoms/xlsatoms.man Mon Jan 9 10:01:35 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xlsatoms.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1989, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.9 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.10 2006/01/09 15:01:35 dawes Exp $ .\" .TH XLSATOMS 1 __vendorversion__ .SH NAME Index: xc/programs/xlsclients/Imakefile diff -u xc/programs/xlsclients/Imakefile:1.4 xc/programs/xlsclients/Imakefile:1.5 --- xc/programs/xlsclients/Imakefile:1.4 Tue May 27 13:58:25 2003 +++ xc/programs/xlsclients/Imakefile Mon Jan 9 10:01:35 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xlsclients/Imakefile,v 1.4 2003/05/27 17:58:25 tsi Exp $ +XCOMM $XFree86: xc/programs/xlsclients/Imakefile,v 1.5 2006/01/09 15:01:35 dawes Exp $ DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB) Index: xc/programs/xlsclients/xlscli.man diff -u xc/programs/xlsclients/xlscli.man:1.9 xc/programs/xlsclients/xlscli.man:1.10 --- xc/programs/xlsclients/xlscli.man:1.9 Thu Feb 10 22:03:20 2005 +++ xc/programs/xlsclients/xlscli.man Mon Jan 9 10:01:35 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xlscli.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ .\" Copyright 1991, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xlsclients/xlscli.man,v 1.9 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xlsclients/xlscli.man,v 1.10 2006/01/09 15:01:35 dawes Exp $ .\" .TH XLSCLIENTS 1 __vendorversion__ .SH NAME Index: xc/programs/xlsclients/xlsclients.c diff -u xc/programs/xlsclients/xlsclients.c:1.6 xc/programs/xlsclients/xlsclients.c:1.7 --- xc/programs/xlsclients/xlsclients.c:1.6 Fri Dec 14 15:02:09 2001 +++ xc/programs/xlsclients/xlsclients.c Mon Jan 9 10:01:35 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: xlsclients.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xlsclients/xlsclients.c,v 1.6 2001/12/14 20:02:09 dawes Exp $ */ +/* $XFree86: xc/programs/xlsclients/xlsclients.c,v 1.7 2006/01/09 15:01:35 dawes Exp $ */ #include #include Index: xc/programs/xlsfonts/Imakefile diff -u xc/programs/xlsfonts/Imakefile:1.2 xc/programs/xlsfonts/Imakefile:1.3 --- xc/programs/xlsfonts/Imakefile:1.2 Tue May 27 13:58:25 2003 +++ xc/programs/xlsfonts/Imakefile Mon Jan 9 10:01:35 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:53 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xlsfonts/Imakefile,v 1.2 2003/05/27 17:58:25 tsi Exp $ +XCOMM $XFree86: xc/programs/xlsfonts/Imakefile,v 1.3 2006/01/09 15:01:35 dawes Exp $ DEPLIBS = $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XONLYLIB) Index: xc/programs/xlsfonts/dsimple.c diff -u xc/programs/xlsfonts/dsimple.c:3.7 xc/programs/xlsfonts/dsimple.c:3.8 --- xc/programs/xlsfonts/dsimple.c:3.7 Tue Sep 23 22:43:38 2003 +++ xc/programs/xlsfonts/dsimple.c Mon Jan 9 10:01:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: dsimple.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.7 2003/09/24 02:43:38 dawes Exp $ */ +/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.8 2006/01/09 15:01:35 dawes Exp $ */ #include #include Index: xc/programs/xlsfonts/dsimple.h diff -u xc/programs/xlsfonts/dsimple.h:1.9 xc/programs/xlsfonts/dsimple.h:1.10 --- xc/programs/xlsfonts/dsimple.h:1.9 Mon Nov 17 17:20:54 2003 +++ xc/programs/xlsfonts/dsimple.h Mon Jan 9 10:01:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: dsimple.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.9 2003/11/17 22:20:54 dawes Exp $ */ +/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.10 2006/01/09 15:01:35 dawes Exp $ */ /* * Just_display.h: This file contains the definitions needed to use the Index: xc/programs/xlsfonts/xlsfonts.c diff -u xc/programs/xlsfonts/xlsfonts.c:1.10 xc/programs/xlsfonts/xlsfonts.c:1.11 --- xc/programs/xlsfonts/xlsfonts.c:1.10 Sat Sep 13 17:33:11 2003 +++ xc/programs/xlsfonts/xlsfonts.c Sun Mar 27 21:51:14 2005 @@ -1,6 +1,4 @@ /* - * $Xorg: xlsfonts.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -24,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/programs/xlsfonts/xlsfonts.c,v 1.10 2003/09/13 21:33:11 dawes Exp $ */ +/* $XFree86: xc/programs/xlsfonts/xlsfonts.c,v 1.11 2005/03/28 02:51:14 dawes Exp $ */ #include #include @@ -68,7 +66,7 @@ static int IgnoreError(Display *, XErrorEvent *); static void PrintProperty(XFontProp *); static void ComputeFontType(XFontStruct *); -static void print_character_metrics(register XFontStruct *); +static void print_character_metrics(XFontStruct *); void @@ -100,9 +98,7 @@ } int -main(argc, argv) -int argc; -char **argv; +main(int argc, char **argv) { int argcnt = 0, i; @@ -168,8 +164,7 @@ } void -get_list(pattern) - char *pattern; +get_list(char *pattern) { int available = nnames+1, i; @@ -224,9 +219,7 @@ } static int -compare(arg1, arg2) - const void *arg1; - const void *arg2; +compare(const void *arg1, const void *arg2) { const FontList *f1 = arg1; const FontList *f2 = arg2; @@ -397,8 +390,7 @@ #ifndef max static int -max(i, j) - int i, j; +max(int i, int j) { if (i > j) return (i); @@ -407,9 +399,7 @@ #endif void -copy_number(pp1, pp2, n1, n2) - char **pp1, **pp2; - int n1, n2; +copy_number(char **pp1, char **pp2, int n1, int n2) { char *p1 = *pp1; char *p2 = *pp2; @@ -429,9 +419,8 @@ /* ARGSUSED */ -static int IgnoreError(disp, event) - Display *disp; - XErrorEvent *event; +static int +IgnoreError(Display *disp, XErrorEvent *event) { return 0; } @@ -445,7 +434,7 @@ #define PrintBounds(_what,_ptr) \ -{ register XCharStruct *p = (_ptr); \ +{ XCharStruct *p = (_ptr); \ printf (bounds_metrics_fmt, _what, p->width, p->lbearing, \ p->rbearing, p->ascent, p->descent, p->attributes); } @@ -488,8 +477,8 @@ NULL }; -static void PrintProperty (prop) - XFontProp *prop; +static void +PrintProperty(XFontProp *prop) { char *atom, *value; char nosuch[40]; @@ -531,8 +520,7 @@ static void -ComputeFontType (fs) - XFontStruct *fs; +ComputeFontType(XFontStruct *fs) { int i; Bool char_cell = True; @@ -600,11 +588,10 @@ static void -print_character_metrics (info) - register XFontStruct *info; +print_character_metrics(XFontStruct *info) { - register XCharStruct *pc = info->per_char; - register int i, j; + XCharStruct *pc = info->per_char; + int i, j; unsigned n, saven; printf (" character metrics:\n"); @@ -625,12 +612,10 @@ void -do_query_font (dpy, name) - Display *dpy; - char *name; +do_query_font(Display *dpy, char *name) { - register int i; - register XFontStruct *info = XLoadQueryFont (dpy, name); + int i; + XFontStruct *info = XLoadQueryFont (dpy, name); if (!info) { fprintf (stderr, "%s: unable to get info about font \"%s\"\n", Index: xc/programs/xlsfonts/xlsfonts.man diff -u xc/programs/xlsfonts/xlsfonts.man:1.9 xc/programs/xlsfonts/xlsfonts.man:1.10 --- xc/programs/xlsfonts/xlsfonts.man:1.9 Thu Feb 10 22:03:20 2005 +++ xc/programs/xlsfonts/xlsfonts.man Mon Jan 9 10:01:35 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xlsfonts.man,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xlsfonts/xlsfonts.man,v 1.9 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xlsfonts/xlsfonts.man,v 1.10 2006/01/09 15:01:35 dawes Exp $ .\" .TH XLSFONTS 1 __vendorversion__ .SH NAME Index: xc/programs/xmag/CutPaste.c diff -u xc/programs/xmag/CutPaste.c:1.6 xc/programs/xmag/CutPaste.c:1.7 --- xc/programs/xmag/CutPaste.c:1.6 Fri Dec 14 15:02:11 2001 +++ xc/programs/xmag/CutPaste.c Mon Jan 9 10:01:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CutPaste.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/CutPaste.c,v 1.6 2001/12/14 20:02:11 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/CutPaste.c,v 1.7 2006/01/09 15:01:36 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium */ Index: xc/programs/xmag/Imakefile diff -u xc/programs/xmag/Imakefile:1.1.1.2 xc/programs/xmag/Imakefile:1.2 --- xc/programs/xmag/Imakefile:1.1.1.2 Tue Jan 16 18:01:41 2001 +++ xc/programs/xmag/Imakefile Mon Jan 9 10:01:36 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xmag/Imakefile,v 1.2 2006/01/09 15:01:36 dawes Exp $ + DEFINES = $(IEEE_DEFS) $(SIGNAL_DEFINES) DEPLIBS = XawClientDepLibs LOCAL_LIBRARIES = XawClientLibs Index: xc/programs/xmag/RootWin.c diff -u xc/programs/xmag/RootWin.c:1.5 xc/programs/xmag/RootWin.c:1.6 --- xc/programs/xmag/RootWin.c:1.5 Fri Dec 14 15:02:11 2001 +++ xc/programs/xmag/RootWin.c Mon Jan 9 10:01:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: RootWin.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/RootWin.c,v 1.5 2001/12/14 20:02:11 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/RootWin.c,v 1.6 2006/01/09 15:01:36 dawes Exp $ */ #include Index: xc/programs/xmag/RootWin.h diff -u xc/programs/xmag/RootWin.h:1.2 xc/programs/xmag/RootWin.h:1.3 --- xc/programs/xmag/RootWin.h:1.2 Fri Dec 14 15:02:11 2001 +++ xc/programs/xmag/RootWin.h Mon Jan 9 10:01:36 2006 @@ -1,4 +1,4 @@ -/* $Xorg: RootWin.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xmag/RootWin.h,v 1.3 2006/01/09 15:01:36 dawes Exp $ */ /* Copyright 1990, 1998 The Open Group Index: xc/programs/xmag/RootWinP.h diff -u xc/programs/xmag/RootWinP.h:1.2 xc/programs/xmag/RootWinP.h:1.3 --- xc/programs/xmag/RootWinP.h:1.2 Fri Dec 14 15:02:11 2001 +++ xc/programs/xmag/RootWinP.h Mon Jan 9 10:01:36 2006 @@ -1,4 +1,4 @@ -/* $Xorg: RootWinP.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xmag/RootWinP.h,v 1.3 2006/01/09 15:01:36 dawes Exp $ */ /* Copyright 1990, 1998 The Open Group Index: xc/programs/xmag/Scale.c diff -u xc/programs/xmag/Scale.c:3.9 xc/programs/xmag/Scale.c:3.10 --- xc/programs/xmag/Scale.c:3.9 Fri Dec 14 15:02:11 2001 +++ xc/programs/xmag/Scale.c Mon Jan 9 10:01:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Scale.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/Scale.c,v 3.9 2001/12/14 20:02:11 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/Scale.c,v 3.10 2006/01/09 15:01:36 dawes Exp $ */ /* * Author: Davor Matic, MIT X Consortium Index: xc/programs/xmag/Scale.h diff -u xc/programs/xmag/Scale.h:1.5 xc/programs/xmag/Scale.h:1.6 --- xc/programs/xmag/Scale.h:1.5 Fri Dec 14 15:02:11 2001 +++ xc/programs/xmag/Scale.h Mon Jan 9 10:01:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Scale.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/Scale.h,v 1.5 2001/12/14 20:02:11 dawes Exp $ */ +/* $XFree86: xc/programs/xmag/Scale.h,v 1.6 2006/01/09 15:01:36 dawes Exp $ */ #ifndef _XawScale_h #define _XawScale_h Index: xc/programs/xmag/ScaleP.h diff -u xc/programs/xmag/ScaleP.h:1.2 xc/programs/xmag/ScaleP.h:1.3 --- xc/programs/xmag/ScaleP.h:1.2 Fri Dec 14 15:02:11 2001 +++ xc/programs/xmag/ScaleP.h Mon Jan 9 10:01:36 2006 @@ -1,4 +1,4 @@ -/* $Xorg: ScaleP.h,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xmag/ScaleP.h,v 1.3 2006/01/09 15:01:36 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group Index: xc/programs/xmag/Xmag.ad diff -u xc/programs/xmag/Xmag.ad:1.2 xc/programs/xmag/Xmag.ad:1.3 --- xc/programs/xmag/Xmag.ad:1.2 Sat Jan 18 23:44:45 2003 +++ xc/programs/xmag/Xmag.ad Mon Jan 9 10:01:36 2006 @@ -1,5 +1,4 @@ -! $Xorg: Xmag.ad,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ -! $XFree86: xc/programs/xmag/Xmag.ad,v 1.2 2003/01/19 04:44:45 paulo Exp $ +! $XFree86: xc/programs/xmag/Xmag.ad,v 1.3 2006/01/09 15:01:36 dawes Exp $ *Font: fixed *pane2*orientation: horizontal *pane2*showGrip: False Index: xc/programs/xmag/xmag.c diff -u xc/programs/xmag/xmag.c:1.14 xc/programs/xmag/xmag.c:1.15 --- xc/programs/xmag/xmag.c:1.14 Sun Sep 21 09:05:51 2003 +++ xc/programs/xmag/xmag.c Mon Jan 9 10:01:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xmag.c,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmag/xmag.c,v 1.14 2003/09/21 13:05:51 herrb Exp $ */ +/* $XFree86: xc/programs/xmag/xmag.c,v 1.15 2006/01/09 15:01:36 dawes Exp $ */ #include /* for exit() and abs() */ Index: xc/programs/xmag/xmag.man diff -u xc/programs/xmag/xmag.man:1.8 xc/programs/xmag/xmag.man:1.9 --- xc/programs/xmag/xmag.man:1.8 Thu Feb 10 22:03:20 2005 +++ xc/programs/xmag/xmag.man Mon Jan 9 10:01:36 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xmag.man,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $ .\" Copyright 1991, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xmag/xmag.man,v 1.8 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xmag/xmag.man,v 1.9 2006/01/09 15:01:36 dawes Exp $ .\" .TH XMAG 1 __vendorversion__ .SH NAME Index: xc/programs/xman/Imakefile diff -u xc/programs/xman/Imakefile:1.10 xc/programs/xman/Imakefile:1.11 --- xc/programs/xman/Imakefile:1.10 Sat Aug 2 13:35:48 2003 +++ xc/programs/xman/Imakefile Mon Jan 9 10:01:36 2006 @@ -1,5 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.22 91/09/09 16:02:18 rws Exp $ -XCOMM $XFree86: xc/programs/xman/Imakefile,v 1.10 2003/08/02 17:35:48 herrb Exp $ +XCOMM $XFree86: xc/programs/xman/Imakefile,v 1.11 2006/01/09 15:01:36 dawes Exp $ #ifdef XmanSearchPath XMANSYSPATH = XmanSearchPath Index: xc/programs/xman/ScrollByL.c diff -u xc/programs/xman/ScrollByL.c:1.8 xc/programs/xman/ScrollByL.c:1.9 --- xc/programs/xman/ScrollByL.c:1.8 Thu Mar 11 21:17:55 2004 +++ xc/programs/xman/ScrollByL.c Mon Jan 9 10:01:36 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: ScrollByL.c,v 1.30 94/04/17 20:43:46 rws Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,11 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/ScrollByL.c,v 1.8 2004/03/12 02:17:55 dickey Exp $ */ - -#if !defined(lint) && !defined(SABER) && 0 - static char rcs_version[] = "$Athena: ScrollByL.c,v 4.5 88/12/19 13:46:04 kit Exp $"; -#endif +/* $XFree86: xc/programs/xman/ScrollByL.c,v 1.9 2006/01/09 15:01:36 dawes Exp $ */ #include #include Index: xc/programs/xman/ScrollByL.h diff -u xc/programs/xman/ScrollByL.h:1.3 xc/programs/xman/ScrollByL.h:1.4 --- xc/programs/xman/ScrollByL.h:1.3 Thu Apr 22 10:15:05 2004 +++ xc/programs/xman/ScrollByL.h Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: ScrollByL.h,v 1.7 94/04/17 20:43:48 dave Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/ScrollByL.h,v 1.3 2004/04/22 14:15:05 tsi Exp $ */ +/* $XFree86: xc/programs/xman/ScrollByL.h,v 1.4 2006/01/09 15:01:37 dawes Exp $ */ #ifndef _XtScrollByLine_h #define _XtScrollByLine_h Index: xc/programs/xman/ScrollByLP.h diff -u xc/programs/xman/ScrollByLP.h:1.3 xc/programs/xman/ScrollByLP.h:1.4 --- xc/programs/xman/ScrollByLP.h:1.3 Thu Apr 22 10:15:05 2004 +++ xc/programs/xman/ScrollByLP.h Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: ScrollByLP.h,v 1.9 94/04/17 20:43:49 keith Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/ScrollByLP.h,v 1.3 2004/04/22 14:15:05 tsi Exp $ */ +/* $XFree86: xc/programs/xman/ScrollByLP.h,v 1.4 2006/01/09 15:01:37 dawes Exp $ */ #ifndef _XtScrollByLinePrivate_h Index: xc/programs/xman/buttons.c diff -u xc/programs/xman/buttons.c:1.5 xc/programs/xman/buttons.c:1.6 --- xc/programs/xman/buttons.c:1.5 Thu Mar 11 21:17:55 2004 +++ xc/programs/xman/buttons.c Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: buttons.c,v 1.33 94/04/17 20:43:50 dave Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/buttons.c,v 1.5 2004/03/12 02:17:55 dickey Exp $ */ +/* $XFree86: xc/programs/xman/buttons.c,v 1.6 2006/01/09 15:01:37 dawes Exp $ */ /* * xman - X window system manual page display program. Index: xc/programs/xman/defs.h diff -u xc/programs/xman/defs.h:1.3 xc/programs/xman/defs.h:1.4 --- xc/programs/xman/defs.h:1.3 Thu Apr 19 15:54:51 2001 +++ xc/programs/xman/defs.h Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: defs.h,v 1.25 94/04/17 20:43:50 converse Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/defs.h,v 1.3 2001/04/19 19:54:51 dawes Exp $ */ +/* $XFree86: xc/programs/xman/defs.h,v 1.4 2006/01/09 15:01:37 dawes Exp $ */ /* * xman - X window system manual page display program. Index: xc/programs/xman/globals.c diff -u xc/programs/xman/globals.c:1.1 xc/programs/xman/globals.c:1.2 --- xc/programs/xman/globals.c:1.1 Fri Feb 11 22:55:15 2000 +++ xc/programs/xman/globals.c Mon Jan 9 10:01:37 2006 @@ -1,4 +1,4 @@ -/* $XConsortium: globals.c,v 1.9 94/04/17 20:43:51 rws Exp $ */ +/* $XFree86: xc/programs/xman/globals.c,v 1.2 2006/01/09 15:01:37 dawes Exp $ */ /* Copyright (c) 1987, 1988 X Consortium Index: xc/programs/xman/globals.h diff -u xc/programs/xman/globals.h:1.3 xc/programs/xman/globals.h:1.4 --- xc/programs/xman/globals.h:1.3 Fri Mar 3 18:16:26 2000 +++ xc/programs/xman/globals.h Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: globals.h,v 1.9 94/04/17 20:43:51 dave Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/globals.h,v 1.3 2000/03/03 23:16:26 dawes Exp $ */ +/* $XFree86: xc/programs/xman/globals.h,v 1.4 2006/01/09 15:01:37 dawes Exp $ */ #include "man.h" Index: xc/programs/xman/handler.c diff -u xc/programs/xman/handler.c:1.8 xc/programs/xman/handler.c:1.9 --- xc/programs/xman/handler.c:1.8 Thu Mar 11 21:17:55 2004 +++ xc/programs/xman/handler.c Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: handler.c,v 1.22 94/12/16 21:36:53 gildea Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/handler.c,v 1.8 2004/03/12 02:17:55 dickey Exp $ */ +/* $XFree86: xc/programs/xman/handler.c,v 1.9 2006/01/09 15:01:37 dawes Exp $ */ /* * xman - X window system manual page display program. Index: xc/programs/xman/help.c diff -u xc/programs/xman/help.c:1.4 xc/programs/xman/help.c:1.5 --- xc/programs/xman/help.c:1.4 Thu Mar 11 21:17:55 2004 +++ xc/programs/xman/help.c Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: help.c,v 1.10 94/04/17 20:43:53 dave Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/help.c,v 1.4 2004/03/12 02:17:55 dickey Exp $ */ +/* $XFree86: xc/programs/xman/help.c,v 1.5 2006/01/09 15:01:37 dawes Exp $ */ /* * xman - X window system manual page display program. Index: xc/programs/xman/icon_help.h diff -u xc/programs/xman/icon_help.h:1.1 xc/programs/xman/icon_help.h:1.2 --- xc/programs/xman/icon_help.h:1.1 Fri Feb 11 22:55:16 2000 +++ xc/programs/xman/icon_help.h Mon Jan 9 10:01:37 2006 @@ -1,4 +1,4 @@ -/* $XConsortium: icon_help.h,v 1.5 94/04/17 20:43:54 rws Exp $ */ +/* $XFree86: xc/programs/xman/icon_help.h,v 1.2 2006/01/09 15:01:37 dawes Exp $ */ /* Copyright (c) 1987, 1988 X Consortium Index: xc/programs/xman/icon_open.h diff -u xc/programs/xman/icon_open.h:1.1 xc/programs/xman/icon_open.h:1.2 --- xc/programs/xman/icon_open.h:1.1 Fri Feb 11 22:55:16 2000 +++ xc/programs/xman/icon_open.h Mon Jan 9 10:01:37 2006 @@ -1,4 +1,4 @@ -/* $XConsortium: icon_open.h,v 1.5 94/04/17 20:43:54 rws Exp $ */ +/* $XFree86: xc/programs/xman/icon_open.h,v 1.2 2006/01/09 15:01:37 dawes Exp $ */ /* Copyright (c) 1987, 1988 X Consortium Index: xc/programs/xman/iconclosed.h diff -u xc/programs/xman/iconclosed.h:1.1 xc/programs/xman/iconclosed.h:1.2 --- xc/programs/xman/iconclosed.h:1.1 Fri Feb 11 22:55:17 2000 +++ xc/programs/xman/iconclosed.h Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: iconclosed.h,v 1.5 94/04/17 20:43:55 rws Exp $ */ /* Copyright (c) 1987, 1988 X Consortium Index: xc/programs/xman/main.c diff -u xc/programs/xman/main.c:1.5 xc/programs/xman/main.c:1.6 --- xc/programs/xman/main.c:1.5 Thu Mar 11 21:17:55 2004 +++ xc/programs/xman/main.c Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: main.c,v 1.23 94/04/17 20:43:55 rws Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/main.c,v 1.5 2004/03/12 02:17:55 dickey Exp $ */ +/* $XFree86: xc/programs/xman/main.c,v 1.6 2006/01/09 15:01:37 dawes Exp $ */ /* * xman - X window system manual page display program. Index: xc/programs/xman/man.c diff -u xc/programs/xman/man.c:1.11 xc/programs/xman/man.c:1.12 --- xc/programs/xman/man.c:1.11 Sat Apr 3 17:26:26 2004 +++ xc/programs/xman/man.c Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: man.c,v 1.30 94/04/17 20:43:56 rws Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/man.c,v 1.11 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xman/man.c,v 1.12 2006/01/09 15:01:37 dawes Exp $ */ #include "globals.h" Index: xc/programs/xman/man.h diff -u xc/programs/xman/man.h:1.6 xc/programs/xman/man.h:1.7 --- xc/programs/xman/man.h:1.6 Thu Jul 1 06:19:09 2004 +++ xc/programs/xman/man.h Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: man.h,v 1.31 94/12/16 21:36:53 gildea Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/man.h,v 1.6 2004/07/01 10:19:09 alanh Exp $ */ +/* $XFree86: xc/programs/xman/man.h,v 1.7 2006/01/09 15:01:37 dawes Exp $ */ /* X toolkit header files */ Index: xc/programs/xman/misc.c diff -u xc/programs/xman/misc.c:1.12 xc/programs/xman/misc.c:1.13 --- xc/programs/xman/misc.c:1.12 Sat Apr 3 17:26:26 2004 +++ xc/programs/xman/misc.c Mon Jan 9 10:01:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: misc.c,v 1.31 94/12/16 21:36:53 gildea Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/misc.c,v 1.12 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xman/misc.c,v 1.13 2006/01/09 15:01:37 dawes Exp $ */ /* * xman - X window system manual page display program. Index: xc/programs/xman/search.c diff -u xc/programs/xman/search.c:1.7 xc/programs/xman/search.c:1.8 --- xc/programs/xman/search.c:1.7 Thu Mar 11 21:17:55 2004 +++ xc/programs/xman/search.c Mon Jan 9 10:01:38 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: search.c,v 1.21 94/04/17 20:43:58 rws Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/search.c,v 1.7 2004/03/12 02:17:55 dickey Exp $ */ +/* $XFree86: xc/programs/xman/search.c,v 1.8 2006/01/09 15:01:38 dawes Exp $ */ #include "globals.h" Index: xc/programs/xman/tkfuncs.c diff -u xc/programs/xman/tkfuncs.c:1.3 xc/programs/xman/tkfuncs.c:1.4 --- xc/programs/xman/tkfuncs.c:1.3 Fri Mar 3 18:16:28 2000 +++ xc/programs/xman/tkfuncs.c Mon Jan 9 10:01:38 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: tkfuncs.c,v 1.6 94/04/17 20:43:59 rws Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/tkfuncs.c,v 1.3 2000/03/03 23:16:28 dawes Exp $ */ +/* $XFree86: xc/programs/xman/tkfuncs.c,v 1.4 2006/01/09 15:01:38 dawes Exp $ */ #include #include Index: xc/programs/xman/vendor.c diff -u xc/programs/xman/vendor.c:1.4 xc/programs/xman/vendor.c:1.5 --- xc/programs/xman/vendor.c:1.4 Sat Apr 3 17:26:26 2004 +++ xc/programs/xman/vendor.c Mon Jan 9 10:01:38 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: vendor.c,v 1.10 94/04/17 20:43:59 rws Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/vendor.c,v 1.4 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xman/vendor.c,v 1.5 2006/01/09 15:01:38 dawes Exp $ */ /* Vendor-specific data structures and operations */ Index: xc/programs/xman/vendor.h diff -u xc/programs/xman/vendor.h:1.14 xc/programs/xman/vendor.h:1.15 --- xc/programs/xman/vendor.h:1.14 Thu Mar 11 21:17:55 2004 +++ xc/programs/xman/vendor.h Mon Jan 9 10:01:38 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: vendor.h,v 1.12 94/04/17 20:44:00 rws Exp $ */ /* Copyright (c) 1991 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xman/vendor.h,v 1.14 2004/03/12 02:17:55 dickey Exp $ */ +/* $XFree86: xc/programs/xman/vendor.h,v 1.15 2006/01/09 15:01:38 dawes Exp $ */ /* Vendor-specific definitions */ Index: xc/programs/xman/version.h diff -u xc/programs/xman/version.h:1.1 xc/programs/xman/version.h:1.2 --- xc/programs/xman/version.h:1.1 Fri Feb 11 22:55:19 2000 +++ xc/programs/xman/version.h Mon Jan 9 10:01:38 2006 @@ -1,4 +1,4 @@ -/* $XConsortium: version.h,v 1.11 94/04/17 20:44:00 gildea Exp $ */ +/* $XFree86: xc/programs/xman/version.h,v 1.2 2006/01/09 15:01:38 dawes Exp $ */ /* Copyright (c) 1987, 1988 X Consortium @@ -29,4 +29,4 @@ */ -#define XMAN_VERSION "Xman Version 3.1.6 - X11R6." +#define XMAN_VERSION "Xman Version 3.1.6 - XFree86 4.x" Index: xc/programs/xman/xman.man diff -u xc/programs/xman/xman.man:1.6 xc/programs/xman/xman.man:1.7 --- xc/programs/xman/xman.man:1.6 Thu Feb 10 22:03:20 2005 +++ xc/programs/xman/xman.man Mon Jan 9 10:01:38 2006 @@ -1,6 +1,4 @@ -.\" $XConsortium: xman.man,v 1.23 94/04/17 20:44:02 matt Exp $ -.\" -.\" $XFree86: xc/programs/xman/xman.man,v 1.6 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xman/xman.man,v 1.7 2006/01/09 15:01:38 dawes Exp $ .\" .TH XMAN 1 __vendorversion__ .SH NAME Index: xc/programs/xmessage/Imakefile diff -u xc/programs/xmessage/Imakefile:1.2 xc/programs/xmessage/Imakefile:1.3 --- xc/programs/xmessage/Imakefile:1.2 Mon Oct 14 22:26:12 2002 +++ xc/programs/xmessage/Imakefile Mon Jan 9 10:01:38 2006 @@ -1,11 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.2 94/04/11 14:39:17 gildea Exp $ - - - - -XCOMM $XFree86: xc/programs/xmessage/Imakefile,v 1.2 2002/10/15 02:26:12 dawes Exp $ - - +XCOMM $XFree86: xc/programs/xmessage/Imakefile,v 1.3 2006/01/09 15:01:38 dawes Exp $ #if HasMkstemp DEFINES = -DHAS_MKSTEMP Index: xc/programs/xmessage/Tests diff -u xc/programs/xmessage/Tests:1.1 xc/programs/xmessage/Tests:1.2 --- xc/programs/xmessage/Tests:1.1 Sat Feb 12 22:26:33 2000 +++ xc/programs/xmessage/Tests Mon Jan 9 10:01:38 2006 @@ -1,5 +1,5 @@ #! /bin/sh -v -# $XConsortium: Tests,v 1.3 94/06/03 15:58:32 gildea Exp $ +# $XFree86: xc/programs/xmessage/Tests,v 1.2 2006/01/09 15:01:38 dawes Exp $ xmessage this is standard usage, message on the command line echo this is a message from standard input | xmessage -file - xmessage -file Imakefile -buttons print,me -print Index: xc/programs/xmessage/Xmessage.ad diff -u xc/programs/xmessage/Xmessage.ad:1.2 xc/programs/xmessage/Xmessage.ad:1.3 --- xc/programs/xmessage/Xmessage.ad:1.2 Mon Oct 14 22:26:12 2002 +++ xc/programs/xmessage/Xmessage.ad Mon Jan 9 10:01:38 2006 @@ -1,4 +1,4 @@ -! $XConsortium: Xmessage.ad,v 1.3 94/07/26 20:23:17 gildea Exp $ +! $XFree86: xc/programs/xmessage/Xmessage.ad,v 1.3 2006/01/09 15:01:38 dawes Exp $ *baseTranslations: #override :Return: default-exit() *message.scrollVertical: Always *message.scrollHorizontal: Never Index: xc/programs/xmessage/makeform.c diff -u xc/programs/xmessage/makeform.c:1.7 xc/programs/xmessage/makeform.c:1.8 --- xc/programs/xmessage/makeform.c:1.7 Mon Apr 14 19:03:13 2003 +++ xc/programs/xmessage/makeform.c Mon May 23 20:46:23 2005 @@ -1,4 +1,3 @@ -/* $XConsortium: makeform.c,v 1.6 95/01/04 16:28:51 gildea Exp $ */ /* Copyright (c) 1988, 1991 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xmessage/makeform.c,v 1.7 2003/04/14 23:03:13 herrb Exp $ */ +/* $XFree86: xc/programs/xmessage/makeform.c,v 1.8 2005/05/24 00:46:23 dawes Exp $ */ #include #include @@ -71,6 +70,7 @@ } } *dst = '\0'; + br++; } return; } Index: xc/programs/xmessage/readfile.c diff -u xc/programs/xmessage/readfile.c:1.3 xc/programs/xmessage/readfile.c:1.4 --- xc/programs/xmessage/readfile.c:1.3 Mon Apr 14 19:03:13 2003 +++ xc/programs/xmessage/readfile.c Mon Jan 9 10:01:39 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: readfile.c,v 1.5 94/12/11 14:25:48 gildea Exp $ */ /* Copyright (c) 1988, 1991 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xmessage/readfile.c,v 1.3 2003/04/14 23:03:13 herrb Exp $ */ +/* $XFree86: xc/programs/xmessage/readfile.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ #include /* for types.h */ #include Index: xc/programs/xmessage/xmessage.c diff -u xc/programs/xmessage/xmessage.c:1.5 xc/programs/xmessage/xmessage.c:1.6 --- xc/programs/xmessage/xmessage.c:1.5 Mon Apr 14 19:03:13 2003 +++ xc/programs/xmessage/xmessage.c Mon Jan 9 10:01:39 2006 @@ -1,4 +1,3 @@ -static char*id="$XConsortium: xmessage.c,v 1.6 95/01/04 16:29:54 gildea Exp $"; /* Copyright (c) 1988, 1991, 1994 X Consortium @@ -28,7 +27,7 @@ from the X Consortium. */ -/* $XFree86: xc/programs/xmessage/xmessage.c,v 1.5 2003/04/14 23:03:13 herrb Exp $ */ +/* $XFree86: xc/programs/xmessage/xmessage.c,v 1.6 2006/01/09 15:01:39 dawes Exp $ */ #include #include @@ -120,7 +119,6 @@ fprintf (outf, "where options include:\n"); for (cpp = options; *cpp; cpp++) fprintf (outf, "%s\n", *cpp); - fprintf (outf, "%s\n", id+1); } /* Index: xc/programs/xmessage/xmessage.man diff -u xc/programs/xmessage/xmessage.man:1.4 xc/programs/xmessage/xmessage.man:1.5 --- xc/programs/xmessage/xmessage.man:1.4 Thu Feb 10 22:03:20 2005 +++ xc/programs/xmessage/xmessage.man Mon Jan 9 10:01:39 2006 @@ -1,6 +1,4 @@ -.\" $XConsortium: xmessage.man,v 1.8 95/03/08 22:28:48 gildea Exp $ -.\" -.\" $XFree86: xc/programs/xmessage/xmessage.man,v 1.4 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xmessage/xmessage.man,v 1.5 2006/01/09 15:01:39 dawes Exp $ .\" .TH XMESSAGE 1 __vendorversion__ .SH NAME Index: xc/programs/xmh/Imakefile diff -u xc/programs/xmh/Imakefile:1.1.1.3 xc/programs/xmh/Imakefile:1.2 --- xc/programs/xmh/Imakefile:1.1.1.3 Sat Dec 21 22:30:56 1996 +++ xc/programs/xmh/Imakefile Mon Jan 9 10:01:39 2006 @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile /main/31 1996/09/28 17:18:46 rws $ +XCOMM $XFree86: xc/programs/xmh/Imakefile,v 1.2 2006/01/09 15:01:39 dawes Exp $ #if HasVFork VFORK_DEFINES = -DHAS_VFORK Index: xc/programs/xmh/Xmh.ad diff -u xc/programs/xmh/Xmh.ad:1.1.1.1 xc/programs/xmh/Xmh.ad:1.2 --- xc/programs/xmh/Xmh.ad:1.1.1.1 Wed Apr 27 03:12:50 1994 +++ xc/programs/xmh/Xmh.ad Mon Jan 9 10:01:39 2006 @@ -1,4 +1,4 @@ -! $XConsortium: Xmh.ad,v 1.32 94/02/09 19:44:06 gildea Exp $ +! $XFree86: xc/programs/xmh/Xmh.ad,v 1.2 2006/01/09 15:01:39 dawes Exp $ ! AppDefaultsVersion should only be defined in the site-wide file Xmh.AppDefaultsVersion: 1 Index: xc/programs/xmh/actions.h diff -u xc/programs/xmh/actions.h:1.3 xc/programs/xmh/actions.h:1.4 --- xc/programs/xmh/actions.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/actions.h Mon Jan 9 10:01:39 2006 @@ -1,6 +1,4 @@ /* - * $XConsortium: actions.h,v 1.10 94/04/17 20:24:00 converse Exp $ - * Copyright (c) 1989 X Consortium Permission is hereby granted, free of charge, to any person obtaining a copy @@ -25,7 +23,7 @@ in this Software without prior written authorization from the X Consortium. * */ -/* $XFree86: xc/programs/xmh/actions.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/actions.h,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ #define XMH_ACTION_ARGS Widget, XEvent *, String *, Cardinal * Index: xc/programs/xmh/bbox.c diff -u xc/programs/xmh/bbox.c:1.3 xc/programs/xmh/bbox.c:1.4 --- xc/programs/xmh/bbox.c:1.3 Fri Apr 5 16:06:28 2002 +++ xc/programs/xmh/bbox.c Mon Jan 9 10:01:39 2006 @@ -1,6 +1,4 @@ /* - * $XConsortium: bbox.c,v 2.35 91/07/10 19:34:59 converse Exp $ - * * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION @@ -24,7 +22,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/bbox.c,v 1.3 2002/04/05 21:06:28 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/bbox.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ /* bbox.c -- management of buttons and buttonboxes. * Index: xc/programs/xmh/bbox.h diff -u xc/programs/xmh/bbox.h:1.3 xc/programs/xmh/bbox.h:1.4 --- xc/programs/xmh/bbox.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/bbox.h Mon Jan 9 10:01:39 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: bbox.h,v 2.12 91/07/10 19:34:09 converse Exp $ */ /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -23,7 +22,7 @@ * advertising or publicity pertaining to distribution of the software without * specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/bbox.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/bbox.h,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ #ifndef _bbox_h #define _bbox_h Index: xc/programs/xmh/bboxint.h diff -u xc/programs/xmh/bboxint.h:1.1.1.1 xc/programs/xmh/bboxint.h:1.2 --- xc/programs/xmh/bboxint.h:1.1.1.1 Wed Apr 27 03:12:48 1994 +++ xc/programs/xmh/bboxint.h Mon Jan 9 10:01:39 2006 @@ -1,5 +1,4 @@ -/* $XConsortium: bboxint.h,v 2.10 89/09/15 16:10:22 converse Exp $ - * +/* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS Index: xc/programs/xmh/command.c diff -u xc/programs/xmh/command.c:3.10 xc/programs/xmh/command.c:3.12 --- xc/programs/xmh/command.c:3.10 Sat Apr 3 17:26:26 2004 +++ xc/programs/xmh/command.c Mon Jan 9 10:01:39 2006 @@ -1,5 +1,4 @@ -/* $XConsortium: command.c,v 2.49 95/04/05 19:59:06 kaleb Exp $ */ -/* $XFree86: xc/programs/xmh/command.c,v 3.10 2004/04/03 22:26:26 dawes Exp $ */ +/* $XFree86: xc/programs/xmh/command.c,v 3.12 2006/01/09 15:01:39 dawes Exp $ */ /* * COPYRIGHT 1987, 1989 @@ -129,16 +128,16 @@ static int _DoCommandToFileOrPipe( char **argv, /* The command to execute, and its args. */ int inputfd, /* Input stream for command. */ - int outputfd, /* Output stream; /dev/null if == -1 */ + volatile int outputfd, /* Output stream; /dev/null if == -1 */ char **bufP, /* output buffer ptr if outputfd == -2 */ int *lenP) /* output length ptr if outputfd == -2 */ { XtAppContext appCtx = XtWidgetToApplicationContext(toplevel); int return_status; - int old_stdin = 0, old_stdout = 0, old_stderr = 0; + volatile int old_stdin = 0, old_stdout = 0, old_stderr = 0; int pid; fd_set readfds, fds; - Boolean output_to_pipe = False; + volatile Boolean output_to_pipe = False; CommandStatus status = XtNew(CommandStatusRec); FD_ZERO(&fds); FD_SET(ConnectionNumber(theDisplay), &fds); Index: xc/programs/xmh/compfuncs.c diff -u xc/programs/xmh/compfuncs.c:1.3 xc/programs/xmh/compfuncs.c:1.4 --- xc/programs/xmh/compfuncs.c:1.3 Fri Apr 5 16:06:28 2002 +++ xc/programs/xmh/compfuncs.c Mon Jan 9 10:01:39 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: compfuncs.c,v 2.18 92/04/08 12:20:08 rws Exp $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/compfuncs.c,v 1.3 2002/04/05 21:06:28 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/compfuncs.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ /* comp.c -- action procedures to handle composition buttons. */ Index: xc/programs/xmh/externs.h diff -u xc/programs/xmh/externs.h:1.5 xc/programs/xmh/externs.h:1.6 --- xc/programs/xmh/externs.h:1.5 Fri Apr 5 16:06:28 2002 +++ xc/programs/xmh/externs.h Mon Jan 9 10:01:39 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: externs.h /main/36 1996/01/14 16:51:37 kaleb $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -25,7 +22,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/externs.h,v 1.5 2002/04/05 21:06:28 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/externs.h,v 1.6 2006/01/09 15:01:39 dawes Exp $ */ #include #include Index: xc/programs/xmh/folder.c diff -u xc/programs/xmh/folder.c:1.4 xc/programs/xmh/folder.c:1.5 --- xc/programs/xmh/folder.c:1.4 Fri Apr 5 16:06:28 2002 +++ xc/programs/xmh/folder.c Mon Jan 9 10:01:39 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: folder.c,v 2.44 94/08/29 20:25:49 swick Exp $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/folder.c,v 1.4 2002/04/05 21:06:28 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/folder.c,v 1.5 2006/01/09 15:01:39 dawes Exp $ */ /* folder.c -- implement buttons relating to folders and other globals. */ Index: xc/programs/xmh/globals.h diff -u xc/programs/xmh/globals.h:1.3 xc/programs/xmh/globals.h:1.4 --- xc/programs/xmh/globals.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/globals.h Mon Jan 9 10:01:39 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: globals.h /main/37 1996/02/02 14:27:39 kaleb $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/globals.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/globals.h,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ #ifdef MAIN #define ext Index: xc/programs/xmh/init.c diff -u xc/programs/xmh/init.c:1.6 xc/programs/xmh/init.c:1.7 --- xc/programs/xmh/init.c:1.6 Fri Apr 5 16:06:28 2002 +++ xc/programs/xmh/init.c Sun Mar 27 21:51:14 2005 @@ -1,7 +1,4 @@ /* - * $XConsortium: init.c,v 2.81 95/01/25 14:56:39 swick Exp $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -25,7 +22,7 @@ * without specific, written prior permission. * */ -/* $XFree86: xc/programs/xmh/init.c,v 1.6 2002/04/05 21:06:28 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/init.c,v 1.7 2005/03/28 02:51:14 dawes Exp $ */ /* Init.c - Handle start-up initialization. */ @@ -259,7 +256,10 @@ /* All the start-up initialization goes here. */ -extern char** environ; /* POSIX doesn't specify a .h for this */ +#include +#ifndef _GNU_SOURCE +extern char **environ; +#endif void InitializeWorld(int argc, char **argv) { Index: xc/programs/xmh/main.c diff -u xc/programs/xmh/main.c:1.3 xc/programs/xmh/main.c:1.4 --- xc/programs/xmh/main.c:1.3 Fri Apr 5 16:06:28 2002 +++ xc/programs/xmh/main.c Mon Jan 9 10:01:39 2006 @@ -1,6 +1,4 @@ -/* $XConsortium: main.c,v 2.30 95/01/25 14:33:57 swick Exp $ - * - * +/* * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -23,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/main.c,v 1.3 2002/04/05 21:06:28 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/main.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ #define MAIN 1 /* Makes global.h actually declare vars */ #include "xmh.h" Index: xc/programs/xmh/menu.c diff -u xc/programs/xmh/menu.c:1.3 xc/programs/xmh/menu.c:1.4 --- xc/programs/xmh/menu.c:1.3 Sat Oct 27 23:34:38 2001 +++ xc/programs/xmh/menu.c Mon Jan 9 10:01:39 2006 @@ -1,5 +1,4 @@ /* - * $XConsortium: menu.c,v 1.7 94/04/17 20:24:02 kaleb Exp $ * Copyright (c) 1989 X Consortium @@ -25,7 +24,7 @@ in this Software without prior written authorization from the X Consortium. * */ -/* $XFree86: xc/programs/xmh/menu.c,v 1.3 2001/10/28 03:34:38 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/menu.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ #include "xmh.h" #include "bboxint.h" Index: xc/programs/xmh/miscfuncs.c diff -u xc/programs/xmh/miscfuncs.c:3.7 xc/programs/xmh/miscfuncs.c:3.8 --- xc/programs/xmh/miscfuncs.c:3.7 Fri Apr 5 16:06:28 2002 +++ xc/programs/xmh/miscfuncs.c Thu Mar 24 21:22:59 2005 @@ -1,5 +1,4 @@ -/* $XConsortium: miscfuncs.c,v 1.7 94/12/01 17:15:05 kaleb Exp $ */ -/* $XFree86: xc/programs/xmh/miscfuncs.c,v 3.7 2002/04/05 21:06:28 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/miscfuncs.c,v 3.8 2005/03/25 02:22:59 dawes Exp $ */ #include "xmh.h" @@ -112,9 +111,11 @@ /* Initial guess at directory size. */ #define INITIAL_SIZE 20 -static int StrCmp(char **a, char **b) +typedef const char *cchar; +static int StrCmp(const void *a, const void *b) { - return strcmp(*a, *b); + const cchar *s1 = a, *s2 = b; + return strcmp(*s1, *s2); } int @@ -163,7 +164,7 @@ /* Sort? */ if (i) - qsort((char *)names, i, sizeof(char *), (int (*)())StrCmp); + qsort((char *)names, i, sizeof(char *), StrCmp); return(i); } Index: xc/programs/xmh/mlist.c diff -u xc/programs/xmh/mlist.c:1.3 xc/programs/xmh/mlist.c:1.4 --- xc/programs/xmh/mlist.c:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/mlist.c Mon Jan 9 10:01:39 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: mlist.c,v 2.10 91/01/06 21:08:51 rws Exp $" */ - /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -24,7 +22,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/mlist.c,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/mlist.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ /* mlist.c -- functions to deal with message lists. */ Index: xc/programs/xmh/mlist.h diff -u xc/programs/xmh/mlist.h:1.3 xc/programs/xmh/mlist.h:1.4 --- xc/programs/xmh/mlist.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/mlist.h Mon Jan 9 10:01:39 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: mlist.h,v 2.4 89/05/04 15:11:31 converse Exp $ */ /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -23,7 +22,7 @@ * or publicity pertaining to distribution of the software without specific, * written prior permission. */ -/* $XFree86: xc/programs/xmh/mlist.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/mlist.h,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ #ifndef _mlist_h #define _mlist_h Index: xc/programs/xmh/msg.c diff -u xc/programs/xmh/msg.c:1.5 xc/programs/xmh/msg.c:1.6 --- xc/programs/xmh/msg.c:1.5 Wed May 28 10:14:40 2003 +++ xc/programs/xmh/msg.c Mon Jan 9 10:01:39 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: msg.c /main/2 1996/01/14 16:51:45 kaleb $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/msg.c,v 1.5 2003/05/28 14:14:40 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/msg.c,v 1.6 2006/01/09 15:01:39 dawes Exp $ */ /* msgs.c -- handle operations on messages. */ Index: xc/programs/xmh/msg.h diff -u xc/programs/xmh/msg.h:1.3 xc/programs/xmh/msg.h:1.4 --- xc/programs/xmh/msg.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/msg.h Mon Jan 9 10:01:39 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: msg.h,v 2.7 89/07/20 21:12:59 converse Exp $ */ /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -23,7 +22,7 @@ * or publicity pertaining to distribution of the software without specific, * written prior permission. */ -/* $XFree86: xc/programs/xmh/msg.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/msg.h,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ #ifndef _msg_h #define _msg_h Index: xc/programs/xmh/pick.c diff -u xc/programs/xmh/pick.c:1.3 xc/programs/xmh/pick.c:1.4 --- xc/programs/xmh/pick.c:1.3 Fri Apr 5 16:06:29 2002 +++ xc/programs/xmh/pick.c Mon Jan 9 10:01:39 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: pick.c,v 2.45 91/07/17 21:26:54 converse Exp $ - * - * * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/pick.c,v 1.3 2002/04/05 21:06:29 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/pick.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ /* pick.c -- handle a pick subwidget. */ Index: xc/programs/xmh/popup.c diff -u xc/programs/xmh/popup.c:1.3 xc/programs/xmh/popup.c:1.4 --- xc/programs/xmh/popup.c:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/popup.c Mon Jan 9 10:01:39 2006 @@ -1,6 +1,4 @@ -/* $XConsortium: popup.c,v 2.38 94/08/26 18:04:22 swick Exp $ - * - * +/* * COPYRIGHT 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -23,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/popup.c,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/popup.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ /* popup.c -- Handle pop-up widgets. */ Index: xc/programs/xmh/screen.c diff -u xc/programs/xmh/screen.c:1.3 xc/programs/xmh/screen.c:1.4 --- xc/programs/xmh/screen.c:1.3 Fri Apr 5 16:06:29 2002 +++ xc/programs/xmh/screen.c Mon Jan 9 10:01:39 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: screen.c,v 2.65 95/01/06 16:39:19 swick Exp $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/screen.c,v 1.3 2002/04/05 21:06:29 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/screen.c,v 1.4 2006/01/09 15:01:39 dawes Exp $ */ /* scrn.c -- management of scrns. */ Index: xc/programs/xmh/toc.c diff -u xc/programs/xmh/toc.c:3.5 xc/programs/xmh/toc.c:3.6 --- xc/programs/xmh/toc.c:3.5 Fri Apr 5 16:06:29 2002 +++ xc/programs/xmh/toc.c Mon Jan 9 10:01:40 2006 @@ -1,6 +1,5 @@ -/* $XConsortium: toc.c,v 2.59 95/01/09 16:52:53 swick Exp $ - * $XFree86: xc/programs/xmh/toc.c,v 3.5 2002/04/05 21:06:29 dickey Exp $ - * +/* + * $XFree86: xc/programs/xmh/toc.c,v 3.6 2006/01/09 15:01:40 dawes Exp $ * * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION Index: xc/programs/xmh/toc.h diff -u xc/programs/xmh/toc.h:1.3 xc/programs/xmh/toc.h:1.4 --- xc/programs/xmh/toc.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/toc.h Mon Jan 9 10:01:40 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: toc.h,v 2.13 91/07/17 12:28:29 converse Exp $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/toc.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/toc.h,v 1.4 2006/01/09 15:01:40 dawes Exp $ */ #ifndef _toc_h #define _toc_h Index: xc/programs/xmh/tocfuncs.c diff -u xc/programs/xmh/tocfuncs.c:1.4 xc/programs/xmh/tocfuncs.c:1.5 --- xc/programs/xmh/tocfuncs.c:1.4 Fri Apr 5 16:06:29 2002 +++ xc/programs/xmh/tocfuncs.c Mon Jan 9 10:01:40 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: tocfuncs.c /main/36 1996/02/02 14:27:42 kaleb $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/tocfuncs.c,v 1.4 2002/04/05 21:06:29 dickey Exp $ */ +/* $XFree86: xc/programs/xmh/tocfuncs.c,v 1.5 2006/01/09 15:01:40 dawes Exp $ */ /* tocfuncs.c -- action procedures concerning things in the toc widget. */ Index: xc/programs/xmh/tocintrnl.h diff -u xc/programs/xmh/tocintrnl.h:1.2 xc/programs/xmh/tocintrnl.h:1.3 --- xc/programs/xmh/tocintrnl.h:1.2 Tue May 27 18:27:08 2003 +++ xc/programs/xmh/tocintrnl.h Mon Jan 9 10:01:40 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: tocintrnl.h,v 2.18 91/07/14 18:53:37 converse Exp $ */ /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -24,7 +23,7 @@ * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/tocintrnl.h,v 1.2 2003/05/27 22:27:08 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/tocintrnl.h,v 1.3 2006/01/09 15:01:40 dawes Exp $ */ /* Includes for modules implementing toc stuff. */ Index: xc/programs/xmh/tocutil.c diff -u xc/programs/xmh/tocutil.c:3.4 xc/programs/xmh/tocutil.c:3.5 --- xc/programs/xmh/tocutil.c:3.4 Fri Apr 5 16:06:29 2002 +++ xc/programs/xmh/tocutil.c Mon Jan 9 10:01:40 2006 @@ -1,7 +1,5 @@ /* - * $XConsortium: tocutil.c,v 2.60 95/01/09 16:52:53 swick Exp $ - * $XFree86: xc/programs/xmh/tocutil.c,v 3.4 2002/04/05 21:06:29 dickey Exp $ - * + * $XFree86: xc/programs/xmh/tocutil.c,v 3.5 2006/01/09 15:01:40 dawes Exp $ * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION Index: xc/programs/xmh/tocutil.h diff -u xc/programs/xmh/tocutil.h:1.3 xc/programs/xmh/tocutil.h:1.4 --- xc/programs/xmh/tocutil.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/tocutil.h Mon Jan 9 10:01:40 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: tocutil.h,v 2.7 95/01/09 16:52:53 swick Exp $ */ /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -23,7 +22,7 @@ * advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/tocutil.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/tocutil.h,v 1.4 2006/01/09 15:01:40 dawes Exp $ */ #ifndef _tocutil_h #define _tocutil_h Index: xc/programs/xmh/tsource.c diff -u xc/programs/xmh/tsource.c:1.4 xc/programs/xmh/tsource.c:1.5 --- xc/programs/xmh/tsource.c:1.4 Sat Apr 6 22:57:46 2002 +++ xc/programs/xmh/tsource.c Mon Jan 9 10:01:40 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: tsource.c,v 2.24 91/10/21 14:32:36 eswu Exp $ */ - /* * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION @@ -24,7 +22,7 @@ * or publicity pertaining to distribution of the software without specific, * written prior permission. */ -/* $XFree86: xc/programs/xmh/tsource.c,v 1.4 2002/04/07 03:57:46 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/tsource.c,v 1.5 2006/01/09 15:01:40 dawes Exp $ */ /* File: tsource.c -- the code for a toc source */ Index: xc/programs/xmh/tsource.h diff -u xc/programs/xmh/tsource.h:1.3 xc/programs/xmh/tsource.h:1.4 --- xc/programs/xmh/tsource.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/tsource.h Mon Jan 9 10:01:40 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: tsource.h,v 1.3 94/04/17 20:24:04 converse Exp $ */ - /*********************************************************** Copyright (c) 1987, 1988 X Consortium @@ -47,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xmh/tsource.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/tsource.h,v 1.4 2006/01/09 15:01:40 dawes Exp $ */ #ifndef _tsource_h #define _tsource_h Index: xc/programs/xmh/tsourceP.h diff -u xc/programs/xmh/tsourceP.h:1.1.1.1 xc/programs/xmh/tsourceP.h:1.2 --- xc/programs/xmh/tsourceP.h:1.1.1.1 Wed Apr 27 03:12:55 1994 +++ xc/programs/xmh/tsourceP.h Mon Jan 9 10:01:40 2006 @@ -1,8 +1,3 @@ -/* -* $XConsortium: tsourceP.h,v 1.2 94/04/17 20:24:05 kit Exp $ -*/ - - /*********************************************************** Copyright (c) 1987, 1988 X Consortium @@ -50,6 +45,7 @@ SOFTWARE. ******************************************************************/ +/* $XFree86: xc/programs/xmh/tsourceP.h,v 1.2 2006/01/09 15:01:40 dawes Exp $ */ /* * tocSourceP.h - Private definitions for tocSource widget Index: xc/programs/xmh/util.c diff -u xc/programs/xmh/util.c:3.7 xc/programs/xmh/util.c:3.8 --- xc/programs/xmh/util.c:3.7 Fri Apr 5 16:06:29 2002 +++ xc/programs/xmh/util.c Mon Jan 9 10:01:40 2006 @@ -1,7 +1,5 @@ /* - * $XConsortium: util.c /main/42 1996/01/14 16:51:55 kaleb $ - * $XFree86: xc/programs/xmh/util.c,v 3.7 2002/04/05 21:06:29 dickey Exp $ - * + * $XFree86: xc/programs/xmh/util.c,v 3.8 2006/01/09 15:01:40 dawes Exp $ * * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION Index: xc/programs/xmh/version.h diff -u xc/programs/xmh/version.h:1.1.1.4 xc/programs/xmh/version.h:1.2 --- xc/programs/xmh/version.h:1.1.1.4 Sat Dec 21 22:31:10 1996 +++ xc/programs/xmh/version.h Mon Jan 9 10:01:40 2006 @@ -1,4 +1,4 @@ -/* $XConsortium: version.h /main/6 1996/12/09 17:57:11 kaleb $ */ +/* $XFree86: xc/programs/xmh/version.h,v 1.2 2006/01/09 15:01:40 dawes Exp $ */ /* Copyright (c) 1993 X Consortium Index: xc/programs/xmh/viewfuncs.c diff -u xc/programs/xmh/viewfuncs.c:1.3 xc/programs/xmh/viewfuncs.c:1.4 --- xc/programs/xmh/viewfuncs.c:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/viewfuncs.c Mon Jan 9 10:01:40 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: viewfuncs.c,v 2.23 92/04/08 12:18:41 rws Exp $ - * - * * COPYRIGHT 1987, 1989 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/viewfuncs.c,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/viewfuncs.c,v 1.4 2006/01/09 15:01:40 dawes Exp $ */ /* view.c -- action procedures to handle viewing of a message */ Index: xc/programs/xmh/xmh.h diff -u xc/programs/xmh/xmh.h:1.3 xc/programs/xmh/xmh.h:1.4 --- xc/programs/xmh/xmh.h:1.3 Sun Jun 30 22:26:05 2002 +++ xc/programs/xmh/xmh.h Mon Jan 9 10:01:40 2006 @@ -1,7 +1,4 @@ /* - * $XConsortium: xmh.h,v 2.32 93/09/08 15:31:11 kaleb Exp $ - * - * * COPYRIGHT 1987 * DIGITAL EQUIPMENT CORPORATION * MAYNARD, MASSACHUSETTS @@ -24,7 +21,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xmh/xmh.h,v 1.3 2002/07/01 02:26:05 tsi Exp $ */ +/* $XFree86: xc/programs/xmh/xmh.h,v 1.4 2006/01/09 15:01:40 dawes Exp $ */ #ifndef _xmh_h #define _xmh_h Index: xc/programs/xmh/xmh.man diff -u xc/programs/xmh/xmh.man:1.6 xc/programs/xmh/xmh.man:1.7 --- xc/programs/xmh/xmh.man:1.6 Thu Feb 10 22:03:20 2005 +++ xc/programs/xmh/xmh.man Mon Jan 9 10:01:40 2006 @@ -1,4 +1,3 @@ -.\" $XConsortium: xmh.man /main/39 1996/12/09 17:10:05 kaleb $ .\" Copyright (c) 1989, 1991, 1994 X Consortium .\" Copyright 1988, 1989, Digital Equipment Corporation. .\" @@ -26,7 +25,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/xmh/xmh.man,v 1.6 2005/02/11 03:03:20 dawes Exp $ +.\" $XFree86: xc/programs/xmh/xmh.man,v 1.7 2006/01/09 15:01:40 dawes Exp $ .\" .TH XMH 1 __vendorversion__ .SH NAME Index: xc/programs/xmodmap/Imakefile diff -u xc/programs/xmodmap/Imakefile:1.1.1.2 xc/programs/xmodmap/Imakefile:1.2 --- xc/programs/xmodmap/Imakefile:1.1.1.2 Tue Jan 16 18:01:47 2001 +++ xc/programs/xmodmap/Imakefile Mon Jan 9 10:01:41 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:54 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xmodmap/Imakefile,v 1.2 2006/01/09 15:01:41 dawes Exp $ + DEPLIBS = $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XONLYLIB) LINTLIBS = $(LINTXLIB) Index: xc/programs/xmodmap/exec.c diff -u xc/programs/xmodmap/exec.c:1.6 xc/programs/xmodmap/exec.c:1.7 --- xc/programs/xmodmap/exec.c:1.6 Tue Dec 2 08:13:57 2003 +++ xc/programs/xmodmap/exec.c Mon Jan 9 10:01:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: exec.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -56,7 +55,7 @@ * Author: Jim Fulton, MIT X Consortium; derived from parts of the * original xmodmap, written by David Rosenthal, of Sun Microsystems. */ -/* $XFree86: xc/programs/xmodmap/exec.c,v 1.6 2003/12/02 13:13:57 pascal Exp $ */ +/* $XFree86: xc/programs/xmodmap/exec.c,v 1.7 2006/01/09 15:01:41 dawes Exp $ */ #include #include Index: xc/programs/xmodmap/handle.c diff -u xc/programs/xmodmap/handle.c:3.7 xc/programs/xmodmap/handle.c:3.8 --- xc/programs/xmodmap/handle.c:3.7 Fri Dec 14 15:02:13 2001 +++ xc/programs/xmodmap/handle.c Mon Jan 9 10:01:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: handle.c,v 1.6 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/handle.c,v 3.7 2001/12/14 20:02:13 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/handle.c,v 3.8 2006/01/09 15:01:41 dawes Exp $ */ #include #include Index: xc/programs/xmodmap/pf.c diff -u xc/programs/xmodmap/pf.c:1.2 xc/programs/xmodmap/pf.c:1.3 --- xc/programs/xmodmap/pf.c:1.2 Fri Dec 14 15:02:13 2001 +++ xc/programs/xmodmap/pf.c Mon Jan 9 10:01:41 2006 @@ -1,4 +1,4 @@ -/* $Xorg: pf.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xmodmap/pf.c,v 1.3 2006/01/09 15:01:41 dawes Exp $ */ /* Copyright 1988, 1998 The Open Group Index: xc/programs/xmodmap/wq.h diff -u xc/programs/xmodmap/wq.h:1.5 xc/programs/xmodmap/wq.h:1.6 --- xc/programs/xmodmap/wq.h:1.5 Fri Dec 14 15:02:13 2001 +++ xc/programs/xmodmap/wq.h Mon Jan 9 10:01:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: wq.h,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/wq.h,v 1.5 2001/12/14 20:02:13 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/wq.h,v 1.6 2006/01/09 15:01:41 dawes Exp $ */ #ifndef _WQ_H #define _WQ_H Index: xc/programs/xmodmap/xmodmap.c diff -u xc/programs/xmodmap/xmodmap.c:1.9 xc/programs/xmodmap/xmodmap.c:1.10 --- xc/programs/xmodmap/xmodmap.c:1.9 Tue May 27 18:27:08 2003 +++ xc/programs/xmodmap/xmodmap.c Mon Jan 9 10:01:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xmodmap.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.9 2003/05/27 22:27:08 tsi Exp $ */ +/* $XFree86: xc/programs/xmodmap/xmodmap.c,v 1.10 2006/01/09 15:01:41 dawes Exp $ */ #include #include Index: xc/programs/xmodmap/xmodmap.h diff -u xc/programs/xmodmap/xmodmap.h:1.5 xc/programs/xmodmap/xmodmap.h:1.6 --- xc/programs/xmodmap/xmodmap.h:1.5 Fri Dec 14 15:02:13 2001 +++ xc/programs/xmodmap/xmodmap.h Mon Jan 9 10:01:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xmodmap.h,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.5 2001/12/14 20:02:13 dawes Exp $ */ +/* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.6 2006/01/09 15:01:41 dawes Exp $ */ extern char *ProgramName; extern Display *dpy; Index: xc/programs/xmodmap/xmodmap.man diff -u xc/programs/xmodmap/xmodmap.man:1.14 xc/programs/xmodmap/xmodmap.man:1.15 --- xc/programs/xmodmap/xmodmap.man:1.14 Thu Feb 10 22:03:21 2005 +++ xc/programs/xmodmap/xmodmap.man Mon Jan 9 10:01:42 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xmodmap.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1988, 1989, 1990, 1998 The Open Group .\" Copyright 1987 Sun Microsystems, Inc. .\" @@ -24,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.14 2005/02/11 03:03:21 dawes Exp $ +.\" $XFree86: xc/programs/xmodmap/xmodmap.man,v 1.15 2006/01/09 15:01:42 dawes Exp $ .\" .de EX \"Begin example .ne 5 Index: xc/programs/xprop/Imakefile diff -u xc/programs/xprop/Imakefile:1.6 xc/programs/xprop/Imakefile:1.7 --- xc/programs/xprop/Imakefile:1.6 Tue May 27 13:58:25 2003 +++ xc/programs/xprop/Imakefile Mon Jan 9 10:01:42 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:55 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xprop/Imakefile,v 1.6 2003/05/27 17:58:25 tsi Exp $ +XCOMM $XFree86: xc/programs/xprop/Imakefile,v 1.7 2006/01/09 15:01:42 dawes Exp $ DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB) Index: xc/programs/xprop/xprop.c diff -u xc/programs/xprop/xprop.c:1.16 xc/programs/xprop/xprop.c:1.17 --- xc/programs/xprop/xprop.c:1.16 Fri Oct 31 16:49:48 2003 +++ xc/programs/xprop/xprop.c Mon Jan 9 10:01:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xprop.c,v 1.6 2001/02/09 02:05:56 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -27,7 +26,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xprop/xprop.c,v 1.16 2003/10/31 21:49:48 herrb Exp $ */ +/* $XFree86: xc/programs/xprop/xprop.c,v 1.17 2006/01/09 15:01:42 dawes Exp $ */ #include Index: xc/programs/xprop/xprop.man diff -u xc/programs/xprop/xprop.man:1.9 xc/programs/xprop/xprop.man:1.10 --- xc/programs/xprop/xprop.man:1.9 Fri Dec 14 15:02:14 2001 +++ xc/programs/xprop/xprop.man Mon Jan 9 10:01:42 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xprop.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" Copyright \(co 2000 The XFree86 Project, Inc. .\" @@ -24,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xprop/xprop.man,v 1.9 2001/12/14 20:02:14 dawes Exp $ +.\" $XFree86: xc/programs/xprop/xprop.man,v 1.10 2006/01/09 15:01:42 dawes Exp $ .\" .TH XPROP 1 __vendorversion__ .SH NAME Index: xc/programs/xrdb/Imakefile diff -u xc/programs/xrdb/Imakefile:3.7 xc/programs/xrdb/Imakefile:3.8 --- xc/programs/xrdb/Imakefile:3.7 Tue May 27 13:58:26 2003 +++ xc/programs/xrdb/Imakefile Mon Jan 9 10:01:42 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.7 2003/05/27 17:58:26 tsi Exp $ +XCOMM $XFree86: xc/programs/xrdb/Imakefile,v 3.8 2006/01/09 15:01:42 dawes Exp $ #ifdef PatheticCpp CPPDEFS = -DPATHETICCPP Index: xc/programs/xrdb/xrdb.c diff -u xc/programs/xrdb/xrdb.c:3.17 xc/programs/xrdb/xrdb.c:3.18 --- xc/programs/xrdb/xrdb.c:3.17 Sun Jul 20 12:12:20 2003 +++ xc/programs/xrdb/xrdb.c Mon Jan 9 10:01:42 2006 @@ -1,7 +1,5 @@ /* * xrdb - X resource manager database utility - * - * $Xorg: xrdb.c,v 1.6 2000/08/17 19:54:56 cpqbld Exp $ */ /* @@ -30,7 +28,7 @@ * used in advertising or publicity pertaining to distribution of the software * without specific, written prior permission. */ -/* $XFree86: xc/programs/xrdb/xrdb.c,v 3.17 2003/07/20 16:12:20 tsi Exp $ */ +/* $XFree86: xc/programs/xrdb/xrdb.c,v 3.18 2006/01/09 15:01:42 dawes Exp $ */ /* * this program is used to load, or dump the resource manager database Index: xc/programs/xrdb/xrdb.man diff -u xc/programs/xrdb/xrdb.man:1.9 xc/programs/xrdb/xrdb.man:1.10 --- xc/programs/xrdb/xrdb.man:1.9 Thu Feb 10 22:03:21 2005 +++ xc/programs/xrdb/xrdb.man Mon Jan 9 10:01:42 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xrdb.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1991, Digital Equipment Corporation. .\" Copyright 1991, 1994, 1998 The Open Group .\" @@ -24,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xrdb/xrdb.man,v 1.9 2005/02/11 03:03:21 dawes Exp $ +.\" $XFree86: xc/programs/xrdb/xrdb.man,v 1.10 2006/01/09 15:01:42 dawes Exp $ .\" .TH XRDB 1 __vendorversion__ .SH NAME Index: xc/programs/xrefresh/Imakefile diff -u xc/programs/xrefresh/Imakefile:1.2 xc/programs/xrefresh/Imakefile:1.3 --- xc/programs/xrefresh/Imakefile:1.2 Tue May 27 13:58:26 2003 +++ xc/programs/xrefresh/Imakefile Mon Jan 9 10:01:43 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xrefresh/Imakefile,v 1.2 2003/05/27 17:58:26 tsi Exp $ +XCOMM $XFree86: xc/programs/xrefresh/Imakefile,v 1.3 2006/01/09 15:01:43 dawes Exp $ DEPLIBS = $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XONLYLIB) Index: xc/programs/xrefresh/xrefresh.c diff -u xc/programs/xrefresh/xrefresh.c:3.6 xc/programs/xrefresh/xrefresh.c:3.7 --- xc/programs/xrefresh/xrefresh.c:3.6 Fri Dec 14 15:02:15 2001 +++ xc/programs/xrefresh/xrefresh.c Mon Jan 9 10:01:43 2006 @@ -46,12 +46,10 @@ ******************************************************************/ /* - * $Xorg: xrefresh.c,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ - * * Kitchen sink version, useful for clearing small areas and flashing the * screen. */ -/* $XFree86: xc/programs/xrefresh/xrefresh.c,v 3.6 2001/12/14 20:02:15 dawes Exp $ */ +/* $XFree86: xc/programs/xrefresh/xrefresh.c,v 3.7 2006/01/09 15:01:43 dawes Exp $ */ #include #include Index: xc/programs/xrefresh/xrefresh.man diff -u xc/programs/xrefresh/xrefresh.man:1.9 xc/programs/xrefresh/xrefresh.man:1.10 --- xc/programs/xrefresh/xrefresh.man:1.9 Thu Feb 10 22:03:21 2005 +++ xc/programs/xrefresh/xrefresh.man Mon Jan 9 10:01:43 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xrefresh.man,v 1.4 2001/02/09 02:05:56 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xrefresh/xrefresh.man,v 1.9 2005/02/11 03:03:21 dawes Exp $ +.\" $XFree86: xc/programs/xrefresh/xrefresh.man,v 1.10 2006/01/09 15:01:43 dawes Exp $ .\" .TH XREFRESH 1 __vendorversion__ .SH NAME Index: xc/programs/xrx/Imakefile diff -u xc/programs/xrx/Imakefile:1.6 xc/programs/xrx/Imakefile:1.7 --- xc/programs/xrx/Imakefile:1.6 Fri Nov 22 17:56:05 2002 +++ xc/programs/xrx/Imakefile Mon Jan 9 10:01:43 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xrx/Imakefile,v 1.6 2002/11/22 22:56:05 tsi Exp $ +XCOMM $XFree86: xc/programs/xrx/Imakefile,v 1.7 2006/01/09 15:01:43 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" Index: xc/programs/xrx/cgi-bin/Imakefile diff -u xc/programs/xrx/cgi-bin/Imakefile:1.4 xc/programs/xrx/cgi-bin/Imakefile:1.5 --- xc/programs/xrx/cgi-bin/Imakefile:1.4 Wed Jan 17 18:46:23 2001 +++ xc/programs/xrx/cgi-bin/Imakefile Mon Jan 9 10:01:43 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:56 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xrx/cgi-bin/Imakefile,v 1.5 2006/01/09 15:01:43 dawes Exp $ #ifndef CgiBinDir #define CgiBinDir /files/web/cgi-bin Index: xc/programs/xrx/cgi-bin/bitmap diff -u xc/programs/xrx/cgi-bin/bitmap:1.1.1.3 xc/programs/xrx/cgi-bin/bitmap:1.2 --- xc/programs/xrx/cgi-bin/bitmap:1.1.1.3 Tue Jan 16 18:02:18 2001 +++ xc/programs/xrx/cgi-bin/bitmap Mon Jan 9 10:01:43 2006 @@ -1,5 +1,5 @@ #!/usr/local/bin/perl -# $Xorg: bitmap,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ +# $XFree86: xc/programs/xrx/cgi-bin/bitmap,v 1.2 2006/01/09 15:01:43 dawes Exp $ # CGI script to launch xclock # Index: xc/programs/xrx/cgi-bin/dtcm diff -u xc/programs/xrx/cgi-bin/dtcm:1.1.1.3 xc/programs/xrx/cgi-bin/dtcm:1.2 --- xc/programs/xrx/cgi-bin/dtcm:1.1.1.3 Tue Jan 16 18:02:19 2001 +++ xc/programs/xrx/cgi-bin/dtcm Mon Jan 9 10:01:43 2006 @@ -1,5 +1,5 @@ #!/usr/local/bin/perl -# $Xorg: dtcm,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ +# $XFree86: xc/programs/xrx/cgi-bin/dtcm,v 1.2 2006/01/09 15:01:43 dawes Exp $ # CGI script to launch dtcm # Index: xc/programs/xrx/cgi-bin/dtcm.sh diff -u xc/programs/xrx/cgi-bin/dtcm.sh:1.1.1.2 xc/programs/xrx/cgi-bin/dtcm.sh:1.2 --- xc/programs/xrx/cgi-bin/dtcm.sh:1.1.1.2 Tue Jan 16 18:02:20 2001 +++ xc/programs/xrx/cgi-bin/dtcm.sh Mon Jan 9 10:01:43 2006 @@ -1,5 +1,5 @@ #! /bin/csh -f -#$Xorg: dtcm.sh,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ +#$XFree86: xc/programs/xrx/cgi-bin/dtcm.sh,v 1.2 2006/01/09 15:01:43 dawes Exp $ setenv SHELL /bin/csh setenv _RLD_ROOT /dev/null setenv LD_LIBRARY_PATH /tools/packages/cde/alpha/osf1/cde_cst8/dt/lib:/tools/packages/cde/alpha/osf1/cde_cst8/x11/lib:/usr/shlib:/usr/ccs/lib:/usr/lib/cmplrs/cxx:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib:/var/shlib Index: xc/programs/xrx/cgi-bin/excel diff -u xc/programs/xrx/cgi-bin/excel:1.1.1.3 xc/programs/xrx/cgi-bin/excel:1.2 --- xc/programs/xrx/cgi-bin/excel:1.1.1.3 Tue Jan 16 18:02:22 2001 +++ xc/programs/xrx/cgi-bin/excel Mon Jan 9 10:01:43 2006 @@ -1,5 +1,5 @@ #!/usr/local/bin/perl -# $Xorg: excel,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ +# $XFree86: xc/programs/xrx/cgi-bin/excel,v 1.2 2006/01/09 15:01:43 dawes Exp $ # CGI script to launch excel # Index: xc/programs/xrx/cgi-bin/xclock diff -u xc/programs/xrx/cgi-bin/xclock:1.1.1.3 xc/programs/xrx/cgi-bin/xclock:1.2 --- xc/programs/xrx/cgi-bin/xclock:1.1.1.3 Tue Jan 16 18:02:24 2001 +++ xc/programs/xrx/cgi-bin/xclock Mon Jan 9 10:01:43 2006 @@ -1,5 +1,5 @@ #!/usr/local/bin/perl -# $Xorg: xclock,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ +# $XFree86: xc/programs/xrx/cgi-bin/xclock,v 1.2 2006/01/09 15:01:43 dawes Exp $ # CGI script to launch xclock # Index: xc/programs/xrx/cgi-bin/xload diff -u xc/programs/xrx/cgi-bin/xload:1.1.1.3 xc/programs/xrx/cgi-bin/xload:1.2 --- xc/programs/xrx/cgi-bin/xload:1.1.1.3 Tue Jan 16 18:02:26 2001 +++ xc/programs/xrx/cgi-bin/xload Mon Jan 9 10:01:43 2006 @@ -1,5 +1,5 @@ #!/usr/local/bin/perl -# $Xorg: xload,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ +# $XFree86: xc/programs/xrx/cgi-bin/xload,v 1.2 2006/01/09 15:01:43 dawes Exp $ # CGI script to launch xload # Index: xc/programs/xrx/helper/GetUrl.c diff -u xc/programs/xrx/helper/GetUrl.c:1.5 xc/programs/xrx/helper/GetUrl.c:1.6 --- xc/programs/xrx/helper/GetUrl.c:1.5 Sun Jul 20 12:12:20 2003 +++ xc/programs/xrx/helper/GetUrl.c Mon Jan 9 10:01:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetUrl.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/helper/GetUrl.c,v 1.5 2003/07/20 16:12:20 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/helper/GetUrl.c,v 1.6 2006/01/09 15:01:43 dawes Exp $ */ /* * This file is really split into two major parts where GetUrl is implemented Index: xc/programs/xrx/helper/GetUrl.h diff -u xc/programs/xrx/helper/GetUrl.h:1.2 xc/programs/xrx/helper/GetUrl.h:1.3 --- xc/programs/xrx/helper/GetUrl.h:1.2 Fri Dec 14 15:02:16 2001 +++ xc/programs/xrx/helper/GetUrl.h Mon Jan 9 10:01:43 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GetUrl.h,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/helper/GetUrl.h,v 1.3 2006/01/09 15:01:43 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/helper/Imakefile diff -u xc/programs/xrx/helper/Imakefile:1.3 xc/programs/xrx/helper/Imakefile:1.4 --- xc/programs/xrx/helper/Imakefile:1.3 Wed Jul 9 11:27:41 2003 +++ xc/programs/xrx/helper/Imakefile Mon Jan 9 10:01:43 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xrx/helper/Imakefile,v 1.3 2003/07/09 15:27:41 tsi Exp $ +XCOMM $XFree86: xc/programs/xrx/helper/Imakefile,v 1.4 2006/01/09 15:01:43 dawes Exp $ XCOMM Define UseWWW in order to use the www program to perform the GET request XCOMM #define UseWWW YES Index: xc/programs/xrx/helper/helper.c diff -u xc/programs/xrx/helper/helper.c:1.5 xc/programs/xrx/helper/helper.c:1.6 --- xc/programs/xrx/helper/helper.c:1.5 Fri Dec 14 15:02:16 2001 +++ xc/programs/xrx/helper/helper.c Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ -/* $Xorg: helper.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/helper/helper.c,v 1.6 2006/01/09 15:01:44 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/helper/httptran.c diff -u xc/programs/xrx/helper/httptran.c:1.6 xc/programs/xrx/helper/httptran.c:1.7 --- xc/programs/xrx/helper/httptran.c:1.6 Fri Dec 14 15:02:16 2001 +++ xc/programs/xrx/helper/httptran.c Mon Jan 9 10:01:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: httptran.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -27,7 +26,7 @@ */ -/* $XFree86: xc/programs/xrx/helper/httptran.c,v 1.6 2001/12/14 20:02:16 dawes Exp $ */ +/* $XFree86: xc/programs/xrx/helper/httptran.c,v 1.7 2006/01/09 15:01:44 dawes Exp $ */ #if !defined(UNIXCPP) || defined(ANSICPP) #define TRANS(func) _HttpTrans##func Index: xc/programs/xrx/helper/xrx.man diff -u xc/programs/xrx/helper/xrx.man:1.8 xc/programs/xrx/helper/xrx.man:1.9 --- xc/programs/xrx/helper/xrx.man:1.8 Thu Feb 10 22:03:21 2005 +++ xc/programs/xrx/helper/xrx.man Mon Jan 9 10:01:44 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xrx.man,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/xrx/helper/xrx.man,v 1.8 2005/02/11 03:03:21 dawes Exp $ +.\" $XFree86: xc/programs/xrx/helper/xrx.man,v 1.9 2006/01/09 15:01:44 dawes Exp $ .\" .TH XRX 1 __vendorversion__ .SH NAME Index: xc/programs/xrx/htdocs/Imakefile diff -u xc/programs/xrx/htdocs/Imakefile:1.3 xc/programs/xrx/htdocs/Imakefile:1.4 --- xc/programs/xrx/htdocs/Imakefile:1.3 Wed Jan 17 18:46:24 2001 +++ xc/programs/xrx/htdocs/Imakefile Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:57 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xrx/htdocs/Imakefile,v 1.4 2006/01/09 15:01:44 dawes Exp $ #ifndef HtmlDir #define HtmlDir /files/web/xfiles/consortium/plug-in Index: xc/programs/xrx/htdocs/bitmap diff -u xc/programs/xrx/htdocs/bitmap:1.1.1.2 xc/programs/xrx/htdocs/bitmap:1.2 --- xc/programs/xrx/htdocs/bitmap:1.1.1.2 Tue Jan 16 18:02:44 2001 +++ xc/programs/xrx/htdocs/bitmap Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + Index: xc/programs/xrx/htdocs/bitmap.html diff -u xc/programs/xrx/htdocs/bitmap.html:1.1.1.2 xc/programs/xrx/htdocs/bitmap.html:1.2 --- xc/programs/xrx/htdocs/bitmap.html:1.1.1.2 Tue Jan 16 18:02:46 2001 +++ xc/programs/xrx/htdocs/bitmap.html Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + X Applications on the Web - bitmap demo page. Index: xc/programs/xrx/htdocs/dtcm diff -u xc/programs/xrx/htdocs/dtcm:1.1.1.2 xc/programs/xrx/htdocs/dtcm:1.2 --- xc/programs/xrx/htdocs/dtcm:1.1.1.2 Tue Jan 16 18:02:47 2001 +++ xc/programs/xrx/htdocs/dtcm Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + Index: xc/programs/xrx/htdocs/dtcm.html diff -u xc/programs/xrx/htdocs/dtcm.html:1.1.1.2 xc/programs/xrx/htdocs/dtcm.html:1.2 --- xc/programs/xrx/htdocs/dtcm.html:1.1.1.2 Tue Jan 16 18:02:48 2001 +++ xc/programs/xrx/htdocs/dtcm.html Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + X Applications on the Web - Demo page. Index: xc/programs/xrx/htdocs/excel diff -u xc/programs/xrx/htdocs/excel:1.1.1.2 xc/programs/xrx/htdocs/excel:1.2 --- xc/programs/xrx/htdocs/excel:1.1.1.2 Tue Jan 16 18:02:50 2001 +++ xc/programs/xrx/htdocs/excel Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + Index: xc/programs/xrx/htdocs/excel.html diff -u xc/programs/xrx/htdocs/excel.html:1.1.1.2 xc/programs/xrx/htdocs/excel.html:1.2 --- xc/programs/xrx/htdocs/excel.html:1.1.1.2 Tue Jan 16 18:02:51 2001 +++ xc/programs/xrx/htdocs/excel.html Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + X Applications on the Web - Excel demo page. Index: xc/programs/xrx/htdocs/xclock diff -u xc/programs/xrx/htdocs/xclock:1.1.1.2 xc/programs/xrx/htdocs/xclock:1.2 --- xc/programs/xrx/htdocs/xclock:1.1.1.2 Tue Jan 16 18:02:52 2001 +++ xc/programs/xrx/htdocs/xclock Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + Index: xc/programs/xrx/htdocs/xclock.html diff -u xc/programs/xrx/htdocs/xclock.html:1.1.1.2 xc/programs/xrx/htdocs/xclock.html:1.2 --- xc/programs/xrx/htdocs/xclock.html:1.1.1.2 Tue Jan 16 18:02:52 2001 +++ xc/programs/xrx/htdocs/xclock.html Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + X Applications on the Web - xclock demo page. Index: xc/programs/xrx/htdocs/xload diff -u xc/programs/xrx/htdocs/xload:1.1.1.2 xc/programs/xrx/htdocs/xload:1.2 --- xc/programs/xrx/htdocs/xload:1.1.1.2 Tue Jan 16 18:02:54 2001 +++ xc/programs/xrx/htdocs/xload Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + Index: xc/programs/xrx/htdocs/xload.html diff -u xc/programs/xrx/htdocs/xload.html:1.1.1.2 xc/programs/xrx/htdocs/xload.html:1.2 --- xc/programs/xrx/htdocs/xload.html:1.1.1.2 Tue Jan 16 18:02:56 2001 +++ xc/programs/xrx/htdocs/xload.html Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ - + X Applications on the Web - Demo page. Index: xc/programs/xrx/libxplugin/Imakefile diff -u xc/programs/xrx/libxplugin/Imakefile:1.4 xc/programs/xrx/libxplugin/Imakefile:1.5 --- xc/programs/xrx/libxplugin/Imakefile:1.4 Fri Oct 24 16:38:22 2003 +++ xc/programs/xrx/libxplugin/Imakefile Fri Oct 14 11:17:34 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:59 cpqbld Exp $ - - - -XCOMM $XFree86: xc/programs/xrx/libxplugin/Imakefile,v 1.4 2003/10/24 20:38:22 tsi Exp $ +XCOMM $XFree86: xc/programs/xrx/libxplugin/Imakefile,v 1.5 2005/10/14 15:17:34 tsi Exp $ #if defined(SGIArchitecture) && (OSMajorVersion > 5) @@ -23,7 +19,7 @@ SRCS = XSecurity.c XAppgroup.c OBJS = XSecurity.o XAppgroup.o - INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) + INCLUDES = -I$(XLIBSRC) NormalLibraryTarget(xplugin,$(OBJS)) Index: xc/programs/xrx/libxplugin/README diff -u xc/programs/xrx/libxplugin/README:1.1.1.2 xc/programs/xrx/libxplugin/README:1.2 --- xc/programs/xrx/libxplugin/README:1.1.1.2 Tue Jan 16 18:02:58 2001 +++ xc/programs/xrx/libxplugin/README Mon Jan 9 10:01:44 2006 @@ -1,4 +1,4 @@ -$Xorg: README,v 1.3 2000/08/17 19:54:59 cpqbld Exp $ +$XFree86: xc/programs/xrx/libxplugin/README,v 1.2 2006/01/09 15:01:44 dawes Exp $ This library exists solely to get the new extensions linked into the Netscape Plug-in. Once vendors start shipping R7 versions of libXext.so Index: xc/programs/xrx/plugin/Global.c diff -u xc/programs/xrx/plugin/Global.c:1.2 xc/programs/xrx/plugin/Global.c:1.3 --- xc/programs/xrx/plugin/Global.c:1.2 Fri Dec 14 15:02:17 2001 +++ xc/programs/xrx/plugin/Global.c Mon Jan 9 10:01:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Global.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/Global.c,v 1.3 2006/01/09 15:01:45 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/plugin/Imakefile diff -u xc/programs/xrx/plugin/Imakefile:1.15 xc/programs/xrx/plugin/Imakefile:1.16 --- xc/programs/xrx/plugin/Imakefile:1.15 Mon May 31 20:17:08 2004 +++ xc/programs/xrx/plugin/Imakefile Fri Oct 14 11:17:34 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/xrx/plugin/Imakefile,v 1.15 2004/06/01 00:17:08 dawes Exp $ +XCOMM $XFree86: xc/programs/xrx/plugin/Imakefile,v 1.16 2005/10/14 15:17:34 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -135,7 +135,7 @@ PLUGIN_INCLUDES = -I./include DEFINES = StrcasecmpDefines -DNETSCAPE_PLUGIN $(PLUGIN_DEFINES) $(XT_DEFINES) $(SOCKET_DEFINES) $(FUNCPROTO_DEFINES) - INCLUDES = -I. $(PLUGIN_INCLUDES) $(RX_INCLUDES) $(VENDOR_INCLUDES) + INCLUDES = $(PLUGIN_INCLUDES) $(RX_INCLUDES) $(VENDOR_INCLUDES) PARAMS_SRCS = PRead.c PParse.c BuildReq.c PARAMS_OBJS = PRead.o PParse.o BuildReq.o Index: xc/programs/xrx/plugin/Main.c diff -u xc/programs/xrx/plugin/Main.c:1.10 xc/programs/xrx/plugin/Main.c:1.11 --- xc/programs/xrx/plugin/Main.c:1.10 Sat Apr 3 17:38:55 2004 +++ xc/programs/xrx/plugin/Main.c Mon Jan 9 10:01:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Main.c,v 1.5 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/plugin/Main.c,v 1.10 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/Main.c,v 1.11 2006/01/09 15:01:45 dawes Exp $ */ /* * RX plug-in module based on the UnixTemplate file provided by Netcape. Index: xc/programs/xrx/plugin/NewNDest.c diff -u xc/programs/xrx/plugin/NewNDest.c:1.5 xc/programs/xrx/plugin/NewNDest.c:1.6 --- xc/programs/xrx/plugin/NewNDest.c:1.5 Fri Dec 14 15:02:17 2001 +++ xc/programs/xrx/plugin/NewNDest.c Mon Jan 9 10:01:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: NewNDest.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/NewNDest.c,v 1.6 2006/01/09 15:01:45 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/plugin/PProcess.c diff -u xc/programs/xrx/plugin/PProcess.c:1.8 xc/programs/xrx/plugin/PProcess.c:1.9 --- xc/programs/xrx/plugin/PProcess.c:1.8 Sat Apr 3 17:38:55 2004 +++ xc/programs/xrx/plugin/PProcess.c Mon Jan 9 10:01:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PProcess.c,v 1.6 2001/02/09 02:05:57 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.8 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/PProcess.c,v 1.9 2006/01/09 15:01:45 dawes Exp $ */ #include "RxPlugin.h" #include "XUrls.h" Index: xc/programs/xrx/plugin/RxPlugin.h diff -u xc/programs/xrx/plugin/RxPlugin.h:1.5 xc/programs/xrx/plugin/RxPlugin.h:1.6 --- xc/programs/xrx/plugin/RxPlugin.h:1.5 Fri Dec 14 15:02:17 2001 +++ xc/programs/xrx/plugin/RxPlugin.h Mon Jan 9 10:01:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: RxPlugin.h,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/RxPlugin.h,v 1.6 2006/01/09 15:01:45 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/plugin/SetWin.c diff -u xc/programs/xrx/plugin/SetWin.c:1.5 xc/programs/xrx/plugin/SetWin.c:1.6 --- xc/programs/xrx/plugin/SetWin.c:1.5 Fri Dec 14 15:02:17 2001 +++ xc/programs/xrx/plugin/SetWin.c Mon Jan 9 10:01:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: SetWin.c,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/SetWin.c,v 1.6 2006/01/09 15:01:45 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/plugin/libxrx.man diff -u xc/programs/xrx/plugin/libxrx.man:1.9 xc/programs/xrx/plugin/libxrx.man:1.10 --- xc/programs/xrx/plugin/libxrx.man:1.9 Thu Feb 10 22:03:21 2005 +++ xc/programs/xrx/plugin/libxrx.man Mon Jan 9 10:01:45 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: libxrx.man,v 1.4 2001/02/09 02:05:57 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/xrx/plugin/libxrx.man,v 1.9 2005/02/11 03:03:21 dawes Exp $ +.\" $XFree86: xc/programs/xrx/plugin/libxrx.man,v 1.10 2006/01/09 15:01:45 dawes Exp $ .\" .TH LIBXRX 1 __vendorversion__ .SH NAME Index: xc/programs/xrx/plugin/stubs.c diff -u xc/programs/xrx/plugin/stubs.c:1.1.1.2 xc/programs/xrx/plugin/stubs.c:1.2 --- xc/programs/xrx/plugin/stubs.c:1.1.1.2 Tue Jan 16 18:03:13 2001 +++ xc/programs/xrx/plugin/stubs.c Mon Jan 9 10:01:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: stubs.c,v 1.3 2000/08/17 19:54:59 cpqbld Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/stubs.c,v 1.2 2006/01/09 15:01:45 dawes Exp $ */ /* -*- Mode: C; tab-width: 4; -*- */ /******************************************************************************* * Simple LiveConnect Sample Plugin Index: xc/programs/xrx/plugin/common/npunix.c diff -u xc/programs/xrx/plugin/common/npunix.c:1.2 xc/programs/xrx/plugin/common/npunix.c:1.3 --- xc/programs/xrx/plugin/common/npunix.c:1.2 Sat Apr 3 17:38:55 2004 +++ xc/programs/xrx/plugin/common/npunix.c Mon Jan 9 10:01:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: npunix.c,v 1.3 2000/08/17 19:54:59 cpqbld Exp $ */ /* * npunix.c * @@ -12,7 +11,7 @@ * YOU WILL NOT NEED TO EDIT THIS FILE. *---------------------------------------------------------------------- */ -/* $XFree86: xc/programs/xrx/plugin/common/npunix.c,v 1.2 2004/04/03 22:38:55 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/common/npunix.c,v 1.3 2006/01/09 15:01:45 dawes Exp $ */ #define XP_UNIX 1 Index: xc/programs/xrx/plugin/include/jri.h diff -u xc/programs/xrx/plugin/include/jri.h:1.1.1.2 xc/programs/xrx/plugin/include/jri.h:1.2 --- xc/programs/xrx/plugin/include/jri.h:1.1.1.2 Tue Jan 16 18:03:18 2001 +++ xc/programs/xrx/plugin/include/jri.h Mon Jan 9 10:01:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: jri.h,v 1.3 2000/08/17 19:55:00 cpqbld Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/include/jri.h,v 1.2 2006/01/09 15:01:45 dawes Exp $ */ /* -*- Mode: C; tab-width: 4; -*- */ /******************************************************************************* * Java Runtime Interface Index: xc/programs/xrx/plugin/include/jri_md.h diff -u xc/programs/xrx/plugin/include/jri_md.h:1.3 xc/programs/xrx/plugin/include/jri_md.h:1.4 --- xc/programs/xrx/plugin/include/jri_md.h:1.3 Wed Jan 17 18:46:25 2001 +++ xc/programs/xrx/plugin/include/jri_md.h Mon Jan 9 10:01:45 2006 @@ -1,10 +1,9 @@ -/* $Xorg: jri_md.h,v 1.3 2000/08/17 19:55:01 cpqbld Exp $ */ /* -*- Mode: C; tab-width: 4; -*- */ /******************************************************************************* * Java Runtime Interface - Machine Dependent Types * Copyright (c) 1996 Netscape Communications Corporation. All rights reserved. ******************************************************************************/ -/* $XFree86: xc/programs/xrx/plugin/include/jri_md.h,v 1.3 2001/01/17 23:46:25 dawes Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/include/jri_md.h,v 1.4 2006/01/09 15:01:45 dawes Exp $ */ #ifndef JRI_MD_H #define JRI_MD_H Index: xc/programs/xrx/plugin/include/jritypes.h diff -u xc/programs/xrx/plugin/include/jritypes.h:1.1.1.2 xc/programs/xrx/plugin/include/jritypes.h:1.2 --- xc/programs/xrx/plugin/include/jritypes.h:1.1.1.2 Tue Jan 16 18:03:19 2001 +++ xc/programs/xrx/plugin/include/jritypes.h Mon Jan 9 10:01:45 2006 @@ -1,4 +1,4 @@ -/* $Xorg: jritypes.h,v 1.3 2000/08/17 19:55:01 cpqbld Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/include/jritypes.h,v 1.2 2006/01/09 15:01:45 dawes Exp $ */ /* -*- Mode: C; tab-width: 4; -*- */ /******************************************************************************* * Java Runtime Interface Index: xc/programs/xrx/plugin/include/npapi.h diff -u xc/programs/xrx/plugin/include/npapi.h:1.5 xc/programs/xrx/plugin/include/npapi.h:1.6 --- xc/programs/xrx/plugin/include/npapi.h:1.5 Wed Jul 25 11:05:28 2001 +++ xc/programs/xrx/plugin/include/npapi.h Mon Jan 9 10:01:45 2006 @@ -1,10 +1,9 @@ -/* $Xorg: npapi.h,v 1.3 2000/08/17 19:55:02 cpqbld Exp $ */ /* -*- Mode: C; tab-width: 4; -*- */ /* * npapi.h Revision: 1.76 * Netscape client plug-in API spec */ -/* $XFree86: xc/programs/xrx/plugin/include/npapi.h,v 1.5 2001/07/25 15:05:28 dawes Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/include/npapi.h,v 1.6 2006/01/09 15:01:45 dawes Exp $ */ #ifndef _NPAPI_H_ #define _NPAPI_H_ Index: xc/programs/xrx/plugin/include/npupp.h diff -u xc/programs/xrx/plugin/include/npupp.h:1.2 xc/programs/xrx/plugin/include/npupp.h:1.3 --- xc/programs/xrx/plugin/include/npupp.h:1.2 Sat Apr 3 17:38:56 2004 +++ xc/programs/xrx/plugin/include/npupp.h Mon Jan 9 10:01:46 2006 @@ -1,10 +1,9 @@ -/* $Xorg: npupp.h,v 1.3 2000/08/17 19:55:02 cpqbld Exp $ */ /* -*- Mode: C; tab-width: 4; -*- */ /* * npupp.h Revision: 1.37 * function call mecahnics needed by platform specific glue code. */ -/* $XFree86: xc/programs/xrx/plugin/include/npupp.h,v 1.2 2004/04/03 22:38:56 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/plugin/include/npupp.h,v 1.3 2006/01/09 15:01:46 dawes Exp $ */ #ifndef _NPUPP_H_ #define _NPUPP_H_ Index: xc/programs/xrx/rx/BuildReq.c diff -u xc/programs/xrx/rx/BuildReq.c:1.2 xc/programs/xrx/rx/BuildReq.c:1.3 --- xc/programs/xrx/rx/BuildReq.c:1.2 Fri Dec 14 15:02:18 2001 +++ xc/programs/xrx/rx/BuildReq.c Mon Jan 9 10:01:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: BuildReq.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/rx/BuildReq.c,v 1.3 2006/01/09 15:01:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/rx/PParse.c diff -u xc/programs/xrx/rx/PParse.c:1.3 xc/programs/xrx/rx/PParse.c:1.4 --- xc/programs/xrx/rx/PParse.c:1.3 Sat Apr 3 17:38:56 2004 +++ xc/programs/xrx/rx/PParse.c Mon Jan 9 10:01:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PParse.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/rx/PParse.c,v 1.3 2004/04/03 22:38:56 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/rx/PParse.c,v 1.4 2006/01/09 15:01:46 dawes Exp $ */ #include "RxI.h" Index: xc/programs/xrx/rx/PRead.c diff -u xc/programs/xrx/rx/PRead.c:1.2 xc/programs/xrx/rx/PRead.c:1.3 --- xc/programs/xrx/rx/PRead.c:1.2 Fri Dec 14 15:02:19 2001 +++ xc/programs/xrx/rx/PRead.c Mon Jan 9 10:01:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PRead.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/rx/PRead.c,v 1.3 2006/01/09 15:01:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/rx/Prefs.c diff -u xc/programs/xrx/rx/Prefs.c:1.6 xc/programs/xrx/rx/Prefs.c:1.7 --- xc/programs/xrx/rx/Prefs.c:1.6 Fri Dec 14 15:02:19 2001 +++ xc/programs/xrx/rx/Prefs.c Mon Jan 9 10:01:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Prefs.c,v 1.5 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/rx/Prefs.c,v 1.6 2001/12/14 20:02:19 dawes Exp $ */ +/* $XFree86: xc/programs/xrx/rx/Prefs.c,v 1.7 2006/01/09 15:01:46 dawes Exp $ */ #include "Prefs.h" #include Index: xc/programs/xrx/rx/Prefs.h diff -u xc/programs/xrx/rx/Prefs.h:1.2 xc/programs/xrx/rx/Prefs.h:1.3 --- xc/programs/xrx/rx/Prefs.h:1.2 Fri Dec 14 15:02:19 2001 +++ xc/programs/xrx/rx/Prefs.h Mon Jan 9 10:01:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Prefs.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/rx/Prefs.h,v 1.3 2006/01/09 15:01:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/rx/Rx.h diff -u xc/programs/xrx/rx/Rx.h:1.2 xc/programs/xrx/rx/Rx.h:1.3 --- xc/programs/xrx/rx/Rx.h:1.2 Fri Dec 14 15:02:19 2001 +++ xc/programs/xrx/rx/Rx.h Mon Jan 9 10:01:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Rx.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/rx/Rx.h,v 1.3 2006/01/09 15:01:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/rx/RxI.h diff -u xc/programs/xrx/rx/RxI.h:1.2 xc/programs/xrx/rx/RxI.h:1.3 --- xc/programs/xrx/rx/RxI.h:1.2 Fri Dec 14 15:02:19 2001 +++ xc/programs/xrx/rx/RxI.h Mon Jan 9 10:01:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: RxI.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/rx/RxI.h,v 1.3 2006/01/09 15:01:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/rx/XAuth.c diff -u xc/programs/xrx/rx/XAuth.c:1.3 xc/programs/xrx/rx/XAuth.c:1.4 --- xc/programs/xrx/rx/XAuth.c:1.3 Sat Apr 3 17:38:56 2004 +++ xc/programs/xrx/rx/XAuth.c Mon Jan 9 10:01:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XAuth.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/rx/XAuth.c,v 1.3 2004/04/03 22:38:56 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/rx/XAuth.c,v 1.4 2006/01/09 15:01:46 dawes Exp $ */ #include "RxI.h" #ifdef XFUNCPROTO_NOT_AVAILABLE Index: xc/programs/xrx/rx/XAuth.h diff -u xc/programs/xrx/rx/XAuth.h:1.2 xc/programs/xrx/rx/XAuth.h:1.3 --- xc/programs/xrx/rx/XAuth.h:1.2 Fri Dec 14 15:02:19 2001 +++ xc/programs/xrx/rx/XAuth.h Mon Jan 9 10:01:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XAuth.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/rx/XAuth.h,v 1.3 2006/01/09 15:01:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/rx/XDpyName.c diff -u xc/programs/xrx/rx/XDpyName.c:1.8 xc/programs/xrx/rx/XDpyName.c:1.9 --- xc/programs/xrx/rx/XDpyName.c:1.8 Sat Apr 3 17:38:56 2004 +++ xc/programs/xrx/rx/XDpyName.c Mon Jan 9 10:01:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XDpyName.c,v 1.5 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/rx/XDpyName.c,v 1.8 2004/04/03 22:38:56 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/rx/XDpyName.c,v 1.9 2006/01/09 15:01:46 dawes Exp $ */ #ifdef XP_UNIX #include "RxPlugin.h" /* for PluginGlobal */ Index: xc/programs/xrx/rx/XDpyName.h diff -u xc/programs/xrx/rx/XDpyName.h:1.2 xc/programs/xrx/rx/XDpyName.h:1.3 --- xc/programs/xrx/rx/XDpyName.h:1.2 Fri Dec 14 15:02:19 2001 +++ xc/programs/xrx/rx/XDpyName.h Mon Jan 9 10:01:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XDpyName.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/rx/XDpyName.h,v 1.3 2006/01/09 15:01:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/rx/XUrls.c diff -u xc/programs/xrx/rx/XUrls.c:1.12 xc/programs/xrx/rx/XUrls.c:1.13 --- xc/programs/xrx/rx/XUrls.c:1.12 Sun Jul 20 12:12:20 2003 +++ xc/programs/xrx/rx/XUrls.c Mon Jan 9 10:01:46 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XUrls.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.12 2003/07/20 16:12:20 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/rx/XUrls.c,v 1.13 2006/01/09 15:01:46 dawes Exp $ */ #include "RxI.h" #include "XUrls.h" Index: xc/programs/xrx/rx/XUrls.h diff -u xc/programs/xrx/rx/XUrls.h:1.5 xc/programs/xrx/rx/XUrls.h:1.6 --- xc/programs/xrx/rx/XUrls.h:1.5 Fri Dec 14 15:02:20 2001 +++ xc/programs/xrx/rx/XUrls.h Mon Jan 9 10:01:46 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XUrls.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/rx/XUrls.h,v 1.6 2006/01/09 15:01:46 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/testplugin/Imakefile diff -u xc/programs/xrx/testplugin/Imakefile:1.1.1.2 xc/programs/xrx/testplugin/Imakefile:1.2 --- xc/programs/xrx/testplugin/Imakefile:1.1.1.2 Tue Jan 16 18:03:40 2001 +++ xc/programs/xrx/testplugin/Imakefile Mon Jan 9 10:01:47 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:02 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xrx/testplugin/Imakefile,v 1.2 2006/01/09 15:01:47 dawes Exp $ XCOMM where and which is the plugin to test PLUGINDIR = ../plugin Index: xc/programs/xrx/testplugin/testplugin.c diff -u xc/programs/xrx/testplugin/testplugin.c:1.2 xc/programs/xrx/testplugin/testplugin.c:1.3 --- xc/programs/xrx/testplugin/testplugin.c:1.2 Fri Dec 14 15:02:20 2001 +++ xc/programs/xrx/testplugin/testplugin.c Mon Jan 9 10:01:47 2006 @@ -1,4 +1,4 @@ -/* $Xorg: testplugin.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/testplugin/testplugin.c,v 1.3 2006/01/09 15:01:47 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/testplugin/testplugin.man diff -u xc/programs/xrx/testplugin/testplugin.man:1.8 xc/programs/xrx/testplugin/testplugin.man:1.9 --- xc/programs/xrx/testplugin/testplugin.man:1.8 Thu Feb 10 22:03:21 2005 +++ xc/programs/xrx/testplugin/testplugin.man Mon Jan 9 10:01:47 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: testplugin.man,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ .\" Copyright 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xrx/testplugin/testplugin.man,v 1.8 2005/02/11 03:03:21 dawes Exp $ +.\" $XFree86: xc/programs/xrx/testplugin/testplugin.man,v 1.9 2006/01/09 15:01:47 dawes Exp $ .\" .TH TESTPLUGIN 1 __vendorversion__ .SH NAME Index: xc/programs/xrx/xnest-plugin/Imakefile diff -u xc/programs/xrx/xnest-plugin/Imakefile:1.5 xc/programs/xrx/xnest-plugin/Imakefile:1.6 --- xc/programs/xrx/xnest-plugin/Imakefile:1.5 Wed Jan 17 18:46:26 2001 +++ xc/programs/xrx/xnest-plugin/Imakefile Fri Oct 14 11:17:35 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xrx/xnest-plugin/Imakefile,v 1.6 2005/10/14 15:17:35 tsi Exp $ XCOMM This isn't an option we must build a shared lib #define DoSharedLib YES @@ -47,7 +47,7 @@ PLUGIN_INCLUDES = -I$(PLUGINSRC) -I$(PLUGINSRC)/include DEFINES = -DNETSCAPE_PLUGIN $(PLUGIN_DEFINES) -DNO_STARTING_STATE $(SOCKET_DEFINES) -INCLUDES = -I. $(PLUGIN_INCLUDES) $(RX_INCLUDES) $(VENDOR_INCLUDES) +INCLUDES = $(PLUGIN_INCLUDES) $(RX_INCLUDES) $(VENDOR_INCLUDES) # most objects are the same as the ones for the standard plugin PLUGIN_OBJS = $(PLUGINSRC)/PRead.o $(PLUGINSRC)/PParse.o \ Index: xc/programs/xrx/xnest-plugin/NewNDest.c diff -u xc/programs/xrx/xnest-plugin/NewNDest.c:1.5 xc/programs/xrx/xnest-plugin/NewNDest.c:1.6 --- xc/programs/xrx/xnest-plugin/NewNDest.c:1.5 Fri Dec 14 15:02:21 2001 +++ xc/programs/xrx/xnest-plugin/NewNDest.c Mon Jan 9 10:01:47 2006 @@ -1,4 +1,4 @@ -/* $Xorg: NewNDest.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/xnest-plugin/NewNDest.c,v 1.6 2006/01/09 15:01:47 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/xnest-plugin/PProcess.c diff -u xc/programs/xrx/xnest-plugin/PProcess.c:1.5 xc/programs/xrx/xnest-plugin/PProcess.c:1.6 --- xc/programs/xrx/xnest-plugin/PProcess.c:1.5 Fri Dec 14 15:02:21 2001 +++ xc/programs/xrx/xnest-plugin/PProcess.c Mon Jan 9 10:01:47 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PProcess.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/xnest-plugin/PProcess.c,v 1.6 2006/01/09 15:01:47 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/xnest-plugin/RxPlugin.h diff -u xc/programs/xrx/xnest-plugin/RxPlugin.h:1.5 xc/programs/xrx/xnest-plugin/RxPlugin.h:1.6 --- xc/programs/xrx/xnest-plugin/RxPlugin.h:1.5 Fri Dec 14 15:02:21 2001 +++ xc/programs/xrx/xnest-plugin/RxPlugin.h Mon Jan 9 10:01:47 2006 @@ -1,4 +1,4 @@ -/* $Xorg: RxPlugin.h,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/xnest-plugin/RxPlugin.h,v 1.6 2006/01/09 15:01:47 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/xnest-plugin/SetWin.c diff -u xc/programs/xrx/xnest-plugin/SetWin.c:1.6 xc/programs/xrx/xnest-plugin/SetWin.c:1.7 --- xc/programs/xrx/xnest-plugin/SetWin.c:1.6 Fri Dec 14 15:02:21 2001 +++ xc/programs/xrx/xnest-plugin/SetWin.c Mon Jan 9 10:01:47 2006 @@ -1,4 +1,4 @@ -/* $Xorg: SetWin.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xrx/xnest-plugin/SetWin.c,v 1.7 2006/01/09 15:01:47 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/xrx/xnest-plugin/XnestDis.c diff -u xc/programs/xrx/xnest-plugin/XnestDis.c:1.3 xc/programs/xrx/xnest-plugin/XnestDis.c:1.4 --- xc/programs/xrx/xnest-plugin/XnestDis.c:1.3 Sun Jul 20 12:12:21 2003 +++ xc/programs/xrx/xnest-plugin/XnestDis.c Mon Jan 9 10:01:48 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XnestDis.c,v 1.4 2001/02/09 02:05:58 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -26,7 +25,7 @@ The Open Group. */ -/* $XFree86: xc/programs/xrx/xnest-plugin/XnestDis.c,v 1.3 2003/07/20 16:12:21 tsi Exp $ */ +/* $XFree86: xc/programs/xrx/xnest-plugin/XnestDis.c,v 1.4 2006/01/09 15:01:48 dawes Exp $ */ #include "RxPlugin.h" Index: xc/programs/xset/Imakefile diff -u xc/programs/xset/Imakefile:3.11 xc/programs/xset/Imakefile:3.12 --- xc/programs/xset/Imakefile:3.11 Thu Mar 29 21:15:26 2001 +++ xc/programs/xset/Imakefile Wed Dec 28 22:32:31 2005 @@ -1,15 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xset/Imakefile,v 3.11 2001/03/30 02:15:26 keithp Exp $ - - DEFINES = ExtensionDefines DPMSDefines \ - FontCacheExtensionDefines \ - XkbDefines - DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) $(DEPXF86LIBS) $(DEPFONTLIBS) -LOCAL_LIBRARIES = $(XMUULIB) $(XF86LIBS) $(FONTLIBS) $(XLIB) +XCOMM $XFree86: xc/programs/xset/Imakefile,v 3.12 2005/12/29 03:32:31 tsi Exp $ #if BuildXF86MiscLibrary DEPXF86LIBS = $(DEPXXF86MISCLIB) @@ -20,4 +9,9 @@ FONTLIBS = $(XFONTCACHELIB) #endif + DEFINES = DPMSDefines FontCacheExtensionDefines XkbDefines \ + MITMiscDefines XF86MiscExtensionDefines + DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) $(DEPXF86LIBS) $(DEPFONTLIBS) +LOCAL_LIBRARIES = $(XMUULIB) $(XF86LIBS) $(FONTLIBS) $(XLIB) + SimpleProgramTarget(xset) Index: xc/programs/xset/xset.c diff -u xc/programs/xset/xset.c:3.32 xc/programs/xset/xset.c:3.33 --- xc/programs/xset/xset.c:3.32 Tue Sep 23 22:43:39 2003 +++ xc/programs/xset/xset.c Mon Jan 9 10:01:48 2006 @@ -1,7 +1,3 @@ -/* - * $Xorg: xset.c,v 1.6 2001/02/09 02:05:58 xorgcvs Exp $ - */ - /* Copyright 1985, 1998 The Open Group @@ -27,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xset/xset.c,v 3.32 2003/09/24 02:43:39 dawes Exp $ */ +/* $XFree86: xc/programs/xset/xset.c,v 3.33 2006/01/09 15:01:48 dawes Exp $ */ /* Modified by Stephen so keyboard rate is set using XKB extensions */ #include Index: xc/programs/xset/xset.man diff -u xc/programs/xset/xset.man:3.17 xc/programs/xset/xset.man:3.18 --- xc/programs/xset/xset.man:3.17 Thu Feb 10 22:03:21 2005 +++ xc/programs/xset/xset.man Mon Jan 9 10:01:48 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xset.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xset/xset.man,v 3.17 2005/02/11 03:03:21 dawes Exp $ +.\" $XFree86: xc/programs/xset/xset.man,v 3.18 2006/01/09 15:01:48 dawes Exp $ .\" .TH XSET 1 __vendorversion__ .SH NAME Index: xc/programs/xsetroot/Imakefile diff -u xc/programs/xsetroot/Imakefile:1.4 xc/programs/xsetroot/Imakefile:1.5 --- xc/programs/xsetroot/Imakefile:1.4 Tue May 27 13:58:26 2003 +++ xc/programs/xsetroot/Imakefile Mon Jan 9 10:01:48 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:03 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xsetroot/Imakefile,v 1.4 2003/05/27 17:58:26 tsi Exp $ +XCOMM $XFree86: xc/programs/xsetroot/Imakefile,v 1.5 2006/01/09 15:01:48 dawes Exp $ DEPLIBS = $(DEPXMUULIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XMUULIB) $(XONLYLIB) Index: xc/programs/xsetroot/xsetroot.c diff -u xc/programs/xsetroot/xsetroot.c:1.8 xc/programs/xsetroot/xsetroot.c:1.9 --- xc/programs/xsetroot/xsetroot.c:1.8 Fri Dec 14 15:02:23 2001 +++ xc/programs/xsetroot/xsetroot.c Mon Jan 9 10:01:48 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: xsetroot.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ * Copyright 1987, 1998 The Open Group @@ -32,7 +31,7 @@ * Author: Mark Lillibridge, MIT Project Athena * 11-Jun-87 */ -/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.8 2001/12/14 20:02:23 dawes Exp $ */ +/* $XFree86: xc/programs/xsetroot/xsetroot.c,v 1.9 2006/01/09 15:01:48 dawes Exp $ */ #include #include Index: xc/programs/xsetroot/xsetroot.man diff -u xc/programs/xsetroot/xsetroot.man:1.9 xc/programs/xsetroot/xsetroot.man:1.10 --- xc/programs/xsetroot/xsetroot.man:1.9 Thu Feb 10 22:03:21 2005 +++ xc/programs/xsetroot/xsetroot.man Mon Jan 9 10:01:48 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xsetroot.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.9 2005/02/11 03:03:21 dawes Exp $ +.\" $XFree86: xc/programs/xsetroot/xsetroot.man,v 1.10 2006/01/09 15:01:48 dawes Exp $ .\" .TH XSETROOT 1 __vendorversion__ .SH NAME Index: xc/programs/xsm/Imakefile diff -u xc/programs/xsm/Imakefile:1.8 xc/programs/xsm/Imakefile:1.9 --- xc/programs/xsm/Imakefile:1.8 Fri May 31 14:46:14 2002 +++ xc/programs/xsm/Imakefile Fri Oct 14 11:17:35 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xsm/Imakefile,v 1.8 2002/05/31 18:46:14 dawes Exp $ +XCOMM $XFree86: xc/programs/xsm/Imakefile,v 1.9 2005/10/14 15:17:35 tsi Exp $ #if !defined(RshCmd) #if SystemV @@ -33,8 +28,6 @@ mainwin.o misc.o popup.o printhex.o prop.o remote.o \ restart.o save.o saveutil.o signals.o xsm.o xtwatch.o - INCLUDES = -I. - PROGS1 = ProgramTargetName(xsm) PROGRAMS = $(PROGS1) Index: xc/programs/xsm/README diff -u xc/programs/xsm/README:1.1.1.2 xc/programs/xsm/README:1.2 --- xc/programs/xsm/README:1.1.1.2 Tue Jan 16 18:04:12 2001 +++ xc/programs/xsm/README Mon Jan 9 10:01:48 2006 @@ -1,4 +1,4 @@ -$Xorg: README,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ +$XFree86: xc/programs/xsm/README,v 1.2 2006/01/09 15:01:48 dawes Exp $ README file for the X Session Manager (xsm) ------------------------------------------- Index: xc/programs/xsm/XSm.ad diff -u xc/programs/xsm/XSm.ad:1.1.1.2 xc/programs/xsm/XSm.ad:1.2 --- xc/programs/xsm/XSm.ad:1.1.1.2 Tue Jan 16 18:04:16 2001 +++ xc/programs/xsm/XSm.ad Mon Jan 9 10:01:49 2006 @@ -1,4 +1,4 @@ -! $Xorg: XSm.ad,v 1.3 2000/08/17 19:55:04 cpqbld Exp $ +! $XFree86: xc/programs/xsm/XSm.ad,v 1.2 2006/01/09 15:01:49 dawes Exp $ *chooseSessionPopup*font: 12x24 *chooseSessionLabel.label: Session Menu *chooseSessionMessageLabel.label: Press button again to confirm, or hit Cancel... Index: xc/programs/xsm/auth.c diff -u xc/programs/xsm/auth.c:1.7 xc/programs/xsm/auth.c:1.8 --- xc/programs/xsm/auth.c:1.7 Fri Dec 14 15:02:23 2001 +++ xc/programs/xsm/auth.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: auth.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/auth.c,v 1.7 2001/12/14 20:02:23 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/auth.c,v 1.8 2006/01/09 15:01:49 dawes Exp $ */ #include "xsm.h" Index: xc/programs/xsm/auth.h diff -u xc/programs/xsm/auth.h:1.6 xc/programs/xsm/auth.h:1.7 --- xc/programs/xsm/auth.h:1.6 Fri Dec 14 15:02:23 2001 +++ xc/programs/xsm/auth.h Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: auth.h,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/auth.h,v 1.6 2001/12/14 20:02:23 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/auth.h,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _AUTH_H_ #define _AUTH_H_ Index: xc/programs/xsm/choose.c diff -u xc/programs/xsm/choose.c:1.7 xc/programs/xsm/choose.c:1.8 --- xc/programs/xsm/choose.c:1.7 Sun Jul 20 12:12:21 2003 +++ xc/programs/xsm/choose.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: choose.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/choose.c,v 1.7 2003/07/20 16:12:21 tsi Exp $ */ +/* $XFree86: xc/programs/xsm/choose.c,v 1.8 2006/01/09 15:01:49 dawes Exp $ */ #include "xsm.h" #include "saveutil.h" Index: xc/programs/xsm/choose.h diff -u xc/programs/xsm/choose.h:1.6 xc/programs/xsm/choose.h:1.7 --- xc/programs/xsm/choose.h:1.6 Fri Dec 14 15:02:24 2001 +++ xc/programs/xsm/choose.h Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: choose.h,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/choose.h,v 1.6 2001/12/14 20:02:24 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/choose.h,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _CHOOSE_H_ #define _CHOOSE_H_ Index: xc/programs/xsm/globals.c diff -u xc/programs/xsm/globals.c:1.6 xc/programs/xsm/globals.c:1.7 --- xc/programs/xsm/globals.c:1.6 Fri Dec 14 15:02:25 2001 +++ xc/programs/xsm/globals.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: globals.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/globals.c,v 1.6 2001/12/14 20:02:25 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/globals.c,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #include Index: xc/programs/xsm/info.c diff -u xc/programs/xsm/info.c:1.6 xc/programs/xsm/info.c:1.7 --- xc/programs/xsm/info.c:1.6 Fri Dec 14 15:02:25 2001 +++ xc/programs/xsm/info.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: info.c,v 1.5 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/info.c,v 1.6 2001/12/14 20:02:25 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/info.c,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #include "xsm.h" #include "restart.h" Index: xc/programs/xsm/info.h diff -u xc/programs/xsm/info.h:3.5 xc/programs/xsm/info.h:3.6 --- xc/programs/xsm/info.h:3.5 Fri Dec 14 15:02:25 2001 +++ xc/programs/xsm/info.h Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: info.h,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/info.h,v 3.5 2001/12/14 20:02:25 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/info.h,v 3.6 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _INFO_H_ #define _INFO_H_ Index: xc/programs/xsm/list.c diff -u xc/programs/xsm/list.c:1.2 xc/programs/xsm/list.c:1.3 --- xc/programs/xsm/list.c:1.2 Fri Dec 14 15:02:25 2001 +++ xc/programs/xsm/list.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,4 @@ -/* $Xorg: list.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ +/* $XFree86: xc/programs/xsm/list.c,v 1.3 2006/01/09 15:01:49 dawes Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group Index: xc/programs/xsm/list.h diff -u xc/programs/xsm/list.h:1.6 xc/programs/xsm/list.h:1.7 --- xc/programs/xsm/list.h:1.6 Fri Dec 14 15:02:25 2001 +++ xc/programs/xsm/list.h Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: list.h,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/list.h,v 1.6 2001/12/14 20:02:25 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/list.h,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _LIST_H_ #define _LIST_H_ Index: xc/programs/xsm/lock.c diff -u xc/programs/xsm/lock.c:3.5 xc/programs/xsm/lock.c:3.6 --- xc/programs/xsm/lock.c:3.5 Fri May 31 14:46:14 2002 +++ xc/programs/xsm/lock.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lock.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/lock.c,v 3.5 2002/05/31 18:46:14 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/lock.c,v 3.6 2006/01/09 15:01:49 dawes Exp $ */ #include "xsm.h" #include "lock.h" Index: xc/programs/xsm/lock.h diff -u xc/programs/xsm/lock.h:1.6 xc/programs/xsm/lock.h:1.7 --- xc/programs/xsm/lock.h:1.6 Fri Dec 14 15:02:25 2001 +++ xc/programs/xsm/lock.h Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lock.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/lock.h,v 1.6 2001/12/14 20:02:25 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/lock.h,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _LOCK_H_ #define _LOCK_H_ Index: xc/programs/xsm/log.c diff -u xc/programs/xsm/log.c:1.5 xc/programs/xsm/log.c:1.6 --- xc/programs/xsm/log.c:1.5 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/log.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: log.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/log.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/log.c,v 1.6 2006/01/09 15:01:49 dawes Exp $ */ #include "xsm.h" #include "save.h" Index: xc/programs/xsm/log.h diff -u xc/programs/xsm/log.h:1.6 xc/programs/xsm/log.h:1.7 --- xc/programs/xsm/log.h:1.6 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/log.h Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: log.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/log.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/log.h,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _LOG_H_ #define _LOG_H_ Index: xc/programs/xsm/mainwin.c diff -u xc/programs/xsm/mainwin.c:1.5 xc/programs/xsm/mainwin.c:1.6 --- xc/programs/xsm/mainwin.c:1.5 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/mainwin.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mainwin.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/mainwin.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/mainwin.c,v 1.6 2006/01/09 15:01:49 dawes Exp $ */ #include "xsm.h" #include "info.h" Index: xc/programs/xsm/mainwin.h diff -u xc/programs/xsm/mainwin.h:1.6 xc/programs/xsm/mainwin.h:1.7 --- xc/programs/xsm/mainwin.h:1.6 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/mainwin.h Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mainwin.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/mainwin.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/mainwin.h,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _MAINWIN_H_ #define _MAINWIN_H_ Index: xc/programs/xsm/misc.c diff -u xc/programs/xsm/misc.c:1.6 xc/programs/xsm/misc.c:1.8 --- xc/programs/xsm/misc.c:1.6 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/misc.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: misc.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/misc.c,v 1.6 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/misc.c,v 1.8 2006/01/09 15:01:49 dawes Exp $ */ #include "xsm.h" @@ -110,7 +109,7 @@ int pid, status; if ((pid = fork ()) == 0) { (void) setpgrp(); - execl ("/bin/sh", "sh", "-c", s, 0); + execl ("/bin/sh", "sh", "-c", s, (void *)0); } else waitpid (pid, &status, 0); return status; Index: xc/programs/xsm/popup.c diff -u xc/programs/xsm/popup.c:1.5 xc/programs/xsm/popup.c:1.6 --- xc/programs/xsm/popup.c:1.5 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/popup.c Mon Jan 9 10:01:49 2006 @@ -1,5 +1,3 @@ -/* $Xorg: popup.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xsm/popup.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/popup.c,v 1.6 2006/01/09 15:01:49 dawes Exp $ */ #include "xsm.h" #include Index: xc/programs/xsm/popup.h diff -u xc/programs/xsm/popup.h:1.6 xc/programs/xsm/popup.h:1.7 --- xc/programs/xsm/popup.h:1.6 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/popup.h Mon Jan 9 10:01:49 2006 @@ -1,5 +1,3 @@ -/* $Xorg: popup.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xsm/popup.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/popup.h,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _POPUP_H_ #define _POPUP_H_ Index: xc/programs/xsm/printhex.c diff -u xc/programs/xsm/printhex.c:1.3 xc/programs/xsm/printhex.c:1.4 --- xc/programs/xsm/printhex.c:1.3 Sat Apr 3 17:38:56 2004 +++ xc/programs/xsm/printhex.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: printhex.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/printhex.c,v 1.3 2004/04/03 22:38:56 tsi Exp $ */ +/* $XFree86: xc/programs/xsm/printhex.c,v 1.4 2006/01/09 15:01:49 dawes Exp $ */ #include Index: xc/programs/xsm/prop.c diff -u xc/programs/xsm/prop.c:1.8 xc/programs/xsm/prop.c:1.9 --- xc/programs/xsm/prop.c:1.8 Mon May 31 20:17:08 2004 +++ xc/programs/xsm/prop.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: prop.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/prop.c,v 1.8 2004/06/01 00:17:08 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/prop.c,v 1.9 2006/01/09 15:01:49 dawes Exp $ */ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. Index: xc/programs/xsm/prop.h diff -u xc/programs/xsm/prop.h:1.6 xc/programs/xsm/prop.h:1.7 --- xc/programs/xsm/prop.h:1.6 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/prop.h Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: prop.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/prop.h,v 1.6 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/prop.h,v 1.7 2006/01/09 15:01:49 dawes Exp $ */ #ifndef _PROP_H_ #define _PROP_H_ Index: xc/programs/xsm/remote.c diff -u xc/programs/xsm/remote.c:1.5 xc/programs/xsm/remote.c:1.6 --- xc/programs/xsm/remote.c:1.5 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/remote.c Mon Jan 9 10:01:49 2006 @@ -1,4 +1,3 @@ -/* $Xorg: remote.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/remote.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/remote.c,v 1.6 2006/01/09 15:01:49 dawes Exp $ */ /* * We use the rstart protocol to restart clients on remote machines. Index: xc/programs/xsm/restart.c diff -u xc/programs/xsm/restart.c:1.6 xc/programs/xsm/restart.c:1.7 --- xc/programs/xsm/restart.c:1.6 Fri Dec 14 15:02:26 2001 +++ xc/programs/xsm/restart.c Sun Mar 27 21:51:14 2005 @@ -1,4 +1,3 @@ -/* $Xorg: restart.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,14 +22,18 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/restart.c,v 1.6 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/restart.c,v 1.7 2005/03/28 02:51:14 dawes Exp $ */ #include "xsm.h" #include "log.h" #include "restart.h" #include "saveutil.h" +#include +#ifndef _GNU_SOURCE extern char **environ; +#endif + /* Index: xc/programs/xsm/restart.h diff -u xc/programs/xsm/restart.h:1.6 xc/programs/xsm/restart.h:1.7 --- xc/programs/xsm/restart.h:1.6 Fri Dec 14 15:02:27 2001 +++ xc/programs/xsm/restart.h Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: restart.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/restart.h,v 1.6 2001/12/14 20:02:27 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/restart.h,v 1.7 2006/01/09 15:01:50 dawes Exp $ */ #ifndef _RESTART_H_ #define _RESTART_H_ Index: xc/programs/xsm/save.c diff -u xc/programs/xsm/save.c:3.6 xc/programs/xsm/save.c:3.7 --- xc/programs/xsm/save.c:3.6 Mon May 31 20:17:08 2004 +++ xc/programs/xsm/save.c Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: save.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/save.c,v 3.6 2004/06/01 00:17:08 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/save.c,v 3.7 2006/01/09 15:01:50 dawes Exp $ */ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. Index: xc/programs/xsm/save.h diff -u xc/programs/xsm/save.h:1.6 xc/programs/xsm/save.h:1.7 --- xc/programs/xsm/save.h:1.6 Fri Dec 14 15:02:27 2001 +++ xc/programs/xsm/save.h Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: save.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/save.h,v 1.6 2001/12/14 20:02:27 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/save.h,v 1.7 2006/01/09 15:01:50 dawes Exp $ */ #ifndef _SAVE_H_ #define _SAVE_H_ Index: xc/programs/xsm/saveutil.c diff -u xc/programs/xsm/saveutil.c:1.6 xc/programs/xsm/saveutil.c:1.7 --- xc/programs/xsm/saveutil.c:1.6 Fri Dec 14 15:02:27 2001 +++ xc/programs/xsm/saveutil.c Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: saveutil.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/saveutil.c,v 1.6 2001/12/14 20:02:27 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/saveutil.c,v 1.7 2006/01/09 15:01:50 dawes Exp $ */ #include "xsm.h" #include "log.h" Index: xc/programs/xsm/saveutil.h diff -u xc/programs/xsm/saveutil.h:1.7 xc/programs/xsm/saveutil.h:1.8 --- xc/programs/xsm/saveutil.h:1.7 Fri Dec 14 15:02:27 2001 +++ xc/programs/xsm/saveutil.h Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: saveutil.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/saveutil.h,v 1.7 2001/12/14 20:02:27 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/saveutil.h,v 1.8 2006/01/09 15:01:50 dawes Exp $ */ #ifndef _SAVEUTIL_H_ #define _SAVEUTIL_H_ Index: xc/programs/xsm/signals.c diff -u xc/programs/xsm/signals.c:3.9 xc/programs/xsm/signals.c:3.10 --- xc/programs/xsm/signals.c:3.9 Mon May 31 20:17:08 2004 +++ xc/programs/xsm/signals.c Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: signals.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/signals.c,v 3.9 2004/06/01 00:17:08 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/signals.c,v 3.10 2006/01/09 15:01:50 dawes Exp $ */ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. Index: xc/programs/xsm/system.xsm diff -u xc/programs/xsm/system.xsm:1.1.1.2 xc/programs/xsm/system.xsm:1.2 --- xc/programs/xsm/system.xsm:1.1.1.2 Tue Jan 16 18:05:12 2001 +++ xc/programs/xsm/system.xsm Mon Jan 9 10:01:50 2006 @@ -1,4 +1,4 @@ -! $Xorg: system.xsm,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ +! $XFree86: xc/programs/xsm/system.xsm,v 1.2 2006/01/09 15:01:50 dawes Exp $ twm smproxy xterm Index: xc/programs/xsm/xsm.c diff -u xc/programs/xsm/xsm.c:1.12 xc/programs/xsm/xsm.c:1.13 --- xc/programs/xsm/xsm.c:1.12 Mon May 31 20:17:08 2004 +++ xc/programs/xsm/xsm.c Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xsm.c,v 1.7 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/xsm.c,v 1.12 2004/06/01 00:17:08 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/xsm.c,v 1.13 2006/01/09 15:01:50 dawes Exp $ */ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. Index: xc/programs/xsm/xsm.h diff -u xc/programs/xsm/xsm.h:1.11 xc/programs/xsm/xsm.h:1.13 --- xc/programs/xsm/xsm.h:1.11 Mon May 31 20:17:08 2004 +++ xc/programs/xsm/xsm.h Sun Feb 19 19:14:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xsm.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/xsm.h,v 1.11 2004/06/01 00:17:08 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/xsm.h,v 1.13 2006/02/20 00:14:38 dawes Exp $ */ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -242,7 +241,7 @@ #endif #if defined(sun) && defined(SVR4) -extern int System(); +extern int System(char *); #define system(s) System(s) #endif Index: xc/programs/xsm/xsm.man diff -u xc/programs/xsm/xsm.man:1.8 xc/programs/xsm/xsm.man:1.9 --- xc/programs/xsm/xsm.man:1.8 Thu Feb 10 22:03:22 2005 +++ xc/programs/xsm/xsm.man Mon Oct 24 12:42:46 2005 @@ -1,4 +1,4 @@ -.\" $Xorg: xsm.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ +.\" $XFree86: xc/programs/xsm/xsm.man,v 1.9 2005/10/24 16:42:46 tsi Exp $ .\" Copyright 1994,1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,8 +23,6 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xsm/xsm.man,v 1.8 2005/02/11 03:03:22 dawes Exp $ -.\" .TH XSM 1 __vendorversion__ .SH NAME xsm \- X Session Manager @@ -89,7 +87,7 @@ applications to start up. For example, this list might include a window manager, a session management proxy, and an xterm. \fIxsm\fP will first look for the file \fI.xsmstartup\fP in the user's home directory. If that -file does not exists, it will look for the \fIsystem.xsm\fP file that was +file does not exist, it will look for the \fIsystem.xsm\fP file that was set up at installation time. Note that \fIxsm\fP provides a "fail safe" option when the user chooses a session to start up. The fail safe option simply loads the default applications described above. Index: xc/programs/xsm/xtwatch.c diff -u xc/programs/xsm/xtwatch.c:1.5 xc/programs/xsm/xtwatch.c:1.6 --- xc/programs/xsm/xtwatch.c:1.5 Fri Dec 14 15:02:28 2001 +++ xc/programs/xsm/xtwatch.c Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xtwatch.c,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/xtwatch.c,v 1.5 2001/12/14 20:02:28 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/xtwatch.c,v 1.6 2006/01/09 15:01:50 dawes Exp $ */ #include #include Index: xc/programs/xsm/xtwatch.h diff -u xc/programs/xsm/xtwatch.h:1.6 xc/programs/xsm/xtwatch.h:1.7 --- xc/programs/xsm/xtwatch.h:1.6 Fri Dec 14 15:02:28 2001 +++ xc/programs/xsm/xtwatch.h Mon Jan 9 10:01:50 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xtwatch.h,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ */ /****************************************************************************** Copyright 1993, 1998 The Open Group @@ -23,7 +22,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/programs/xsm/xtwatch.h,v 1.6 2001/12/14 20:02:28 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/xtwatch.h,v 1.7 2006/01/09 15:01:50 dawes Exp $ */ #ifndef _XTWATCH_H_ #define _XTWATCH_H_ Index: xc/programs/xstdcmap/Imakefile diff -u xc/programs/xstdcmap/Imakefile:1.1.1.2 xc/programs/xstdcmap/Imakefile:1.2 --- xc/programs/xstdcmap/Imakefile:1.1.1.2 Tue Jan 16 18:05:20 2001 +++ xc/programs/xstdcmap/Imakefile Mon Jan 9 10:01:51 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:06 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xstdcmap/Imakefile,v 1.2 2006/01/09 15:01:51 dawes Exp $ + DEPLIBS = $(DEPXMULIB) $(DEPXLIB) LOCAL_LIBRARIES = $(XMULIB) $(XLIB) SRCS = xstdcmap.c Index: xc/programs/xstdcmap/xstdcmap.c diff -u xc/programs/xstdcmap/xstdcmap.c:1.10 xc/programs/xstdcmap/xstdcmap.c:1.11 --- xc/programs/xstdcmap/xstdcmap.c:1.10 Wed Mar 31 11:37:10 2004 +++ xc/programs/xstdcmap/xstdcmap.c Mon Jan 9 10:01:51 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: xstdcmap.c,v 1.5 2001/02/09 02:06:01 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ * * * Author: Donna Converse, MIT X Consortium */ -/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.10 2004/03/31 16:37:10 tsi Exp $ */ +/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.11 2006/01/09 15:01:51 dawes Exp $ */ #include #include Index: xc/programs/xstdcmap/xstdcmap.man diff -u xc/programs/xstdcmap/xstdcmap.man:1.9 xc/programs/xstdcmap/xstdcmap.man:1.10 --- xc/programs/xstdcmap/xstdcmap.man:1.9 Thu Feb 10 22:03:22 2005 +++ xc/programs/xstdcmap/xstdcmap.man Mon Jan 9 10:01:51 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xstdcmap.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $ .\" Copyright 1989, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.9 2005/02/11 03:03:22 dawes Exp $ +.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.10 2006/01/09 15:01:51 dawes Exp $ .\" .de EX \"Begin example .ne 5 Index: xc/programs/xterm/88colres.pl diff -u xc/programs/xterm/88colres.pl:1.6 xc/programs/xterm/88colres.pl:1.7 --- xc/programs/xterm/88colres.pl:1.6 Sat Oct 5 13:57:11 2002 +++ xc/programs/xterm/88colres.pl Sun Sep 18 19:48:11 2005 @@ -1,6 +1,7 @@ #!/usr/bin/perl # Author: Steve Wall -# $XFree86: xc/programs/xterm/88colres.pl,v 1.6 2002/10/05 17:57:11 dickey Exp $ +# $XTermId: 88colres.pl,v 1.14 2005/09/05 20:53:45 Emanuele.Giaquinta Exp $ +# $XFree86: xc/programs/xterm/88colres.pl,v 1.7 2005/09/18 23:48:11 dickey Exp $ # Made from 256colres.pl # Construct a header file defining default resources for the @@ -41,7 +42,7 @@ } } -# colors 80-91 are a grayscale ramp, intentionally leaving out +# colors 80-87 are a grayscale ramp, intentionally leaving out # black and white for ($gray = 0; $gray < 8; $gray++) { $level = ($gray * 23.18181818) + 46.36363636; Index: xc/programs/xterm/INSTALL diff -u xc/programs/xterm/INSTALL:3.37 xc/programs/xterm/INSTALL:3.42 --- xc/programs/xterm/INSTALL:3.37 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/INSTALL Sun Feb 12 20:14:57 2006 @@ -1,5 +1,5 @@ --- $XTermId: INSTALL,v 1.79 2005/01/09 16:20:01 tom Exp $ --- $XFree86: xc/programs/xterm/INSTALL,v 3.37 2005/01/14 01:50:02 dickey Exp $ +-- $XTermId: INSTALL,v 1.104 2006/02/12 22:43:56 tom Exp $ +-- $XFree86: xc/programs/xterm/INSTALL,v 3.42 2006/02/13 01:14:57 dickey Exp $ -- Thomas E. Dickey Xterm is normally built as part of the X Window System source tree, using @@ -160,6 +160,12 @@ type. If you do not need input method (and are troubled by the warning messages), it is safe to disable this option. + --disable-leaks test: set to test memory leaks + + Compile-in code which frees memory which might confuse a leak-testing + tool. Normally these chunks of memory are retained as long as xterm + is running. + --disable-maximize disable actions for iconify/deiconify/maximize/restore Do not compile-in code that implements runtime 'actions' for @@ -185,6 +191,11 @@ match the parent's. In particular, it addresses a problem where the terminal size is not defined in the stty settings. + --disable-regex disable regular-expression selections + + Do not compile-in code to support the "regex" option for multiple + mouse clicks. + --disable-rightbar disable right-scrollbar support Do not compile-in code that supports a scrollbar on the right. @@ -264,7 +275,7 @@ translation. --enable-dec-locator enable DECterm Locator support - Add support for for DEC Locator control sequences for xterm: + Add support for DEC Locator control sequences for xterm: DECEFR - Enable Filter Rectangle DECELR - Enable Locator Reports @@ -310,6 +321,40 @@ This sets "--enable-luit" as a side-effect. + --enable-narrowproto enable narrow prototypes for X libraries + + Originally xterm was built using imake rather than a configure script. + One feature of imake that is not possible to guess within the + configure script is the wide-prototype compile-time definition + NARROWPROTO. When this is not set properly, the Athena widget + scrollbars do not work properly. xterm's configure script has a + fallback case which allows disabling imake. However, this is moot + with the X.org "modular" build, whose compiler options are unrelated to + imake or older versions of any libraries that it may distribute. In + this case, the configure script needs some help. Use this option to + enable or disable NARROW proto (and disable imake with the + --disable-imake option) to match the whims of X.org hackers. + + For instance + + configure --disable-imake --disable-narrowproto + + --enable-paste64 enable support for bracketed paste mode + + Compile-in code to support experimental bracketed paste mode, i.e., + provide functions for setting/getting the selection data. + + (see ctlseqs.ms description of OSC 52). + + --enable-readline-mouse enable support for mouse in readline applications + + Compile-in code to support experimental bracketed paste mode, i.e., + provide functions for setting/getting the selection data. Essentially + this puts xterm into a mode that sends special function-key strings to + bracket the data. + + (See --enable-paste64, which fits xterm's protocol better). + --enable-sco-fkeys enable support for SCO-style function keys Compile-in code to support SCO-style function keys. @@ -326,6 +371,15 @@ Compile-in code that builds a toolbar with pulldown menus. The normal popup menus are still available. + This is an experimental option. As of patch #206, it is known to + work well with fvwm, but not as well with some other window managers, + e.g., KDE's Kwin and IceWM. + + In addition to isolated layout problems, it is reported that some + flavors of the Athena widget library perform badly with ISO-10646 + fonts. You can work around those by setting the menu fonts to + an ISO-8859 variant in your X resources. + --enable-trace test: set to enable debugging traces Compile-in code to trace xterm's internal states. @@ -359,6 +413,28 @@ Look for, compile and link with the Xaw Plus widget library. + --with-app-defaults=DIR directory in which to install resource files (default: EPREFIX/lib/X11/app-defaults) + + autoconf scripts assume that all of the files should be installed + under the same top-level directory. But X applications defaults + must be installed into a special directory, e.g., + + /usr/X11/lib/app-defaults + + However, there is no standard for this pathname. The manual page + for X notes that the environment variable $XUSERFILESEARCHPATH can + specify a list of places where X searches for applications defaults. + Also, it may look in $XAPPLRESDIR, but that usually is not related + to where xterm might be installed. To keep it simple, the configure + script uses + + EPREFIX/lib/X11/app-defaults + + as the default (EPREFIX is --prefix). That makes it work normally + for most systems if --prefix is /usr. For other installs, e.g., to + /usr/local, you should use this option to customize the location to + match your system configuration. + --with-freetype-cflags -D/-I options for compiling with FreeType library Override options provided by xft-config or freetype-config. @@ -385,7 +461,58 @@ workable terminfo description. Be advised, however, that the common variety of "xterm-color" is not suited for xterm, but is directed to other variations (such as nxterm) which do not - support the back-color erase capability. + support the background-color erase capability. + + --with-pcre use PCRE for regular-expressions + + If regular expressions are not disable (--disable-regex), use PCRE + rather than the POSIX regular expressions. + + --with-reference=XXX program to use as permissions-reference + + To install xterm with setuid permissions, the scripts usually compare + it with a previous install. That works well for individual + maintainers, but can be a problem for packagers who may be + cross-compiling, etc. This option lets the package builder specify + the file used for permissions reference. + + --with-setuid=XXX use the given setuid user + + Install xterm setuid'd to the given user. If no parameter value + is given, assume it is root. + + See also --with-utmp-setgid and --with-utempter, which manipulate + the setgid group. + + --with-tty-group=XXX use XXX for the tty-group + + If xterm is installed setuid'd to root, change the group of the tty + device to the given value on startup. Three cases are possible: + + a) If this option is not given, the configure script will attempt to + find a suitable value (usually "tty"), and verify that it exists in + the group database. + + b) If the option value is given, it will use the value even if it does + not exist in the group database (allowing packagers to work about + deficient environments). + + c) If the option is disabled, e.g., --without-tty-group, the + permissions change will use the group-id of the process. + + If xterm is not installed setuid'd to root, this option is not needed, + since it cannot change the tty device's ownership. + + --with-xterm-symlink=XXX make symbolic link to installed xterm + + If any of the configure options to modify the program name i.e., + --program-prefix, --program-suffix or --program-transform-name + are given, this option allows the makefile to create a symbolic link, + e.g., to "xterm" on install. The option value gives the name for + the link, which defaults to "xterm". + + Use --without-xterm-symlink to disable a link to "xterm" if none + is wanted. --with-terminal-id[=V] set default decTerminalID (default: vt100) @@ -417,3 +544,12 @@ The utempter library is a set-uid wrapper for the utmp facility. On systems with Unix98 pty's, xterm can use this library when available so it need not be installed set-uid. + + --with-utmp-setgid use setgid for access to utmp + + The option value specifies a group to use when installing. + xterm will be installed with setgid privilege to this group. + At runtime, xterm will drop the setuid privilege immediately + after opening the pseudo-terminal, and will have only the + group privilege needed to access the utmp file. This relies + on having POSIX setuid behavior. Index: xc/programs/xterm/Imakefile diff -u xc/programs/xterm/Imakefile:3.57 xc/programs/xterm/Imakefile:3.73 --- xc/programs/xterm/Imakefile:3.57 Mon Jan 17 15:40:01 2005 +++ xc/programs/xterm/Imakefile Sun Apr 9 20:34:36 2006 @@ -1,6 +1,4 @@ -XCOMM $XTermId: Imakefile,v 1.73 2005/01/13 23:39:33 tom Exp $ -XCOMM -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:07 cpqbld Exp $ +XCOMM $XTermId: Imakefile,v 1.97 2006/04/08 22:08:34 tom Exp $ XCOMM XCOMM Attention xterm porters XCOMM @@ -9,7 +7,7 @@ XCOMM bcopy (or memcpy) cannot, write a routine called bcopy and link it in XCOMM or add -Dbcopy=mybcopy to the DEFINES list below. XCOMM -XCOMM $XFree86: xc/programs/xterm/Imakefile,v 3.57 2005/01/17 20:40:01 dickey Exp $ +XCOMM $XFree86: xc/programs/xterm/Imakefile,v 3.73 2006/04/10 00:34:36 dickey Exp $ XCOMM /* Uncomment SCROLLBAR_RIGHT if you want the scroll bar to be on the right */ @@ -19,17 +17,56 @@ #define UTF8support /* - * Fixes to allow compile with X11R5 + * setgid mode works for systems that do not require setuid to open pty. + * + * This feature could also be applied to FreeBSD, but requires the installer + * to define a "utmp" group as well as chgrp the utmp file to match. + * + * Note: InstallXtermSetUID is always defined; InstallXtermSetGID is defined + * in newer imake configurations. */ -#ifndef XkbClientDefines -#define XkbClientDefines /**/ +#if !defined(InstallXtermSetGID) && !InstallXtermSetUID +#if defined(OpenBSDArchitecture) || \ + (defined(LinuxArchitecture) && \ + (LinuxCLibMajorVersion == 6)) +#define InstallXtermSetGID YES +#endif #endif +/* + * Override the set uid/gid flags to use the utempter library. + */ #if defined(UseUtempter) -#undef InstallXtermSetUID +#undef InstallXtermSetUID /* imake sets this */ +#undef InstallXtermSetGID /* we set this */ +#define InstallXtermSetUID NO +#define InstallXtermSetGID NO UTMPLIB = -lutempter #endif +/* + * Fixes to allow compile with X11R5, etc. + */ +#ifndef InstGidFlags +#define InstGidFlags -m 2755 -g utmp +#endif + +#ifndef InstUidFlags +#define InstUidFlags -m 4711 +#endif + +#ifndef XkbClientDefines +#define XkbClientDefines /**/ +#endif + +#ifndef InstallXtermSetUID +#define InstallXtermSetUID NO +#endif + +#ifndef InstallXtermSetGID +#define InstallXtermSetGID NO +#endif + #ifndef XkbClientDepLibs #define XkbClientDepLibs /**/ #endif @@ -38,6 +75,25 @@ #define XkbClientLibs /**/ #endif +/* This must come before setting DEFINES */ +#if InstallXtermSetUID +INSTSETIDFLAGS = InstUidFlags +#elif InstallXtermSetGID +CSGIDFLAGS = -DUSE_UTMP_SETGID +INSTSETIDFLAGS = InstGidFlags +#else +INSTSETIDFLAGS = NullParameter +#endif + +/* + * Compensate for broken imake configuration. + */ +#ifdef LinuxGnuSourceDefines +# ifdef UseInstalled + IMAKEDEFINES = -D_GNU_SOURCE +# endif +#endif + #ifndef SpecialCObjectRule #define SpecialCObjectRule(module,ignore,defines) \ module.o: ; $(CC) -c defines $(CFLAGS) module.c @@ -52,14 +108,16 @@ * handle overlapping copies before using it. */ #if SetTtyGroup /* turn on in config/machine.cf */ - TTYGROUPDEF = -DUSE_TTY_GROUP + TTYGROUPDEF = -DUSE_TTY_GROUP #endif -#ifdef UsePUCCPtyd /* turn on in config/site.def */ - PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ +#ifdef UsePUCCPtyd /* turn on in config/site.def */ + PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ PTYLIB = -lpucc #endif -#if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || \ +#if defined(NetBSDArchitecture) || \ + defined(OpenBSDArchitecture) || \ + defined(FreeBSDArchitecture) || \ (defined(LinuxArchitecture) && \ (LinuxCLibMajorVersion == 6) && (LinuxCLibMinorVersion < 1)) PTYLIB = -lutil @@ -106,7 +164,7 @@ XRFDEF = -DXRENDERFONT -DXFREE86_FT2 XRFLIBS = XftClientLibs XRFDEPLIBS = XftClientDepLibs - XRFINCLUDES = $(XFTINCLUDES) -I$(XBUILDINCDIR) + XRFINCLUDES = $(XFTINCLUDES) #endif #if !HasPutenv PUTENVDEF = -DNOPUTENV @@ -114,13 +172,13 @@ #ifdef TraceXTerm TRACEDEF = -DOPT_TRACE=1 #endif - MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) $(NOPOSIXTERMIOS) \ + MAIN_DEFINES = $(UTMPDEF) $(TTYGROUPDEF) $(PUCCPTYDDEF) $(CSGIDFLAGS) \ -DOSMAJORVERSION=$(OSMAJORVERSION) \ -DOSMINORVERSION=$(OSMINORVERSION) MISC_DEFINES = /* -DALLOWLOGGING -DALLOWLOGFILEEXEC */ XKB_DEFINES = XkbClientDefines PATH_DEFINES = -DPROJECTROOT=$(PROJECTROOT) - DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(TRACEDEF) + DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) INCLUDES = -I. $(XRFINCLUDES) #ifdef OS2Architecture @@ -156,7 +214,11 @@ #ifndef TermcapLibrary #if SystemV && !defined(MacIIArchitecture) -#if defined(CrayArchitecture) || (defined(HPArchitecture) && (OSMajorVersion < 10)) || defined(RsArchitecture) +#if defined(CrayArchitecture) || \ + (defined(HPArchitecture) && (OSMajorVersion < 10)) || \ + defined(RsArchitecture) || \ + defined(SCOArchitecture) || \ + defined(USLArchitecture) #define TermcapLibrary -lcurses /* special cases of System V */ #else #define TermcapLibrary -ltermlib /* usually in here */ @@ -182,11 +244,6 @@ NormalProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(UTMPLIB) $(PTYLIB)) #endif -#if defined(OpenBSDArchitecture) -/* On OpenBSD xterm is now setgid utmp */ -INSTUIDFLAGS= -m 6755 -g utmp -#endif - #if InstallXtermSetUID && defined(SunArchitecture) && HasSharedLibraries && (OSMajorVersion < 5) #if AlternateUsrLibDir #if ((OSMajorVersion == 4) && (OSMinorVersion >= 1)) @@ -207,14 +264,10 @@ $(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS),$(OBJS1),$(LDOVERRIDE) $(XRFLIBS) XawClientLibs $(LDRESUME) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB)) - $(INSTALL) -c $(INSTPGMFLAGS) $(INSTUIDFLAGS) ProgramTargetName(xterm.inst) $(DESTDIR)$(BINDIR)/ProgramTargetName(xterm) + $(INSTALL) -c $(INSTPGMFLAGS) $(INSTSETIDFLAGS) ProgramTargetName(xterm.inst) $(DESTDIR)$(BINDIR)/ProgramTargetName(xterm) RemoveFile(ProgramTargetName(xterm.inst)) #else -#if InstallXtermSetUID -InstallProgramWithFlags(xterm,$(BINDIR),$(INSTUIDFLAGS)) -#else -InstallProgramWithFlags(xterm,$(BINDIR),NullParameter) -#endif +InstallProgramWithFlags(xterm,$(BINDIR),$(INSTSETIDFLAGS)) #endif InstallNamedProg(uxterm,uxterm,$(BINDIR)) @@ -223,7 +276,6 @@ * Link with the termcap library if USE_TERMCAP is defined in resize.c */ #if defined(NTOArchitecture) || \ - defined(SCOArchitecture) || \ defined(LinuxArchitecture) || \ defined(OpenBSDArchitecture) || \ defined(SGIArchitecture) || \ Index: xc/programs/xterm/MANIFEST diff -u xc/programs/xterm/MANIFEST:1.37 xc/programs/xterm/MANIFEST:1.49 --- xc/programs/xterm/MANIFEST:1.37 Sun Feb 6 16:42:37 2005 +++ xc/programs/xterm/MANIFEST Sun Apr 30 17:55:39 2006 @@ -1,4 +1,4 @@ -MANIFEST for xterm, version xterm-200 +MANIFEST for xterm, version xterm-213 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode @@ -120,6 +120,7 @@ vttests/doublechars.sh test script to demonstrate doublesize chars vttests/dynamic.sh script to illustrate the dynamic colors control sequence vttests/fonts.sh script to demonstrate font-switching sequences +vttests/paste64.pl script to test base64-selection option vttests/resize.pl translated resize.sh to perl since it is easy to test, and I needed vttests/resize.sh script to demonstrate resizing vttests/tcapquery.pl script to test tcap-query option Index: xc/programs/xterm/Makefile.in diff -u xc/programs/xterm/Makefile.in:3.50 xc/programs/xterm/Makefile.in:3.55 --- xc/programs/xterm/Makefile.in:3.50 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/Makefile.in Sun Apr 30 17:55:39 2006 @@ -1,8 +1,8 @@ -## $XTermId: Makefile.in,v 1.114 2005/01/09 16:06:34 tom Exp $ +## $XTermId: Makefile.in,v 1.129 2006/04/21 18:57:58 tom Exp $ ## -## $XFree86: xc/programs/xterm/Makefile.in,v 3.50 2005/01/14 01:50:02 dickey Exp $ ## +## $XFree86: xc/programs/xterm/Makefile.in,v 3.55 2006/04/30 21:55:39 dickey Exp $ ## ## -## Copyright 2002-2003,2004 by Thomas E. Dickey +## Copyright 2002-2005,2006 by Thomas E. Dickey ## ## All Rights Reserved ## @@ -63,7 +63,7 @@ bindir = @bindir@ libdir = @libdir@ mandir = @mandir@/man$(manext) -appsdir = $(libdir)/X11/app-defaults +appsdir = @appsdir@ #### End of system configuration section. #### @@ -138,40 +138,52 @@ charproc$o : main.h @CHARPROC_DEPS@ -TRANSFORM = sed 's/$x$$//'|sed '$(transform)'|sed 's/$$/$x/' actual_xterm = `echo xterm| sed '$(transform)'` actual_resize = `echo resize| sed '$(transform)'` -binary_xterm = `echo xterm$x| $(TRANSFORM)` -binary_resize = `echo resize$x| $(TRANSFORM)` -binary_uxterm = `echo uxterm| $(TRANSFORM)` +actual_uxterm = `echo uxterm| sed '$(transform)'` + +binary_xterm = $(actual_xterm)$x +binary_resize = $(actual_resize)$x +binary_uxterm = $(actual_uxterm) install \ install-bin \ install-full :: xterm$x resize$x $(BINDIR) -@MAY_SETUID@ $(SHELL) $(srcdir)/sinstall.sh "$(INSTALL_PROGRAM)" xterm$x @XTERM_PATH@ $(BINDIR)/$(binary_xterm) +@MAY_SETUID@ $(SHELL) $(srcdir)/sinstall.sh @SINSTALL_OPTS@ "$(INSTALL_PROGRAM)" xterm$x @XTERM_PATH@ $(BINDIR)/$(binary_xterm) @NOT_SETUID@ $(INSTALL_PROGRAM) xterm$x $(BINDIR)/$(binary_xterm) $(INSTALL_PROGRAM) -m 755 resize$x $(BINDIR)/$(binary_resize) - $(INSTALL_SCRIPT) -m 755 $(srcdir)/uxterm $(BINDIR)/$(binary_uxterm) + @$(SHELL) -c 'echo "... installing $(BINDIR)/$(binary_uxterm)"; \ + if test "$(binary_xterm)" != "xterm"; then \ + name="$(binary_xterm)"; \ + sed -e "s,=xterm,=$$name," $(srcdir)/uxterm >uxterm.tmp; \ + $(INSTALL_SCRIPT) -m 755 uxterm.tmp $(BINDIR)/$(binary_uxterm); \ + rm -f uxterm.tmp; \ + else \ + $(INSTALL_SCRIPT) -m 755 $(srcdir)/uxterm $(BINDIR)/$(binary_uxterm); \ + fi' + @-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && rm -f @XTERM_SYMLINK@" + @-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && ln -s $(binary_xterm) @XTERM_SYMLINK@" + @-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && echo '... created symbolic link:' && ls -l $(binary_xterm) @XTERM_SYMLINK@" install \ install-man \ install-full :: $(MANDIR) - $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) - $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) + $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(APPSDIR) + $(SHELL) $(srcdir)/minstall.sh "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(APPSDIR) -install \ -install-app \ -install-full :: $(APPSDIR) - @echo installing $(APPSDIR)/$(CLASS) - @sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm.ad >XTerm.tmp - @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS) - @echo installing $(APPSDIR)/$(CLASS)-color - @sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm-col.ad >XTerm.tmp - @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)-color - @echo installing $(APPSDIR)/UXTerm - @sed -e s/XTerm/$(CLASS)/ $(srcdir)/UXTerm.ad >XTerm.tmp - @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/UXTerm - @rm -f XTerm.tmp +@no_appsdir@install \ +@no_appsdir@install-app \ +@no_appsdir@install-full :: $(APPSDIR) +@no_appsdir@ @echo installing $(APPSDIR)/$(CLASS) +@no_appsdir@ @sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm.ad >XTerm.tmp +@no_appsdir@ @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS) +@no_appsdir@ @echo installing $(APPSDIR)/$(CLASS)-color +@no_appsdir@ @sed -e s/XTerm/$(CLASS)/ $(srcdir)/XTerm-col.ad >XTerm.tmp +@no_appsdir@ @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/$(CLASS)-color +@no_appsdir@ @echo installing $(APPSDIR)/UXTerm +@no_appsdir@ @sed -e s/XTerm/$(CLASS)/ $(srcdir)/UXTerm.ad >XTerm.tmp +@no_appsdir@ @$(INSTALL_DATA) XTerm.tmp $(APPSDIR)/UXTerm +@no_appsdir@ @rm -f XTerm.tmp install :: @echo 'Completed installation of executables and documentation.' @@ -191,15 +203,29 @@ installdirs : $(INSTALL_DIRS) -uninstall : +uninstall \ +uninstall-bin \ +uninstall-full :: -$(RM) $(BINDIR)/$(binary_xterm) -$(RM) $(BINDIR)/$(binary_resize) -$(RM) $(BINDIR)/$(binary_uxterm) + +uninstall-bin \ +uninstall-full :: + @-$(SHELL) -c "test @XTERM_SYMLINK@ != NONE && cd $(BINDIR) && rm -f @XTERM_SYMLINK@" + +uninstall \ +uninstall-man \ +uninstall-full :: -$(RM) $(MANDIR)/$(actual_xterm).$(manext) -$(RM) $(MANDIR)/$(actual_resize).$(manext) - -$(RM) $(APPSDIR)/$(CLASS) - -$(RM) $(APPSDIR)/$(CLASS)-color - -$(RM) $(APPSDIR)/UXTerm + +@no_appsdir@uninstall \ +@no_appsdir@uninstall-app \ +@no_appsdir@uninstall-full :: +@no_appsdir@ -$(RM) $(APPSDIR)/$(CLASS) +@no_appsdir@ -$(RM) $(APPSDIR)/$(CLASS)-color +@no_appsdir@ -$(RM) $(APPSDIR)/UXTerm mostlyclean : -$(RM) *$o *.[is] XtermLog.* .pure core *~ *.bak *.BAK *.out *.tmp @@ -216,6 +242,9 @@ maintainer-clean : realclean -$(RM) 256colres.h 88colres.h +ctlseqs.html : ctlseqs.ms + GROFF_NO_SGR=stupid $(SHELL) -c "tbl ctlseqs.ms | groff -Thtml -ms" >$@ + ctlseqs.txt : ctlseqs.ms GROFF_NO_SGR=stupid $(SHELL) -c "tbl ctlseqs.ms | nroff -Tascii -ms" >$@ Index: xc/programs/xterm/TekPrsTbl.c diff -u xc/programs/xterm/TekPrsTbl.c:3.3 xc/programs/xterm/TekPrsTbl.c:3.5 --- xc/programs/xterm/TekPrsTbl.c:3.3 Wed Jan 17 18:46:33 2001 +++ xc/programs/xterm/TekPrsTbl.c Sun Feb 12 20:14:57 2006 @@ -1,7 +1,4 @@ -/* - * $Xorg: TekPrsTbl.c,v 1.3 2000/08/17 19:55:07 cpqbld Exp $ - */ - +/* $XTermId: TekPrsTbl.c,v 1.7 2006/02/12 22:43:56 tom Exp $ */ /* * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -25,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/programs/xterm/TekPrsTbl.c,v 3.3 2001/01/17 23:46:33 dawes Exp $ */ +/* $XFree86: xc/programs/xterm/TekPrsTbl.c,v 3.5 2006/02/13 01:14:57 dickey Exp $ */ #include Index: xc/programs/xterm/Tekparse.def diff -u xc/programs/xterm/Tekparse.def:1.1.1.2 xc/programs/xterm/Tekparse.def:1.3 --- xc/programs/xterm/Tekparse.def:1.1.1.2 Tue Jan 16 18:05:26 2001 +++ xc/programs/xterm/Tekparse.def Sun Feb 12 20:14:57 2006 @@ -1,5 +1,4 @@ -# -# $Xorg: Tekparse.def,v 1.3 2000/08/17 19:55:07 cpqbld Exp $ +# $XTermId: Tekparse.def,v 1.3 2006/02/12 22:43:56 tom Exp $ # # List of symbols that need to be defined for Tekparse.h. If you need to # change any of the CASE_ macros, make the change here and rerun the command Index: xc/programs/xterm/Tekparse.h diff -u xc/programs/xterm/Tekparse.h:1.4 xc/programs/xterm/Tekparse.h:1.6 --- xc/programs/xterm/Tekparse.h:1.4 Wed Jan 17 18:46:34 2001 +++ xc/programs/xterm/Tekparse.h Sun Feb 12 20:14:57 2006 @@ -1,6 +1,4 @@ -/* - * $Xorg: Tekparse.h,v 1.3 2000/08/17 19:55:07 cpqbld Exp $ - */ +/* $XTermId: Tekparse.h,v 1.6 2006/02/12 22:43:56 tom Exp $ */ /* * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/programs/xterm/Tekparse.h,v 1.4 2001/01/17 23:46:34 dawes Exp $ */ +/* $XFree86: xc/programs/xterm/Tekparse.h,v 1.6 2006/02/13 01:14:57 dickey Exp $ */ /* @(#)Tekparse.h X10/6.6 11/7/86 */ Index: xc/programs/xterm/Tekproc.c diff -u xc/programs/xterm/Tekproc.c:3.51 xc/programs/xterm/Tekproc.c:3.57 --- xc/programs/xterm/Tekproc.c:3.51 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/Tekproc.c Sun Feb 12 20:14:57 2006 @@ -1,15 +1,13 @@ -/* $XTermId: Tekproc.c,v 1.114 2005/01/10 22:20:03 tom Exp $ */ +/* $XTermId: Tekproc.c,v 1.134 2006/02/12 22:43:56 tom Exp $ */ /* - * $Xorg: Tekproc.c,v 1.5 2001/02/09 02:06:02 xorgcvs Exp $ - * * Warning, there be crufty dragons here. */ -/* $XFree86: xc/programs/xterm/Tekproc.c,v 3.51 2005/01/14 01:50:02 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/Tekproc.c,v 3.57 2006/02/13 01:14:57 dickey Exp $ */ /* -Copyright 2001-2004,2005 by Thomas E. Dickey +Copyright 2001-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -338,16 +336,19 @@ TekInit(void) { Widget form_top, menu_top; + Dimension menu_high; if (!Tfailed && tekWidget == 0) { + + TRACE(("TekInit\n")); /* this causes the Initialize method to be called */ tekshellwidget = XtCreatePopupShell("tektronix", topLevelShellWidgetClass, toplevel, ourTopLevelShellArgs, number_ourTopLevelShellArgs); - SetupMenus(tekshellwidget, &form_top, &menu_top); + SetupMenus(tekshellwidget, &form_top, &menu_top, &menu_high); /* this causes the Realize method to be called */ tekWidget = (TekWidget) @@ -361,10 +362,11 @@ XtNleft, XawChainLeft, XtNright, XawChainRight, XtNbottom, XawChainBottom, + XtNmenuHeight, menu_high, #endif (XtPointer) 0); #if OPT_TOOLBAR - SetupToolbar((Widget) tekWidget); + ShowToolbar(resource.toolBar); #endif } return (!Tfailed); @@ -721,6 +723,12 @@ */ TRACE(("case: do osc escape\n")); { + /* + * do_osc() can call TekExpose(), which calls dorefresh(), + * and sends us recurring here - don't do that... + */ + static int nested; + Char buf2[512]; IChar c2; unsigned len = 0; @@ -730,8 +738,12 @@ break; buf2[len++] = c2; } - if (c2 == BEL) - do_osc(buf2, len, BEL); + buf2[len] = 0; + if (!nested++) { + if (c2 == BEL) + do_osc(buf2, len, BEL); + } + --nested; } Tparsestate = curstate; break; @@ -765,8 +777,8 @@ longjmp(Tekjump, 1); } again: - if (VTbuffer.next >= VTbuffer.last) { - int update = VTbuffer.update; + if (VTbuffer->next >= VTbuffer->last) { + int update = VTbuffer->update; if (nplot > 0) /* flush line */ TekFlush(); @@ -784,7 +796,7 @@ &Tselect_mask, NULL, NULL, &crocktimeout); #endif - if (readPtyData(screen, &Tselect_mask, &VTbuffer)) { + if (readPtyData(screen, &Tselect_mask, VTbuffer)) { break; } if (Ttoggled && curstate == Talptable) { @@ -814,13 +826,13 @@ #ifdef VMS if (Tselect_mask & X_mask) { xevents(); - if (VTbuffer.update != update) + if (VTbuffer->update != update) goto again; } #else /* VMS */ if (FD_ISSET(ConnectionNumber(screen->display), &Tselect_mask)) { xevents(); - if (VTbuffer.update != update) + if (VTbuffer->update != update) goto again; } #endif /* VMS */ @@ -843,8 +855,8 @@ } tek->count++; - (void) morePtyData(screen, &VTbuffer); - return (*tek->ptr++ = nextPtyData(screen, &VTbuffer)); + (void) morePtyData(screen, VTbuffer); + return (*tek->ptr++ = nextPtyData(screen, VTbuffer)); } /* this should become the Tek Widget's Resize proc */ @@ -875,6 +887,8 @@ { TScreen *screen = &term->screen; + TRACE(("TekExpose\n")); + #ifdef lint region = region; #endif @@ -895,6 +909,7 @@ rptr = TekRefresh->data; rcnt = TekRefresh->count; Tparsestate = curstate = Talptable; + TRACE(("TekExpose resets data to replay %d bytes\n", rcnt)); if (waiting_for_initial_map) first_map_occurred(); if (!screen->waitrefresh) @@ -1292,21 +1307,20 @@ * to care about the shell's border being part of our focus. */ XtAddEventHandler(tekparent, EnterWindowMask, False, - HandleEnterWindow, (caddr_t) 0); + HandleEnterWindow, (Opaque) 0); XtAddEventHandler(tekparent, LeaveWindowMask, False, - HandleLeaveWindow, (caddr_t) 0); + HandleLeaveWindow, (Opaque) 0); XtAddEventHandler(tekparent, FocusChangeMask, False, - HandleFocusChange, (caddr_t) 0); + HandleFocusChange, (Opaque) 0); XtAddEventHandler((Widget) wnew, PropertyChangeMask, False, HandleBellPropertyChange, (Opaque) 0); } static void -TekRealize(Widget gw, +TekRealize(Widget gw GCC_UNUSED, /* same as tekWidget */ XtValueMask * valuemaskp, XSetWindowAttributes * values) { - TekWidget tw = (TekWidget) gw; TScreen *screen = &term->screen; int i; TekLink *tek; @@ -1325,13 +1339,18 @@ term->screen.whichTwin = &term->screen.fullTwin; #endif /* NO_ACTIVE_ICON */ - tw->core.border_pixel = term->core.border_pixel; + BorderPixel(tekWidget) = BorderPixel(term); for (i = 0; i < TEKNUMFONTS; i++) { - if (!tw->tek.Tfont[i]) { - tw->tek.Tfont[i] = XQueryFont(screen->display, DefaultGCID); + if (!tekWidget->tek.Tfont[i]) { + tekWidget->tek.Tfont[i] = XQueryFont(screen->display, DefaultGCID); } - tw->tek.tobaseline[i] = tw->tek.Tfont[i]->ascent; + TRACE(("Tfont[%d] %dx%d\n", + i, + tekWidget->tek.Tfont[i]->ascent + + tekWidget->tek.Tfont[i]->descent, + tekWidget->tek.Tfont[i]->max_bounds.width)); + tekWidget->tek.tobaseline[i] = tekWidget->tek.Tfont[i]->ascent; } if (!TekPtyData()) @@ -1356,17 +1375,19 @@ width = TEKDEFWIDTH + border; height = TEKDEFHEIGHT + border; + TRACE(("parsing T_geometry %s\n", NonNull(term->misc.T_geometry))); pr = XParseGeometry(term->misc.T_geometry, &winX, &winY, (unsigned int *) &width, (unsigned int *) &height); + TRACE(("... position %d,%d size %dx%d\n", winY, winX, height, width)); if ((pr & XValue) && (pr & XNegative)) winX += DisplayWidth(screen->display, DefaultScreen(screen->display)) - - width - (SHELL_OF(term)->core.border_width * 2); + - width - (BorderWidth(SHELL_OF(term)) * 2); if ((pr & YValue) && (pr & YNegative)) winY += DisplayHeight(screen->display, DefaultScreen(screen->display)) - - height - (SHELL_OF(term)->core.border_width * 2); + - height - (BorderWidth(SHELL_OF(term)) * 2); /* set up size hints */ sizehints.min_width = TEKMINWIDTH + border; @@ -1394,6 +1415,7 @@ break; } } else { + /* set a default size, but do *not* set position */ sizehints.flags |= PSize; } sizehints.width = width; @@ -1403,30 +1425,32 @@ else sizehints.flags |= PSize; - (void) XtMakeResizeRequest((Widget) tw, width, height, - &tw->core.width, &tw->core.height); + TRACE(("make resize request %dx%d\n", height, width)); + (void) XtMakeResizeRequest((Widget) tekWidget, + width, height, + &tekWidget->core.width, &tekWidget->core.height); + TRACE(("...made resize request %dx%d\n", tekWidget->core.height, tekWidget->core.width)); /* XXX This is bogus. We are parsing geometries too late. This * is information that the shell widget ought to have before we get * realized, so that it can do the right thing. */ if (sizehints.flags & USPosition) - XMoveWindow(XtDisplay(tw), XtWindow(SHELL_OF(tw)), - sizehints.x, sizehints.y); + XMoveWindow(XtDisplay(tekWidget), TShellWindow, sizehints.x, sizehints.y); - XSetWMNormalHints(XtDisplay(tw), XtWindow(SHELL_OF(tw)), - &sizehints); - XFlush(XtDisplay(tw)); /* get it out to window manager */ + XSetWMNormalHints(XtDisplay(tekWidget), TShellWindow, &sizehints); + XFlush(XtDisplay(tekWidget)); /* get it out to window manager */ values->win_gravity = NorthWestGravity; values->background_pixel = T_COLOR(screen, TEK_BG); - XtWindow(tw) = TWindow(screen) = + XtWindow(tekWidget) = TWindow(screen) = XCreateWindow(screen->display, - XtWindow(SHELL_OF(tw)), - tw->core.x, tw->core.y, - tw->core.width, tw->core.height, tw->core.border_width, - (int) tw->core.depth, + XtWindow(SHELL_OF(tekWidget)), + tekWidget->core.x, tekWidget->core.y, + tekWidget->core.width, tekWidget->core.height, + BorderWidth(tekWidget), + (int) tekWidget->core.depth, InputOutput, CopyFromParent, ((*valuemaskp) | CWBackPixel | CWWinGravity), values); @@ -1441,8 +1465,8 @@ TekScale(screen) = d; screen->cur.fontsize = TEK_FONT_LARGE; - if (tw->tek.initial_font) { - char *s = tw->tek.initial_font; + if (tekWidget->tek.initial_font) { + char *s = tekWidget->tek.initial_font; if (XmuCompareISOLatin1(s, "large") == 0) screen->cur.fontsize = TEK_FONT_LARGE; @@ -1455,7 +1479,7 @@ else if (XmuCompareISOLatin1(s, "small") == 0) screen->cur.fontsize = TEK_FONT_SMALL; } -#define TestGIN(s) XmuCompareISOLatin1(tw->tek.gin_terminator_str, s) +#define TestGIN(s) XmuCompareISOLatin1(tekWidget->tek.gin_terminator_str, s) if (TestGIN(GIN_TERM_NONE_STR) == 0) screen->gin_terminator = GIN_TERM_NONE; @@ -1465,10 +1489,10 @@ screen->gin_terminator = GIN_TERM_EOT; else fprintf(stderr, "%s: illegal GIN terminator setting \"%s\"\n", - xterm_name, tw->tek.gin_terminator_str); + xterm_name, tekWidget->tek.gin_terminator_str); gcv.graphics_exposures = True; /* default */ - gcv.font = tw->tek.Tfont[screen->cur.fontsize]->fid; + gcv.font = tekWidget->tek.Tfont[screen->cur.fontsize]->fid; gcv.foreground = T_COLOR(screen, TEK_FG); gcv.background = T_COLOR(screen, TEK_BG); @@ -1516,7 +1540,7 @@ args[0].value = (XtArgVal) & icon_name; args[1].value = (XtArgVal) & title; - XtGetValues(SHELL_OF(tw), args, 2); + XtGetValues(SHELL_OF(tekWidget), args, 2); tek_icon_name = XtMalloc(strlen(icon_name) + 7); strcpy(tek_icon_name, icon_name); strcat(tek_icon_name, "(Tek)"); @@ -1525,7 +1549,7 @@ strcat(tek_title, "(Tek)"); args[0].value = (XtArgVal) tek_icon_name; args[1].value = (XtArgVal) tek_title; - XtSetValues(SHELL_OF(tw), args, 2); + XtSetValues(SHELL_OF(tekWidget), args, 2); XtFree(tek_icon_name); XtFree(tek_title); } @@ -1552,6 +1576,8 @@ int newsize = MI2FS(newitem); Font fid; + TRACE(("TekSetFontSize(%d)\n", newitem)); + if (!tekWidget || oldsize == newsize) return; if (!Ttoggled) @@ -1601,13 +1627,13 @@ T_COLOR(screen, TEK_FG)); XSetBackground(screen->display, screen->TnormalGC, T_COLOR(screen, TEK_BG)); - if (tekWidget->core.border_pixel == T_COLOR(screen, TEK_BG)) { - tekWidget->core.border_pixel = T_COLOR(screen, TEK_FG); - XtParent(tekWidget)->core.border_pixel = T_COLOR(screen, TEK_FG); + if (BorderPixel(tekWidget) == T_COLOR(screen, TEK_BG)) { + BorderPixel(tekWidget) = T_COLOR(screen, TEK_FG); + BorderPixel(XtParent(tekWidget)) = T_COLOR(screen, TEK_FG); if (XtWindow(XtParent(tekWidget))) XSetWindowBorder(screen->display, XtWindow(XtParent(tekWidget)), - tekWidget->core.border_pixel); + BorderPixel(tekWidget)); } for (i = 0; i < TEKNUMLINES; i++) { @@ -1637,13 +1663,13 @@ XSetForeground(screen->display, screen->TnormalGC, T_COLOR(screen, TEK_FG)); XSetBackground(screen->display, screen->TnormalGC, T_COLOR(screen, TEK_BG)); - if (tekWidget->core.border_pixel == T_COLOR(screen, TEK_BG)) { - tekWidget->core.border_pixel = T_COLOR(screen, TEK_FG); - XtParent(tekWidget)->core.border_pixel = T_COLOR(screen, TEK_FG); + if (BorderPixel(tekWidget) == T_COLOR(screen, TEK_BG)) { + BorderPixel(tekWidget) = T_COLOR(screen, TEK_FG); + BorderPixel(XtParent(tekWidget)) = T_COLOR(screen, TEK_FG); if (XtWindow(XtParent(tekWidget))) XSetWindowBorder(screen->display, XtWindow(XtParent(tekWidget)), - tekWidget->core.border_pixel); + BorderPixel(tekWidget)); } for (i = 0; i < TEKNUMLINES; i++) { Index: xc/programs/xterm/UXTerm.ad diff -u xc/programs/xterm/UXTerm.ad:1.3 xc/programs/xterm/UXTerm.ad:1.5 --- xc/programs/xterm/UXTerm.ad:1.3 Sun Oct 26 20:07:55 2003 +++ xc/programs/xterm/UXTerm.ad Sun Feb 12 20:14:58 2006 @@ -1,19 +1,47 @@ -! $XFree86: xc/programs/xterm/UXTerm.ad,v 1.3 2003/10/27 01:07:55 dickey Exp $ +! $XTermId: UXTerm.ad,v 1.10 2006/02/11 15:23:23 tom Exp $ +! $XFree86: xc/programs/xterm/UXTerm.ad,v 1.5 2006/02/13 01:14:58 dickey Exp $ ! Use ! xterm -class UXTerm ! to set resources for UTF-8 mode with corresponding fonts. +! See the uxterm script for an example. #include "XTerm-color" *fontMenu.Label: Unicode Fonts -*VT100*utf8: 1 +*VT100.utf8: 1 -! The fonts here are duplicated in "XTerm" by "*VT100.utf8fonts", but are -! left here for compatibility: -*VT100*font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 -*VT100*font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 -*VT100*font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 -*VT100*font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 -*VT100*font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 -*VT100*font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 +! This includes "XTerm-color" which includes "XTerm", which defines fonts. +! Why set them here? +! +! Here is a simple description. A technically precise one would be very long. +! When xterm starts up, it uses the +! +! *VT100.font +! +! resource, and if it is told to switch to wide-character (UTF-8) mode, it +! checks if the given font is "wide", and if not looks for the +! +! *VT100.utf8Fonts.font +! +! to obtain a wide font. A "wide" font has more than 256 glyphs. Typical +! wide fonts have 10,000 glyphs. If the original "*VT100.font" is not wide, +! and xterm can load the *VT100.utf8Fonts.font, it will use that. +! +! Making the wide fonts associated with *VT100.font in this file allows uxterm +! to skip that step. It will use the fonts that the XTerm file gives for the +! *VT100.uft8Fonts.font pattern. +*VT100.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 +*VT100.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 +*VT100.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 +*VT100.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 +*VT100.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +*VT100.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 + +! Here is an alternate set of fonts with better support for bold: +!*VT100.font2: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1 +!*VT100.font: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1 +!*VT100.font3: -efont-biwidth-medium-r-normal--12-120-75-75-p-60-iso10646-1 +!*VT100.font4: -efont-biwidth-medium-r-normal--14-140-75-75-p-70-iso10646-1 +!*VT100.font5: -efont-biwidth-medium-r-normal--16-160-75-75-p-80-iso10646-1 +!*VT100.font6: -efont-biwidth-medium-r-normal--24-240-75-75-p-120-iso10646-1 Index: xc/programs/xterm/VTPrsTbl.c diff -u xc/programs/xterm/VTPrsTbl.c:3.27 xc/programs/xterm/VTPrsTbl.c:3.31 --- xc/programs/xterm/VTPrsTbl.c:3.27 Tue Nov 30 20:27:46 2004 +++ xc/programs/xterm/VTPrsTbl.c Sun Feb 12 20:14:58 2006 @@ -1,13 +1,9 @@ -/* $XTermId: VTPrsTbl.c,v 1.38 2004/11/25 17:47:32 tom Exp $ */ +/* $XTermId: VTPrsTbl.c,v 1.45 2006/02/12 22:45:50 tom Exp $ */ -/* - * $Xorg: VTPrsTbl.c,v 1.3 2000/08/17 19:55:07 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/VTPrsTbl.c,v 3.27 2004/12/01 01:27:46 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/VTPrsTbl.c,v 3.31 2006/02/13 01:14:58 dickey Exp $ */ /* * - * Copyright 1999-2000,2004 by Thomas E. Dickey + * Copyright 1999-2005,2006 by Thomas E. Dickey * * All Rights Reserved * Index: xc/programs/xterm/VTparse.def diff -u xc/programs/xterm/VTparse.def:3.15 xc/programs/xterm/VTparse.def:3.18 --- xc/programs/xterm/VTparse.def:3.15 Tue Nov 30 20:27:46 2004 +++ xc/programs/xterm/VTparse.def Sun Feb 12 20:14:58 2006 @@ -1,12 +1,10 @@ -# $XTermId: VTparse.def,v 1.21 2004/11/25 15:04:09 tom Exp $ -# -# $Xorg: VTparse.def,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ +# $XTermId: VTparse.def,v 1.26 2006/02/12 22:43:56 tom Exp $ # # List of symbols that need to be defined for VTparse.h. If you need to # change any of the CASE_ macros, make the change here and rerun the command # shown in VTparse.h. # -# $XFree86: xc/programs/xterm/VTparse.def,v 3.15 2004/12/01 01:27:46 dickey Exp $ +# $XFree86: xc/programs/xterm/VTparse.def,v 3.18 2006/02/13 01:14:58 dickey Exp $ # CASE_GROUND_STATE Index: xc/programs/xterm/VTparse.h diff -u xc/programs/xterm/VTparse.h:3.20 xc/programs/xterm/VTparse.h:3.24 --- xc/programs/xterm/VTparse.h:3.20 Tue Nov 30 20:27:46 2004 +++ xc/programs/xterm/VTparse.h Sun Feb 12 20:14:58 2006 @@ -1,12 +1,8 @@ -/* $XTermId: VTparse.h,v 1.32 2004/11/25 15:03:47 tom Exp $ */ +/* $XTermId: VTparse.h,v 1.39 2006/02/12 22:45:50 tom Exp $ */ +/* $XFree86: xc/programs/xterm/VTparse.h,v 3.24 2006/02/13 01:14:58 dickey Exp $ */ /* - * $Xorg: VTparse.h,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/VTparse.h,v 3.20 2004/12/01 01:27:46 dickey Exp $ */ -/* - * Copyright 2002-2003,2004 by Thomas E. Dickey + * Copyright 2002-2005,2006 by Thomas E. Dickey * * All Rights Reserved * Index: xc/programs/xterm/XTerm-col.ad diff -u xc/programs/xterm/XTerm-col.ad:3.3 xc/programs/xterm/XTerm-col.ad:3.7 --- xc/programs/xterm/XTerm-col.ad:3.3 Mon Jul 12 20:41:24 2004 +++ xc/programs/xterm/XTerm-col.ad Sun Sep 18 19:48:12 2005 @@ -1,5 +1,5 @@ -! $XTermId: XTerm-col.ad,v 1.9 2004/07/12 21:00:15 tom Exp $ -! $XFree86: xc/programs/xterm/XTerm-col.ad,v 3.3 2004/07/13 00:41:24 dickey Exp $ +! $XTermId: XTerm-col.ad,v 1.18 2005/09/05 19:49:43 tom Exp $ +! $XFree86: xc/programs/xterm/XTerm-col.ad,v 3.7 2005/09/18 23:48:12 dickey Exp $ #include "XTerm" @@ -11,16 +11,37 @@ !*VT100*foreground: gray90 !*VT100*background: black +! - OR - +! Uncomment this for black text on a "white" background. +!*VT100*foreground: black +!*VT100*background: gray90 + +! - OR - +! leave the foreground/background colors alone (at the mercy of your desktop +! designer). + +! Color the popup/pulldown menu border to match the text widget's foreground. +!*SimpleMenu*borderColor: gray15 + ! Uncomment this to use color for underline attribute !*VT100*colorULMode: on +*VT100*colorUL: yellow + +!*VT100*italicULMode: on + +! Uncomment this to disable underlining, e.g., if colorULMode is set. !*VT100*underLine: off ! Uncomment this to use color for the bold attribute !*VT100*colorBDMode: on +*VT100*colorBD: white ! Uncomment this to use the bold/underline colors in preference to other colors !*VT100*colorAttrMode: on +! These are the 8 ANSI colors and their bright equivalents. Depending on +! other resource settings, xterm may use the bright colors when displaying +! bold text (see the boldColors resource). *VT100*color0: black *VT100*color1: red3 *VT100*color2: green3 @@ -37,9 +58,6 @@ *VT100*color13: magenta *VT100*color14: cyan *VT100*color15: white -*VT100*colorUL: yellow -*VT100*colorBD: white - ! Disclaimer: there are no standard colors used in terminal emulation. ! @@ -83,17 +101,21 @@ ! Some refinement is certainly possible (you are welcome to try) -TD +#if PLANES > 8 +! Color the popup menus and the menubar to match: +*SimpleMenu.*.background: AntiqueWhite +*SimpleMenu.*.foreground: gray15 + +! Color the menubar to match: +*.Form.menubar.*.background: AntiqueWhite +*.Form.menubar.*.foreground: gray15 +*.Form.background: AntiqueWhite + ! The following two sections take advantage of new features in version 7 ! of the Athena widget library. Comment them out if you have a shallow ! color depth. -!*mainMenu*backgroundPixmap: gradient:vertical?dimension=350&start=gray90&end=gray60 -!*mainMenu*foreground: gray15 -!*vtMenu*backgroundPixmap: gradient:vertical?dimension=445&start=gray90&end=gray60 -!*vtMenu*foreground: gray15 -!*fontMenu*backgroundPixmap: gradient:vertical?dimension=220&start=gray90&end=gray60 -!*fontMenu*foreground: gray15 -!*tekMenu*backgroundPixmap: gradient:vertical?dimension=205&start=gray90&end=gray60 -!*tekMenu*foreground: gray15 +!*SimpleMenu*backgroundPixmap: gradient:vertical?dimension=350&start=gray90&end=gray60 +!*SimpleMenu*foreground: gray15 !*VT100.scrollbar.thumb: vlines2 !*VT100.scrollbar.width: 14 @@ -105,3 +127,4 @@ !lines 1,-1,-1,-1,-1,1;\ !foreground gray60;\ !lines -1,0,0,0,0,-1 +#endif Index: xc/programs/xterm/XTerm.ad diff -u xc/programs/xterm/XTerm.ad:3.29 xc/programs/xterm/XTerm.ad:3.37 --- xc/programs/xterm/XTerm.ad:3.29 Tue Nov 30 20:27:46 2004 +++ xc/programs/xterm/XTerm.ad Sun Apr 9 20:34:36 2006 @@ -1,10 +1,5 @@ -! $Xorg: XTerm.ad,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ -! -! -! -! -! $XTermId: XTerm.ad,v 1.62 2004/11/24 22:54:02 tom Exp $ -! $XFree86: xc/programs/xterm/XTerm.ad,v 3.29 2004/12/01 01:27:46 dickey Exp $ +! $XTermId: XTerm.ad,v 1.79 2006/04/09 00:23:50 tom Exp $ +! $XFree86: xc/programs/xterm/XTerm.ad,v 3.37 2006/04/10 00:34:36 dickey Exp $ *saveLines: 1024 @@ -27,6 +22,7 @@ *mainMenu*8-bit control*Label: 8-Bit Controls *mainMenu*backarrow key*Label: Backarrow Key (BS/DEL) *mainMenu*num-lock*Label: Alt/NumLock Modifiers +*mainMenu*alt-esc*Label: Alt Sends Escape *mainMenu*meta-esc*Label: Meta Sends Escape *mainMenu*delete-is-del*Label: Delete is DEL *mainMenu*oldFunctionKeys*Label: Old Function-Keys @@ -54,6 +50,7 @@ *vtMenu*scrollkey*Label: Scroll to Bottom on Key Press *vtMenu*scrollttyoutput*Label: Scroll to Bottom on Tty Output *vtMenu*allow132*Label: Allow 80/132 Column Switching +*vtMenu*selectToClipboard*Label: Select to Clipboard *vtMenu*cursesemul*Label: Enable Curses Emulation *vtMenu*visualbell*Label: Enable Visual Bell *vtMenu*poponbell*Label: Enable Pop on Bell @@ -72,18 +69,18 @@ *fontMenu.Label: VT Fonts *fontMenu*fontdefault*Label: Default *fontMenu*font1*Label: Unreadable -*VT100*font1: nil2 +*VT100.font1: nil2 *IconFont: nil2 *fontMenu*font2*Label: Tiny -*VT100*font2: 5x7 +*VT100.font2: 5x7 *fontMenu*font3*Label: Small -*VT100*font3: 6x10 +*VT100.font3: 6x10 *fontMenu*font4*Label: Medium -*VT100*font4: 7x13 +*VT100.font4: 7x13 *fontMenu*font5*Label: Large -*VT100*font5: 9x15 +*VT100.font5: 9x15 *fontMenu*font6*Label: Huge -*VT100*font6: 10x20 +*VT100.font6: 10x20 *fontMenu*fontescape*Label: Escape Sequence *fontMenu*fontsel*Label: Selection !fontescape and fontsel overridden by application @@ -92,6 +89,7 @@ *fontMenu*font-loadable*Label: VT220 Soft Fonts *fontMenu*render-font*Label: TrueType Fonts *fontMenu*utf8-mode*Label: UTF-8 +*fontMenu*utf8-title*Label: UTF-8 Titles *VT100.utf8Fonts.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 *VT100.utf8Fonts.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 @@ -116,3 +114,75 @@ *tek4014*font2: 8x13 *tek4014*font3: 6x13 *tek4014*fontSmall: 6x10 + +! If xterm is built with a toolbar, the widget hierarchy looks like this, +! showing widget name / class names. The complete menu hierarchy is built +! at startup because it is needed to make the layout work for the menubar: +! +! xterm/XTerm +! form/Form +! menubar/Box +! mainMenuButton/MenuButton +! mainMenu/SimpleMenu +! menuLabel/SmeBSB +! toolbar/SmeBSB +! ... +! vtMenu/SimpleMenu +! menuLabel/SmeBSB +! scrollbar/SmeBSB +! ... +! fontMenu/SimpleMenu +! menuLabel/SmeBSB +! fontdefault/SmeBSB +! ... +! tekMenu/SimpleMenu +! menuLabel/SmeBSB +! fontdefault/SmeBSB +! ... +! vt100/VT100 +! tektronix/TopLevelShell +! shellext/VendorShellExt +! tek4014/Tek4014 +! +! If built without a toolbar, the widget hierarchy is simpler, because there +! is no form, and the popup menu widgets are created only when they are first +! used. +! +! xterm/XTerm +! shellext/VendorShellExt +! mainMenu/SimpleMenu +! menuLabel/SmeBSB +! ... +! ... +! vt100/VT100 +! tektronix/TopLevelShell +! shellext/VendorShellExt +! tek4014/Tek4014 +! +! A more complete list of the widget/class names can be obtained using editres +! to dump a file. Some widget names are not available until the corresponding +! menu has been created. + +! These resources reduce space around the menubar, by eliminating padding in +! the enclosing form (Thickness) and the border of the Box which represents +! the menubar widget. +*form.Thickness: 0 +*menubar.borderWidth: 0 + +! If we wanted to eliminate the border of the popup menus, we could do this +! instead, since they are children of the menubar: +!*menubar.*.borderWidth: 0 + +! Eliminate the border of the buttons in the menubar, so the only line around +! the text is for the highlighted button: +*MenuButton*borderWidth: 0 + +! Set a border for the menus to make them simpler to distinguish against the +! vt100 widget: +*SimpleMenu*borderWidth: 2 + +! Here is a pattern that is useful for double-clicking on a URL: +!*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48 +! +! Alternatively, +!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ Index: xc/programs/xterm/aclocal.m4 diff -u xc/programs/xterm/aclocal.m4:3.56 xc/programs/xterm/aclocal.m4:3.64 --- xc/programs/xterm/aclocal.m4:3.56 Sun Feb 6 16:42:37 2005 +++ xc/programs/xterm/aclocal.m4 Sun Apr 9 20:34:36 2006 @@ -1,10 +1,10 @@ -dnl $XTermId: aclocal.m4,v 1.189 2005/02/06 18:49:00 tom Exp $ +dnl $XTermId: aclocal.m4,v 1.222 2006/04/02 20:41:59 tom Exp $ dnl -dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.56 2005/02/06 21:42:37 dickey Exp $ +dnl $XFree86: xc/programs/xterm/aclocal.m4,v 3.64 2006/04/10 00:34:36 dickey Exp $ dnl dnl --------------------------------------------------------------------------- dnl -dnl Copyright 1997-2004,2005 by Thomas E. Dickey +dnl Copyright 1997-2005,2006 by Thomas E. Dickey dnl dnl All Rights Reserved dnl @@ -369,6 +369,33 @@ AC_SUBST(ECHO_CC) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_ENABLE_NARROWPROTO version: 3 updated: 2006/02/12 17:46:00 +dnl --------------------- +dnl If this is not set properly, Xaw's scrollbars will not work. +dnl The so-called "modular" configuration for X.org omits most of the +dnl configure checks that would be needed to provide compatibility with +dnl older X builds. This one breaks things noticeably. +AC_DEFUN([CF_ENABLE_NARROWPROTO], +[ +AC_MSG_CHECKING(if you want narrow prototypes for X libraries) + +case `$ac_config_guess` in #(vi +*cygwin*|*freebsd*|*gnu*|*irix5*|*irix6*|*linux-gnu*|*netbsd*|*openbsd*|*qnx*|*sco*|*sgi*) #(vi + cf_default_narrowproto=yes + ;; +*) + cf_default_narrowproto=no + ;; +esac + +CF_ARG_OPTION(narrowproto, + [ --enable-narrowproto enable narrow prototypes for X libraries], + [enable_narrowproto=$enableval], + [enable_narrowproto=$cf_default_narrowproto], + [$cf_default_narrowproto]) +AC_MSG_RESULT($enable_narrowproto) +]) +dnl --------------------------------------------------------------------------- dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39 dnl -------- dnl Check if 'errno' is declared in @@ -408,7 +435,7 @@ fi ])])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_TGETENT version: 9 updated: 2005/01/09 11:23:34 +dnl CF_FUNC_TGETENT version: 10 updated: 2005/09/18 15:26:47 dnl --------------- dnl Check for tgetent function in termcap library. If we cannot find this, dnl we'll use the $LINES and $COLUMNS environment variables to pass screen @@ -446,7 +473,7 @@ cf_cv_lib_tgetent=no if test "$cf_full_tgetent" = yes ; then cf_TERMLIB="termcap termlib ncurses curses" - cf_TERMTST="buffer[0] == 0" + cf_TERMTST="buffer[[0]] == 0" else cf_TERMLIB="termlib ncurses curses" cf_TERMTST="0" @@ -519,7 +546,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_ATTRIBUTES version: 9 updated: 2002/12/21 19:25:52 +dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28 dnl ----------------- dnl Test for availability of useful gcc __attribute__ directives to quiet dnl compiler warnings. Though useful, not all are supported -- and contrary @@ -567,18 +594,18 @@ EOF for cf_attribute in scanf printf unused noreturn do - CF_UPPER(CF_ATTRIBUTE,$cf_attribute) + CF_UPPER(cf_ATTRIBUTE,$cf_attribute) cf_directive="__attribute__(($cf_attribute))" echo "checking for $CC $cf_directive" 1>&AC_FD_CC case $cf_attribute in scanf|printf) cat >conftest.h <conftest.h < conftest.$ac_ext < conftest.$ac_ext <],[ #ifndef _XOPEN_SOURCE @@ -728,7 +774,6 @@ ]) ]) test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" -fi ])dnl dnl --------------------------------------------------------------------------- dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23 @@ -738,7 +783,7 @@ [AC_DIVERT_HELP([$1])dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_IMAKE_CFLAGS version: 26 updated: 2005/02/05 10:39:02 +dnl CF_IMAKE_CFLAGS version: 27 updated: 2005/04/05 18:26:15 dnl --------------- dnl Use imake to obtain compiler flags. We could, in principle, write tests to dnl get these, but if imake is properly configured there is no point in doing @@ -750,6 +795,9 @@ AC_DEFUN([CF_IMAKE_CFLAGS], [ AC_PATH_PROGS(IMAKE,xmkmf imake) + +if test -n "$IMAKE" ; then + case $IMAKE in # (vi */imake) cf_imake_opts="-DUseInstalled=YES" # (vi @@ -765,7 +813,6 @@ # If it's installed properly, imake (or its wrapper, xmkmf) will point to the # config directory. -if test -n "$IMAKE" ; then if mkdir conftestdir; then CDPATH=; export CDPATH cf_makefile=`cd $srcdir;pwd`/Imakefile @@ -868,7 +915,6 @@ fi fi fi -fi # Some imake configurations define PROJECTROOT with an empty value. Remove # the empty definition. @@ -880,6 +926,8 @@ ;; esac +fi + CF_VERBOSE(IMAKE_CFLAGS $IMAKE_CFLAGS) CF_VERBOSE(IMAKE_LOADFLAGS $IMAKE_LOADFLAGS) @@ -918,35 +966,38 @@ [cf_cv_input_method=no])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 1 updated: 2004/12/03 20:27:48 +dnl CF_INTEL_COMPILER version: 3 updated: 2005/08/06 18:37:29 dnl ----------------- -dnl Check if the given compiler is really the Intel compiler for Linux. -dnl It tries to imitate gcc, but does not return an error when it finds a -dnl mismatch between prototypes, e.g., as exercised by CF_MISSING_CHECK. -dnl -dnl This macro should be run "soon" after AC_PROG_CC, to ensure that it is -dnl not mistaken for gcc. +dnl Check if the given compiler is really the Intel compiler for Linux. It +dnl tries to imitate gcc, but does not return an error when it finds a mismatch +dnl between prototypes, e.g., as exercised by CF_MISSING_CHECK. +dnl +dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to +dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from +dnl the wrappers for gcc and g++ warnings. +dnl +dnl $1 = GCC (default) or GXX +dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS +dnl $3 = CFLAGS (default) or CXXFLAGS AC_DEFUN([CF_INTEL_COMPILER],[ -AC_REQUIRE([AC_PROG_CC]) - -INTEL_COMPILER=no +ifelse($2,,INTEL_COMPILER,[$2])=no -if test "$GCC" = yes ; then +if test "$ifelse($1,,[$1],GCC)" = yes ; then case $host_os in linux*|gnu*) - AC_MSG_CHECKING(if this is really Intel compiler) - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -no-gcc" + AC_MSG_CHECKING(if this is really Intel ifelse($1,GXX,C++,C) compiler) + cf_save_CFLAGS="$ifelse($3,,CFLAGS,[$3])" + ifelse($3,,CFLAGS,[$3])="$ifelse($3,,CFLAGS,[$3]) -no-gcc" AC_TRY_COMPILE([],[ #ifdef __INTEL_COMPILER #else make an error #endif -],[INTEL_COMPILER=yes +],[ifelse($2,,INTEL_COMPILER,[$2])=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" ],[]) - CFLAGS="$cf_save_CFLAGS" - AC_MSG_RESULT($INTEL_COMPILER) + ifelse($3,,CFLAGS,[$3])="$cf_save_CFLAGS" + AC_MSG_RESULT($ifelse($2,,INTEL_COMPILER,[$2])) ;; esac fi @@ -987,7 +1038,90 @@ echo "(line __oline__) testing $* ..." 1>&AC_FD_CC ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 3 updated: 2005/02/04 06:56:22 +dnl CF_PATH_PROG version: 6 updated: 2004/01/26 20:58:41 +dnl ------------ +dnl Check for a given program, defining corresponding symbol. +dnl $1 = environment variable, which is suffixed by "_PATH" in the #define. +dnl $2 = program name to find. +dnl $3 = optional list of additional program names to test. +dnl +dnl If there is more than one token in the result, #define the remaining tokens +dnl to $1_ARGS. We need this for 'install' in particular. +dnl +dnl FIXME: we should allow this to be overridden by environment variables +dnl +AC_DEFUN([CF_PATH_PROG],[ +test -z "[$]$1" && $1=$2 +AC_PATH_PROGS($1,[$]$1 $2 $3,[$]$1) + +cf_path_prog="" +cf_path_args="" +IFS="${IFS= }"; cf_save_ifs="$IFS" +case $host_os in #(vi +os2*) #(vi + IFS="${IFS};" + ;; +*) + IFS="${IFS}:" + ;; +esac + +for cf_temp in $ac_cv_path_$1 +do + if test -z "$cf_path_prog" ; then + if test "$with_full_paths" = yes ; then + CF_PATH_SYNTAX(cf_temp,break) + cf_path_prog="$cf_temp" + else + cf_path_prog="`basename $cf_temp`" + fi + elif test -z "$cf_path_args" ; then + cf_path_args="$cf_temp" + else + cf_path_args="$cf_path_args $cf_temp" + fi +done +IFS="$cf_save_ifs" + +if test -n "$cf_path_prog" ; then + CF_MSG_LOG(defining path for ${cf_path_prog}) + AC_DEFINE_UNQUOTED($1_PATH,"$cf_path_prog") + test -n "$cf_path_args" && AC_DEFINE_UNQUOTED($1_ARGS,"$cf_path_args") +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_PATH_SYNTAX version: 10 updated: 2006/01/02 19:36:00 +dnl -------------- +dnl Check the argument to see that it looks like a pathname. Rewrite it if it +dnl begins with one of the prefix/exec_prefix variables, and then again if the +dnl result begins with 'NONE'. This is necessary to work around autoconf's +dnl delayed evaluation of those symbols. +AC_DEFUN([CF_PATH_SYNTAX],[ +case ".[$]$1" in #(vi +.\[$]\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX + ;; +.\[$]{*prefix}*) #(vi + eval $1="[$]$1" + case ".[$]$1" in #(vi + .NONE/*) + $1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%` + ;; + esac + ;; #(vi +.no|.NONE/*) + $1=`echo [$]$1 | sed -e s%NONE%$ac_default_prefix%` + ;; +*) + ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2) + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_POSIX_C_SOURCE version: 6 updated: 2005/07/14 20:25:10 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -1004,6 +1138,13 @@ AC_DEFUN([CF_POSIX_C_SOURCE], [ cf_POSIX_C_SOURCE=ifelse($1,,199506L,$1) + +cf_save_CFLAGS="$CFLAGS" +cf_save_CPPFLAGS="$CPPFLAGS" + +CF_REMOVE_DEFINE(cf_trim_CFLAGS,$cf_save_CFLAGS,_POSIX_C_SOURCE) +CF_REMOVE_DEFINE(cf_trim_CPPFLAGS,$cf_save_CPPFLAGS,_POSIX_C_SOURCE) + AC_CACHE_CHECK(if we should define _POSIX_C_SOURCE,cf_cv_posix_c_source,[ CF_MSG_LOG(if the symbol is already defined go no further) AC_TRY_COMPILE([#include ],[ @@ -1012,12 +1153,12 @@ #endif], [cf_cv_posix_c_source=no], [cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in - .[[12]]??*) - cf_cv_posix_c_source="-U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + case .$cf_POSIX_C_SOURCE in #(vi + .[[12]]??*) #(vi + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ;; - .2) - cf_cv_posix_c_source="-U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + .2) #(vi + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" cf_want_posix_source=yes ;; .*) @@ -1029,21 +1170,33 @@ #ifdef _POSIX_SOURCE make an error #endif],[], - cf_cv_posix_c_source="$cf_cv_posix_c_source -U_POSIX_SOURCE -D_POSIX_SOURCE") + cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE") fi CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE) - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" CF_MSG_LOG(if the second compile does not leave our definition intact error) AC_TRY_COMPILE([#include ],[ #ifndef _POSIX_C_SOURCE make an error #endif],, - [cf_cv_posix_c_source=no]) - CPPFLAGS="$cf_save" + [cf_cv_posix_c_source=no]) + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" ]) ]) -test "$cf_cv_posix_c_source" != no && CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" + +if test "$cf_cv_posix_c_source" != no ; then + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" + if test "$cf_cv_cc_u_d_options" = yes ; then + cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \ + sed -e 's/-D/-U/g' -e 's/=[[^ ]]*//g'` + CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source" + fi + CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" +fi + ])dnl dnl --------------------------------------------------------------------------- dnl CF_POSIX_WAIT version: 2 updated: 2000/05/29 16:16:04 @@ -1071,6 +1224,31 @@ test "$cf_cv_posix_wait" = yes && AC_DEFINE(USE_POSIX_WAIT) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30 +dnl -------------- +dnl Check if C (preprocessor) -U and -D options are processed in the order +dnl given rather than by type of option. Some compilers insist on apply all +dnl of the -U options after all of the -D options. Others allow mixing them, +dnl and may predefine symbols that conflict with those we define. +AC_DEFUN([CF_PROG_CC_U_D], +[ +AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[ + cf_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" + AC_TRY_COMPILE([],[ +#ifndef U_D_OPTIONS +make an undefined-error +#endif +#ifdef D_U_OPTIONS +make a defined-error +#endif + ],[ + cf_cv_cc_u_d_options=yes],[ + cf_cv_cc_u_d_options=no]) + CPPFLAGS="$cf_save_CPPFLAGS" +]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18 dnl ----------- dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX. @@ -1096,6 +1274,152 @@ test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT") ])dnl dnl --------------------------------------------------------------------------- +dnl CF_REGEX version: 3 updated: 1997/11/01 14:26:01 +dnl -------- +dnl Attempt to determine if we've got one of the flavors of regular-expression +dnl code that we can support. +AC_DEFUN([CF_REGEX], +[ +AC_MSG_CHECKING([for regular-expression headers]) +AC_CACHE_VAL(cf_cv_regex,[ +AC_TRY_LINK([#include +#include ],[ + regex_t *p; + int x = regcomp(p, "", 0); + int y = regexec(p, "", 0, 0, 0); + regfree(p); + ],[cf_cv_regex="regex.h"],[ + AC_TRY_LINK([#include ],[ + char *p = compile("", "", "", 0); + int x = step("", ""); + ],[cf_cv_regex="regexp.h"],[ + cf_save_LIBS="$LIBS" + LIBS="-lgen $LIBS" + AC_TRY_LINK([#include ],[ + char *p = compile("", "", ""); + int x = step("", ""); + ],[cf_cv_regex="regexpr.h"],[LIBS="$cf_save_LIBS"])])]) +]) +AC_MSG_RESULT($cf_cv_regex) +case $cf_cv_regex in + regex.h) AC_DEFINE(HAVE_REGEX_H_FUNCS) ;; + regexp.h) AC_DEFINE(HAVE_REGEXP_H_FUNCS) ;; + regexpr.h) AC_DEFINE(HAVE_REGEXPR_H_FUNCS) ;; +esac +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_REMOVE_DEFINE version: 2 updated: 2005/07/09 16:12:18 +dnl ---------------- +dnl Remove all -U and -D options that refer to the given symbol from a list +dnl of C compiler options. This works around the problem that not all +dnl compilers process -U and -D options from left-to-right, so a -U option +dnl cannot be used to cancel the effect of a preceding -D option. +dnl +dnl $1 = target (which could be the same as the source variable) +dnl $2 = source (including '$') +dnl $3 = symbol to remove +define([CF_REMOVE_DEFINE], +[ +# remove $3 symbol from $2 +$1=`echo "$2" | \ + sed -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[[ ]]/ /g' \ + -e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'` +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_SIGWINCH version: 1 updated: 2006/04/02 16:41:09 +dnl ----------- +dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all +dnl programs need this test). +dnl +dnl This is really a MacOS X 10.4.3 workaround. Defining _POSIX_C_SOURCE +dnl forces SIGWINCH to be undefined (breaks xterm, ncurses). Oddly, the struct +dnl winsize declaration is left alone - we may revisit this if Apple choose to +dnl break that part of the interface as well. +AC_DEFUN([CF_SIGWINCH], +[ +AC_CACHE_CHECK(if SIGWINCH is defined,cf_cv_define_sigwinch,[ + AC_TRY_COMPILE([ +#include +#include +],[int x = SIGWINCH], + [cf_cv_define_sigwinch=yes], + [AC_TRY_COMPILE([ +#undef _XOPEN_SOURCE +#undef _POSIX_SOURCE +#undef _POSIX_C_SOURCE +#include +#include +],[int x = SIGWINCH], + [cf_cv_define_sigwinch=maybe], + [cf_cv_define_sigwinch=no]) +]) +]) + +if test "$cf_cv_define_sigwinch" = maybe ; then +AC_CACHE_CHECK(for actual SIGWINCH definition,cf_cv_fixup_sigwinch,[ +cf_cv_fixup_sigwinch=unknown +cf_sigwinch=32 +while test $cf_sigwinch != 1 +do + AC_TRY_COMPILE([ +#undef _XOPEN_SOURCE +#undef _POSIX_SOURCE +#undef _POSIX_C_SOURCE +#include +#include +],[ +#if SIGWINCH != $cf_sigwinch +make an error +#endif +int x = SIGWINCH], + [cf_cv_fixup_sigwinch=$cf_sigwinch + break]) + +cf_sigwinch=`expr $cf_sigwinch - 1` +done +]) + + if test "$cf_cv_fixup_sigwinch" != unknown ; then + CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch" + fi +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12 +dnl --------------- +dnl signal handler, but there are some gcc depedencies in that recommendation. +dnl Try anyway. +AC_DEFUN([CF_SIG_ATOMIC_T], +[ +AC_MSG_CHECKING(for signal global datatype) +AC_CACHE_VAL(cf_cv_sig_atomic_t,[ + for cf_type in \ + "volatile sig_atomic_t" \ + "sig_atomic_t" \ + "int" + do + AC_TRY_COMPILE([ +#include +#include +#include + +extern $cf_type x; +$cf_type x; +static void handler(int sig) +{ + x = 5; +}], + [signal(SIGINT, handler); + x = 1], + [cf_cv_sig_atomic_t=$cf_type], + [cf_cv_sig_atomic_t=no]) + test "$cf_cv_sig_atomic_t" != no && break + done + ]) +AC_MSG_RESULT($cf_cv_sig_atomic_t) +test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_SIZE_T version: 4 updated: 2000/01/22 00:19:54 dnl --------- dnl On both Ultrix and CLIX, I find size_t defined in @@ -1118,6 +1442,31 @@ test $cf_cv_type_size_t = no && AC_DEFINE(size_t, unsigned) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_STRUCT_LASTLOG version: 1 updated: 2006/03/12 17:46:43 +dnl ----------------- +dnl Check for header defining struct lastlog, ensure that its .ll_time member +dnl is compatible with time(). +AC_DEFUN([CF_STRUCT_LASTLOG], +[ +AC_CHECK_HEADERS(lastlog.h) +AC_CACHE_CHECK(for struct lastlog,cf_cv_struct_lastlog,[ +AC_TRY_RUN([ +#include +#include +#include + +int main() +{ + struct lastlog data; + return (sizeof(data.ll_time) != sizeof(time_t)); +}],[ +cf_cv_struct_lastlog=yes],[ +cf_cv_struct_lastlog=no],[ +cf_cv_struct_lastlog=unknown])]) + +test $cf_cv_struct_lastlog != no && AC_DEFINE(USE_STRUCT_LASTLOG) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_SVR4 version: 3 updated: 2000/05/31 10:16:52 dnl ------- dnl Check if this is an SVR4 system. We need the definition for xterm @@ -1147,7 +1496,7 @@ test "$cf_cv_svr4" = yes && AC_DEFINE(SVR4) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SYSV version: 9 updated: 2003/12/30 13:52:30 +dnl CF_SYSV version: 10 updated: 2005/09/18 15:42:35 dnl ------- dnl Check if this is a SYSV platform, e.g., as used in , and whether dnl defining it will be helpful. The following features are used to check: @@ -1162,15 +1511,23 @@ dnl c) compile with type definitions that differ on SYSV hosts from standard C. AC_DEFUN([CF_SYSV], [ -AC_CACHE_CHECK(if we should define SYSV,cf_cv_sysv,[ +AC_CHECK_HEADERS( \ +stdlib.h \ +X11/Intrinsic.h \ +) + AC_REQUIRE([CF_SYS_ERRLIST]) + +AC_CACHE_CHECK(if we should define SYSV,cf_cv_sysv,[ AC_TRY_COMPILE([ #undef SYSV #define SYSV 1 /* get Xos.h to declare sys_errlist[] */ #ifdef HAVE_STDLIB_H #include /* look for wchar_t */ #endif +#ifdef HAVE_X11_INTRINSIC_H #include /* Intrinsic.h has other traps... */ +#endif #include #include /* eliminate most BSD hacks */ #include /* declare sys_errlist on older systems */ @@ -1246,12 +1603,22 @@ test "$cf_cv_termio_c_ispeed" = yes && AC_DEFINE(HAVE_TERMIO_C_ISPEED) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TTY_GROUP version: 5 updated: 2003/03/19 23:52:35 +dnl CF_TTY_GROUP version: 6 updated: 2006/01/23 19:42:39 dnl ------------ dnl Check if the system has a tty-group defined. This is used in xterm when dnl setting pty ownership. AC_DEFUN([CF_TTY_GROUP], [ +AC_MSG_CHECKING(for explicit tty group name) +AC_ARG_WITH(tty-group, + [ --with-tty-group=XXX use XXX for the tty-group], + [cf_tty_group=$withval], + [cf_tty_group=auto...]) +test -z "$cf_tty_group" && cf_tty_group=auto... +test "$cf_tty_group" = yes && cf_tty_group=auto... +AC_MSG_RESULT($cf_tty_group) + +if test "$cf_tty_group" = "auto..." ; then AC_CACHE_CHECK(for tty group name,cf_cv_tty_group_name,[ # If we are configuring as root, it is hard to get a clue about the tty group. @@ -1259,6 +1626,7 @@ # properly. cf_uid=`id | sed -e 's/^[^=]*=//' -e 's/(.*$//'` +# )vi if test "$cf_uid" != 0 ; then cf_cv_tty_group_name= cf_tty_name=`tty` @@ -1299,14 +1667,19 @@ esac fi ]) +cf_tty_group="$cf_cv_tty_group_name" +else + # if configure option, always do this + AC_DEFINE(USE_TTY_GROUP) +fi -AC_DEFINE_UNQUOTED(TTY_GROUP_NAME,"$cf_cv_tty_group_name") +AC_DEFINE_UNQUOTED(TTY_GROUP_NAME,"$cf_tty_group") # This is only a double-check that the group-name we obtained above really # does apply to the device. We cannot perform this test if we are in batch # mode, or if we are cross-compiling. -AC_CACHE_CHECK(if we may use $cf_cv_tty_group_name group,cf_cv_tty_group,[ +AC_CACHE_CHECK(if we may use the $cf_tty_group group,cf_cv_tty_group,[ cf_tty_name=`tty` if test "$cf_tty_name" != "not a tty" then @@ -1341,7 +1714,12 @@ cf_cv_tty_group=yes fi ]) -test $cf_cv_tty_group = yes && AC_DEFINE(USE_TTY_GROUP) + +if test $cf_cv_tty_group = no ; then + AC_MSG_WARN(Cannot use $cf_tty_group group) +else + AC_DEFINE(USE_TTY_GROUP) +fi ])dnl dnl --------------------------------------------------------------------------- dnl CF_TYPE_FD_SET version: 3 updated: 1999/10/16 13:49:00 @@ -1457,6 +1835,54 @@ fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_UTMP_GROUP version: 1 updated: 2005/10/06 20:29:29 +dnl ------------- +dnl Find the utmp/utmpx file and determine its group to allow setgid programs +dnl to manipulate it, e.g., when there is no intermediary. +AC_DEFUN([CF_UTMP_GROUP],[ +AC_REQUIRE([CF_UTMP]) +if test $cf_cv_have_utmp != no ; then +AC_CACHE_CHECK(for utmp/utmpx group,cf_cv_utmp_group,[ +for cf_utmp_path in /var/adm /var/run +do + for cf_utmp_file in utmpx utmp + do + if test -f $cf_utmp_path/$cf_utmp_file + then + cf_cv_utmp_group=root + + cf_option="-l -L" + + # Expect listing to have fields like this: + #-r--r--r-- 1 user group 34293 Jul 18 16:29 pathname + ls $cf_option $cf_utmp_path/$cf_utmp_file >conftest + read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest conftest + read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest &AC_FD_MSG ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_IMAKE_CFLAGS version: 6 updated: 2005/02/06 13:47:10 +dnl CF_WITH_IMAKE_CFLAGS version: 8 updated: 2005/11/02 15:04:41 dnl -------------------- dnl xterm and similar programs build more readily when propped up with imake's dnl hand-tuned definitions. If we do not use imake, provide fallbacks for the dnl most common definitions that we're not likely to do by autoconf tests. AC_DEFUN([CF_WITH_IMAKE_CFLAGS],[ +AC_REQUIRE([CF_ENABLE_NARROWPROTO]) + AC_MSG_CHECKING(if we should use imake to help) CF_ARG_DISABLE(imake, [ --disable-imake disable use of imake for definitions], [enable_imake=no], [enable_imake=yes]) AC_MSG_RESULT($enable_imake) + if test "$enable_imake" = yes ; then CF_IMAKE_CFLAGS(ifelse($1,,,$1)) +fi + +if test -n "$IMAKE" && test -n "$IMAKE_CFLAGS" ; then CF_ADD_CFLAGS($IMAKE_CFLAGS) else IMAKE_CFLAGS= @@ -1655,10 +2087,9 @@ IMAKE_CFLAGS="-DFUNCPROTO=15 $IMAKE_CFLAGS" # If this is not set properly, Xaw's scrollbars will not work - case `$ac_config_guess` in - *freebsd*|*gnu*|*irix5*|*irix6*|*linux-gnu*|*netbsd*|*openbsd*) + if test "$enable_narrowproto" = yes ; then IMAKE_CFLAGS="-DNARROWPROTO=1 $IMAKE_CFLAGS" - esac + fi # Other special definitions: case $host_os in @@ -1679,6 +2110,54 @@ fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_PATH version: 6 updated: 1998/10/11 00:40:17 +dnl ------------ +dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just +dnl defaulting to yes/no. +dnl +dnl $1 = option name +dnl $2 = help-text +dnl $3 = environment variable to set +dnl $4 = default value, shown in the help-message, must be a constant +dnl $5 = default value, if it's an expression & cannot be in the help-message +dnl +AC_DEFUN([CF_WITH_PATH], +[AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),, +ifelse($4,,[withval="${$3}"],[withval="${$3-ifelse($5,,$4,$5)}"]))dnl +CF_PATH_SYNTAX(withval) +eval $3="$withval" +AC_SUBST($3)dnl +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_WITH_PCRE version: 3 updated: 2006/02/12 17:28:56 +dnl ------------ +dnl Add PCRE (Perl-compatible regular expressions) to the build if it is +dnl available and the user requests it. Assume the application will otherwise +dnl use the POSIX interface. +dnl +dnl TODO allow $withval to specify package location +AC_DEFUN([CF_WITH_PCRE], +[ +AC_MSG_CHECKING(if you want to use PCRE for regular-expressions) +AC_ARG_WITH(pcre, + [ --with-pcre use PCRE for regular-expressions]) +test -z "$with_pcre" && with_pcre=no +AC_MSG_RESULT($with_pcre) + +if test "$with_pcre" != no ; then + AC_CHECK_LIB(pcre,pcre_compile, + [AC_CHECK_HEADER(pcreposix.h, + [AC_CHECK_LIB(pcreposix,pcreposix_regcomp, + [AC_DEFINE(HAVE_LIB_PCRE) + AC_DEFINE(HAVE_PCREPOSIX_H) + LIBS="-lpcreposix -lpcre $LIBS"], + AC_MSG_ERROR(Cannot find PCRE POSIX library), + "-lpcre")], + AC_MSG_ERROR(Cannot find PCRE POSIX header))], + AC_MSG_ERROR(Cannot find PCRE library)) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_XKB_BELL_EXT version: 2 updated: 2003/05/18 17:28:57 dnl --------------- dnl Check for XKB bell extension @@ -1699,16 +2178,19 @@ test "$cf_cv_xkb_bell_ext" = yes && AC_DEFINE(HAVE_XKB_BELL_EXT) ]) dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 17 updated: 2005/02/06 12:07:45 +dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, -dnl or adapt to the vendor's definitions to get equivalent functionality. +dnl or adapt to the vendor's definitions to get equivalent functionality, +dnl without losing the common non-POSIX features. dnl dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE AC_DEFUN([CF_XOPEN_SOURCE],[ +AC_REQUIRE([CF_PROG_CC_U_D]) + cf_XOPEN_SOURCE=ifelse($1,,500,$1) cf_POSIX_C_SOURCE=ifelse($2,,199506L,$2) @@ -1745,6 +2227,9 @@ osf[[45]]*) #(vi CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" ;; +nto-qnx*) #(vi + CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE" + ;; sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; @@ -1769,7 +2254,13 @@ CPPFLAGS="$cf_save" ]) ]) -test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE -D_XOPEN_SOURCE=$cf_cv_xopen_source" + if test "$cf_cv_xopen_source" != no ; then + CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) + CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) + test "$cf_cv_cc_u_d_options" = yes && \ + CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source" + fi CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; esac @@ -1929,35 +2420,53 @@ AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) ]) dnl --------------------------------------------------------------------------- -dnl CF_X_FREETYPE version: 11 updated: 2004/04/25 16:43:59 +dnl CF_X_FREETYPE version: 15 updated: 2006/02/12 17:30:04 dnl ------------- -dnl Check for X FreeType headers and libraries (XFree86 4.x). +dnl Check for X FreeType headers and libraries (XFree86 4.x, etc). +dnl +dnl First check for the appropriate config program, since the developers for +dnl these libraries change their configuration (and config program) more or +dnl less randomly. If we cannot find the config program, do not bother trying +dnl to guess the latest variation of include/lib directories. dnl dnl If either or both of these configure-script options are not given, rely on -dnl the output of xft-config or the older freetype-config to provide the -dnl cflags/libs options. +dnl the output of the config program to provide the dnl cflags/libs options: dnl --with-freetype-cflags dnl --with-freetype-libs AC_DEFUN([CF_X_FREETYPE], [ cf_extra_freetype_libs= -AC_PATH_PROG(FREETYPE_CONFIG, xft-config, none) -if test "$FREETYPE_CONFIG" = none; then - cf_extra_freetype_libs="-lXft" - AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, none) -fi +FREETYPE_CONFIG= +FREETYPE_PARAMS= -if test "$FREETYPE_CONFIG" != none ; then +AC_PATH_PROG(FREETYPE_PKG_CONFIG, pkg-config, none) +if test "$FREETYPE_PKG_CONFIG" != none && "$FREETYPE_PKG_CONFIG" --exists xft; then + FREETYPE_CONFIG=$FREETYPE_PKG_CONFIG + FREETYPE_PARAMS=xft +else + AC_PATH_PROG(FREETYPE_XFT_CONFIG, xft-config, none) + if test "$FREETYPE_XFT_CONFIG" != none; then + FREETYPE_CONFIG=$FREETYPE_XFT_CONFIG + else + cf_extra_freetype_libs="-lXft" + AC_PATH_PROG(FREETYPE_OLD_CONFIG, freetype-config, none) + if test "$FREETYPE_OLD_CONFIG" != none; then + FREETYPE_CONFIG=$FREETYPE_OLD_CONFIG + fi + fi +fi +if test -n "$FREETYPE_CONFIG" ; then +withval= AC_ARG_WITH(freetype-cflags, [ --with-freetype-cflags -D/-I options for compiling with FreeType], [cf_cv_x_freetype_incs="$withval" CF_VERBOSE(freetype-cflags $cf_cv_x_freetype_incs) ],[ AC_CACHE_CHECK(for X FreeType headers,cf_cv_x_freetype_incs,[ - cf_cv_x_freetype_incs="`$FREETYPE_CONFIG --cflags 2>/dev/null`" + cf_cv_x_freetype_incs="`$FREETYPE_CONFIG $FREETYPE_PARAMS --cflags 2>/dev/null`" ])]) - +withval= AC_ARG_WITH(freetype-libs, [ --with-freetype-libs -L/-l options to link FreeType], [cf_cv_x_freetype_libs="$withval" @@ -1968,7 +2477,7 @@ cf_save_LIBS="$LIBS" cf_save_INCS="$CPPFLAGS" -cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG --libs 2>/dev/null`" +cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG $FREETYPE_PARAMS --libs 2>/dev/null`" LIBS="$cf_cv_x_freetype_libs $LIBS" CPPFLAGS="$cf_cv_x_freetype_incs $CPPFLAGS" @@ -1988,9 +2497,12 @@ CF_ADD_CFLAGS($cf_cv_x_freetype_incs) AC_DEFINE(XRENDERFONT) else + AC_MSG_WARN(No libraries found for FreeType) CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi + else + AC_MSG_WARN(Cannot find FreeType configuration program) CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi Index: xc/programs/xterm/button.c diff -u xc/programs/xterm/button.c:3.78 xc/programs/xterm/button.c:3.87 --- xc/programs/xterm/button.c:3.78 Sun Feb 6 16:42:37 2005 +++ xc/programs/xterm/button.c Sun Apr 9 20:34:36 2006 @@ -1,8 +1,7 @@ -/* $XTermId: button.c,v 1.178 2005/02/04 21:40:20 tom Exp $ */ +/* $XTermId: button.c,v 1.243 2006/04/09 20:22:15 tom Exp $ */ -/* $Xorg: button.c,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ */ /* - * Copyright 1999-2004,2005 by Thomas E. Dickey + * Copyright 1999-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -52,7 +51,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/programs/xterm/button.c,v 3.78 2005/02/06 21:42:37 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/button.c,v 3.87 2006/04/10 00:34:36 dickey Exp $ */ /* button.c Handles button events in the terminal emulator. @@ -76,6 +75,16 @@ #include #include #include +#include + +#if OPT_SELECT_REGEX +#ifdef HAVE_PCREPOSIX_H +#include +#else /* POSIX regex.h */ +#include +#include +#endif +#endif #if OPT_WIDE_CHARS #include @@ -84,10 +93,6 @@ charClass[value & ((sizeof(charClass)/sizeof(charClass[0]))-1)] #endif -#define XTERM_CELL(row,col) getXtermCell(screen, row + screen->topline, col) -#define XTERM_CELL_C1(row,col) getXtermCellComb1(screen, row + screen->topline, col) -#define XTERM_CELL_C2(row,col) getXtermCellComb2(screen, row + screen->topline, col) - /* * We reserve shift modifier for cut/paste operations. In principle we * can pass through control and meta modifiers, but in practice, the @@ -106,88 +111,50 @@ meta key -> 2 control key -> 4 */ -#define Coordinate(r,c) ((r) * (term->screen.max_col+1) + (c)) - -#if OPT_DEC_LOCATOR -static ANSI reply; -#endif - -/* Selection/extension variables */ - -/* Raw char position where the selection started */ -static int rawRow, rawCol; - -/* Selected area before CHAR, WORD, LINE selectUnit processing */ -static int startRRow, startRCol, endRRow, endRCol = 0; - -/* Selected area after CHAR, WORD, LINE selectUnit processing */ -static int startSRow, startSCol, endSRow, endSCol = 0; - -/* Valid rows for selection clipping */ -static int firstValidRow, lastValidRow; +#define Coordinate(s,c) ((c)->row * MaxCols(s) + (c)->col) -/* Start, end of extension */ -static int startERow, startECol, endERow, endECol; +static const CELL zeroCELL = +{0, 0}; -/* Saved values of raw selection for extend to restore to */ -static int saveStartRRow, saveStartRCol, saveEndRRow, saveEndRCol; - -/* Saved value of WORD selection for LINE processing to restore to */ -static int saveStartWRow, saveStartWCol; +#if OPT_DEC_LOCATOR +static Bool SendLocatorPosition(XtermWidget xw, XEvent * event); +static void CheckLocatorPosition(XtermWidget xw, XEvent * event); +#endif /* OPT_DEC_LOCATOR */ /* Multi-click handling */ -static int numberOfClicks = 0; -static Time lastButtonUpTime = 0; - #if OPT_READLINE static Time lastButtonDownTime = 0; static int ExtendingSelection = 0; static Time lastButton3UpTime = 0; static Time lastButton3DoubleDownTime = 0; -static int lastButton3row, lastButton3col; /* At the release time */ +static CELL lastButton3; /* At the release time */ #endif /* OPT_READLINE */ -typedef int SelectUnit; - -#define SELECTCHAR 0 -#define SELECTWORD 1 -#define SELECTLINE 2 -#define NSELECTUNITS 3 -static SelectUnit selectUnit; - -/* Send emacs escape code when done selecting or extending? */ -static int replyToEmacs; - -static Char *SaveText(TScreen * screen, int row, int scol, int ecol, Char * - lp, int *eol); +static Char *SaveText(TScreen * screen, int row, int scol, int ecol, + Char * lp, int *eol); static int Length(TScreen * screen, int row, int scol, int ecol); -static void ComputeSelect(int startRow, int startCol, int endRow, int - endCol, Bool extend); -static void EditorButton(XButtonEvent * event); -static void EndExtend(Widget w, XEvent * event, String * params, Cardinal +static void ComputeSelect(TScreen * screen, CELL * startc, CELL * endc, Bool extend); +static void EditorButton(TScreen * screen, XButtonEvent * event); +static void EndExtend(XtermWidget w, XEvent * event, String * params, Cardinal num_params, Bool use_cursor_loc); -static void ExtendExtend(int row, int col); -static void PointToRowCol(int y, int x, int *r, int *c); -static void ReHiliteText(int frow, int fcol, int trow, int tcol); -static void SaltTextAway(int crow, int ccol, int row, int col, String * - params, Cardinal num_params); -static void SelectSet(Widget w, XEvent * event, String * params, Cardinal num_params); +static void ExtendExtend(TScreen * screen, const CELL * cell); +static void PointToCELL(TScreen * screen, int y, int x, CELL * cell); +static void ReHiliteText(TScreen * screen, CELL * first, CELL * last); +static void SaltTextAway(XtermWidget xw, CELL * cellc, CELL * cell, + String * params, Cardinal num_params); +static void SelectSet(XtermWidget xw, XEvent * event, String * params, Cardinal num_params); static void SelectionReceived PROTO_XT_SEL_CB_ARGS; -static void StartSelect(int startrow, int startcol); -static void TrackDown(XButtonEvent * event); -static void _OwnSelection(XtermWidget termw, String * selections, Cardinal count); -static void do_select_end(Widget w, XEvent * event, String * params, +static void StartSelect(TScreen * screen, const CELL * cell); +static void TrackDown(TScreen * screen, XButtonEvent * event); +static void TrackText(TScreen * screen, const CELL * first, const CELL * last); +static void _OwnSelection(XtermWidget xw, String * selections, Cardinal count); +static void do_select_end(XtermWidget xw, XEvent * event, String * params, Cardinal *num_params, Bool use_cursor_loc); Bool -SendMousePosition(Widget w, XEvent * event) +SendMousePosition(XtermWidget xw, XEvent * event) { - TScreen *screen; - - if (!IsXtermWidget(w)) - return False; - - screen = &((XtermWidget) w)->screen; + TScreen *screen = &(xw->screen); /* If send_mouse_pos mode isn't on, we shouldn't be here */ if (screen->send_mouse_pos == MOUSE_OFF) @@ -195,7 +162,7 @@ #if OPT_DEC_LOCATOR if (screen->send_mouse_pos == DEC_LOCATOR) { - return (SendLocatorPosition(w, event)); + return (SendLocatorPosition(xw, event)); } #endif /* OPT_DEC_LOCATOR */ @@ -211,7 +178,7 @@ if (KeyModifiers == 0) { if (event->type == ButtonPress) - EditorButton((XButtonEvent *) event); + EditorButton(screen, (XButtonEvent *) event); return True; } return False; @@ -220,11 +187,11 @@ if (event->type == ButtonPress && KeyModifiers == 0 && event->xbutton.button == Button1) { - TrackDown((XButtonEvent *) event); + TrackDown(screen, (XButtonEvent *) event); return True; } if (KeyModifiers == 0 || KeyModifiers == ControlMask) { - EditorButton((XButtonEvent *) event); + EditorButton(screen, (XButtonEvent *) event); return True; } return False; @@ -236,7 +203,7 @@ case BTN_EVENT_MOUSE: case ANY_EVENT_MOUSE: if (KeyModifiers == 0 || KeyModifiers == ControlMask) { - EditorButton((XButtonEvent *) event); + EditorButton(screen, (XButtonEvent *) event); return True; } return False; @@ -273,10 +240,11 @@ (row)++; (col)++; \ } -Bool -SendLocatorPosition(Widget w, XEvent * event) +static Bool +SendLocatorPosition(XtermWidget xw, XEvent * event) { - TScreen *screen = &((XtermWidget) w)->screen; + ANSI reply; + TScreen *screen = &(xw->screen); int row, col; Bool oor; int button; @@ -296,7 +264,7 @@ return (True); if (event->type == MotionNotify) { - CheckLocatorPosition(w, event); + CheckLocatorPosition(xw, event); return (True); } @@ -310,6 +278,7 @@ * * ESCAPE '[' event ; mask ; row ; column '&' 'w' */ + memset(&reply, 0, sizeof(reply)); reply.a_type = CSI; if (oor) { @@ -320,7 +289,7 @@ unparseseq(&reply, screen->respond); if (screen->locator_reset) { - MotionOff(screen, term); + MotionOff(screen, xw); screen->send_mouse_pos = MOUSE_OFF; } return (True); @@ -372,7 +341,7 @@ unparseseq(&reply, screen->respond); if (screen->locator_reset) { - MotionOff(screen, term); + MotionOff(screen, xw); screen->send_mouse_pos = MOUSE_OFF; } @@ -384,7 +353,7 @@ screen->send_mouse_pos = MOUSE_OFF; screen->loc_filter = False; screen->locator_events = 0; - MotionOff(screen, term); + MotionOff(screen, xw); } return (True); @@ -404,9 +373,10 @@ } void -GetLocatorPosition(XtermWidget w) +GetLocatorPosition(XtermWidget xw) { - TScreen *screen = &w->screen; + ANSI reply; + TScreen *screen = &xw->screen; Window root, child; int rx, ry, x, y; unsigned int mask; @@ -423,9 +393,10 @@ screen->send_mouse_pos = MOUSE_OFF; screen->loc_filter = False; screen->locator_events = 0; - MotionOff(screen, term); + MotionOff(screen, xw); } + memset(&reply, 0, sizeof(reply)); reply.a_type = CSI; if (screen->send_mouse_pos == DEC_LOCATOR) { @@ -443,7 +414,7 @@ unparseseq(&reply, screen->respond); if (screen->locator_reset) { - MotionOff(screen, term); + MotionOff(screen, xw); screen->send_mouse_pos = MOUSE_OFF; } return; @@ -461,15 +432,16 @@ unparseseq(&reply, screen->respond); if (screen->locator_reset) { - MotionOff(screen, term); + MotionOff(screen, xw); screen->send_mouse_pos = MOUSE_OFF; } } void -InitLocatorFilter(XtermWidget w) +InitLocatorFilter(XtermWidget xw) { - TScreen *screen = &w->screen; + ANSI reply; + TScreen *screen = &xw->screen; Window root, child; int rx, ry, x, y; unsigned int mask; @@ -494,6 +466,7 @@ * If any explicit coordinates were received, * report immediately with no coordinates. */ + memset(&reply, 0, sizeof(reply)); reply.a_type = CSI; reply.a_nparam = 1; reply.a_param[0] = 0; /* Event - 0 = locator unavailable */ @@ -502,7 +475,7 @@ unparseseq(&reply, screen->respond); if (screen->locator_reset) { - MotionOff(screen, term); + MotionOff(screen, xw); screen->send_mouse_pos = MOUSE_OFF; } } else { @@ -511,7 +484,7 @@ * unavailable. Report when the pointer re-enters the window. */ screen->loc_filter = True; - MotionOn(screen, term); + MotionOn(screen, xw); } return; } @@ -559,6 +532,7 @@ /* Pointer is already outside the rectangle - report immediately */ ButtonState(state, mask); + memset(&reply, 0, sizeof(reply)); reply.a_type = CSI; reply.a_nparam = 4; reply.a_param[0] = 10; /* Event - 10 = locator outside filter */ @@ -570,7 +544,7 @@ unparseseq(&reply, screen->respond); if (screen->locator_reset) { - MotionOff(screen, term); + MotionOff(screen, xw); screen->send_mouse_pos = MOUSE_OFF; } return; @@ -581,13 +555,14 @@ * to detect if the mouse leaves the rectangle. */ screen->loc_filter = True; - MotionOn(screen, term); + MotionOn(screen, xw); } -void -CheckLocatorPosition(Widget w, XEvent * event) +static void +CheckLocatorPosition(XtermWidget xw, XEvent * event) { - TScreen *screen = &((XtermWidget) w)->screen; + ANSI reply; + TScreen *screen = &(xw->screen); int row, col; Bool oor; int state; @@ -606,8 +581,9 @@ (row > screen->loc_filter_bottom)) { /* Filter triggered - disable it */ screen->loc_filter = False; - MotionOff(screen, term); + MotionOff(screen, xw); + memset(&reply, 0, sizeof(reply)); reply.a_type = CSI; if (oor) { reply.a_nparam = 1; @@ -627,7 +603,7 @@ unparseseq(&reply, screen->respond); if (screen->locator_reset) { - MotionOff(screen, term); + MotionOff(screen, xw); screen->send_mouse_pos = MOUSE_OFF; } } @@ -636,9 +612,8 @@ #if OPT_READLINE static int -isClick1_clean(XEvent * event) +isClick1_clean(TScreen * screen, XEvent * event) { - TScreen *screen = &term->screen; int delta; if (!(event->type == ButtonPress || event->type == ButtonRelease) @@ -647,19 +622,26 @@ || (screen->send_mouse_pos != MOUSE_OFF) /* Kinda duplicate... */ ||ExtendingSelection) /* Was moved */ return 0; + if (event->type != ButtonRelease) return 0; - if (lastButtonDownTime == (Time) 0) /* first time or once in a blue moon */ - delta = term->screen.multiClickTime + 1; - else if (event->xbutton.time > lastButtonDownTime) /* most of the time */ + + if (lastButtonDownTime == (Time) 0) { + /* first time or once in a blue moon */ + delta = screen->multiClickTime + 1; + } else if (event->xbutton.time > lastButtonDownTime) { + /* most of the time */ delta = event->xbutton.time - lastButtonDownTime; - else /* time has rolled over since lastButtonUpTime */ + } else { + /* time has rolled over since lastButtonUpTime */ delta = (((Time) ~ 0) - lastButtonDownTime) + event->xbutton.time; - return delta <= term->screen.multiClickTime; + } + + return delta <= screen->multiClickTime; } static int -isDoubleClick3(XEvent * event) +isDoubleClick3(TScreen * screen, XEvent * event) { int delta; @@ -670,35 +652,37 @@ return 0; } /* Process Btn3Release. */ - if (lastButton3DoubleDownTime == (Time) 0) /* No previous click - or once in a blue moon */ - delta = term->screen.multiClickTime + 1; - else if (event->xbutton.time > lastButton3DoubleDownTime) /* most of the time */ + if (lastButton3DoubleDownTime == (Time) 0) { + /* No previous click or once in a blue moon */ + delta = screen->multiClickTime + 1; + } else if (event->xbutton.time > lastButton3DoubleDownTime) { + /* most of the time */ delta = event->xbutton.time - lastButton3DoubleDownTime; - else /* time has rolled over since lastButton3DoubleDownTime */ + } else { + /* time has rolled over since lastButton3DoubleDownTime */ delta = (((Time) ~ 0) - lastButton3DoubleDownTime) + event->xbutton.time; - if (delta <= term->screen.multiClickTime) { + } + if (delta <= screen->multiClickTime) { /* Double click */ - int row, col; + CELL cell; /* Cannot check ExtendingSelection, since mouse-3 always sets it */ - PointToRowCol(event->xbutton.y, event->xbutton.x, &row, &col); - if (row == lastButton3row && col == lastButton3col) { + PointToCELL(screen, event->xbutton.y, event->xbutton.x, &cell); + if (isSameCELL(&cell, &lastButton3)) { lastButton3DoubleDownTime = 0; /* Disable the third click */ return 1; } } /* Not a double click, memorize for future check. */ lastButton3UpTime = event->xbutton.time; - PointToRowCol(event->xbutton.y, event->xbutton.x, - &lastButton3row, &lastButton3col); + PointToCELL(screen, event->xbutton.y, event->xbutton.x, &lastButton3); return 0; } static int -CheckSecondPress3(XEvent * event) +CheckSecondPress3(TScreen * screen, XEvent * event) { - int delta, row, col; + int delta; if (event->type != ButtonPress || (KeyModifiers & ShiftMask) @@ -707,20 +691,24 @@ return 0; } /* Process Btn3Press. */ - if (lastButton3UpTime == (Time) 0) /* No previous click - or once in a blue moon */ - delta = term->screen.multiClickTime + 1; - else if (event->xbutton.time > lastButton3UpTime) /* most of the time */ + if (lastButton3UpTime == (Time) 0) { + /* No previous click or once in a blue moon */ + delta = screen->multiClickTime + 1; + } else if (event->xbutton.time > lastButton3UpTime) { + /* most of the time */ delta = event->xbutton.time - lastButton3UpTime; - else /* time has rolled over since lastButton3UpTime */ + } else { + /* time has rolled over since lastButton3UpTime */ delta = (((Time) ~ 0) - lastButton3UpTime) + event->xbutton.time; - if (delta <= term->screen.multiClickTime) { - PointToRowCol(event->xbutton.y, event->xbutton.x, &row, &col); - if (row == lastButton3row && col == lastButton3col) { + } + if (delta <= screen->multiClickTime) { + CELL cell; + + PointToCELL(screen, event->xbutton.y, event->xbutton.x, &cell); + if (isSameCELL(&cell, &lastButton3)) { /* A candidate for a double-click */ lastButton3DoubleDownTime = event->xbutton.time; - PointToRowCol(event->xbutton.y, event->xbutton.x, - &lastButton3row, &lastButton3col); + PointToCELL(screen, event->xbutton.y, event->xbutton.x, &lastButton3); return 1; } lastButton3UpTime = 0; /* Disable the info about the previous click */ @@ -731,9 +719,10 @@ } static int -rowOnCurrentLine(int line, int *deltap) /* must be XButtonEvent */ +rowOnCurrentLine(TScreen * screen, + int line, + int *deltap) /* must be XButtonEvent */ { - TScreen *screen = &term->screen; int l1, l2; *deltap = 0; @@ -754,31 +743,26 @@ } static int -eventRow(XEvent * event) /* must be XButtonEvent */ +eventRow(TScreen * screen, XEvent * event) /* must be XButtonEvent */ { - TScreen *screen = &term->screen; - return (event->xbutton.y - screen->border) / FontHeight(screen); } static int -eventColBetween(XEvent * event) /* must be XButtonEvent */ +eventColBetween(TScreen * screen, XEvent * event) /* must be XButtonEvent */ { - TScreen *screen = &term->screen; - /* Correct by half a width - we are acting on a boundary, not on a cell. */ return ((event->xbutton.x - OriginX(screen) + (FontWidth(screen) - 1) / 2) / FontWidth(screen)); } static int -ReadLineMovePoint(int col, int ldelta) +ReadLineMovePoint(TScreen * screen, int col, int ldelta) { - TScreen *screen = &term->screen; Char line[6]; unsigned count = 0; - col += ldelta * (screen->max_col + 1) - screen->cur_col; + col += ldelta * MaxCols(screen) - screen->cur_col; if (col == 0) return 0; if (screen->control_eight_bits) { @@ -796,131 +780,144 @@ } static int -ReadLineDelete(int r1, int c1, int r2, int c2) +ReadLineDelete(TScreen * screen, CELL * cell1, CELL * cell2) { - TScreen *screen = &term->screen; int del; - del = c2 - c1 + (r2 - r1) * (screen->max_col + 1); + del = (cell2->col - cell1->col) + ((cell2->row - cell1->row) * MaxCols(screen)); if (del <= 0) /* Just in case... */ return 0; while (del--) - v_write(screen->respond, "\177", 1); /* XXX Sometimes "\08"? */ + v_write(screen->respond, (Char *) "\177", 1); return 1; } #endif /* OPT_READLINE */ /* ^XM-G */ void -DiredButton(Widget w GCC_UNUSED, +DiredButton(Widget w, XEvent * event, /* must be XButtonEvent */ String * params GCC_UNUSED, /* selections */ Cardinal *num_params GCC_UNUSED) { - TScreen *screen = &term->screen; - Char Line[6]; - unsigned line, col; - - if (event->type == ButtonPress || event->type == ButtonRelease) { - line = (event->xbutton.y - screen->border) / FontHeight(screen); - col = (event->xbutton.x - OriginX(screen)) / FontWidth(screen); - Line[0] = CONTROL('X'); - Line[1] = ESC; - Line[2] = 'G'; - Line[3] = ' ' + col; - Line[4] = ' ' + line; - v_write(screen->respond, Line, 5); + if (IsXtermWidget(w)) { + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &(xw->screen); + Char Line[6]; + unsigned line, col; + + if (event->type == ButtonPress || event->type == ButtonRelease) { + line = (event->xbutton.y - screen->border) / FontHeight(screen); + col = (event->xbutton.x - OriginX(screen)) / FontWidth(screen); + Line[0] = CONTROL('X'); + Line[1] = ESC; + Line[2] = 'G'; + Line[3] = ' ' + col; + Line[4] = ' ' + line; + v_write(screen->respond, Line, 5); + } } } #if OPT_READLINE void -ReadLineButton(Widget w GCC_UNUSED, +ReadLineButton(Widget w, XEvent * event, /* must be XButtonEvent */ String * params GCC_UNUSED, /* selections */ Cardinal *num_params GCC_UNUSED) { - TScreen *screen = &term->screen; - Char Line[6]; - int line, col, ldelta = 0; + if (IsXtermWidget(w)) { + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &(xw->screen); + Char Line[6]; + int line, col, ldelta = 0; + + if (!(event->type == ButtonPress || event->type == ButtonRelease) + || (screen->send_mouse_pos != MOUSE_OFF) || ExtendingSelection) + goto finish; + if (event->type == ButtonRelease) { + int delta; + + if (lastButtonDownTime == (Time) 0) { + /* first time and once in a blue moon */ + delta = screen->multiClickTime + 1; + } else if (event->xbutton.time > lastButtonDownTime) { + /* most of the time */ + delta = event->xbutton.time - lastButtonDownTime; + } else { + /* time has rolled over since lastButtonUpTime */ + delta = (((Time) ~ 0) - lastButtonDownTime) + event->xbutton.time; + } + if (delta > screen->multiClickTime) + goto finish; /* All this work for this... */ + } + line = (event->xbutton.y - screen->border) / FontHeight(screen); + if (line != screen->cur_row) { + int l1, l2; - if (!(event->type == ButtonPress || event->type == ButtonRelease) - || (screen->send_mouse_pos != MOUSE_OFF) || ExtendingSelection) - goto finish; - if (event->type == ButtonRelease) { - int delta; - - if (lastButtonDownTime == (Time) 0) /* first time and once in a blue moon */ - delta = screen->multiClickTime + 1; - else if (event->xbutton.time > lastButtonDownTime) /* most of the time */ - delta = event->xbutton.time - lastButtonDownTime; - else /* time has rolled over since lastButtonUpTime */ - delta = (((Time) ~ 0) - lastButtonDownTime) + event->xbutton.time; - if (delta > screen->multiClickTime) - goto finish; /* All this work for this... */ - } - line = (event->xbutton.y - screen->border) / FontHeight(screen); - if (line != screen->cur_row) { - int l1, l2; - - if (line < screen->cur_row) - l1 = line, l2 = screen->cur_row; - else - l2 = line, l1 = screen->cur_row; - l1--; - while (++l1 < l2) - if (!ScrnTstWrapped(screen, l1)) - goto finish; - /* Everything is on one "wrapped line" now */ - ldelta = line - screen->cur_row; + if (line < screen->cur_row) + l1 = line, l2 = screen->cur_row; + else + l2 = line, l1 = screen->cur_row; + l1--; + while (++l1 < l2) + if (!ScrnTstWrapped(screen, l1)) + goto finish; + /* Everything is on one "wrapped line" now */ + ldelta = line - screen->cur_row; + } + /* Correct by half a width - we are acting on a boundary, not on a cell. */ + col = (event->xbutton.x - OriginX(screen) + (FontWidth(screen) - 1) + / 2) + / FontWidth(screen) - screen->cur_col + ldelta * MaxCols(screen); + if (col == 0) + goto finish; + Line[0] = ESC; + /* XXX: sometimes it is better to send '['? */ + Line[1] = 'O'; + Line[2] = (col > 0 ? 'C' : 'D'); + if (col < 0) + col = -col; + while (col--) + v_write(screen->respond, Line, 3); + finish: + if (event->type == ButtonRelease) + do_select_end(xw, event, params, num_params, False); } - /* Correct by half a width - we are acting on a boundary, not on a cell. */ - col = (event->xbutton.x - OriginX(screen) + (FontWidth(screen) - 1) / 2) - / FontWidth(screen) - screen->cur_col + ldelta * (screen->max_col + 1); - if (col == 0) - goto finish; - Line[0] = ESC; - /* XXX: sometimes it is better to send '['? */ - Line[1] = 'O'; - Line[2] = (col > 0 ? 'C' : 'D'); - if (col < 0) - col = -col; - while (col--) - v_write(screen->respond, Line, 3); - finish: - if (event->type == ButtonRelease) - do_select_end(w, event, params, num_params, False); } #endif /* OPT_READLINE */ /* repeats n or p */ void -ViButton(Widget w GCC_UNUSED, +ViButton(Widget w, XEvent * event, /* must be XButtonEvent */ String * params GCC_UNUSED, /* selections */ Cardinal *num_params GCC_UNUSED) { - TScreen *screen = &term->screen; - int pty = screen->respond; - Char Line[6]; - int line; - - if (event->type == ButtonPress || event->type == ButtonRelease) { + if (IsXtermWidget(w)) { + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &(xw->screen); + int pty = screen->respond; + Char Line[6]; + int line; + + if (event->type == ButtonPress || event->type == ButtonRelease) { + + line = screen->cur_row - + ((event->xbutton.y - screen->border) / FontHeight(screen)); + if (line != 0) { + Line[0] = ESC; /* force an exit from insert-mode */ + v_write(pty, Line, 1); - line = screen->cur_row - - ((event->xbutton.y - screen->border) / FontHeight(screen)); - if (line != 0) { - Line[0] = ESC; /* force an exit from insert-mode */ - v_write(pty, Line, 1); - - if (line < 0) { - line = -line; - Line[0] = CONTROL('n'); - } else { - Line[0] = CONTROL('p'); + if (line < 0) { + line = -line; + Line[0] = CONTROL('n'); + } else { + Line[0] = CONTROL('p'); + } + while (--line >= 0) + v_write(pty, Line, 1); } - while (--line >= 0) - v_write(pty, Line, 1); } } } @@ -935,37 +932,47 @@ String * params GCC_UNUSED, Cardinal *num_params GCC_UNUSED) { - TScreen *screen; - int row, col; - - if (!IsXtermWidget(w)) - return; - - screen = &((XtermWidget) w)->screen; - screen->selection_time = event->xmotion.time; - switch (eventMode) { - /* If not in one of the DEC mouse-reporting modes */ - case LEFTEXTENSION: - case RIGHTEXTENSION: - PointToRowCol(event->xmotion.y, event->xmotion.x, - &row, &col); - ExtendExtend(row, col); - break; + if (IsXtermWidget(w)) { + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &(xw->screen); + CELL cell; + + screen->selection_time = event->xmotion.time; + switch (eventMode) { + /* If not in one of the DEC mouse-reporting modes */ + case LEFTEXTENSION: + case RIGHTEXTENSION: + PointToCELL(screen, event->xmotion.y, event->xmotion.x, &cell); + ExtendExtend(screen, &cell); + break; - /* If in motion reporting mode, send mouse position to - character process as a key sequence \E[M... */ - case NORMAL: - /* will get here if send_mouse_pos != MOUSE_OFF */ - if (screen->send_mouse_pos == BTN_EVENT_MOUSE - || screen->send_mouse_pos == ANY_EVENT_MOUSE) { - (void) SendMousePosition(w, event); + /* If in motion reporting mode, send mouse position to + character process as a key sequence \E[M... */ + case NORMAL: + /* will get here if send_mouse_pos != MOUSE_OFF */ + if (screen->send_mouse_pos == BTN_EVENT_MOUSE + || screen->send_mouse_pos == ANY_EVENT_MOUSE) { + (void) SendMousePosition(xw, event); + } + break; } - break; + } +} + +void +HandleKeyboardSelectExtend(Widget w, + XEvent * event GCC_UNUSED, /* must be XButtonEvent */ + String * params GCC_UNUSED, + Cardinal *num_params GCC_UNUSED) +{ + if (IsXtermWidget(w)) { + TScreen *screen = &((XtermWidget) w)->screen; + ExtendExtend(screen, &screen->cursorp); } } static void -do_select_end(Widget w, +do_select_end(XtermWidget xw, XEvent * event, /* must be XButtonEvent */ String * params, /* selections */ Cardinal *num_params, @@ -973,33 +980,29 @@ { #if OPT_READLINE int ldelta1, ldelta2; - TScreen *screen = &term->screen; + TScreen *screen = &xw->screen; #endif - if (!IsXtermWidget(w)) { - return; - } - - ((XtermWidget) w)->screen.selection_time = event->xbutton.time; + xw->screen.selection_time = event->xbutton.time; switch (eventMode) { case NORMAL: - (void) SendMousePosition(w, event); + (void) SendMousePosition(xw, event); break; case LEFTEXTENSION: case RIGHTEXTENSION: - EndExtend(w, event, params, *num_params, use_cursor_loc); + EndExtend(xw, event, params, *num_params, use_cursor_loc); #if OPT_READLINE - if (isClick1_clean(event) + if (isClick1_clean(screen, event) && SCREEN_FLAG(screen, click1_moves) - && rowOnCurrentLine(eventRow(event), &ldelta1)) { - ReadLineMovePoint(eventColBetween(event), ldelta1); + && rowOnCurrentLine(screen, eventRow(screen, event), &ldelta1)) { + ReadLineMovePoint(screen, eventColBetween(screen, event), ldelta1); } - if (isDoubleClick3(event) + if (isDoubleClick3(screen, event) && SCREEN_FLAG(screen, dclick3_deletes) - && rowOnCurrentLine(startSRow, &ldelta1) - && rowOnCurrentLine(endSRow, &ldelta2)) { - ReadLineMovePoint(endSCol, ldelta2); - ReadLineDelete(startSRow, startSCol, endSRow, endSCol); + && rowOnCurrentLine(screen, screen->startSel.row, &ldelta1) + && rowOnCurrentLine(screen, screen->endSel.row, &ldelta2)) { + ReadLineMovePoint(screen, screen->endSel.col, ldelta2); + ReadLineDelete(screen, &screen->startSel, &(screen->endSel)); } #endif /* OPT_READLINE */ break; @@ -1012,7 +1015,8 @@ String * params, /* selections */ Cardinal *num_params) { - do_select_end(w, event, params, num_params, False); + if (IsXtermWidget(w)) + do_select_end((XtermWidget) w, event, params, num_params, False); } void @@ -1021,7 +1025,8 @@ String * params, /* selections */ Cardinal *num_params) { - do_select_end(w, event, params, num_params, True); + if (IsXtermWidget(w)) + do_select_end((XtermWidget) w, event, params, num_params, True); } struct _SelectionList { @@ -1031,9 +1036,9 @@ Time time; }; -/* convert a UTF-8 string to Latin-1, replacing non Latin-1 characters - * by `#'. */ - +/* + * Convert a UTF-8 string to Latin-1, replacing non Latin-1 characters by `#'. + */ #if OPT_WIDE_CHARS static Char * UTF8toLatin1(Char * s, unsigned len, unsigned long *result) @@ -1134,6 +1139,70 @@ return eightBitSelectionTargets; } +#define isSELECT(value) (!strcmp(value, "SELECT")) + +static void +UnmapSelections(XtermWidget xw) +{ + TScreen *screen = &(xw->screen); + Cardinal n; + + if (screen->mappedSelect) { + for (n = 0; screen->mappedSelect[n] != 0; ++n) + free(screen->mappedSelect[n]); + free(screen->mappedSelect); + screen->mappedSelect = 0; + } +} + +/* + * xterm generally uses the primary selection. Some applications prefer + * (or are limited to) the clipboard. Since the translations resource is + * complicated, users seldom change the way it affects selection. But it + * is simple to remap the choice between primary and clipboard before the + * call to XmuInternStrings(). + */ +static String * +MapSelections(XtermWidget xw, String * params, Cardinal num_params) +{ + String *result = params; + + if (num_params > 0) { + Cardinal j; + Boolean map = False; + + for (j = 0; j < num_params; ++j) { + TRACE(("param[%d]:%s\n", j, params[j])); + if (isSELECT(params[j])) { + map = True; + break; + } + } + if (map) { + String mapTo = (xw->screen.selectToClipboard + ? "CLIPBOARD" + : "PRIMARY"); + + UnmapSelections(xw); + if ((result = TypeMallocN(String, num_params + 1)) != 0) { + result[num_params] = 0; + for (j = 0; j < num_params; ++j) { + result[j] = x_strdup((isSELECT(params[j]) + ? mapTo + : params[j])); + if (result[j] == 0) { + UnmapSelections(xw); + result = 0; + break; + } + } + xw->screen.mappedSelect = result; + } + } + } + return result; +} + /* * Lookup the cut-buffer number, which will be in the range 0-7. * If it is not a cut-buffer, it is the primary selection (-1). @@ -1174,12 +1243,27 @@ return cutbuffer; } +#if OPT_PASTE64 static void -_GetSelection(Widget w, - Time ev_time, - String * params, /* selections in precedence order */ - Cardinal num_params, - Atom * targets) +FinishPaste64(TScreen * screen) +{ + TRACE(("FinishPaste64(%d)\n", screen->base64_paste)); + if (screen->base64_paste) { + screen->base64_paste = 0; + unparseputc1(screen->base64_final, screen->respond); + } +} +#endif + +#if !OPT_PASTE64 +static +#endif +void +xtermGetSelection(Widget w, + Time ev_time, + String * params, /* selections in precedence order */ + Cardinal num_params, + Atom * targets) { Atom selection; int cutbuffer; @@ -1188,20 +1272,15 @@ if (!IsXtermWidget(w)) return; -#if OPT_TRACE - TRACE(("_GetSelection\n")); - if (num_params > 0) { - Cardinal n; - for (n = 0; n < num_params; ++n) { - TRACE(("param[%d]:%s\n", n, params[n])); - } - } -#endif + TRACE(("xtermGetSelection\n")); + params = MapSelections((XtermWidget) w, params, num_params); XmuInternStrings(XtDisplay(w), params, (Cardinal) 1, &selection); cutbuffer = CutBuffer(selection); + TRACE(("Cutbuffer: %d, target: %lu\n", cutbuffer, targets ? (unsigned long) targets[0] : 0)); + if (cutbuffer >= 0) { int inbytes; unsigned long nbytes; @@ -1212,11 +1291,18 @@ /* 'line' is freed in SelectionReceived */ line = XFetchBuffer(XtDisplay(w), &inbytes, cutbuffer); nbytes = (unsigned long) inbytes; + if (nbytes > 0) SelectionReceived(w, NULL, &selection, &type, (XtPointer) line, &nbytes, &fmt8); - else if (num_params > 1) - _GetSelection(w, ev_time, params + 1, num_params - 1, NULL); + else if (num_params > 1) { + xtermGetSelection(w, ev_time, params + 1, num_params - 1, NULL); + } +#if OPT_PASTE64 + else { + FinishPaste64(&(((XtermWidget) w)->screen)); + } +#endif return; } else { struct _SelectionList *list; @@ -1266,9 +1352,15 @@ name = XGetAtomName(dpy, type); - Trace("Getting %s (%ld)\n", name, (long int) type); - for (cp = line; cp < line + len; cp++) - Trace("%c\n", *cp); + TRACE(("Getting %s (%ld)\n", name, (long int) type)); + for (cp = line; cp < line + len; cp++) { + TRACE(("[%d:%lu]", cp + 1 - line, len)); + if (isprint(*cp)) { + TRACE(("%c\n", *cp)); + } else { + TRACE(("\\x%02x\n", *cp)); + } + } } #else #define GettingSelection(dpy,type,line,len) /* nothing */ @@ -1280,13 +1372,86 @@ # define tty_vwrite(pty,lag,l) v_write(pty,lag,l) #endif /* defined VMS */ +#if OPT_PASTE64 +/* Return base64 code character given 6-bit number */ +static const char base64_code[] = "\ +ABCDEFGHIJKLMNOPQRSTUVWXYZ\ +abcdefghijklmnopqrstuvwxyz\ +0123456789+/"; +static void +base64_flush(TScreen * screen) +{ + Char x; + switch (screen->base64_count) { + case 0: + break; + case 2: + x = base64_code[screen->base64_accu << 4]; + tty_vwrite(screen->respond, &x, 1); + break; + case 4: + x = base64_code[screen->base64_accu << 2]; + tty_vwrite(screen->respond, &x, 1); + break; + } + if (screen->base64_pad & 3) + tty_vwrite(screen->respond, + (Char *) "===", + 4 - (screen->base64_pad & 3)); + screen->base64_count = 0; + screen->base64_accu = 0; + screen->base64_pad = 0; +} +#endif /* OPT_PASTE64 */ + static void _qWriteSelectionData(TScreen * screen, Char * lag, unsigned length) { +#if OPT_PASTE64 + if (screen->base64_paste) { + /* Send data as base64 */ + Char *p = lag; + Char buf[64]; + unsigned x = 0; + while (length--) { + switch (screen->base64_count) { + case 0: + buf[x++] = base64_code[*p >> 2]; + screen->base64_accu = (*p & 0x3); + screen->base64_count = 2; + ++p; + break; + case 2: + buf[x++] = base64_code[(screen->base64_accu << 4) + (*p >> 4)]; + screen->base64_accu = (*p & 0xF); + screen->base64_count = 4; + ++p; + break; + case 4: + buf[x++] = base64_code[(screen->base64_accu << 2) + (*p >> 6)]; + buf[x++] = base64_code[*p & 0x3F]; + screen->base64_accu = 0; + screen->base64_count = 0; + ++p; + break; + } + if (x >= 63) { + /* Write 63 or 64 characters */ + screen->base64_pad += x; + tty_vwrite(screen->respond, buf, x); + x = 0; + } + } + if (x != 0) { + screen->base64_pad += x; + tty_vwrite(screen->respond, buf, x); + } + } else +#endif /* OPT_PASTE64 */ #if OPT_READLINE if (SCREEN_FLAG(screen, paste_quotes)) { while (length--) { - tty_vwrite(screen->respond, "\026", 1); /* Control-V */ + tty_vwrite(screen->respond, (Char *) "\026", 1); /* Control-V */ tty_vwrite(screen->respond, lag++, 1); } } else @@ -1301,7 +1466,7 @@ /* Doing this one line at a time may no longer be necessary because v_write has been re-written. */ - Char *lag, *cp, *end; + Char *lag, *end; /* in the VMS version, if tt_pasting isn't set to True then qio reads aren't blocked and an infinite loop is entered, where the @@ -1313,17 +1478,28 @@ end = &line[length]; lag = line; - if (!SCREEN_FLAG(screen, paste_literal_nl)) { - for (cp = line; cp != end; cp++) { - if (*cp == '\n') { - *cp = '\r'; - _qWriteSelectionData(screen, lag, (unsigned) (cp - lag + 1)); - lag = cp + 1; + +#if OPT_PASTE64 + if (screen->base64_paste) { + _qWriteSelectionData(screen, lag, (unsigned) (end - lag)); + base64_flush(screen); + } else +#endif + { + if (!SCREEN_FLAG(screen, paste_literal_nl)) { + Char *cp; + for (cp = line; cp != end; cp++) { + if (*cp == '\n') { + *cp = '\r'; + _qWriteSelectionData(screen, lag, (unsigned) (cp - lag + 1)); + lag = cp + 1; + } } } - } - if (lag != end) { - _qWriteSelectionData(screen, lag, (unsigned) (end - lag)); + + if (lag != end) { + _qWriteSelectionData(screen, lag, (unsigned) (end - lag)); + } } #ifdef VMS tt_pasting = False; @@ -1335,9 +1511,9 @@ static void _WriteKey(TScreen * screen, Char * in) { - char line[16]; + Char line[16]; unsigned count = 0; - unsigned length = strlen(in); + unsigned length = strlen((char *) in); if (screen->control_eight_bits) { line[count++] = CSI; @@ -1362,7 +1538,7 @@ Atom * type, XtPointer value, unsigned long *length, - int *format GCC_UNUSED) + int *format) { char **text_list = NULL; int text_list_count; @@ -1434,17 +1610,29 @@ if (text_list != NULL && text_list_count != 0) { int i; +#if OPT_PASTE64 + if (screen->base64_paste) { + ; + } else +#endif #if OPT_READLINE - if (SCREEN_FLAG(screen, paste_brackets)) - _WriteKey(screen, "200"); + if (SCREEN_FLAG(screen, paste_brackets)) { + _WriteKey(screen, (Char *) "200"); + } #endif for (i = 0; i < text_list_count; i++) { int len = strlen(text_list[i]); _WriteSelectionData(screen, (Char *) text_list[i], len); } +#if OPT_PASTE64 + if (screen->base64_paste) { + FinishPaste64(screen); + } else +#endif #if OPT_READLINE - if (SCREEN_FLAG(screen, paste_brackets)) - _WriteKey(screen, "201"); + if (SCREEN_FLAG(screen, paste_brackets)) { + _WriteKey(screen, (Char *) "201"); + } #endif XFreeStringList(text_list); } else @@ -1458,9 +1646,13 @@ fail: if (client_data != 0) { struct _SelectionList *list = (struct _SelectionList *) client_data; - _GetSelection(w, list->time, - list->params, list->count, list->targets); + xtermGetSelection(w, list->time, + list->params, list->count, list->targets); XtFree((char *) client_data); +#if OPT_PASTE64 + } else { + FinishPaste64(screen); +#endif } return; } @@ -1471,64 +1663,72 @@ String * params, /* selections in precedence order */ Cardinal *num_params) { -#if OPT_READLINE - int ldelta; - TScreen *screen = &((XtermWidget) w)->screen; -#endif - - if (SendMousePosition(w, event)) - return; + if (IsXtermWidget(w)) { + XtermWidget xw = (XtermWidget) w; + if (!SendMousePosition(xw, event)) { #if OPT_READLINE - if ((event->type == ButtonPress || event->type == ButtonRelease) - /* Disable on Shift-mouse, including the application-mouse modes */ - && !(KeyModifiers & ShiftMask) - && (screen->send_mouse_pos == MOUSE_OFF) - && SCREEN_FLAG(screen, paste_moves) - && rowOnCurrentLine(eventRow(event), &ldelta)) - ReadLineMovePoint(eventColBetween(event), ldelta); + int ldelta; + TScreen *screen = &(xw->screen); + if ((event->type == ButtonPress || event->type == ButtonRelease) + /* Disable on Shift-mouse, including the application-mouse modes */ + && !(KeyModifiers & ShiftMask) + && (screen->send_mouse_pos == MOUSE_OFF) + && SCREEN_FLAG(screen, paste_moves) + && rowOnCurrentLine(screen, eventRow(screen, event), &ldelta)) + ReadLineMovePoint(screen, eventColBetween(screen, event), ldelta); #endif /* OPT_READLINE */ - _GetSelection(w, event->xbutton.time, params, *num_params, NULL); + xtermGetSelection(w, event->xbutton.time, params, *num_params, NULL); + } + } } static SelectUnit -EvalSelectUnit(Time buttonDownTime, SelectUnit defaultUnit) +EvalSelectUnit(TScreen * screen, Time buttonDownTime, SelectUnit defaultUnit) { + SelectUnit result; int delta; - if (lastButtonUpTime == (Time) 0) /* first time and once in a blue moon */ - delta = term->screen.multiClickTime + 1; - else if (buttonDownTime > lastButtonUpTime) /* most of the time */ - delta = buttonDownTime - lastButtonUpTime; - else /* time has rolled over since lastButtonUpTime */ - delta = (((Time) ~ 0) - lastButtonUpTime) + buttonDownTime; + if (screen->lastButtonUpTime == (Time) 0) { + /* first time and once in a blue moon */ + delta = screen->multiClickTime + 1; + } else if (buttonDownTime > screen->lastButtonUpTime) { + /* most of the time */ + delta = buttonDownTime - screen->lastButtonUpTime; + } else { + /* time has rolled over since lastButtonUpTime */ + delta = (((Time) ~ 0) - screen->lastButtonUpTime) + buttonDownTime; + } - if (delta > term->screen.multiClickTime) { - numberOfClicks = 1; - return defaultUnit; + if (delta > screen->multiClickTime) { + screen->numberOfClicks = 1; + result = defaultUnit; } else { - ++numberOfClicks; - return ((selectUnit + 1) % NSELECTUNITS); + result = screen->selectMap[screen->numberOfClicks % screen->maxClicks]; + screen->numberOfClicks += 1; } + TRACE(("EvalSelectUnit(%d) = %d\n", screen->numberOfClicks, result)); + return result; } static void -do_select_start(Widget w, +do_select_start(XtermWidget xw, XEvent * event, /* must be XButtonEvent* */ - int startrow, - int startcol) + CELL * cell) { - if (SendMousePosition(w, event)) + TScreen *screen = &(xw->screen); + + if (SendMousePosition(xw, event)) return; - selectUnit = EvalSelectUnit(event->xbutton.time, SELECTCHAR); - replyToEmacs = False; + screen->selectUnit = EvalSelectUnit(screen, event->xbutton.time, Select_CHAR); + screen->replyToEmacs = False; #if OPT_READLINE lastButtonDownTime = event->xbutton.time; #endif - StartSelect(startrow, startcol); + StartSelect(screen, cell); } /* ARGSUSED */ @@ -1538,22 +1738,21 @@ String * params GCC_UNUSED, Cardinal *num_params GCC_UNUSED) { - TScreen *screen; - int startrow, startcol; - - if (!IsXtermWidget(w)) - return; - - screen = &((XtermWidget) w)->screen; - firstValidRow = 0; - lastValidRow = screen->max_row; - PointToRowCol(event->xbutton.y, event->xbutton.x, &startrow, &startcol); + if (IsXtermWidget(w)) { + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &(xw->screen); + CELL cell; + + screen->firstValidRow = 0; + screen->lastValidRow = screen->max_row; + PointToCELL(screen, event->xbutton.y, event->xbutton.x, &cell); #if OPT_READLINE - ExtendingSelection = 0; + ExtendingSelection = 0; #endif - do_select_start(w, event, startrow, startcol); + do_select_start(xw, event, &cell); + } } /* ARGSUSED */ @@ -1563,109 +1762,101 @@ String * params GCC_UNUSED, Cardinal *num_params GCC_UNUSED) { - TScreen *screen; - - if (!IsXtermWidget(w)) - return; - - screen = &((XtermWidget) w)->screen; - do_select_start(w, event, screen->cursor_row, screen->cursor_col); + if (IsXtermWidget(w)) { + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &(xw->screen); + do_select_start(xw, event, &screen->cursorp); + } } static void -TrackDown(XButtonEvent * event) +TrackDown(TScreen * screen, XButtonEvent * event) { - int startrow, startcol; + CELL cell; - selectUnit = EvalSelectUnit(event->time, SELECTCHAR); - if (numberOfClicks > 1) { - PointToRowCol(event->y, event->x, &startrow, &startcol); - replyToEmacs = True; - StartSelect(startrow, startcol); + screen->selectUnit = EvalSelectUnit(screen, event->time, Select_CHAR); + if (screen->numberOfClicks > 1) { + PointToCELL(screen, event->y, event->x, &cell); + screen->replyToEmacs = True; + StartSelect(screen, &cell); } else { - waitingForTrackInfo = 1; - EditorButton((XButtonEvent *) event); + waitingForTrackInfo = True; + EditorButton(screen, (XButtonEvent *) event); } } #define boundsCheck(x) if (x < 0) \ x = 0; \ else if (x >= screen->max_row) \ - x = screen->max_row; + x = screen->max_row void -TrackMouse(int func, int startrow, int startcol, int firstrow, int lastrow) +TrackMouse(TScreen * screen, + int func, + CELL * start, + int firstrow, + int lastrow) { - TScreen *screen = &term->screen; + if (waitingForTrackInfo) { /* if Timed, ignore */ + waitingForTrackInfo = False; + if (func != 0) { + CELL first = *start; - if (!waitingForTrackInfo) { /* Timed out, so ignore */ - return; + boundsCheck(first.row); + boundsCheck(firstrow); + boundsCheck(lastrow); + screen->firstValidRow = firstrow; + screen->lastValidRow = lastrow; + screen->replyToEmacs = True; + StartSelect(screen, &first); + } } - waitingForTrackInfo = 0; - if (func == 0) - return; - boundsCheck(startrow) - boundsCheck(firstrow) - boundsCheck(lastrow) - firstValidRow = firstrow; - lastValidRow = lastrow; - replyToEmacs = True; - StartSelect(startrow, startcol); } static void -StartSelect(int startrow, int startcol) +StartSelect(TScreen * screen, const CELL * cell) { - TScreen *screen = &term->screen; - - TRACE(("StartSelect row=%d, col=%d\n", startrow, startcol)); + TRACE(("StartSelect row=%d, col=%d\n", cell->row, cell->col)); if (screen->cursor_state) HideCursor(); - if (numberOfClicks == 1) { + if (screen->numberOfClicks == 1) { /* set start of selection */ - rawRow = startrow; - rawCol = startcol; - + screen->rawPos = *cell; } - /* else use old values in rawRow, Col */ - saveStartRRow = startERow = rawRow; - saveStartRCol = startECol = rawCol; - saveEndRRow = endERow = rawRow; - saveEndRCol = endECol = rawCol; - if (Coordinate(startrow, startcol) < Coordinate(rawRow, rawCol)) { + /* else use old values in rawPos */ + screen->saveStartR = screen->startExt = screen->rawPos; + screen->saveEndR = screen->endExt = screen->rawPos; + if (Coordinate(screen, cell) < Coordinate(screen, &(screen->rawPos))) { eventMode = LEFTEXTENSION; - startERow = startrow; - startECol = startcol; + screen->startExt = *cell; } else { eventMode = RIGHTEXTENSION; - endERow = startrow; - endECol = startcol; + screen->endExt = *cell; } - ComputeSelect(startERow, startECol, endERow, endECol, False); + ComputeSelect(screen, &(screen->startExt), &(screen->endExt), False); } static void -EndExtend(Widget w, +EndExtend(XtermWidget xw, XEvent * event, /* must be XButtonEvent */ String * params, /* selections */ Cardinal num_params, Bool use_cursor_loc) { - int row, col; + CELL cell; unsigned count; - TScreen *screen = &term->screen; + TScreen *screen = &xw->screen; Char line[9]; if (use_cursor_loc) { - row = screen->cursor_row; - col = screen->cursor_col; + cell = screen->cursorp; } else { - PointToRowCol(event->xbutton.y, event->xbutton.x, &row, &col); + PointToCELL(screen, event->xbutton.y, event->xbutton.x, &cell); } - ExtendExtend(row, col); - lastButtonUpTime = event->xbutton.time; - if (startSRow != endSRow || startSCol != endSCol) { - if (replyToEmacs) { + ExtendExtend(screen, &cell); + screen->lastButtonUpTime = event->xbutton.time; + if (!isSameCELL(&(screen->startSel), &(screen->endSel))) { + if (screen->replyToEmacs) { count = 0; if (screen->control_eight_bits) { line[count++] = CSI; @@ -1673,27 +1864,27 @@ line[count++] = ESC; line[count++] = '['; } - if (rawRow == startSRow && rawCol == startSCol - && row == endSRow && col == endSCol) { + if (isSameCELL(&(screen->rawPos), &(screen->startSel)) + && isSameCELL(&cell, &(screen->endSel))) { /* Use short-form emacs select */ line[count++] = 't'; - line[count++] = ' ' + endSCol + 1; - line[count++] = ' ' + endSRow + 1; + line[count++] = ' ' + screen->endSel.col + 1; + line[count++] = ' ' + screen->endSel.row + 1; } else { /* long-form, specify everything */ line[count++] = 'T'; - line[count++] = ' ' + startSCol + 1; - line[count++] = ' ' + startSRow + 1; - line[count++] = ' ' + endSCol + 1; - line[count++] = ' ' + endSRow + 1; - line[count++] = ' ' + col + 1; - line[count++] = ' ' + row + 1; + line[count++] = ' ' + screen->startSel.col + 1; + line[count++] = ' ' + screen->startSel.row + 1; + line[count++] = ' ' + screen->endSel.col + 1; + line[count++] = ' ' + screen->endSel.row + 1; + line[count++] = ' ' + cell.col + 1; + line[count++] = ' ' + cell.row + 1; } v_write(screen->respond, line, count); - TrackText(0, 0, 0, 0); + TrackText(screen, &zeroCELL, &zeroCELL); } } - SelectSet(w, event, params, num_params); + SelectSet(xw, event, params, num_params); eventMode = NORMAL; } @@ -1703,23 +1894,26 @@ String * params, Cardinal *num_params) { - SelectSet(w, event, params, *num_params); + if (IsXtermWidget(w)) { + SelectSet((XtermWidget) w, event, params, *num_params); + } } /* ARGSUSED */ static void -SelectSet(Widget w GCC_UNUSED, +SelectSet(XtermWidget xw, XEvent * event GCC_UNUSED, String * params, Cardinal num_params) { + TScreen *screen = &(xw->screen); + TRACE(("SelectSet\n")); /* Only do select stuff if non-null select */ - if (startSRow != endSRow || startSCol != endSCol) { - SaltTextAway(startSRow, startSCol, endSRow, endSCol, - params, num_params); + if (!isSameCELL(&(screen->startSel), &(screen->endSel))) { + SaltTextAway(xw, &(screen->startSel), &(screen->endSel), params, num_params); } else { - DisownSelection(term); + DisownSelection(xw); } } @@ -1727,111 +1921,101 @@ /* ARGSUSED */ static void -do_start_extend(Widget w, +do_start_extend(XtermWidget xw, XEvent * event, /* must be XButtonEvent* */ String * params GCC_UNUSED, Cardinal *num_params GCC_UNUSED, Bool use_cursor_loc) { - TScreen *screen; - int row, col, coord; + TScreen *screen = &(xw->screen); + int coord; + CELL cell; - if (!IsXtermWidget(w)) + if (!IsXtermWidget(xw)) return; - screen = &((XtermWidget) w)->screen; - if (SendMousePosition(w, event)) + if (SendMousePosition(xw, event)) return; - firstValidRow = 0; - lastValidRow = screen->max_row; + + screen->firstValidRow = 0; + screen->lastValidRow = screen->max_row; #if OPT_READLINE if ((KeyModifiers & ShiftMask) || event->xbutton.button != Button3 || !(SCREEN_FLAG(screen, dclick3_deletes))) #endif - selectUnit = EvalSelectUnit(event->xbutton.time, selectUnit); - replyToEmacs = False; + screen->selectUnit = EvalSelectUnit(screen, event->xbutton.time, screen->selectUnit); + screen->replyToEmacs = False; #if OPT_READLINE - CheckSecondPress3(event); + CheckSecondPress3(screen, event); #endif - if (numberOfClicks == 1 + if (screen->numberOfClicks == 1 || (SCREEN_FLAG(screen, dclick3_deletes) /* Dclick special */ &&!(KeyModifiers & ShiftMask))) { /* Save existing selection so we can reestablish it if the guy extends past the other end of the selection */ - saveStartRRow = startERow = startRRow; - saveStartRCol = startECol = startRCol; - saveEndRRow = endERow = endRRow; - saveEndRCol = endECol = endRCol; + screen->saveStartR = screen->startExt = screen->startRaw; + screen->saveEndR = screen->endExt = screen->endRaw; } else { /* He just needed the selection mode changed, use old values. */ - startERow = startRRow = saveStartRRow; - startECol = startRCol = saveStartRCol; - endERow = endRRow = saveEndRRow; - endECol = endRCol = saveEndRCol; - + screen->startExt = screen->startRaw = screen->saveStartR; + screen->endExt = screen->endRaw = screen->saveEndR; } if (use_cursor_loc) { - row = screen->cursor_row; - col = screen->cursor_col; + cell = screen->cursorp; } else { - PointToRowCol(event->xbutton.y, event->xbutton.x, &row, &col); + PointToCELL(screen, event->xbutton.y, event->xbutton.x, &cell); } - coord = Coordinate(row, col); + coord = Coordinate(screen, &cell); - if (Abs(coord - Coordinate(startSRow, startSCol)) - < Abs(coord - Coordinate(endSRow, endSCol)) - || coord < Coordinate(startSRow, startSCol)) { + if (Abs(coord - Coordinate(screen, &(screen->startSel))) + < Abs(coord - Coordinate(screen, &(screen->endSel))) + || coord < Coordinate(screen, &(screen->startSel))) { /* point is close to left side of selection */ eventMode = LEFTEXTENSION; - startERow = row; - startECol = col; + screen->startExt = cell; } else { /* point is close to left side of selection */ eventMode = RIGHTEXTENSION; - endERow = row; - endECol = col; + screen->endExt = cell; } - ComputeSelect(startERow, startECol, endERow, endECol, True); + ComputeSelect(screen, &(screen->startExt), &(screen->endExt), True); #if OPT_READLINE - if (startSRow != endSRow || startSCol != endSCol) + if (!isSameCELL(&(screen->startSel), &(screen->endSel))) ExtendingSelection = 1; #endif } static void -ExtendExtend(int row, int col) +ExtendExtend(TScreen * screen, const CELL * cell) { - int coord = Coordinate(row, col); + int coord = Coordinate(screen, cell); - TRACE(("ExtendExtend row=%d, col=%d\n", row, col)); + TRACE(("ExtendExtend row=%d, col=%d\n", cell->row, cell->col)); if (eventMode == LEFTEXTENSION - && (coord + (selectUnit != SELECTCHAR)) > Coordinate(endSRow, endSCol)) { + && ((coord + (screen->selectUnit != Select_CHAR)) + > Coordinate(screen, &(screen->endSel)))) { /* Whoops, he's changed his mind. Do RIGHTEXTENSION */ eventMode = RIGHTEXTENSION; - startERow = saveStartRRow; - startECol = saveStartRCol; + screen->startExt = screen->saveStartR; } else if (eventMode == RIGHTEXTENSION - && coord < Coordinate(startSRow, startSCol)) { + && coord < Coordinate(screen, &(screen->startSel))) { /* Whoops, he's changed his mind. Do LEFTEXTENSION */ eventMode = LEFTEXTENSION; - endERow = saveEndRRow; - endECol = saveEndRCol; + screen->endExt = screen->saveEndR; } if (eventMode == LEFTEXTENSION) { - startERow = row; - startECol = col; + screen->startExt = *cell; } else { - endERow = row; - endECol = col; + screen->endExt = *cell; } - ComputeSelect(startERow, startECol, endERow, endECol, False); + ComputeSelect(screen, &(screen->startExt), &(screen->endExt), False); #if OPT_READLINE - if (startSRow != endSRow || startSCol != endSCol) + if (!isSameCELL(&(screen->startSel), &(screen->endSel))) ExtendingSelection = 1; #endif } @@ -1842,7 +2026,8 @@ String * params, /* unused */ Cardinal *num_params) /* unused */ { - do_start_extend(w, event, params, num_params, False); + if (IsXtermWidget(w)) + do_start_extend((XtermWidget) w, event, params, num_params, False); } void @@ -1851,33 +2036,34 @@ String * params, /* unused */ Cardinal *num_params) /* unused */ { - do_start_extend(w, event, params, num_params, True); + if (IsXtermWidget(w)) + do_start_extend((XtermWidget) w, event, params, num_params, True); } void ScrollSelection(TScreen * screen, int amount, Bool always) { - int minrow = -screen->savedlines - screen->topline; - int maxrow = screen->max_row - screen->topline; + int minrow = INX2ROW(screen, -screen->savedlines); + int maxrow = INX2ROW(screen, screen->max_row); int maxcol = screen->max_col; -#define scroll_update_one(row, col) \ - row += amount; \ - if (row < minrow) { \ - row = minrow; \ - col = 0; \ +#define scroll_update_one(cell) \ + (cell)->row += amount; \ + if ((cell)->row < minrow) { \ + (cell)->row = minrow; \ + (cell)->col = 0; \ } \ - if (row > maxrow) { \ - row = maxrow; \ - col = maxcol; \ + if ((cell)->row > maxrow) { \ + (cell)->row = maxrow; \ + (cell)->col = maxcol; \ } - scroll_update_one(startRRow, startRCol); - scroll_update_one(endRRow, endRCol); - scroll_update_one(startSRow, startSCol); - scroll_update_one(endSRow, endSCol); + scroll_update_one(&(screen->startRaw)); + scroll_update_one(&(screen->endRaw)); + scroll_update_one(&(screen->startSel)); + scroll_update_one(&(screen->endSel)); - scroll_update_one(rawRow, rawCol); + scroll_update_one(&(screen->rawPos)); /* * If we are told to scroll the selection but it lies outside the scrolling @@ -1889,22 +2075,22 @@ if (ScrnHaveSelection(screen)) { int adjust; - adjust = screen->startHRow + screen->topline; + adjust = ROW2INX(screen, screen->startH.row); if (always || !ScrnHaveLineMargins(screen) || ScrnIsLineInMargins(screen, adjust)) { - scroll_update_one(screen->startHRow, screen->startHCol); + scroll_update_one(&screen->startH); } - adjust = screen->endHRow + screen->topline; + adjust = ROW2INX(screen, screen->endH.row); if (always || !ScrnHaveLineMargins(screen) || ScrnIsLineInMargins(screen, adjust)) { - scroll_update_one(screen->endHRow, screen->endHCol); + scroll_update_one(&screen->endH); } } - screen->startHCoord = Coordinate(screen->startHRow, screen->startHCol); - screen->endHCoord = Coordinate(screen->endHRow, screen->endHCol); + screen->startHCoord = Coordinate(screen, &screen->startH); + screen->endHCoord = Coordinate(screen, &screen->endH); } /*ARGSUSED*/ @@ -1914,27 +2100,27 @@ rows--; /* decr to get 0-max */ cols--; - if (startRRow > rows) - startRRow = rows; - if (startSRow > rows) - startSRow = rows; - if (endRRow > rows) - endRRow = rows; - if (endSRow > rows) - endSRow = rows; - if (rawRow > rows) - rawRow = rows; - - if (startRCol > cols) - startRCol = cols; - if (startSCol > cols) - startSCol = cols; - if (endRCol > cols) - endRCol = cols; - if (endSCol > cols) - endSCol = cols; - if (rawCol > cols) - rawCol = cols; + if (screen->startRaw.row > rows) + screen->startRaw.row = rows; + if (screen->startSel.row > rows) + screen->startSel.row = rows; + if (screen->endRaw.row > rows) + screen->endRaw.row = rows; + if (screen->endSel.row > rows) + screen->endSel.row = rows; + if (screen->rawPos.row > rows) + screen->rawPos.row = rows; + + if (screen->startRaw.col > cols) + screen->startRaw.col = cols; + if (screen->startSel.col > cols) + screen->startSel.col = cols; + if (screen->endRaw.col > cols) + screen->endRaw.col = cols; + if (screen->endSel.col > cols) + screen->endSel.col = cols; + if (screen->rawPos.col > cols) + screen->rawPos.col = cols; } #if OPT_WIDE_CHARS @@ -1948,58 +2134,56 @@ #endif static void -PointToRowCol(int y, - int x, - int *r, - int *c) +PointToCELL(TScreen * screen, + int y, + int x, + CELL * cell) /* Convert pixel coordinates to character coordinates. Rows are clipped between firstValidRow and lastValidRow. Columns are clipped between to be 0 or greater, but are not clipped to some maximum value. */ { - TScreen *screen = &term->screen; - int row, col; - - row = (y - screen->border) / FontHeight(screen); - if (row < firstValidRow) - row = firstValidRow; - else if (row > lastValidRow) - row = lastValidRow; - col = (x - OriginX(screen)) / FontWidth(screen); - if (col < 0) - col = 0; - else if (col > screen->max_col + 1) { - col = screen->max_col + 1; + cell->row = (y - screen->border) / FontHeight(screen); + if (cell->row < screen->firstValidRow) + cell->row = screen->firstValidRow; + else if (cell->row > screen->lastValidRow) + cell->row = screen->lastValidRow; + cell->col = (x - OriginX(screen)) / FontWidth(screen); + if (cell->col < 0) + cell->col = 0; + else if (cell->col > MaxCols(screen)) { + cell->col = MaxCols(screen); } #if OPT_WIDE_CHARS /* * If we got a click on the right half of a doublewidth character, * pretend it happened on the left half. */ - if (col > 0 - && isWideCell(row, col - 1) - && (XTERM_CELL(row, col) == HIDDEN_CHAR)) { - col -= 1; + if (cell->col > 0 + && isWideCell(cell->row, cell->col - 1) + && (XTERM_CELL(cell->row, cell->col) == HIDDEN_CHAR)) { + cell->col -= 1; } #endif - *r = row; - *c = col; } +/* + * Find the last column at which text was drawn on the given row. + */ static int -LastTextCol(int row) +LastTextCol(TScreen * screen, int row) { - TScreen *screen = &term->screen; + int inx = ROW2INX(screen, row); int i; Char *ch; - if ((row += screen->topline) + screen->savedlines >= 0) { + if (inx + screen->savedlines >= 0) { for (i = screen->max_col, - ch = SCRN_BUF_ATTRS(screen, row) + i; + ch = SCRN_BUF_ATTRS(screen, inx) + i; i >= 0 && !(*ch & CHARDRAWN); ch--, i--) ; #if OPT_DEC_CHRSET - if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, row)[0])) { + if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, inx)[0])) { i *= 2; } #endif @@ -2107,305 +2291,604 @@ #if OPT_WIDE_CHARS static int -class_of(TScreen * screen, int row, int col) +class_of(TScreen * screen, CELL * cell) { + CELL temp = *cell; int value; + #if OPT_DEC_CHRSET - if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, row + screen->topline)[0])) { - col /= 2; + if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, ROW2INX(screen, temp.row))[0])) { + temp.col /= 2; } #endif - value = XTERM_CELL(row, col); + + value = XTERM_CELL(temp.row, temp.col); if_OPT_WIDE_CHARS(screen, { return CharacterClass(value); }); return CharacterClass(value); } -#define ClassSelects(screen, row, col, cclass) \ - (class_of(screen, row, col) == cclass \ - || XTERM_CELL(row, col) == HIDDEN_CHAR) +#define ClassSelects(screen, cell, cclass) \ + (class_of(screen, cell) == cclass \ + || XTERM_CELL((cell)->row, (cell)->col) == HIDDEN_CHAR) #else -#define class_of(screen,row,col) charClass[XTERM_CELL(row, col)] -#define ClassSelects(screen, row, col, cclass) \ - (class_of(screen,row, col) == cclass) +#define class_of(screen, cell) charClass[XTERM_CELL((cell)->row, (cell)->col)] +#define ClassSelects(screen, cell, cclass) \ + (class_of(screen, (cell)) == cclass) #endif /* - * sets startSRow startSCol endSRow endSCol + * If the given column is past the end of text on the given row, bump to the + * beginning of the next line. + */ +static Boolean +okPosition(TScreen * screen, + CELL * cell) +{ + if (cell->col > (LastTextCol(screen, cell->row) + 1)) { + cell->col = 0; + cell->row += 1; + return False; + } + return True; +} + +static void +trimLastLine(TScreen * screen, CELL * last) +{ + if (screen->cutNewline) { + last->col = 0; + ++last->row; + } else { + last->col = LastTextCol(screen, last->row) + 1; + } +} + +#if OPT_SELECT_REGEX +/* + * Returns the first row of a wrapped line. + */ +static int +firstRowOfLine(TScreen * screen, int row, Bool visible) +{ + int limit = visible ? 0 : -screen->savedlines; + + while (row > limit && + ScrnTstWrapped(screen, row - 1)) + --row; + return row; +} + +/* + * Returns the last row of a wrapped line. + */ +static int +lastRowOfLine(TScreen * screen, int row) +{ + while (row < screen->max_row && + ScrnTstWrapped(screen, row)) + ++row; + return row; +} + +/* + * Returns the number of cells on the range of rows. + */ +static int +lengthOfLines(TScreen * screen, int firstRow, int lastRow) +{ + int length = 0; + int n; + for (n = firstRow; n <= lastRow; ++n) { + int value = LastTextCol(screen, n); + if (value >= 0) + length += (value + 1); + } + return length; +} + +/* + * Make a copy of the wrapped-line which corresponds to the given row as a + * string of bytes. Construct an index for the columns from the beginning of + * the line. + */ +static char * +make_indexed_text(TScreen * screen, int row, int length, int *indexed) +{ + Char *result = 0; + unsigned need = (length + 1); + + /* + * Get a quick upper bound to the number of bytes needed, if the whole + * string were UTF-8. + */ + if_OPT_WIDE_CHARS(screen, { + need *= (MAX_PTRS * 6); + }); + + if ((result = TypeCallocN(Char, need + 1)) != 0) { + int used = 0; + Char *last = result; + do { + int col = 0; + int limit = LastTextCol(screen, row); + + while (col <= limit) { + Char *next = last; + unsigned data = XTERM_CELL(row, col); + + /* some internal points may not be drawn */ + if (data == 0) + data = ' '; +#if OPT_WIDE_CHARS + next = convertToUTF8(last, data); +#else + *next++ = CharOf(data); +#endif + + if_OPT_WIDE_CHARS(screen, { + if ((data = XTERM_CELL_C1(row, col)) != 0) + next = convertToUTF8(next, data); + if ((data = XTERM_CELL_C2(row, col)) != 0) + next = convertToUTF8(next, data); + }); + + indexed[used] = last - result; + *next = 0; + /* TRACE(("index[%d.%d] %d:%s\n", row, used, indexed[used], last)); */ + last = next; + ++used; + ++col; + indexed[used] = next - result; + } + } while (used < length && + ScrnTstWrapped(screen, row) && + ++row < screen->max_row); + } + /* TRACE(("result:%s\n", result)); */ + return (char *) result; +} + +/* + * Find the column given an offset into the character string by using the + * index constructed in make_indexed_text(). + */ +static int +indexToCol(int *indexed, int len, int off) +{ + int col = 0; + while (indexed[col] < len) { + if (indexed[col] >= off) + break; + ++col; + } + return col; +} + +/* + * Given a row number, and a column offset from that (which may be wrapped), + * set the cell to the actual row/column values. + */ +static void +columnToCell(TScreen * screen, int row, int col, CELL * cell) +{ + while (row < screen->max_row) { + int last = LastTextCol(screen, row); + + /* TRACE(("last(%d) = %d, have %d\n", row, last, col)); */ + if (col <= last) { + break; + } + col -= (last + 1); + ++row; + } + if (col < 0) + col = 0; + cell->row = row; + cell->col = col; +} + +/* + * Given a cell, find the corresponding column offset. + */ +static int +cellToColumn(TScreen * screen, CELL * cell) +{ + int col = cell->col; + int row = firstRowOfLine(screen, cell->row, False); + while (row < cell->row) { + col += LastTextCol(screen, row++); + } + return col; +} + +static void +do_select_regex(TScreen * screen, CELL * startc, CELL * endc) +{ + char *expr = screen->selectExpr[screen->numberOfClicks - 1]; + regex_t preg; + regmatch_t match; + char *search; + int *indexed; + + TRACE(("Select_REGEX:%s\n", NonNull(expr))); + if (okPosition(screen, startc) && expr != 0) { + if (regcomp(&preg, expr, REG_EXTENDED) == 0) { + int firstRow = firstRowOfLine(screen, startc->row, True); + int lastRow = lastRowOfLine(screen, firstRow); + int size = lengthOfLines(screen, firstRow, lastRow); + int actual = cellToColumn(screen, startc); + + TRACE(("regcomp ok rows %d..%d bytes %d\n", + firstRow, lastRow, size)); + + if ((indexed = TypeCallocN(int, size + 1)) != 0) { + if ((search = make_indexed_text(screen, + firstRow, + size, + indexed)) != 0) { + int len = strlen(search); + int col; + int best_col = -1; + int best_len = -1; + + for (col = 0; indexed[col] < len; ++col) { + if (regexec(&preg, + search + indexed[col], + 1, &match, 0) == 0) { + int start_inx = match.rm_so + indexed[col]; + int finis_inx = match.rm_eo + indexed[col]; + int start_col = indexToCol(indexed, len, start_inx); + int finis_col = indexToCol(indexed, len, finis_inx); + + if (start_col <= actual && + actual < finis_col) { + int test = finis_col - start_col; + if (best_len < test) { + best_len = test; + best_col = start_col; + TRACE(("match column %d len %d\n", + best_col, + best_len)); + } + } + } + } + if (best_col >= 0) { + columnToCell(screen, firstRow, best_col, startc); + columnToCell(screen, firstRow, best_col + best_len, endc); + TRACE(("search::%s\n", search)); + TRACE(("indexed:%d..%d -> %d..%d\n", + best_col, best_col + best_len, + indexed[best_col], + indexed[best_col + best_len])); + TRACE(("matched:%.*s\n", + indexed[best_col + best_len] + 1 - + indexed[best_col], + search + indexed[best_col])); + } + free(search); + } + free(indexed); + } + regfree(&preg); + } + } +} +#endif /* OPT_SELECT_REGEX */ + +/* + * sets startSel endSel * ensuring that they have legal values */ static void -ComputeSelect(int startRow, - int startCol, - int endRow, - int endCol, +ComputeSelect(TScreen * screen, + CELL * startc, + CELL * endc, Bool extend) { - TScreen *screen = &term->screen; int length; int cclass; + CELL first = *startc; + CELL last = *endc; TRACE(("ComputeSelect(startRow=%d, startCol=%d, endRow=%d, endCol=%d, %sextend)\n", - startRow, startCol, endRow, endCol, extend ? "" : "no")); + first.row, first.col, + last.row, last.col, + extend ? "" : "no")); #if OPT_WIDE_CHARS - if (startCol > 1 - && isWideCell(startRow, startCol - 1) - && XTERM_CELL(startRow, startCol - 0) == HIDDEN_CHAR) { - fprintf(stderr, "Adjusting start. Changing downwards from %i.\n", startCol); - startCol -= 1; - if (endCol == (startCol + 1)) - endCol--; - } - - if (endCol > 1 - && isWideCell(endRow, endCol - 1) - && XTERM_CELL(endRow, endCol) == HIDDEN_CHAR) { - endCol += 1; + if (first.col > 1 + && isWideCell(first.row, first.col - 1) + && XTERM_CELL(first.row, first.col - 0) == HIDDEN_CHAR) { + fprintf(stderr, "Adjusting start. Changing downwards from %i.\n", first.col); + first.col -= 1; + if (last.col == (first.col + 1)) + last.col--; + } + + if (last.col > 1 + && isWideCell(last.row, last.col - 1) + && XTERM_CELL(last.row, last.col) == HIDDEN_CHAR) { + last.col += 1; } #endif - if (Coordinate(startRow, startCol) <= Coordinate(endRow, endCol)) { - startSRow = startRRow = startRow; - startSCol = startRCol = startCol; - endSRow = endRRow = endRow; - endSCol = endRCol = endCol; + if (Coordinate(screen, &first) <= Coordinate(screen, &last)) { + screen->startSel = screen->startRaw = first; + screen->endSel = screen->endRaw = last; } else { /* Swap them */ - startSRow = startRRow = endRow; - startSCol = startRCol = endCol; - endSRow = endRRow = startRow; - endSCol = endRCol = startCol; - } - - switch (selectUnit) { - case SELECTCHAR: - if (startSCol > (LastTextCol(startSRow) + 1)) { - startSCol = 0; - startSRow++; - } - if (endSCol > (LastTextCol(endSRow) + 1)) { - endSCol = 0; - endSRow++; - } - break; - case SELECTWORD: - if (startSCol > (LastTextCol(startSRow) + 1)) { - startSCol = 0; - startSRow++; - } else { - cclass = class_of(screen, startSRow, startSCol); + screen->startSel = screen->startRaw = last; + screen->endSel = screen->endRaw = first; + } + + switch (screen->selectUnit) { + case Select_CHAR: + (void) okPosition(screen, &(screen->startSel)); + (void) okPosition(screen, &(screen->endSel)); + break; + + case Select_WORD: + TRACE(("Select_WORD\n")); + if (okPosition(screen, &(screen->startSel))) { + cclass = class_of(screen, &(screen->startSel)); do { - --startSCol; - if (startSCol < 0 - && ScrnTstWrapped(screen, startSRow - 1)) { - --startSRow; - startSCol = LastTextCol(startSRow); + --screen->startSel.col; + if (screen->startSel.row > 0 + && screen->startSel.col < 0 + && ScrnTstWrapped(screen, screen->startSel.row - 1)) { + --screen->startSel.row; + screen->startSel.col = LastTextCol(screen, screen->startSel.row); } - } while (startSCol >= 0 - && ClassSelects(screen, startSRow, startSCol, cclass)); - ++startSCol; + } while (screen->startSel.col >= 0 + && ClassSelects(screen, &(screen->startSel), cclass)); + ++screen->startSel.col; } - #if OPT_WIDE_CHARS - if (startSCol && XTERM_CELL(startSRow, startSCol) == HIDDEN_CHAR) - startSCol++; + if (screen->startSel.col + && XTERM_CELL(screen->startSel.row, + screen->startSel.col) == HIDDEN_CHAR) + screen->startSel.col++; #endif - if (endSCol > (LastTextCol(endSRow) + 1)) { - endSCol = 0; - endSRow++; - } else { - length = LastTextCol(endSRow); - cclass = class_of(screen, endSRow, endSCol); + if (okPosition(screen, &(screen->endSel))) { + length = LastTextCol(screen, screen->endSel.row); + cclass = class_of(screen, &(screen->endSel)); do { - ++endSCol; - if (endSCol > length - && ScrnTstWrapped(screen, endSRow)) { - endSCol = 0; - ++endSRow; - length = LastTextCol(endSRow); + ++screen->endSel.col; + if (screen->endSel.col > length + && ScrnTstWrapped(screen, screen->endSel.row)) { + screen->endSel.col = 0; + ++screen->endSel.row; + length = LastTextCol(screen, screen->endSel.row); } - } while (endSCol <= length - && ClassSelects(screen, endSRow, endSCol, cclass)); - /* Word select selects if pointing to any char - in "word", especially in that it includes - the last character in a word. So no --endSCol - and do special eol handling */ - if (endSCol > length + 1) { - endSCol = 0; - ++endSRow; + } while (screen->endSel.col <= length + && ClassSelects(screen, &(screen->endSel), cclass)); + /* Word-select selects if pointing to any char in "word", + * especially note that it includes the last character in a word. + * So we do no --endSel.col and do special eol handling. + */ + if (screen->endSel.col > length + 1) { + screen->endSel.col = 0; + ++screen->endSel.row; } } - #if OPT_WIDE_CHARS - if (endSCol && XTERM_CELL(endSRow, endSCol) == HIDDEN_CHAR) - endSCol++; + if (screen->endSel.col + && XTERM_CELL(screen->endSel.row, + screen->endSel.col) == HIDDEN_CHAR) + screen->endSel.col++; #endif - saveStartWRow = startSRow; - saveStartWCol = startSCol; + screen->saveStartW = screen->startSel; break; - case SELECTLINE: - while (ScrnTstWrapped(screen, endSRow)) { - ++endSRow; - } - if (term->screen.cutToBeginningOfLine - || startSRow < saveStartWRow) { - startSCol = 0; - while (ScrnTstWrapped(screen, startSRow - 1)) { - --startSRow; + + case Select_LINE: + TRACE(("Select_LINE\n")); + while (ScrnTstWrapped(screen, screen->endSel.row)) { + ++screen->endSel.row; + } + if (screen->cutToBeginningOfLine + || screen->startSel.row < screen->saveStartW.row) { + screen->startSel.col = 0; + while (screen->startSel.row > 0 + && ScrnTstWrapped(screen, screen->startSel.row - 1)) { + --screen->startSel.row; } } else if (!extend) { - if ((startRow < saveStartWRow) - || (startRow == saveStartWRow - && startCol < saveStartWCol)) { - startSCol = 0; - while (ScrnTstWrapped(screen, startSRow - 1)) { - --startSRow; + if ((first.row < screen->saveStartW.row) + || (isSameRow(&first, &(screen->saveStartW)) + && first.col < screen->saveStartW.col)) { + screen->startSel.col = 0; + while (screen->startSel.row > 0 + && ScrnTstWrapped(screen, screen->startSel.row - 1)) { + --screen->startSel.row; } } else { - startSRow = saveStartWRow; - startSCol = saveStartWCol; + screen->startSel = screen->saveStartW; } } - if (term->screen.cutNewline) { - endSCol = 0; - ++endSRow; - } else { - endSCol = LastTextCol(endSRow) + 1; + trimLastLine(screen, &(screen->endSel)); + break; + + case Select_GROUP: /* paragraph */ + TRACE(("Select_GROUP\n")); + if (okPosition(screen, &(screen->startSel))) { + /* scan backward for beginning of group */ + while (screen->startSel.row > 0 && + (LastTextCol(screen, screen->startSel.row - 1) > 0 || + ScrnTstWrapped(screen, screen->startSel.row - 1))) { + --screen->startSel.row; + } + screen->startSel.col = 0; + /* scan forward for end of group */ + while (screen->endSel.row < screen->max_row && + (LastTextCol(screen, screen->endSel.row + 1) > 0 || + ScrnTstWrapped(screen, screen->endSel.row))) { + ++screen->endSel.row; + } + trimLastLine(screen, &(screen->endSel)); } break; + + case Select_PAGE: /* everything one can see */ + TRACE(("Select_PAGE\n")); + screen->startSel.row = 0; + screen->startSel.col = 0; + screen->endSel.row = screen->max_row + 1; + screen->endSel.col = 0; + break; + + case Select_ALL: /* counts scrollback if in normal screen */ + TRACE(("Select_ALL\n")); + screen->startSel.row = -screen->savedlines; + screen->startSel.col = 0; + screen->endSel.row = screen->max_row + 1; + screen->endSel.col = 0; + break; + +#if OPT_SELECT_REGEX + case Select_REGEX: + do_select_regex(screen, &(screen->startSel), &(screen->endSel)); + break; +#endif + + case NSELECTUNITS: /* always ignore */ + return; } /* check boundaries */ ScrollSelection(screen, 0, False); - TrackText(startSRow, startSCol, endSRow, endSCol); + TrackText(screen, &(screen->startSel), &(screen->endSel)); return; } -void -TrackText(int frow, - int fcol, - int trow, - int tcol) - /* Guaranteed (frow, fcol) <= (trow, tcol) */ +/* Guaranteed (first.row, first.col) <= (last.row, last.col) */ +static void +TrackText(TScreen * screen, + const CELL * firstp, + const CELL * lastp) { int from, to; - TScreen *screen = &term->screen; - int old_startrow, old_startcol, old_endrow, old_endcol; - - TRACE(("TrackText(frow=%d, fcol=%d, trow=%d, tcol=%d)\n", - frow, fcol, trow, tcol)); - - old_startrow = screen->startHRow; - old_startcol = screen->startHCol; - old_endrow = screen->endHRow; - old_endcol = screen->endHCol; - if (frow == old_startrow && fcol == old_startcol && - trow == old_endrow && tcol == old_endcol) - return; - screen->startHRow = frow; - screen->startHCol = fcol; - screen->endHRow = trow; - screen->endHCol = tcol; - from = Coordinate(frow, fcol); - to = Coordinate(trow, tcol); + CELL old_start, old_end; + CELL first = *firstp; + CELL last = *lastp; + + TRACE(("TrackText(first=%d,%d, last=%d,%d)\n", + first.row, first.col, last.row, last.col)); + + old_start = screen->startH; + old_end = screen->endH; + if (isSameCELL(&first, &old_start) && + isSameCELL(&last, &old_end)) + return; + screen->startH = first; + screen->endH = last; + from = Coordinate(screen, &screen->startH); + to = Coordinate(screen, &screen->endH); if (to <= screen->startHCoord || from > screen->endHCoord) { /* No overlap whatsoever between old and new hilite */ - ReHiliteText(old_startrow, old_startcol, old_endrow, old_endcol); - ReHiliteText(frow, fcol, trow, tcol); + ReHiliteText(screen, &old_start, &old_end); + ReHiliteText(screen, &first, &last); } else { if (from < screen->startHCoord) { /* Extend left end */ - ReHiliteText(frow, fcol, old_startrow, old_startcol); + ReHiliteText(screen, &first, &old_start); } else if (from > screen->startHCoord) { /* Shorten left end */ - ReHiliteText(old_startrow, old_startcol, frow, fcol); + ReHiliteText(screen, &old_start, &first); } if (to > screen->endHCoord) { /* Extend right end */ - ReHiliteText(old_endrow, old_endcol, trow, tcol); + ReHiliteText(screen, &old_end, &last); } else if (to < screen->endHCoord) { /* Shorten right end */ - ReHiliteText(trow, tcol, old_endrow, old_endcol); + ReHiliteText(screen, &last, &old_end); } } screen->startHCoord = from; screen->endHCoord = to; } +/* Guaranteed that (first->row, first->col) <= (last->row, last->col) */ static void -ReHiliteText(int frow, - int fcol, - int trow, - int tcol) - /* Guaranteed that (frow, fcol) <= (trow, tcol) */ +ReHiliteText(TScreen * screen, + CELL * firstp, + CELL * lastp) { - TScreen *screen = &term->screen; int i; + CELL first = *firstp; + CELL last = *lastp; - TRACE(("ReHiliteText from %d.%d to %d.%d\n", frow, fcol, trow, tcol)); + TRACE(("ReHiliteText from %d.%d to %d.%d\n", + first.row, first.col, last.row, last.col)); - if (frow < 0) - frow = fcol = 0; - else if (frow > screen->max_row) - return; /* nothing to do, since trow >= frow */ - - if (trow < 0) - return; /* nothing to do, since frow <= trow */ - else if (trow > screen->max_row) { - trow = screen->max_row; - tcol = screen->max_col + 1; + if (first.row < 0) + first.row = first.col = 0; + else if (first.row > screen->max_row) + return; /* nothing to do, since last.row >= first.row */ + + if (last.row < 0) + return; /* nothing to do, since first.row <= last.row */ + else if (last.row > screen->max_row) { + last.row = screen->max_row; + last.col = MaxCols(screen); } - if (frow == trow && fcol == tcol) + if (isSameCELL(&first, &last)) return; - if (frow != trow) { /* do multiple rows */ - if ((i = screen->max_col - fcol + 1) > 0) { /* first row */ - ScrnRefresh(screen, frow, fcol, 1, i, True); + if (!isSameRow(&first, &last)) { /* do multiple rows */ + if ((i = screen->max_col - first.col + 1) > 0) { /* first row */ + ScrnRefresh(screen, first.row, first.col, 1, i, True); } - if ((i = trow - frow - 1) > 0) { /* middle rows */ - ScrnRefresh(screen, frow + 1, 0, i, screen->max_col + 1, True); + if ((i = last.row - first.row - 1) > 0) { /* middle rows */ + ScrnRefresh(screen, first.row + 1, 0, i, MaxCols(screen), True); } - if (tcol > 0 && trow <= screen->max_row) { /* last row */ - ScrnRefresh(screen, trow, 0, 1, tcol, True); + if (last.col > 0 && last.row <= screen->max_row) { /* last row */ + ScrnRefresh(screen, last.row, 0, 1, last.col, True); } } else { /* do single row */ - ScrnRefresh(screen, frow, fcol, 1, tcol - fcol, True); + ScrnRefresh(screen, first.row, first.col, 1, last.col - first.col, True); } } +/* + * Guaranteed that (cellc->row, cellc->col) <= (cell->row, cell->col), and that both points are valid + * (may have cell->row = screen->max_row+1, cell->col = 0). + */ static void -SaltTextAway(int crow, int ccol, int row, int col, +SaltTextAway(XtermWidget xw, + CELL * cellc, + CELL * cell, String * params, /* selections */ Cardinal num_params) - /* Guaranteed that (crow, ccol) <= (row, col), and that both points are valid - (may have row = screen->max_row+1, col = 0) */ { - TScreen *screen = &term->screen; + TScreen *screen = &(xw->screen); int i, j = 0; int eol; Char *line; Char *lp; + CELL first = *cellc; + CELL last = *cell; - if (crow == row && ccol > col) { - int tmp = ccol; - ccol = col; - col = tmp; + if (isSameRow(&first, &last) && first.col > last.col) { + int tmp = first.col; + first.col = last.col; + last.col = tmp; } - --col; + --last.col; /* first we need to know how long the string is before we can save it */ - if (row == crow) { - j = Length(screen, crow, ccol, col); + if (isSameRow(&last, &first)) { + j = Length(screen, first.row, first.col, last.col); } else { /* two cases, cut is on same line, cut spans multiple lines */ - j += Length(screen, crow, ccol, screen->max_col) + 1; - for (i = crow + 1; i < row; i++) + j += Length(screen, first.row, first.col, screen->max_col) + 1; + for (i = first.row + 1; i < last.row; i++) j += Length(screen, i, 0, screen->max_col) + 1; - if (col >= 0) - j += Length(screen, row, 0, col); + if (last.col >= 0) + j += Length(screen, last.row, 0, last.col); } /* UTF-8 may require more space */ @@ -2431,55 +2914,151 @@ line[j] = '\0'; /* make sure it is null terminated */ lp = line; /* lp points to where to save the text */ - if (row == crow) { - lp = SaveText(screen, row, ccol, col, lp, &eol); + if (isSameRow(&last, &first)) { + lp = SaveText(screen, last.row, first.col, last.col, lp, &eol); } else { - lp = SaveText(screen, crow, ccol, screen->max_col, lp, &eol); + lp = SaveText(screen, first.row, first.col, screen->max_col, lp, &eol); if (eol) *lp++ = '\n'; /* put in newline at end of line */ - for (i = crow + 1; i < row; i++) { + for (i = first.row + 1; i < last.row; i++) { lp = SaveText(screen, i, 0, screen->max_col, lp, &eol); if (eol) *lp++ = '\n'; } - if (col >= 0) - lp = SaveText(screen, row, 0, col, lp, &eol); + if (last.col >= 0) + lp = SaveText(screen, last.row, 0, last.col, lp, &eol); } *lp = '\0'; /* make sure we have end marked */ TRACE(("Salted TEXT:%d:%.*s\n", lp - line, lp - line, line)); screen->selection_length = (lp - line); - _OwnSelection(term, params, num_params); + _OwnSelection(xw, params, num_params); +} + +#if OPT_PASTE64 +void +ClearSelectionBuffer(TScreen * screen) +{ + screen->selection_length = 0; + screen->base64_count = 0; } +static void +AppendStrToSelectionBuffer(TScreen * screen, Char * text, int len) +{ + if (len != 0) { + int j = screen->selection_length + len; /* New length */ + int k = j + (j >> 2) + 80; /* New size if we grow buffer: grow by ~50% */ + if (j + 1 >= screen->selection_size) { + if (!screen->selection_length) { + /* New buffer */ + Char *line; + if ((line = (Char *) malloc((unsigned) k)) == 0) + SysError(ERROR_BMALLOC2); + XtFree((char *) screen->selection_data); + screen->selection_data = line; + } else { + /* Realloc buffer */ + screen->selection_data = (Char *) + realloc(screen->selection_data, + (unsigned) k); + if (screen->selection_data == 0) + SysError(ERROR_BMALLOC2); + } + screen->selection_size = k; + } + memcpy(screen->selection_data + screen->selection_length, text, len); + screen->selection_length += len; + screen->selection_data[screen->selection_length] = 0; + } +} + +void +AppendToSelectionBuffer(TScreen * screen, unsigned c) +{ + int six; + Char ch; + + /* Decode base64 character */ + if (c >= 'A' && c <= 'Z') + six = c - 'A'; + else if (c >= 'a' && c <= 'z') + six = c - 'a' + 26; + else if (c >= '0' && c <= '9') + six = c - '0' + 52; + else if (c == '+') + six = 62; + else if (c == '/') + six = 63; + else + return; + + /* Accumulate bytes */ + switch (screen->base64_count) { + case 0: + screen->base64_accu = six; + screen->base64_count = 6; + break; + + case 2: + ch = (screen->base64_accu << 6) + six; + screen->base64_count = 0; + AppendStrToSelectionBuffer(screen, &ch, 1); + break; + + case 4: + ch = (screen->base64_accu << 4) + (six >> 2); + screen->base64_accu = (six & 0x3); + screen->base64_count = 2; + AppendStrToSelectionBuffer(screen, &ch, 1); + break; + + case 6: + ch = (screen->base64_accu << 2) + (six >> 4); + screen->base64_accu = (six & 0xF); + screen->base64_count = 4; + AppendStrToSelectionBuffer(screen, &ch, 1); + break; + } +} + +void +CompleteSelection(XtermWidget xw, char **args, Cardinal len) +{ + xw->screen.base64_count = 0; + xw->screen.base64_accu = 0; + _OwnSelection(xw, args, len); +} +#endif /* OPT_PASTE64 */ + static Bool _ConvertSelectionHelper(Widget w, - Atom * type, XtPointer *value, - unsigned long *length, int *format, + Atom * type, + XtPointer *value, + unsigned long *length, + int *format, int (*conversion_function) (Display *, char **, int, XICCEncodingStyle, XTextProperty *), XICCEncodingStyle conversion_style) { - Display *d = XtDisplay(w); - TScreen *screen; - XTextProperty textprop; - - if (!IsXtermWidget(w)) - return False; - - screen = &((XtermWidget) w)->screen; - - if (conversion_function(d, (char **) &screen->selection_data, 1, - conversion_style, - &textprop) < Success) - return False; - *value = (XtPointer) textprop.value; - *length = textprop.nitems; - *type = textprop.encoding; - *format = textprop.format; - return True; + if (IsXtermWidget(w)) { + Display *d = XtDisplay(w); + TScreen *screen = &((XtermWidget) w)->screen; + XTextProperty textprop; + + if (conversion_function(d, (char **) &screen->selection_data, 1, + conversion_style, + &textprop) >= Success) { + *value = (XtPointer) textprop.value; + *length = textprop.nitems; + *type = textprop.encoding; + *format = textprop.format; + return True; + } + } + return False; } static Boolean @@ -2508,6 +3087,8 @@ Atom *std_targets; XPointer std_return = 0; unsigned long std_length; + + TRACE(("ConvertSelection XA_TARGETS(d)\n")); if (XmuConvertStandardSelection(w, screen->selection_time, selection, target, type, &std_return, &std_length, format)) { @@ -2538,24 +3119,28 @@ } #if OPT_WIDE_CHARS else if (screen->wide_chars && *target == XA_STRING) { + TRACE(("ConvertSelection XA_STRING - wide\n")); result = _ConvertSelectionHelper(w, type, value, length, format, Xutf8TextListToTextProperty, XStringStyle); } else if (screen->wide_chars && *target == XA_UTF8_STRING(d)) { + TRACE(("ConvertSelection XA_UTF8_STRING(d) - wide\n")); result = _ConvertSelectionHelper(w, type, value, length, format, Xutf8TextListToTextProperty, XUTF8StringStyle); } else if (screen->wide_chars && *target == XA_TEXT(d)) { + TRACE(("ConvertSelection XA_TEXT(d) - wide\n")); result = _ConvertSelectionHelper(w, type, value, length, format, Xutf8TextListToTextProperty, XStdICCTextStyle); } else if (screen->wide_chars && *target == XA_COMPOUND_TEXT(d)) { + TRACE(("ConvertSelection XA_COMPOUND_TEXT(d) - wide\n")); result = _ConvertSelectionHelper(w, type, value, length, format, @@ -2571,18 +3156,21 @@ properly internationalised, and dump raw eight-bit data with no conversion into the selection. Yes, this breaks the ICCCM in non-Latin-1 locales. */ + TRACE(("ConvertSelection XA_STRING\n")); *type = XA_STRING; *value = (XtPointer) screen->selection_data; *length = screen->selection_length; *format = 8; result = True; } else if (*target == XA_TEXT(d)) { /* not wide_chars */ + TRACE(("ConvertSelection XA_TEXT(d)\n")); result = _ConvertSelectionHelper(w, type, value, length, format, XmbTextListToTextProperty, XStdICCTextStyle); } else if (*target == XA_COMPOUND_TEXT(d)) { /* not wide_chars */ + TRACE(("ConvertSelection XA_COMPOUND_TEXT(d)\n")); result = _ConvertSelectionHelper(w, type, value, length, format, @@ -2591,6 +3179,7 @@ } #ifdef X_HAVE_UTF8_STRING else if (*target == XA_UTF8_STRING(d)) { /* not wide_chars */ + TRACE(("ConvertSelection XA_UTF8_STRING(d)\n")); result = _ConvertSelectionHelper(w, type, value, length, format, @@ -2599,6 +3188,7 @@ } #endif else if (*target == XA_LIST_LENGTH(d)) { + TRACE(("ConvertSelection XA_LIST_LENGTH(d)\n")); *value = XtMalloc(4); if (sizeof(long) == 4) *(long *) *value = 1; @@ -2611,6 +3201,7 @@ *format = 32; result = True; } else if (*target == XA_LENGTH(d)) { + TRACE(("ConvertSelection XA_LENGTH(d)\n")); /* This value is wrong if we have UTF-8 text */ *value = XtMalloc(4); if (sizeof(long) == 4) { @@ -2627,6 +3218,7 @@ screen->selection_time, selection, target, type, (XPointer *) value, length, format)) { + TRACE(("ConvertSelection XmuConvertStandardSelection\n")); result = True; } @@ -2668,7 +3260,7 @@ } if (screen->selection_count == 0) - TrackText(0, 0, 0, 0); + TrackText(screen, &zeroCELL, &zeroCELL); } /* ARGSUSED */ @@ -2681,89 +3273,93 @@ } static void -_OwnSelection(XtermWidget termw, +_OwnSelection(XtermWidget xw, String * selections, Cardinal count) { - Atom *atoms = termw->screen.selection_atoms; + TScreen *screen = &(xw->screen); + Atom *atoms = screen->selection_atoms; Cardinal i; Bool have_selection = False; - if (termw->screen.selection_length < 0) + if (screen->selection_length < 0) return; - if (count > termw->screen.sel_atoms_size) { + TRACE(("_OwnSelection\n")); + selections = MapSelections(xw, selections, count); + + if (count > screen->sel_atoms_size) { XtFree((char *) atoms); atoms = (Atom *) XtMalloc(count * sizeof(Atom)); - termw->screen.selection_atoms = atoms; - termw->screen.sel_atoms_size = count; + screen->selection_atoms = atoms; + screen->sel_atoms_size = count; } - XmuInternStrings(XtDisplay((Widget) termw), selections, count, atoms); + XmuInternStrings(XtDisplay((Widget) xw), selections, count, atoms); for (i = 0; i < count; i++) { int cutbuffer = CutBuffer(atoms[i]); if (cutbuffer >= 0) { - if (termw->screen.selection_length > - 4 * XMaxRequestSize(XtDisplay((Widget) termw)) - 32) { + if (screen->selection_length > + 4 * XMaxRequestSize(XtDisplay((Widget) xw)) - 32) { fprintf(stderr, "%s: selection too big (%d bytes), not storing in CUT_BUFFER%d\n", - xterm_name, termw->screen.selection_length, cutbuffer); + xterm_name, screen->selection_length, cutbuffer); } else { /* This used to just use the UTF-8 data, which was totally * broken as not even the corresponding paste code in Xterm * understood this! So now it converts to Latin1 first. * Robert Brady, 2000-09-05 */ - unsigned long length = termw->screen.selection_length; - Char *data = termw->screen.selection_data; - if_OPT_WIDE_CHARS((&(termw->screen)), { + unsigned long length = screen->selection_length; + Char *data = screen->selection_data; + if_OPT_WIDE_CHARS((screen), { data = UTF8toLatin1(data, length, &length); }); TRACE(("XStoreBuffer(%d)\n", cutbuffer)); - XStoreBuffer(XtDisplay((Widget) termw), + XStoreBuffer(XtDisplay((Widget) xw), (char *) data, (int) length, cutbuffer); } - } else if (!replyToEmacs) { + } else if (!screen->replyToEmacs) { have_selection |= - XtOwnSelection((Widget) termw, atoms[i], - termw->screen.selection_time, + XtOwnSelection((Widget) xw, atoms[i], + screen->selection_time, ConvertSelection, LoseSelection, SelectionDone); } } - if (!replyToEmacs) - termw->screen.selection_count = count; + if (!screen->replyToEmacs) + screen->selection_count = count; if (!have_selection) - TrackText(0, 0, 0, 0); + TrackText(screen, &zeroCELL, &zeroCELL); } static void ResetSelectionState(TScreen * screen) { screen->selection_count = 0; - screen->startHRow = screen->startHCol = 0; - screen->endHRow = screen->endHCol = 0; + screen->startH = zeroCELL; + screen->endH = zeroCELL; } void -DisownSelection(XtermWidget termw) +DisownSelection(XtermWidget xw) { - TScreen *screen = &(termw->screen); + TScreen *screen = &(xw->screen); Atom *atoms = screen->selection_atoms; Cardinal count = screen->selection_count; Cardinal i; TRACE(("DisownSelection count %d, start %d.%d, end %d.%d\n", count, - screen->startHRow, - screen->startHCol, - screen->endHRow, - screen->endHCol)); + screen->startH.row, + screen->startH.col, + screen->endH.row, + screen->endH.col)); for (i = 0; i < count; i++) { int cutbuffer = CutBuffer(atoms[i]); if (cutbuffer < 0) { - XtDisownSelection((Widget) termw, atoms[i], + XtDisownSelection((Widget) xw, atoms[i], screen->selection_time); } } @@ -2773,13 +3369,11 @@ */ if (ScrnHaveSelection(screen)) { /* save data which will be reset */ - int start_row = screen->startHRow; - int start_col = screen->startHCol; - int end_row = screen->endHRow; - int end_col = screen->endHCol; + CELL first = screen->startH; + CELL last = screen->endH; ResetSelectionState(screen); - ReHiliteText(start_row, start_col, end_row, end_col); + ReHiliteText(screen, &first, &last); } else { ResetSelectionState(screen); } @@ -2793,7 +3387,7 @@ int scol, int ecol) { - int lastcol = LastTextCol(row); + int lastcol = LastTextCol(screen, row); if (ecol > lastcol) ecol = lastcol; @@ -2820,7 +3414,7 @@ i = Length(screen, row, scol, ecol); ecol = scol + i; #if OPT_DEC_CHRSET - if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, row + screen->topline)[0])) { + if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, ROW2INX(screen, row))[0])) { scol = (scol + 0) / 2; ecol = (ecol + 1) / 2; } @@ -2829,7 +3423,7 @@ for (i = scol; i < ecol; i++) { c = E2A(XTERM_CELL(row, i)); #if OPT_WIDE_CHARS - if (screen->utf8_mode) { + if (screen->utf8_mode != uFalse) { c_1 = E2A(XTERM_CELL_C1(row, i)); c_2 = E2A(XTERM_CELL_C2(row, i)); } @@ -2849,7 +3443,7 @@ continue; } previous = c; - if (screen->utf8_mode) { + if (screen->utf8_mode != uFalse) { lp = convertToUTF8(lp, (c != 0) ? c : ' '); if (c_1) { lp = convertToUTF8(lp, c_1); @@ -2885,6 +3479,18 @@ return (result); } +/* 32 + following 7-bit word: + + 1:0 Button no: 0, 1, 2. 3=release. + 2 shift + 3 meta + 4 ctrl + 5 set for motion notify + 6 set for wheel +*/ + +/* Position: 32 - 255. */ + static int BtnCode(XButtonEvent * event, int button) { @@ -2905,9 +3511,8 @@ #define MOUSE_LIMIT (255 - 32) static void -EditorButton(XButtonEvent * event) +EditorButton(TScreen * screen, XButtonEvent * event) { - TScreen *screen = &term->screen; int pty = screen->respond; Char line[6]; int row, col; @@ -3023,21 +3628,3 @@ } } #endif /* OPT_TEK4014 */ - -/* ARGSUSED */ -void -HandleSecure(Widget w GCC_UNUSED, - XEvent * event, /* unused */ - String * params GCC_UNUSED, /* [0] = volume */ - Cardinal *param_count GCC_UNUSED) /* 0 or 1 */ -{ - Time ev_time = CurrentTime; - - if ((event->xany.type == KeyPress) || - (event->xany.type == KeyRelease)) - ev_time = event->xkey.time; - else if ((event->xany.type == ButtonPress) || - (event->xany.type == ButtonRelease)) - ev_time = event->xbutton.time; - DoSecureKeyboard(ev_time); -} Index: xc/programs/xterm/charclass.c diff -u xc/programs/xterm/charclass.c:1.5 xc/programs/xterm/charclass.c:1.7 --- xc/programs/xterm/charclass.c:1.5 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/charclass.c Sun Feb 12 20:14:58 2006 @@ -1,4 +1,4 @@ -/* $XTermId: charclass.c,v 1.9 2005/01/11 00:06:05 tom Exp $ */ +/* $XTermId: charclass.c,v 1.13 2006/02/11 12:01:35 tom Exp $ */ /* * Compact and efficient reimplementation of the @@ -22,7 +22,7 @@ * but merging in new intervals is significantly more hassle and * not worth the effort here. */ -/* $XFree86: xc/programs/xterm/charclass.c,v 1.5 2005/01/14 01:50:02 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/charclass.c,v 1.7 2006/02/13 01:14:58 dickey Exp $ */ #include #include @@ -139,4 +139,15 @@ return cclass; } +#ifdef NO_LEAKS +void +noleaks_CharacterClass(void) +{ + if (classtab != 0) { + free(classtab); + classtab = 0; + } +} +#endif + #endif /* OPT_WIDE_CHARS */ Index: xc/programs/xterm/charclass.h diff -u xc/programs/xterm/charclass.h:1.1 xc/programs/xterm/charclass.h:1.3 --- xc/programs/xterm/charclass.h:1.1 Sat Aug 26 00:33:53 2000 +++ xc/programs/xterm/charclass.h Sun Feb 12 20:14:58 2006 @@ -1,4 +1,6 @@ -/* $XFree86: xc/programs/xterm/charclass.h,v 1.1 2000/08/26 04:33:53 dawes Exp $ */ +/* $XTermId: charclass.h,v 1.5 2006/02/11 12:01:35 tom Exp $ */ + +/* $XFree86: xc/programs/xterm/charclass.h,v 1.3 2006/02/13 01:14:58 dickey Exp $ */ #ifndef CHARCLASS_H #define CHARCLASS_H @@ -10,4 +12,8 @@ extern int SetCharacterClassRange(int low, int high, int value); extern int CharacterClass(int c); +#ifdef NO_LEAKS +extern void noleaks_CharacterClass(void); +#endif + #endif Index: xc/programs/xterm/charproc.c diff -u xc/programs/xterm/charproc.c:3.168 xc/programs/xterm/charproc.c:3.183 --- xc/programs/xterm/charproc.c:3.168 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/charproc.c Sun Apr 30 17:55:39 2006 @@ -1,14 +1,10 @@ -/* $XTermId: charproc.c,v 1.550 2005/02/05 00:25:54 tom Exp $ */ +/* $XTermId: charproc.c,v 1.674 2006/04/30 17:27:28 tom Exp $ */ -/* - * $Xorg: charproc.c,v 1.6 2001/02/09 02:06:02 xorgcvs Exp $ - */ - -/* $XFree86: xc/programs/xterm/charproc.c,v 3.168 2005/02/06 21:42:38 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/charproc.c,v 3.183 2006/04/30 21:55:39 dickey Exp $ */ /* -Copyright 1999-2004,2005 by Thomas E. Dickey +Copyright 1999-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -123,6 +119,10 @@ #include #include +#if defined(HAVE_SCHED_YIELD) +#include +#endif + #include #include #include @@ -218,14 +218,9 @@ "\ Shift Prior:scroll-back(1,halfpage) \n\ Shift Next:scroll-forw(1,halfpage) \n\ - Shift Select:select-cursor-start() select-cursor-end(PRIMARY, CUT_BUFFER0) \n\ - Shift Insert:insert-selection(PRIMARY, CUT_BUFFER0) \n\ + Shift Select:select-cursor-start() select-cursor-end(SELECT, CUT_BUFFER0) \n\ + Shift Insert:insert-selection(SELECT, CUT_BUFFER0) \n\ " -#if OPT_DABBREV -"\ - Meta /:dabbrev-expand() \n\ -" -#endif #if OPT_SHIFT_FONTS "\ Shift~Ctrl KP_Add:larger-vt-font() \n\ @@ -248,7 +243,7 @@ ! @Num_Lock Ctrl :popup-menu(vtMenu) \n\ ~Ctrl ~Meta :ignore() \n\ Meta :clear-saved-lines() \n\ - ~Ctrl ~Meta :insert-selection(PRIMARY, CUT_BUFFER0) \n\ + ~Ctrl ~Meta :insert-selection(SELECT, CUT_BUFFER0) \n\ !Ctrl :popup-menu(fontMenu) \n\ !Lock Ctrl :popup-menu(fontMenu) \n\ !Lock Ctrl @Num_Lock :popup-menu(fontMenu) \n\ @@ -265,7 +260,7 @@ Lock @Num_Lock Ctrl :scroll-forw(1,halfpage,m) \n\ @Num_Lock Ctrl :scroll-forw(1,halfpage,m) \n\ :scroll-forw(5,line,m) \n\ - :select-end(PRIMARY, CUT_BUFFER0) \n\ + :select-end(SELECT, CUT_BUFFER0) \n\ :ignore() \ "; /* PROCURA added "Meta :clear-saved-lines()" */ /* *INDENT-OFF* */ @@ -293,6 +288,7 @@ { "scroll-forw", HandleScrollForward }, { "secure", HandleSecure }, { "select-cursor-end", HandleKeyboardSelectEnd }, + { "select-cursor-extend", HandleKeyboardSelectExtend }, { "select-cursor-start", HandleKeyboardSelectStart }, { "select-end", HandleSelectEnd }, { "select-extend", HandleSelectExtend }, @@ -316,6 +312,7 @@ { "set-scroll-on-key", HandleScrollKey }, { "set-scroll-on-tty-output", HandleScrollTtyOutput }, { "set-scrollbar", HandleScrollbar }, + { "set-select", HandleSetSelect }, { "set-sun-function-keys", HandleSunFunctionKeys }, { "set-sun-keyboard", HandleSunKeyboard }, { "set-titeInhibit", HandleTiteInhibit }, @@ -359,6 +356,7 @@ { "restore", HandleRestoreSize }, #endif #if OPT_NUM_LOCK + { "alt-sends-escape", HandleAltEsc }, { "meta-sends-escape", HandleMetaEsc }, { "set-num-lock", HandleNumLock }, #endif @@ -388,20 +386,15 @@ #endif #if OPT_WIDE_CHARS { "set-utf8-mode", HandleUTF8Mode }, + { "set-utf8-title", HandleUTF8Title }, #endif }; /* *INDENT-ON* */ -#ifdef VMS -#define OS_DEPENDENT_PRINT_COMMAND "print/delete/noflag" -#else /* VMS */ -#define OS_DEPENDENT_PRINT_COMMAND "lpr" -#endif /* VMS */ - static XtResource resources[] = { - Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvents, False), - Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOps, True), + Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False), + Bres(XtNallowWindowOps, XtCAllowWindowOps, screen.allowWindowOp0, True), Bres(XtNalwaysHighlight, XtCAlwaysHighlight, screen.always_highlight, False), Bres(XtNappcursorDefault, XtCAppcursorDefault, misc.appcursorDefault, False), Bres(XtNappkeypadDefault, XtCAppkeypadDefault, misc.appkeypadDefault, False), @@ -441,6 +434,8 @@ Bres(XtNscrollBar, XtCScrollBar, misc.scrollbar, False), Bres(XtNscrollKey, XtCScrollCond, screen.scrollkey, False), Bres(XtNscrollTtyOutput, XtCScrollCond, screen.scrollttyoutput, True), + Bres(XtNselectToClipboard, XtCSelectToClipboard, + screen.selectToClipboard, False), Bres(XtNsignalInhibit, XtCSignalInhibit, misc.signalInhibit, False), Bres(XtNtiteInhibit, XtCTiteInhibit, misc.titeInhibit, False), Bres(XtNtiXtraScroll, XtCTiXtraScroll, misc.tiXtraScroll, False), @@ -457,14 +452,15 @@ screen.printer_controlmode, 0), Ires(XtNvisualBellDelay, XtCVisualBellDelay, screen.visualBellDelay, 100), Ires(XtNsaveLines, XtCSaveLines, screen.savelines, SAVELINES), + Ires(XtNscrollBarBorder, XtCScrollBarBorder, screen.scrollBarBorder, 1), Ires(XtNscrollLines, XtCScrollLines, screen.scrolllines, SCROLLLINES), - Sres(XtNfont1, XtCFont1, screen.menu_font_names[fontMenu_font1], NULL), - Sres(XtNfont2, XtCFont2, screen.menu_font_names[fontMenu_font2], NULL), - Sres(XtNfont3, XtCFont3, screen.menu_font_names[fontMenu_font3], NULL), - Sres(XtNfont4, XtCFont4, screen.menu_font_names[fontMenu_font4], NULL), - Sres(XtNfont5, XtCFont5, screen.menu_font_names[fontMenu_font5], NULL), - Sres(XtNfont6, XtCFont6, screen.menu_font_names[fontMenu_font6], NULL), + Sres(XtNfont1, XtCFont1, screen.MenuFontName(fontMenu_font1), NULL), + Sres(XtNfont2, XtCFont2, screen.MenuFontName(fontMenu_font2), NULL), + Sres(XtNfont3, XtCFont3, screen.MenuFontName(fontMenu_font3), NULL), + Sres(XtNfont4, XtCFont4, screen.MenuFontName(fontMenu_font4), NULL), + Sres(XtNfont5, XtCFont5, screen.MenuFontName(fontMenu_font5), NULL), + Sres(XtNfont6, XtCFont6, screen.MenuFontName(fontMenu_font6), NULL), Sres(XtNanswerbackString, XtCAnswerbackString, screen.answer_back, ""), Sres(XtNboldFont, XtCBoldFont, misc.default_font.f_b, DEFBOLDFONT), Sres(XtNcharClass, XtCCharClass, screen.charClass, NULL), @@ -472,7 +468,7 @@ Sres(XtNfont, XtCFont, misc.default_font.f_n, DEFFONT), Sres(XtNgeometry, XtCGeometry, misc.geo_metry, NULL), Sres(XtNkeyboardDialect, XtCKeyboardDialect, screen.keyboard_dialect, DFT_KBD_DIALECT), - Sres(XtNprinterCommand, XtCPrinterCommand, screen.printer_command, OS_DEPENDENT_PRINT_COMMAND), + Sres(XtNprinterCommand, XtCPrinterCommand, screen.printer_command, ""), Sres(XtNtekGeometry, XtCGeometry, misc.T_geometry, NULL), Tres(XtNcursorColor, XtCCursorColor, TEXT_CURSOR, XtDefaultForeground), @@ -558,6 +554,7 @@ Bres(XtNcolorBLMode, XtCColorAttrMode, screen.colorBLMode, False), Bres(XtNcolorRVMode, XtCColorAttrMode, screen.colorRVMode, False), Bres(XtNcolorULMode, XtCColorAttrMode, screen.colorULMode, False), + Bres(XtNitalicULMode, XtCColorAttrMode, screen.italicULMode, False), COLOR_RES("0", screen.Acolors[COLOR_0], DFT_COLOR("black")), COLOR_RES("1", screen.Acolors[COLOR_1], DFT_COLOR("red3")), @@ -580,6 +577,11 @@ COLOR_RES("UL", screen.Acolors[COLOR_UL], DFT_COLOR(XtDefaultForeground)), COLOR_RES("RV", screen.Acolors[COLOR_RV], DFT_COLOR(XtDefaultForeground)), + CLICK_RES("2", screen.onClick[1], "word"), + CLICK_RES("3", screen.onClick[2], "line"), + CLICK_RES("4", screen.onClick[3], 0), + CLICK_RES("5", screen.onClick[4], 0), + #if !OPT_COLOR_RES2 #if OPT_256_COLORS # include <256colres.h> @@ -621,12 +623,14 @@ #if OPT_TOOLBAR Wres(XtNmenuBar, XtCMenuBar, VT100_TB_INFO(menu_bar), 0), Ires(XtNmenuHeight, XtCMenuHeight, VT100_TB_INFO(menu_height), 25), - Bres(XtNtoolBar, XtCToolBar, screen.toolbars, True), #endif #if OPT_WIDE_CHARS - Ires(XtNutf8, XtCUtf8, screen.utf8_mode, 3), + Ires(XtNutf8, XtCUtf8, screen.utf8_mode, uDefault), + Bres(XtNutf8Latin1, XtCUtf8Latin1, screen.utf8_latin1, False), + Bres(XtNutf8Title, XtCUtf8Title, screen.utf8_title, False), Bres(XtNwideChars, XtCWideChars, screen.wide_chars, False), + Bres(XtNmkWidth, XtCMkWidth, misc.mk_width, False), Bres(XtNcjkWidth, XtCCjkWidth, misc.cjk_width, False), Bres(XtNvt100Graphics, XtCVT100Graphics, screen.vt100_graphics, True), Sres(XtNwideBoldFont, XtCWideBoldFont, misc.default_font.f_wb, DEFWIDEBOLDFONT), @@ -755,6 +759,7 @@ { "scroll-back", HandleScrollBack }, { "scroll-forw", HandleScrollForward }, { "select-cursor-end", HandleKeyboardSelectEnd }, + { "select-cursor-extend", HandleKeyboardSelectExtend }, { "select-cursor-start", HandleKeyboardSelectStart }, { "insert-selection", HandleInsertSelection }, { "select-start", HandleSelectStart }, @@ -801,12 +806,12 @@ fg = getXtermForeground(term->flags, color); term->cur_foreground = color; - XSetForeground(screen->display, NormalGC(screen), fg); - XSetBackground(screen->display, ReverseGC(screen), fg); - if (NormalGC(screen) != NormalBoldGC(screen)) { XSetForeground(screen->display, NormalBoldGC(screen), fg); XSetBackground(screen->display, ReverseBoldGC(screen), fg); + } else { + XSetForeground(screen->display, NormalGC(screen), fg); + XSetBackground(screen->display, ReverseGC(screen), fg); } } @@ -833,12 +838,12 @@ bg = getXtermBackground(term->flags, color); term->cur_background = color; - XSetBackground(screen->display, NormalGC(screen), bg); - XSetForeground(screen->display, ReverseGC(screen), bg); - if (NormalGC(screen) != NormalBoldGC(screen)) { XSetBackground(screen->display, NormalBoldGC(screen), bg); XSetForeground(screen->display, ReverseBoldGC(screen), bg); + } else { + XSetBackground(screen->display, NormalGC(screen), bg); + XSetForeground(screen->display, ReverseGC(screen), bg); } } @@ -898,7 +903,7 @@ reset_SGR_Foreground(void) { term->sgr_foreground = -1; - term->sgr_extended = 0; + term->sgr_extended = False; setExtendedFG(); } @@ -982,6 +987,10 @@ screen->top_marg = top; screen->bot_marg = bottom; } + if (screen->top_marg > screen->max_row) + screen->top_marg = screen->max_row; + if (screen->bot_marg > screen->max_row) + screen->bot_marg = screen->max_row; } void @@ -1121,15 +1130,21 @@ do { #if OPT_WIDE_CHARS - if (screen->wide_chars + + /* + * Handle zero-width combining characters. Make it faster by noting + * that according to the Unicode charts, the majority of Western + * character sets do not use this feature. There are some unassigned + * codes at 0x242, but no zero-width characters until past 0x300. + */ + if (c >= 0x300 && screen->wide_chars && my_wcwidth((int) c) == 0) { int prev, precomposed; WriteNow(); - prev = getXtermCell(screen, - screen->last_written_row, - screen->last_written_col); + prev = XTERM_CELL(screen->last_written_row, + screen->last_written_col); precomposed = do_precomposition(prev, (int) c); if (precomposed != -1) { @@ -1324,7 +1339,7 @@ #if OPT_WIDE_CHARS sp->last_was_wide = iswide((int) c); #endif - if (morePtyData(screen, &VTbuffer)) { + if (morePtyData(screen, VTbuffer)) { continue; } } @@ -1448,7 +1463,7 @@ if ((count = param[0]) == DEFAULT) count = 1; while ((count-- > 0) - && (TabToPrevStop())) ; + && (TabToPrevStop(screen))) ; sp->parsestate = sp->groundtable; break; @@ -1457,13 +1472,13 @@ if ((count = param[0]) == DEFAULT) count = 1; while ((count-- > 0) - && (TabToNextStop())) ; + && (TabToNextStop(screen))) ; sp->parsestate = sp->groundtable; break; case CASE_TAB: /* tab */ - TabToNextStop(); + TabToNextStop(screen); break; case CASE_SI: @@ -1686,14 +1701,23 @@ break; case CASE_TRACK_MOUSE: - if (screen->send_mouse_pos == VT200_HIGHLIGHT_MOUSE - || nparam > 1) { + /* + * A single parameter other than zero is always scroll-down. + * A zero-parameter is used to reset the mouse mode, and is + * not useful for scrolling anyway. + */ + if (nparam > 1 || param[0] == 0) { + CELL start; + TRACE(("CASE_TRACK_MOUSE\n")); /* Track mouse as long as in window and between * specified rows */ - TrackMouse(param[0], - param[2] - 1, param[1] - 1, + start.row = param[2] - 1; + start.col = param[1] - 1; + TrackMouse(screen, + param[0], + &start, param[3] - 1, param[4] - 2); } else { TRACE(("CASE_SD - scroll down\n")); @@ -1719,7 +1743,7 @@ /* FALLTHRU */ case CASE_DA1: TRACE(("CASE_DA1\n")); - if (param[0] <= 1) { /* less than means DEFAULT */ + if (param[0] <= 0) { /* less than means DEFAULT */ count = 0; reply.a_type = CSI; reply.a_pintro = '?'; @@ -1906,7 +1930,7 @@ case 37: if_OPT_ISO_COLORS(screen, { term->sgr_foreground = (param[row] - 30); - term->sgr_extended = 0; + term->sgr_extended = False; setExtendedFG(); }); break; @@ -1924,7 +1948,7 @@ if (row < nparam && param[row] < NUM_ANSI_COLORS) { term->sgr_foreground = param[row]; - term->sgr_extended = 1; + term->sgr_extended = True; setExtendedFG(); } break; @@ -1988,7 +2012,7 @@ case 97: if_OPT_AIX_COLORS(screen, { term->sgr_foreground = (param[row] - 90 + 8); - term->sgr_extended = 0; + term->sgr_extended = False; setExtendedFG(); }); break; @@ -2107,9 +2131,9 @@ if ((top = param[0]) < 1) top = 1; if (nparam < 2 || (bot = param[1]) == DEFAULT - || bot > screen->max_row + 1 + || bot > MaxRows(screen) || bot == 0) - bot = screen->max_row + 1; + bot = MaxRows(screen); if (bot > top) { if (screen->scroll_amt) FlushScroll(screen); @@ -2709,14 +2733,14 @@ ChangeToWide(screen); } if (screen->wide_chars - && screen->utf8_mode != 2) { + && screen->utf8_mode != uAlways) { switchPtyData(screen, c == 'G'); TRACE(("UTF8 mode %s\n", BtoS(screen->utf8_mode))); } else { TRACE(("UTF8 mode NOT turned %s (%s)\n", BtoS(c == 'G'), - (screen->utf8_mode == 2) + (screen->utf8_mode == uAlways) ? "UTF-8 mode set from command-line" : "wideChars resource was not set")); } @@ -2731,6 +2755,12 @@ if (sp->parsestate == sp->groundtable) sp->lastchar = thischar; } while (0); + +#if OPT_WIDE_CHARS + screen->utf8_inparse = (screen->utf8_mode != uFalse + && sp->parsestate != sos_table); +#endif + return True; } @@ -2937,8 +2967,7 @@ { static PtySelect select_mask; static PtySelect write_mask; - static int pty_read_bytes; - int update = VTbuffer.update; + int update = VTbuffer->update; int size; int status; @@ -2973,10 +3002,11 @@ ScreenResize(&term->screen, replyWidth, replyHeight, &term->flags); } + repairSizeHints(); } if (eventMode == NORMAL - && readPtyData(screen, &select_mask, &VTbuffer)) { + && readPtyData(screen, &select_mask, VTbuffer)) { if (screen->scrollWidget && screen->scrollttyoutput && screen->topline < 0) @@ -3015,23 +3045,23 @@ if (select_mask & X_mask) { xevents(); - if (VTbuffer.update != update) + if (VTbuffer->update != update) break; } } } #else /* VMS */ + static void in_put(void) { static PtySelect select_mask; static PtySelect write_mask; - static int pty_read_bytes; TScreen *screen = &term->screen; int i, time_select; int size; - int update = VTbuffer.update; + int update = VTbuffer->update; static struct timeval select_timeout; @@ -3050,19 +3080,43 @@ for (;;) { if (eventMode == NORMAL - && (size = readPtyData(screen, &select_mask, &VTbuffer)) != 0) { + && (size = readPtyData(screen, &select_mask, VTbuffer)) != 0) { if (screen->scrollWidget && screen->scrollttyoutput && screen->topline < 0) WindowScroll(screen, 0); /* Scroll to bottom */ - pty_read_bytes += size; /* stop speed reading at some point to look for X stuff */ - /* (BUF_SIZE is just a random large number.) */ - if (pty_read_bytes > BUF_SIZE) + TRACE(("VTbuffer uses %d/%d\n", + VTbuffer->last - VTbuffer->buffer, + BUF_SIZE)); + if ((VTbuffer->last - VTbuffer->buffer) > BUF_SIZE) { FD_CLR(screen->respond, &select_mask); + break; + } +#if defined(HAVE_SCHED_YIELD) + /* + * If we've read a full (small/fragment) buffer, let the operating + * system have a turn, and we'll resume reading until we've either + * read only a fragment of the buffer, or we've filled the large + * buffer (see above). Doing this helps keep up with large bursts + * of output. + */ + if (size == FRG_SIZE) { + select_timeout.tv_sec = 0; + i = Select(max_plus1, &select_mask, &write_mask, 0, + &select_timeout); + if (i > 0) { + sched_yield(); + } else + break; + } else { + break; + } +#else + (void) size; /* unused in this branch */ break; +#endif } - pty_read_bytes = 0; /* update the screen */ if (screen->scroll_amt) FlushScroll(screen); @@ -3132,6 +3186,8 @@ time_select = 1; #endif } + if (need_cleanup) + Cleanup(0); i = Select(max_plus1, &select_mask, &write_mask, 0, (time_select ? &select_timeout : 0)); if (i < 0) { @@ -3150,7 +3206,7 @@ if (XtAppPending(app_con) || FD_ISSET(ConnectionNumber(screen->display), &select_mask)) { xevents(); - if (VTbuffer.update != update) /* HandleInterpret */ + if (VTbuffer->update != update) /* HandleInterpret */ break; } @@ -3163,9 +3219,9 @@ { TScreen *screen = &term->screen; - while (!morePtyData(screen, &VTbuffer)) + while (!morePtyData(screen, VTbuffer)) in_put(); - return nextPtyData(screen, &VTbuffer); + return nextPtyData(screen, VTbuffer); } #if OPT_INPUT_METHOD @@ -3204,6 +3260,7 @@ { #if OPT_WIDE_CHARS Cardinal chars_chomped = 1; + int next_col = screen->cur_col; #else int next_col, last_col, this_col; /* must be signed */ #endif @@ -3213,7 +3270,7 @@ /* don't translate if we use UTF-8, and are not handling legacy support * for line-drawing characters. */ - if (!screen->utf8_mode + if ((screen->utf8_mode == uFalse) || (screen->vt100_graphics && charset == '0')) #endif @@ -3234,9 +3291,10 @@ for (offset = 0; offset < len && (chars_chomped > 0 || screen->do_wrap); offset += chars_chomped) { - int width_available = screen->max_col - screen->cur_col + 1; + int width_available = MaxCols(screen) - screen->cur_col; int width_here = 0; int need_wrap = 0; + int last_chomp = 0; chars_chomped = 0; if (screen->do_wrap && (term->flags & WRAPAROUND)) { @@ -3244,28 +3302,27 @@ ScrnSetWrapped(screen, screen->cur_row); xtermAutoPrint('\n'); xtermIndex(screen, 1); - screen->cur_col = 0; + set_cur_col(screen, 0); screen->do_wrap = 0; - width_available = screen->max_col - screen->cur_col + 1; + width_available = MaxCols(screen) - screen->cur_col; + next_col = screen->cur_col; } while (width_here <= width_available && chars_chomped < (len - offset)) { if (!screen->utf8_mode || (screen->vt100_graphics && charset == '0')) - width_here++; + last_chomp = 1; else - width_here += my_wcwidth((int) buf[chars_chomped + offset]); + last_chomp = my_wcwidth((int) buf[chars_chomped + offset]); + width_here += last_chomp; chars_chomped++; } if (width_here > width_available) { chars_chomped--; - if (!screen->utf8_mode - || (screen->vt100_graphics && charset == '0')) - width_here--; - else - width_here -= my_wcwidth((int) buf[chars_chomped + offset]); - need_wrap = 1; + width_here -= last_chomp; + if (chars_chomped > 0 || (term->flags & WRAPAROUND)) + need_wrap = 1; } else if (width_here == width_available) { need_wrap = 1; } else if (chars_chomped != (len - offset)) { @@ -3280,7 +3337,7 @@ * rewriting all of the memory-management for the screen * buffers (perhaps this is simpler). */ - if (chars_chomped != 0) { + if (chars_chomped != 0 && next_col <= screen->max_col) { static unsigned limit; static Char *hibyte, *lobyte; Bool both = False; @@ -3305,10 +3362,18 @@ WriteText(screen, PAIRED_CHARS(lobyte, (both ? hibyte : 0)), chars_chomped); +#ifdef NO_LEAKS + if (limit != 0) { + limit = 0; + XtFree((char *) lobyte); + XtFree((char *) hibyte); + } +#endif } + next_col += width_here; screen->do_wrap = need_wrap; } -#else +#else /* ! OPT_WIDE_CHARS */ for (offset = 0; offset < len; offset += this_col) { last_col = CurMaxCol(screen, screen->cur_row); @@ -3319,7 +3384,7 @@ ScrnSetWrapped(screen, screen->cur_row); xtermAutoPrint('\n'); xtermIndex(screen, 1); - screen->cur_col = 0; + set_cur_col(screen, 0); screen->do_wrap = 0; this_col = last_col + 1; } else @@ -3332,17 +3397,17 @@ WriteText(screen, PAIRED_CHARS(buf + offset, buf2 ? buf2 + offset : 0), - this_col); + (unsigned) this_col); /* * the call to WriteText updates screen->cur_col. * If screen->cur_col != next_col, we must have * hit the right margin, so set the do_wrap flag. */ - screen->do_wrap = (screen->cur_col < (int) next_col); + screen->do_wrap = (screen->cur_col < next_col); } -#endif +#endif /* OPT_WIDE_CHARS */ } #if HANDLE_STRUCT_NOTIFY @@ -3390,9 +3455,11 @@ static void WriteText(TScreen * screen, PAIRED_CHARS(Char * str, Char * str2), Cardinal len) { + ScrnPtr PAIRED_CHARS(temp_str = 0, temp_str2 = 0); unsigned test; unsigned flags = term->flags; unsigned fg_bg = makeColorPair(term->cur_foreground, term->cur_background); + unsigned cells = visual_width(PAIRED_CHARS(str, str2), len); GC currentGC; TRACE(("WriteText (%2d,%2d) (%d) %3d:%s\n", @@ -3402,25 +3469,35 @@ len, visibleChars(PAIRED_CHARS(str, str2), len))); if (ScrnHaveSelection(screen) - && ScrnIsLineInSelection(screen, screen->cur_row - screen->topline)) { + && ScrnIsLineInSelection(screen, INX2ROW(screen, screen->cur_row))) { ScrnDisownSelection(screen); } - if (screen->cur_row - screen->topline <= screen->max_row) { + if (INX2ROW(screen, screen->cur_row) <= screen->max_row) { if (screen->cursor_state) HideCursor(); if (flags & INSERT) { - InsertChar(screen, visual_width(PAIRED_CHARS(str, str2), len)); + InsertChar(screen, cells); } if (!AddToRefresh(screen)) { - /* make sure that the correct GC is current */ - currentGC = updatedXtermGC(screen, flags, fg_bg, False); if (screen->scroll_amt) FlushScroll(screen); if (flags & INVISIBLE) { + if (cells > len) { + str = temp_str = TypeMallocN(Char, cells); + if (str == 0) + return; + } + if_OPT_WIDE_CHARS(screen, { + if (cells > len) { + str2 = temp_str2 = TypeMallocN(Char, cells); + } + }); + len = cells; + memset(str, ' ', len); if_OPT_WIDE_CHARS(screen, { if (str2 != 0) @@ -3435,6 +3512,9 @@ test = flags; checkVeryBoldColors(test, term->cur_foreground); + /* make sure that the correct GC is current */ + currentGC = updatedXtermGC(screen, flags, fg_bg, False); + drawXtermText(screen, test & DRAWX_MASK, currentGC, CurCursorX(screen, screen->cur_row, screen->cur_col), CursorY(screen, screen->cur_row), @@ -3446,7 +3526,7 @@ } ScreenWrite(screen, PAIRED_CHARS(str, str2), flags, fg_bg, len); - CursorForward(screen, (int) visual_width(PAIRED_CHARS(str, str2), len)); + CursorForward(screen, (int) cells); #if OPT_ZICONBEEP /* Flag icon name with "***" on window output when iconified. */ @@ -3474,6 +3554,12 @@ } mapstate = -1; #endif /* OPT_ZICONBEEP */ + if (temp_str != 0) + free(temp_str); + if_OPT_WIDE_CHARS(screen, { + if (temp_str2 != 0) + free(temp_str2); + }); return; } @@ -3521,16 +3607,46 @@ case ConfigureNotify: TRACE(("HandleStructNotify(ConfigureNotify)\n")); #if OPT_TOOLBAR + /* the notify is for the top-level widget, but we care about vt100 */ if (term->screen.Vshow) { + TScreen *screen = &term->screen; struct _vtwin *Vwin = WhichVWin(&(term->screen)); - if (Vwin->tb_info.menu_bar) { - XtVaGetValues(Vwin->tb_info.menu_bar, - XtNheight, &Vwin->tb_info.menu_height, + TbInfo *info = &(Vwin->tb_info); + TbInfo save = *info; + + if (info->menu_bar) { + XtVaGetValues(info->menu_bar, + XtNheight, &info->menu_height, + XtNborderWidth, &info->menu_border, (XtPointer) 0); - TRACE(("...menu_height %d\n", Vwin->tb_info.menu_height)); + + if (save.menu_height != info->menu_height + || save.menu_border != info->menu_border) { + + TRACE(("...menu_height %d\n", info->menu_height)); + TRACE(("...menu_border %d\n", info->menu_border)); + TRACE(("...had height %d, border %d\n", + save.menu_height, + save.menu_border)); + + /* + * FIXME: Window manager still may be using the old values. + * Try to fool it. + */ + XtMakeResizeRequest((Widget) term, + screen->fullVwin.fullwidth, + info->menu_height + - save.menu_height + + screen->fullVwin.fullheight, + NULL, NULL); + repairSizeHints(); + } } } -#endif +#endif /* OPT_TOOLBAR */ + break; + case ReparentNotify: + TRACE(("HandleStructNotify(ReparentNotify)\n")); break; default: TRACE(("HandleStructNotify(event %d)\n", event->type)); @@ -3646,7 +3762,7 @@ CursorSet(screen, 0, 0, termw->flags); if ((j = func == bitset ? 132 : 80) != ((termw->flags & IN132COLUMNS) ? 132 : 80) || - j != screen->max_col + 1) + j != MaxCols(screen)) RequestResize(termw, -1, j, True); (*func) (&termw->flags, IN132COLUMNS); } @@ -3840,13 +3956,16 @@ #if OPT_NUM_LOCK case 1035: term->misc.real_NumLock = (func == bitset) ? ON : OFF; + update_num_lock(); break; case 1036: screen->meta_sends_esc = (func == bitset) ? ON : OFF; + update_meta_esc(); break; #endif case 1037: screen->delete_is_del = (func == bitset) ? ON : OFF; + update_delete_del(); break; case 1048: if (!termw->misc.titeInhibit) { @@ -3941,7 +4060,7 @@ break; #if OPT_TOOLBAR case 10: /* rxvt */ - DoSM(DP_TOOLBAR, screen->toolbars); + DoSM(DP_TOOLBAR, resource.toolBar); break; #endif #if OPT_BLINK_CURS @@ -4040,7 +4159,7 @@ CursorSet(screen, 0, 0, termw->flags); if ((j = (screen->save_modes[DP_DECCOLM] & IN132COLUMNS) ? 132 : 80) != ((termw->flags & IN132COLUMNS) - ? 132 : 80) || j != screen->max_col + 1) + ? 132 : 80) || j != MaxCols(screen)) RequestResize(termw, -1, j, True); bitcpy(&termw->flags, screen->save_modes[DP_DECCOLM], @@ -4081,8 +4200,8 @@ break; #if OPT_TOOLBAR case 10: /* rxvt */ - DoRM(DP_TOOLBAR, screen->toolbars); - ShowToolbar(screen->toolbars); + DoRM(DP_TOOLBAR, resource.toolBar); + ShowToolbar(resource.toolBar); break; #endif #if OPT_BLINK_CURS @@ -4333,8 +4452,8 @@ reply.a_pintro = 0; reply.a_nparam = 3; reply.a_param[0] = 8; - reply.a_param[1] = screen->max_row + 1; - reply.a_param[2] = screen->max_col + 1; + reply.a_param[1] = MaxRows(screen); + reply.a_param[2] = MaxCols(screen); reply.a_inters = 0; reply.a_final = 't'; unparseseq(&reply, screen->respond); @@ -4342,7 +4461,7 @@ #if OPT_MAXIMIZE case 19: /* Report the screen's size, in characters */ - if (!QueryMaximize(screen, &root_height, &root_width)) { + if (!QueryMaximize(term, &root_height, &root_width)) { root_height = 0; root_width = 0; } @@ -4519,8 +4638,8 @@ return; TRACE(("ToAlternate\n")); if (!screen->altbuf) - screen->altbuf = Allocate(screen->max_row + 1, screen->max_col - + 1, &screen->abuf_address); + screen->altbuf = Allocate(MaxRows(screen), MaxCols(screen), + &screen->abuf_address); SwitchBufs(screen); screen->alternate = True; update_altscreen(); @@ -4547,10 +4666,10 @@ if (screen->cursor_state) HideCursor(); - rows = screen->max_row + 1; + rows = MaxRows(screen); SwitchBufPtrs(screen); - if ((top = -screen->topline) < rows) { + if ((top = INX2ROW(screen, 0)) < rows) { if (screen->scroll_amt) FlushScroll(screen); if (top == 0) @@ -4564,14 +4683,20 @@ (unsigned) (rows - top) * FontHeight(screen), False); } - ScrnUpdate(screen, 0, 0, rows, screen->max_col + 1, False); + ScrnUpdate(screen, 0, 0, rows, MaxCols(screen), False); } -/* swap buffer line pointers between alt and regular screens */ +/* + * Swap buffer line pointers between alternate and regular screens. + * visbuf contains pointers from allbuf or altbuf for the visible screen, + * and pointers from allbuf for the saved lines. That makes it simple to + * scroll back over the saved lines without juggling pointers for the + * regular and alternate screens. + */ void SwitchBufPtrs(TScreen * screen) { - size_t len = ScrnPointers(screen, (unsigned) (screen->max_row + 1)); + size_t len = ScrnPointers(screen, (unsigned) MaxRows(screen)); memcpy((char *) screen->save_ptr, (char *) screen->visbuf, len); memcpy((char *) screen->visbuf, (char *) screen->altbuf, len); @@ -4605,7 +4730,7 @@ #if OPT_TEK4014 if (Tpushb > Tpushback) { - fillPtyData(screen, &VTbuffer, (char *) Tpushback, Tpushb - Tpushback); + fillPtyData(screen, VTbuffer, (char *) Tpushback, Tpushb - Tpushback); Tpushb = Tpushback; } #endif @@ -4673,8 +4798,9 @@ static void VTResize(Widget w) { - if (XtIsRealized(w)) + if (XtIsRealized(w)) { ScreenResize(&term->screen, term->core.width, term->core.height, &term->flags); + } } #define okDimension(src,dst) ((src <= 32767) && ((dst = src) == src)) @@ -4709,7 +4835,7 @@ if (text) { if ((value = rows) != 0) { if (rows < 0) - value = screen->max_row + 1; + value = MaxRows(screen); value *= FontHeight(screen); value += (2 * screen->border); if (!okDimension(value, askedHeight)) @@ -4718,7 +4844,7 @@ if ((value = cols) != 0) { if (cols < 0) - value = screen->max_col + 1; + value = MaxCols(screen); value *= FontWidth(screen); value += (2 * screen->border) + ScrollbarWidth(screen); if (!okDimension(value, askedWidth)) @@ -4781,7 +4907,12 @@ && replyWidth) { sizehints.height = replyHeight; sizehints.width = replyWidth; + + TRACE(("%s@%d -- ", __FILE__, __LINE__)); + TRACE_HINTS(&sizehints); XSetWMNormalHints(screen->display, VShellWindow, &sizehints); + TRACE(("%s@%d -- ", __FILE__, __LINE__)); + TRACE_WM_HINTS(termw); } #endif @@ -4816,12 +4947,12 @@ VTallocbuf(void) { TScreen *screen = &term->screen; - int nrows = screen->max_row + 1; + int nrows = MaxRows(screen); /* allocate screen buffer now, if necessary. */ if (screen->scrollWidget) nrows += screen->savelines; - screen->allbuf = Allocate(nrows, screen->max_col + 1, + screen->allbuf = Allocate(nrows, MaxCols(screen), &screen->sbuf_address); if (screen->scrollWidget) screen->visbuf = &screen->allbuf[MAX_PTRS * screen->savelines]; @@ -4899,7 +5030,10 @@ ? target->dft_background : target->screen.Tcolors[TEXT_BG].value); } else { + memset(&temp, 0, sizeof(temp)); if (AllocateTermColor(target, &temp, offset, name)) { + if (COLOR_DEFINED(&(temp), offset)) + free(temp.names[offset]); target->screen.Tcolors[offset].value = temp.colors[offset]; } } @@ -4914,26 +5048,16 @@ static void VTInitialize_locale(XtermWidget request) { - char *locale; - Bool is_utf8; -#ifdef HAVE_LANGINFO_CODESET - char *encoding; -#endif + Bool is_utf8 = xtermEnvUTF8(); TRACE(("VTInitialize_locale\n")); TRACE(("... request screen.utf8_mode = %d\n", request->screen.utf8_mode)); - if ((locale = getenv("LC_ALL")) == 0 || *locale == '\0') - if ((locale = getenv("LC_CTYPE")) == 0 || *locale == '\0') - if ((locale = getenv("LANG")) == 0 || *locale == '\0') - locale = ""; -#ifdef HAVE_LANGINFO_CODESET - encoding = nl_langinfo(CODESET); - is_utf8 = (strcmp(encoding, "UTF-8") == 0); -#else - is_utf8 = (strstr(locale, "UTF-8") != NULL); -#endif - TRACE(("... is_utf8 = %s\n", BtoS(is_utf8))); + if (request->screen.utf8_mode < 0) + request->screen.utf8_mode = uFalse; + + if (request->screen.utf8_mode > 3) + request->screen.utf8_mode = uDefault; request->screen.latin9_mode = 0; request->screen.unicode_font = 0; @@ -4944,6 +5068,9 @@ TRACE(("... setup for luit:\n")); TRACE(("... request misc.locale_str = \"%s\"\n", request->misc.locale_str)); + if (request->screen.utf8_mode == uFalse) { + TRACE(("... command-line +u8 overrides\n")); + } else #if OPT_MINI_LUIT if (x_strcasecmp(request->misc.locale_str, "CHECKFONT") == 0) { int fl = (request->misc.default_font.f_n @@ -4955,26 +5082,26 @@ request->screen.unicode_font = 1; /* unicode font, use True */ #ifdef HAVE_LANGINFO_CODESET - if (!strcmp(encoding, "ANSI_X3.4-1968") - || !strcmp(encoding, "ISO-8859-1")) { - if (request->screen.utf8_mode == 3) - request->screen.utf8_mode = 0; - } else if (!strcmp(encoding, "ISO-8859-15")) { - if (request->screen.utf8_mode == 3) - request->screen.utf8_mode = 0; + if (!strcmp(xtermEnvEncoding(), "ANSI_X3.4-1968") + || !strcmp(xtermEnvEncoding(), "ISO-8859-1")) { + if (request->screen.utf8_mode == uDefault) + request->screen.utf8_mode = uFalse; + } else if (!strcmp(xtermEnvEncoding(), "ISO-8859-15")) { + if (request->screen.utf8_mode == uDefault) + request->screen.utf8_mode = uFalse; request->screen.latin9_mode = 1; } else { request->misc.callfilter = is_utf8 ? 0 : 1; - request->screen.utf8_mode = 2; + request->screen.utf8_mode = uAlways; } #else request->misc.callfilter = is_utf8 ? 0 : 1; - request->screen.utf8_mode = 2; + request->screen.utf8_mode = uAlways; #endif } else { /* other encoding, use False */ - if (request->screen.utf8_mode == 3) { - request->screen.utf8_mode = is_utf8 ? 2 : 0; + if (request->screen.utf8_mode == uDefault) { + request->screen.utf8_mode = is_utf8 ? uAlways : uFalse; } } } else @@ -4986,58 +5113,99 @@ strcmp(request->misc.locale_str, "1") == 0) { /* when true ... fully obeying LC_CTYPE locale */ request->misc.callfilter = is_utf8 ? 0 : 1; - request->screen.utf8_mode = 2; + request->screen.utf8_mode = uAlways; } else if (x_strcasecmp(request->misc.locale_str, "FALSE") == 0 || x_strcasecmp(request->misc.locale_str, "OFF") == 0 || x_strcasecmp(request->misc.locale_str, "NO") == 0 || strcmp(request->misc.locale_str, "0") == 0) { /* when false ... original value of utf8_mode is effective */ - if (request->screen.utf8_mode == 3) { - request->screen.utf8_mode = is_utf8 ? 2 : 0; + if (request->screen.utf8_mode == uDefault) { + request->screen.utf8_mode = is_utf8 ? uAlways : uFalse; } } else if (x_strcasecmp(request->misc.locale_str, "MEDIUM") == 0 || x_strcasecmp(request->misc.locale_str, "SEMIAUTO") == 0) { /* when medium ... obeying locale only for UTF-8 and Asian */ if (is_utf8) { - request->screen.utf8_mode = 2; + request->screen.utf8_mode = uAlways; } else if ( #ifdef MB_CUR_MAX MB_CUR_MAX > 1 || #else - !strncmp(locale, "ja", 2) || - !strncmp(locale, "ko", 2) || - !strncmp(locale, "zh", 2) || + !strncmp(xtermEnvLocale(), "ja", 2) || + !strncmp(xtermEnvLocale(), "ko", 2) || + !strncmp(xtermEnvLocale(), "zh", 2) || #endif - !strncmp(locale, "th", 2) || - !strncmp(locale, "vi", 2)) { + !strncmp(xtermEnvLocale(), "th", 2) || + !strncmp(xtermEnvLocale(), "vi", 2)) { request->misc.callfilter = 1; - request->screen.utf8_mode = 2; + request->screen.utf8_mode = uAlways; } else { - request->screen.utf8_mode = 0; + request->screen.utf8_mode = uFalse; } } else if (x_strcasecmp(request->misc.locale_str, "UTF-8") == 0 || x_strcasecmp(request->misc.locale_str, "UTF8") == 0) { /* when UTF-8 ... UTF-8 mode */ - request->screen.utf8_mode = 2; + request->screen.utf8_mode = uAlways; } else { /* other words are regarded as encoding name passed to luit */ request->misc.callfilter = 1; - request->screen.utf8_mode = 2; + request->screen.utf8_mode = uAlways; request->misc.use_encoding = 1; } TRACE(("... updated misc.callfilter = %s\n", BtoS(request->misc.callfilter))); TRACE(("... updated misc.use_encoding = %s\n", BtoS(request->misc.use_encoding))); #else - if (request->screen.utf8_mode == 3) { - request->screen.utf8_mode = is_utf8 ? 2 : 0; + if (request->screen.utf8_mode == uDefault) { + request->screen.utf8_mode = is_utf8 ? uAlways : uFalse; } #endif /* OPT_LUIT_PROG */ + + request->screen.utf8_inparse = (request->screen.utf8_mode != uFalse); + TRACE(("... updated screen.utf8_mode = %d\n", request->screen.utf8_mode)); TRACE(("...VTInitialize_locale done\n")); - } #endif +static void +ParseOnClicks(XtermWidget wnew, XtermWidget wreq, Cardinal item) +{ + /* *INDENT-OFF* */ + static struct { + const String name; + SelectUnit code; + } table[] = { + { "char", Select_CHAR }, + { "word", Select_WORD }, + { "line", Select_LINE }, + { "group", Select_GROUP }, + { "page", Select_PAGE }, + { "all", Select_ALL }, +#if OPT_SELECT_REGEX + { "regex", Select_REGEX }, +#endif + }; + /* *INDENT-ON* */ + + String res = wreq->screen.onClick[item]; + String next = x_skip_nonblanks(res); + Cardinal n; + + wnew->screen.selectMap[item] = NSELECTUNITS; + for (n = 0; n < XtNumber(table); ++n) { + if (!x_strncasecmp(table[n].name, res, (unsigned) (next - res))) { + wnew->screen.selectMap[item] = table[n].code; +#if OPT_SELECT_REGEX + if (table[n].code == Select_REGEX) { + wnew->screen.selectExpr[item] = x_strtrim(next); + TRACE(("Parsed regex \"%s\"\n", wnew->screen.selectExpr[item])); + } +#endif + break; + } + } +} + /* ARGSUSED */ static void VTInitialize(Widget wrequest, @@ -5154,12 +5322,11 @@ init_Bres(screen.multiscroll); init_Ires(screen.nmarginbell); init_Ires(screen.savelines); + init_Ires(screen.scrollBarBorder); init_Ires(screen.scrolllines); init_Bres(screen.scrollttyoutput); init_Bres(screen.scrollkey); -#if OPT_TOOLBAR - init_Bres(screen.toolbars); -#endif + init_Bres(screen.selectToClipboard); init_Sres(screen.term_id); for (s = request->screen.term_id; *s; s++) { @@ -5236,8 +5403,14 @@ init_Bres(screen.control_eight_bits); init_Bres(screen.backarrow_key); init_Bres(screen.meta_sends_esc); - init_Bres(screen.allowSendEvents); - init_Bres(screen.allowWindowOps); + + init_Bres(screen.allowSendEvent0); + init_Bres(screen.allowWindowOp0); + + /* make a copy so that editres cannot change the resource after startup */ + wnew->screen.allowSendEvents = wnew->screen.allowSendEvent0; + wnew->screen.allowWindowOps = wnew->screen.allowWindowOp0; + #ifndef NO_ACTIVE_ICON wnew->screen.fnt_icon = request->screen.fnt_icon; init_Bres(misc.active_icon); @@ -5248,12 +5421,12 @@ init_Bres(misc.tiXtraScroll); init_Bres(misc.dynamicColors); for (i = fontMenu_font1; i <= fontMenu_lastBuiltin; i++) { - init_Sres(screen.menu_font_names[i]); + init_Sres(screen.MenuFontName(i)); } /* set default in realize proc */ - wnew->screen.menu_font_names[fontMenu_fontdefault] = NULL; - wnew->screen.menu_font_names[fontMenu_fontescape] = NULL; - wnew->screen.menu_font_names[fontMenu_fontsel] = NULL; + wnew->screen.MenuFontName(fontMenu_fontdefault) = NULL; + wnew->screen.MenuFontName(fontMenu_fontescape) = NULL; + wnew->screen.MenuFontName(fontMenu_fontsel) = NULL; wnew->screen.menu_font_number = fontMenu_fontdefault; #if OPT_BROKEN_OSC @@ -5280,8 +5453,8 @@ wnew->screen.cache_doublesize)); #endif -#if OPT_ISO_COLORS || OPT_DEC_CHRSET || OPT_WIDE_CHARS - wnew->num_ptrs = (OFF_ATTRS + 1); /* OFF_FLAGS, OFF_CHARS, OFF_ATTRS */ +#if OPT_WIDE_CHARS + wnew->num_ptrs = (OFF_CHARS + 1); /* minimum needed for cell */ #endif #if OPT_ISO_COLORS init_Ires(screen.veryBoldColors); @@ -5291,6 +5464,7 @@ init_Bres(screen.colorBLMode); init_Bres(screen.colorMode); init_Bres(screen.colorULMode); + init_Bres(screen.italicULMode); init_Bres(screen.colorRVMode); for (i = 0, color_ok = False; i < MAXCOLORS; i++) { @@ -5360,6 +5534,30 @@ } } + /* + * Decode the resources that control the behavior on multiple mouse clicks. + * A single click is always bound to normal character selection, but the + * other flavors can be changed. + */ + for (i = 0; i < NSELECTUNITS; ++i) { + int ck = (i + 1); + wnew->screen.maxClicks = ck; + if (i == Select_CHAR) + wnew->screen.selectMap[i] = Select_CHAR; + else if (request->screen.onClick[i] != 0) + ParseOnClicks(wnew, request, (unsigned) i); + else if (i <= Select_LINE) + wnew->screen.selectMap[i] = (SelectUnit) i; + else + break; + TRACE(("on%dClicks %s=%d\n", ck, + NonNull(request->screen.onClick[i]), + wnew->screen.selectMap[i])); + if (wnew->screen.selectMap[i] == NSELECTUNITS) + break; + } + TRACE(("maxClicks %d\n", wnew->screen.maxClicks)); + /* If none of the colors are anything other than the foreground or * background, we'll assume this isn't color, no matter what the colorMode * resource says. (There doesn't seem to be any good way to determine if @@ -5369,14 +5567,9 @@ wnew->screen.colorMode = False; TRACE(("All colors are foreground or background: disable colorMode\n")); } -#if OPT_EXT_COLORS - wnew->num_ptrs = (OFF_BGRND + 1); -#else - wnew->num_ptrs = (OFF_COLOR + 1); -#endif wnew->sgr_foreground = -1; wnew->sgr_background = -1; - wnew->sgr_extended = 0; + wnew->sgr_extended = False; #endif /* OPT_ISO_COLORS */ init_Tres(MOUSE_FG); @@ -5399,12 +5592,10 @@ T_COLOR(&(wnew->screen), TEK_CURSOR) = T_COLOR(&(wnew->screen), TEXT_CURSOR); #endif -#if OPT_DEC_CHRSET - wnew->num_ptrs = (OFF_CSETS + 1); -#endif - #if OPT_WIDE_CHARS VTInitialize_locale(request); + init_Bres(screen.utf8_latin1); + init_Bres(screen.utf8_title); #if OPT_LUIT_PROG init_Bres(misc.callfilter); @@ -5430,15 +5621,14 @@ init_Bres(screen.vt100_graphics); init_Ires(screen.utf8_mode); init_Bres(screen.wide_chars); + init_Bres(misc.mk_width); init_Bres(misc.cjk_width); if (request->screen.utf8_mode) { - TRACE(("setting utf8_mode to 2, wide_chars on\n")); + TRACE(("setting wide_chars on\n")); wnew->screen.wide_chars = True; - wnew->screen.utf8_mode = 2; /* disable further change */ - xtermLoadVTFonts(wnew, "utf8Fonts", "Utf8Fonts"); } else { TRACE(("setting utf8_mode to 0\n")); - wnew->screen.utf8_mode = 0; + wnew->screen.utf8_mode = uFalse; } TRACE(("initialized UTF-8 mode to %d\n", wnew->screen.utf8_mode)); @@ -5454,7 +5644,11 @@ #endif if (wnew->screen.wide_chars != False) - wnew->num_ptrs = (OFF_COM2H + 1); + wnew->num_ptrs = OFF_FINAL; + + decode_wcwidth((wnew->misc.cjk_width ? 2 : 0) + + (wnew->misc.mk_width ? 1 : 0) + + 1); #endif /* OPT_WIDE_CHARS */ init_Bres(screen.bold_mode); @@ -5494,7 +5688,7 @@ if (zIconBeep) #endif XtAddEventHandler(my_parent, StructureNotifyMask, False, - HandleStructNotify, (XtPointer) 0); + HandleStructNotify, (Opaque) 0); #endif /* HANDLE_STRUCT_NOTIFY */ wnew->screen.bellInProgress = False; @@ -5535,6 +5729,8 @@ wnew->flags |= WRAPAROUND; if (wnew->misc.re_verse != wnew->misc.re_verse0) wnew->flags |= REVERSE_VIDEO; + if (wnew->screen.c132) + wnew->flags |= IN132COLUMNS; wnew->initflags = wnew->flags; @@ -5552,9 +5748,131 @@ } static void -VTDestroy(Widget w) +releaseCursorGCs(TScreen * screen) +{ + GC cursorGC = screen->cursorGC; + GC fillCursorGC = screen->fillCursorGC; + GC reverseCursorGC = screen->reversecursorGC; + GC cursorOutlineGC = screen->cursoroutlineGC; + + if (cursorGC) + XFreeGC(screen->display, cursorGC); + screen->cursorGC = 0; + + if (fillCursorGC && (fillCursorGC != cursorGC)) + XFreeGC(screen->display, fillCursorGC); + screen->fillCursorGC = 0; + + if (reverseCursorGC + && (reverseCursorGC != cursorGC) + && (reverseCursorGC != fillCursorGC) + ) + XFreeGC(screen->display, screen->reversecursorGC); + screen->reversecursorGC = 0; + + if (cursorOutlineGC + && (cursorOutlineGC != cursorGC) + && (cursorOutlineGC != fillCursorGC) + && (cursorOutlineGC != reverseCursorGC) + ) + XFreeGC(screen->display, screen->cursoroutlineGC); + screen->cursoroutlineGC = 0; +} + +#ifdef NO_LEAKS +static void +releaseWindowGCs(Widget w, struct _vtwin *win) { - XtFree((char *) (((XtermWidget) w)->screen.selection_data)); + XtReleaseGC(w, win->normalGC); + XtReleaseGC(w, win->reverseGC); + XtReleaseGC(w, win->normalboldGC); + XtReleaseGC(w, win->reverseboldGC); +} +#endif + +static void +VTDestroy(Widget w GCC_UNUSED) +{ +#ifdef NO_LEAKS + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &xw->screen; + Cardinal n; + + StopBlinking(screen); + + if (screen->scrollWidget) + XtDestroyWidget(screen->scrollWidget); + + if (screen->save_ptr) { + free(screen->save_ptr); + TRACE(("freed screen->save_ptr\n")); + } + + if (screen->sbuf_address) { + free(screen->sbuf_address); + TRACE(("freed screen->sbuf_address\n")); + } + if (screen->allbuf) { + free(screen->allbuf); + TRACE(("freed screen->allbuf\n")); + } + + if (screen->abuf_address) { + free(screen->abuf_address); + TRACE(("freed screen->abuf_address\n")); + } + if (screen->altbuf) { + free(screen->altbuf); + TRACE(("freed screen->altbuf\n")); + } +#if OPT_WIDE_CHARS + if (screen->draw_buf) { + free(screen->draw_buf); + TRACE(("freed screen->draw_buf\n")); + } +#endif +#if OPT_INPUT_METHOD + if (screen->xim) { + XCloseIM(screen->xim); + TRACE(("freed screen->xim\n")); + } +#endif + releaseCursorGCs(screen); + releaseWindowGCs(w, &(screen->fullVwin)); +#ifndef NO_ACTIVE_ICON + releaseWindowGCs(w, &(screen->iconVwin)); +#endif + + xtermCloseFonts(screen, screen->fnts); + +#if 0 /* some strings may be owned by X libraries */ + for (n = 0; n <= fontMenu_lastBuiltin; ++n) { + int k; + for (k = 0; k < fMAX; ++k) { + char *s = screen->menu_font_names[n][k]; + if (s != 0) + free(s); + } + } +#endif + + /* free local copies of resource strings */ + for (n = 0; n < NCOLORS; ++n) { + if (screen->Tcolors[n].resource) + free(screen->Tcolors[n].resource); + } +#if OPT_SELECT_REGEX + for (n = 0; n < NSELECTUNITS; ++n) { + if (screen->selectExpr[n]) + free(screen->selectExpr[n]); + } +#endif + + if (screen->selection_atoms) + XtFree((char *) (screen->selection_atoms)); + + XtFree((char *) (screen->selection_data)); +#endif /* defined(NO_LEAKS) */ } /*ARGSUSED*/ @@ -5563,43 +5881,49 @@ XtValueMask * valuemask, XSetWindowAttributes * values) { + XtermWidget xw = (XtermWidget) w; + TScreen *screen = &xw->screen; + unsigned width, height; - TScreen *screen = &term->screen; int xpos, ypos, pr; XSizeHints sizehints; - int scrollbar_width; + Atom pid_atom; + int i; TRACE(("VTRealize\n")); - TabReset(term->tabs); + TabReset(xw->tabs); - screen->menu_font_names[fontMenu_fontdefault] = term->misc.default_font.f_n; - screen->fnt_norm = NULL; - screen->fnt_bold = NULL; -#if OPT_WIDE_CHARS - screen->fnt_dwd = NULL; - screen->fnt_dwdb = NULL; -#endif - if (!xtermLoadFont(screen, - &(term->misc.default_font), + screen->MenuFontName(fontMenu_fontdefault) = xw->misc.default_font.f_n; + memset(screen->fnts, 0, sizeof(screen->fnts)); + + if (!xtermLoadFont(xw, + &(xw->misc.default_font), False, 0)) { - if (XmuCompareISOLatin1(term->misc.default_font.f_n, "fixed") != 0) { + if (XmuCompareISOLatin1(xw->misc.default_font.f_n, "fixed") != 0) { fprintf(stderr, "%s: unable to open font \"%s\", trying \"fixed\"....\n", - xterm_name, term->misc.default_font.f_n); - (void) xtermLoadFont(screen, + xterm_name, xw->misc.default_font.f_n); + (void) xtermLoadFont(xw, xtermFontName("fixed"), False, 0); - screen->menu_font_names[fontMenu_fontdefault] = "fixed"; + screen->MenuFontName(fontMenu_fontdefault) = "fixed"; } } /* really screwed if we couldn't open default font */ - if (!screen->fnt_norm) { + if (!screen->fnts[fNorm]) { fprintf(stderr, "%s: unable to locate a suitable font\n", xterm_name); Exit(1); } +#if OPT_WIDE_CHARS + if (xw->screen.utf8_mode) { + TRACE(("check if this is a wide font, if not try again\n")); + if (xtermLoadWideFonts(xw, False)) + SetVTFont(xw, screen->menu_font_number, TRUE, NULL); + } +#endif /* making cursor */ if (!screen->pointer_cursor) { @@ -5613,39 +5937,45 @@ T_COLOR(screen, MOUSE_BG)); } - scrollbar_width = (term->misc.scrollbar ? - screen->scrollWidget->core.width : 0); - /* set defaults */ xpos = 1; ypos = 1; width = 80; height = 24; - pr = XParseGeometry(term->misc.geo_metry, &xpos, &ypos, + + TRACE(("parsing geo_metry %s\n", NonNull(xw->misc.geo_metry))); + pr = XParseGeometry(xw->misc.geo_metry, &xpos, &ypos, &width, &height); + TRACE(("... position %d,%d size %dx%d\n", ypos, xpos, height, width)); + set_max_col(screen, (int) (width - 1)); /* units in character cells */ set_max_row(screen, (int) (height - 1)); /* units in character cells */ - xtermUpdateFontInfo(&term->screen, False); + xtermUpdateFontInfo(xw, False); width = screen->fullVwin.fullwidth; height = screen->fullVwin.fullheight; - if ((pr & XValue) && (XNegative & pr)) + TRACE(("... border widget %d parent %d shell %d\n", + BorderWidth(xw), + BorderWidth(XtParent(xw)), + BorderWidth(SHELL_OF(xw)))); + + if ((pr & XValue) && (XNegative & pr)) { xpos += DisplayWidth(screen->display, DefaultScreen(screen->display)) - - width - (XtParent(term)->core.border_width * 2); - if ((pr & YValue) && (YNegative & pr)) + - width - (BorderWidth(XtParent(xw)) * 2); + } + if ((pr & YValue) && (YNegative & pr)) { ypos += DisplayHeight(screen->display, DefaultScreen(screen->display)) - - height - (XtParent(term)->core.border_width * 2); + - height - (BorderWidth(XtParent(xw)) * 2); + } /* set up size hints for window manager; min 1 char by 1 char */ bzero(&sizehints, sizeof(sizehints)); - sizehints.base_width = 2 * screen->border + scrollbar_width; - sizehints.base_height = 2 * screen->border; - sizehints.width_inc = FontWidth(screen); - sizehints.height_inc = FontHeight(screen); - sizehints.min_width = sizehints.base_width + sizehints.width_inc; - sizehints.min_height = sizehints.base_height + sizehints.height_inc; - sizehints.flags = (PBaseSize | PMinSize | PResizeInc); + xtermSizeHints(xw, &sizehints, (xw->misc.scrollbar + ? (screen->scrollWidget->core.width + + BorderWidth(screen->scrollWidget)) + : 0)); + sizehints.x = xpos; sizehints.y = ypos; if ((XValue & pr) || (YValue & pr)) { @@ -5669,75 +5999,97 @@ /* set a default size, but do *not* set position */ sizehints.flags |= PSize; } - sizehints.width = width; - sizehints.height = height; + sizehints.height = sizehints.base_height + + sizehints.height_inc * MaxRows(screen); + sizehints.width = sizehints.base_width + + sizehints.width_inc * MaxCols(screen); + if ((WidthValue & pr) || (HeightValue & pr)) sizehints.flags |= USSize; else sizehints.flags |= PSize; - (void) XtMakeResizeRequest((Widget) term, + /* + * Note that the size-hints are for the shell, while the resize-request + * is for the vt100 widget. They are not the same size. + */ + TRACE(("make resize request %dx%d\n", height, width)); + (void) XtMakeResizeRequest((Widget) xw, (Dimension) width, (Dimension) height, - &term->core.width, &term->core.height); + &xw->core.width, &xw->core.height); + TRACE(("...made resize request %dx%d\n", xw->core.height, xw->core.width)); /* XXX This is bogus. We are parsing geometries too late. This * is information that the shell widget ought to have before we get * realized, so that it can do the right thing. */ if (sizehints.flags & USPosition) - XMoveWindow(XtDisplay(term), XtWindow(XtParent(term)), + XMoveWindow(XtDisplay(xw), XtWindow(SHELL_OF(xw)), sizehints.x, sizehints.y); - XSetWMNormalHints(XtDisplay(term), XtWindow(XtParent(term)), - &sizehints); - XFlush(XtDisplay(term)); /* get it out to window manager */ + TRACE(("%s@%d -- ", __FILE__, __LINE__)); + TRACE_HINTS(&sizehints); + XSetWMNormalHints(XtDisplay(xw), XtWindow(SHELL_OF(xw)), &sizehints); + TRACE(("%s@%d -- ", __FILE__, __LINE__)); + TRACE_WM_HINTS(xw); + + if ((pid_atom = XInternAtom(XtDisplay(xw), "_NET_WM_PID", False)) != None) { + /* XChangeProperty format 32 really is "long" */ + unsigned long pid_l = (unsigned long) getpid(); + TRACE(("Setting _NET_WM_PID property to %lu\n", pid_l)); + XChangeProperty(XtDisplay(xw), VShellWindow, + pid_atom, XA_CARDINAL, 32, PropModeReplace, + (unsigned char *) &pid_l, 1); + } + + XFlush(XtDisplay(xw)); /* get it out to window manager */ /* use ForgetGravity instead of SouthWestGravity because translating the Expose events for ConfigureNotifys is too hard */ - values->bit_gravity = ((term->misc.resizeGravity == NorthWestGravity) + values->bit_gravity = ((xw->misc.resizeGravity == NorthWestGravity) ? NorthWestGravity : ForgetGravity); - term->screen.fullVwin.window = XtWindow(term) = - XCreateWindow(XtDisplay(term), XtWindow(XtParent(term)), - term->core.x, term->core.y, - term->core.width, term->core.height, term->core.border_width, - (int) term->core.depth, + xw->screen.fullVwin.window = XtWindow(xw) = + XCreateWindow(XtDisplay(xw), XtWindow(XtParent(xw)), + xw->core.x, xw->core.y, + xw->core.width, xw->core.height, BorderWidth(xw), + (int) xw->core.depth, InputOutput, CopyFromParent, *valuemask | CWBitGravity, values); screen->event_mask = values->event_mask; #ifndef NO_ACTIVE_ICON - if (term->misc.active_icon && screen->fnt_icon) { + if (xw->misc.active_icon && screen->fnt_icon) { int iconX = 0, iconY = 0; - Widget shell = SHELL_OF(term); + Widget shell = SHELL_OF(xw); unsigned long mask; XGCValues xgcv; TRACE(("Initializing active-icon\n")); XtVaGetValues(shell, XtNiconX, &iconX, XtNiconY, &iconY, (XtPointer) 0); - xtermComputeFontInfo(screen, &(screen->iconVwin), screen->fnt_icon, 0); + xtermComputeFontInfo(xw, &(screen->iconVwin), screen->fnt_icon, 0); /* since only one client is permitted to select for Button * events, we have to let the window manager get 'em... */ values->event_mask &= ~(ButtonPressMask | ButtonReleaseMask); - values->border_pixel = term->misc.icon_border_pixel; + values->border_pixel = xw->misc.icon_border_pixel; screen->iconVwin.window = - XCreateWindow(XtDisplay(term), + XCreateWindow(XtDisplay(xw), RootWindowOfScreen(XtScreen(shell)), iconX, iconY, screen->iconVwin.fullwidth, screen->iconVwin.fullheight, - term->misc.icon_border_width, - (int) term->core.depth, + xw->misc.icon_border_width, + (int) xw->core.depth, InputOutput, CopyFromParent, *valuemask | CWBitGravity | CWBorderPixel, values); XtVaSetValues(shell, XtNiconWindow, screen->iconVwin.window, (XtPointer) 0); - XtRegisterDrawable(XtDisplay(term), screen->iconVwin.window, w); + XtRegisterDrawable(XtDisplay(xw), screen->iconVwin.window, w); mask = (GCFont | GCForeground | GCBackground | GCGraphicsExposures | GCFunction); @@ -5770,14 +6122,14 @@ #endif } else { TRACE(("Disabled active-icon\n")); - term->misc.active_icon = False; + xw->misc.active_icon = False; } #endif /* NO_ACTIVE_ICON */ #if OPT_I18N_SUPPORT && OPT_INPUT_METHOD VTInitI18N(); #else - term->screen.xic = NULL; + xw->screen.xic = NULL; #endif #if OPT_NUM_LOCK VTInitModifiers(); @@ -5791,7 +6143,8 @@ XDefineCursor(screen->display, VShellWindow, screen->pointer_cursor); - screen->cur_col = screen->cur_row = 0; + set_cur_col(screen, 0); + set_cur_row(screen, 0); set_max_col(screen, Width(screen) / screen->fullVwin.f_width - 1); set_max_row(screen, Height(screen) / screen->fullVwin.f_height - 1); set_tb_margins(screen, 0, screen->max_row); @@ -5813,11 +6166,14 @@ screen->savedlines = 0; - if (term->misc.scrollbar) { + if (xw->misc.scrollbar) { screen->fullVwin.sb_info.width = 0; - ScrollBarOn(term, False, True); + ScrollBarOn(xw, False, True); + } + for (i = 0; i < 2; ++i) { + screen->alternate = !screen->alternate; + CursorSave(xw); } - CursorSave(term); return; } @@ -6105,19 +6461,19 @@ T_COLOR(&(newvt->screen), TEXT_BG)) || (T_COLOR(&(curvt->screen), TEXT_FG) != T_COLOR(&(newvt->screen), TEXT_FG)) || - (curvt->screen.menu_font_names[curvt->screen.menu_font_number] != - newvt->screen.menu_font_names[newvt->screen.menu_font_number]) || + (curvt->screen.MenuFontName(curvt->screen.menu_font_number) != + newvt->screen.MenuFontName(newvt->screen.menu_font_number)) || (curvt->misc.default_font.f_n != newvt->misc.default_font.f_n)) { if (curvt->misc.default_font.f_n != newvt->misc.default_font.f_n) - newvt->screen.menu_font_names[fontMenu_fontdefault] = newvt->misc.default_font.f_n; - if (xtermLoadFont(&newvt->screen, - xtermFontName(newvt->screen.menu_font_names[curvt->screen.menu_font_number]), + newvt->screen.MenuFontName(fontMenu_fontdefault) = newvt->misc.default_font.f_n; + if (xtermLoadFont(newvt, + xtermFontName(newvt->screen.MenuFontName(curvt->screen.menu_font_number)), True, newvt->screen.menu_font_number)) { /* resizing does the redisplay, so don't ask for it here */ refresh_needed = True; fonts_redone = True; } else if (curvt->misc.default_font.f_n != newvt->misc.default_font.f_n) - newvt->screen.menu_font_names[fontMenu_fontdefault] = curvt->misc.default_font.f_n; + newvt->screen.MenuFontName(fontMenu_fontdefault) = curvt->misc.default_font.f_n; } if (!fonts_redone && (T_COLOR(&(curvt->screen), TEXT_CURSOR) != @@ -6149,13 +6505,13 @@ #define setGC(value) set_at = __LINE__, currentGC = value -#define OutsideSelection(screen,row,col) \ - ((row) > (screen)->endHRow || \ - ((row) == (screen)->endHRow && \ - (col) >= (screen)->endHCol) || \ - (row) < (screen)->startHRow || \ - ((row) == (screen)->startHRow && \ - (col) < (screen)->startHCol)) +#define OutsideSelection(screen,srow,scol) \ + ((srow) > (screen)->endH.row || \ + ((srow) == (screen)->endH.row && \ + (scol) >= (screen)->endH.col) || \ + (srow) < (screen)->startH.row || \ + ((srow) == (screen)->startH.row && \ + (scol) < (screen)->startH.col)) /* * Shows cursor at new cursor position in screen. @@ -6194,11 +6550,11 @@ if (eventMode != NORMAL) return; - if (screen->cur_row - screen->topline > screen->max_row) + if (INX2ROW(screen, screen->cur_row) > screen->max_row) return; - screen->cursor_row = screen->cur_row; - cursor_col = screen->cursor_col = screen->cur_col; + screen->cursorp.row = screen->cur_row; + cursor_col = screen->cursorp.col = screen->cur_col; screen->cursor_moved = False; #ifndef NO_ACTIVE_ICON @@ -6211,30 +6567,30 @@ #if OPT_WIDE_CHARS base = #endif - clo = SCRN_BUF_CHARS(screen, screen->cursor_row)[cursor_col]; + clo = SCRN_BUF_CHARS(screen, screen->cursorp.row)[cursor_col]; if_OPT_WIDE_CHARS(screen, { int my_col; - chi = SCRN_BUF_WIDEC(screen, screen->cursor_row)[cursor_col]; + chi = SCRN_BUF_WIDEC(screen, screen->cursorp.row)[cursor_col]; if (clo == HIDDEN_LO && chi == HIDDEN_HI && cursor_col > 0) { /* if cursor points to non-initial part of wide character, * back it up */ --cursor_col; - clo = SCRN_BUF_CHARS(screen, screen->cursor_row)[cursor_col]; - chi = SCRN_BUF_WIDEC(screen, screen->cursor_row)[cursor_col]; + clo = SCRN_BUF_CHARS(screen, screen->cursorp.row)[cursor_col]; + chi = SCRN_BUF_WIDEC(screen, screen->cursorp.row)[cursor_col]; } my_col = cursor_col; base = (chi << 8) | clo; if (iswide(base)) my_col += 1; - c1l = SCRN_BUF_COM1L(screen, screen->cursor_row)[my_col]; - c1h = SCRN_BUF_COM1H(screen, screen->cursor_row)[my_col]; - c2l = SCRN_BUF_COM2L(screen, screen->cursor_row)[my_col]; - c2h = SCRN_BUF_COM2H(screen, screen->cursor_row)[my_col]; + c1l = SCRN_BUF_COM1L(screen, screen->cursorp.row)[my_col]; + c1h = SCRN_BUF_COM1H(screen, screen->cursorp.row)[my_col]; + c2l = SCRN_BUF_COM2L(screen, screen->cursorp.row)[my_col]; + c2h = SCRN_BUF_COM2H(screen, screen->cursorp.row)[my_col]; }); - flags = SCRN_BUF_ATTRS(screen, screen->cursor_row)[cursor_col]; + flags = SCRN_BUF_ATTRS(screen, screen->cursorp.row)[cursor_col]; if (clo == 0 #if OPT_WIDE_CHARS @@ -6249,12 +6605,12 @@ * but not the background, do not treat it as a colored cell. */ #if OPT_ISO_COLORS - if ((flags & TERM_COLOR_FLAGS) == BG_COLOR + if ((flags & TERM_COLOR_FLAGS(term)) == BG_COLOR #if OPT_WIDE_CHARS && chi == 0 #endif && clo == ' ') { - flags &= ~TERM_COLOR_FLAGS; + flags &= ~TERM_COLOR_FLAGS(term); } #endif @@ -6263,11 +6619,11 @@ * cursor and update the GC's if needed. */ if_OPT_EXT_COLORS(screen, { - fg_bg = (SCRN_BUF_FGRND(screen, screen->cursor_row)[cursor_col] << 8) - | (SCRN_BUF_BGRND(screen, screen->cursor_row)[cursor_col]); + fg_bg = (SCRN_BUF_FGRND(screen, screen->cursorp.row)[cursor_col] << 8) + | (SCRN_BUF_BGRND(screen, screen->cursorp.row)[cursor_col]); }); if_OPT_ISO_TRADITIONAL_COLORS(screen, { - fg_bg = SCRN_BUF_COLOR(screen, screen->cursor_row)[cursor_col]; + fg_bg = SCRN_BUF_COLOR(screen, screen->cursorp.row)[cursor_col]; }); fg_pix = getXtermForeground(flags, extract_fg(fg_bg, flags)); bg_pix = getXtermBackground(flags, extract_bg(fg_bg, flags)); @@ -6405,10 +6761,10 @@ if (screen->cursor_state == OFF) /* FIXME */ return; - if (screen->cursor_row - screen->topline > screen->max_row) + if (INX2ROW(screen, screen->cursorp.row) > screen->max_row) return; - cursor_col = screen->cursor_col; + cursor_col = screen->cursorp.col; #ifndef NO_ACTIVE_ICON if (IsIcon(screen)) { @@ -6420,39 +6776,39 @@ #if OPT_WIDE_CHARS base = #endif - clo = SCRN_BUF_CHARS(screen, screen->cursor_row)[cursor_col]; - flags = SCRN_BUF_ATTRS(screen, screen->cursor_row)[cursor_col]; + clo = SCRN_BUF_CHARS(screen, screen->cursorp.row)[cursor_col]; + flags = SCRN_BUF_ATTRS(screen, screen->cursorp.row)[cursor_col]; if_OPT_WIDE_CHARS(screen, { int my_col; - chi = SCRN_BUF_WIDEC(screen, screen->cursor_row)[cursor_col]; + chi = SCRN_BUF_WIDEC(screen, screen->cursorp.row)[cursor_col]; if (clo == HIDDEN_LO && chi == HIDDEN_HI) { /* if cursor points to non-initial part of wide character, * back it up */ --cursor_col; - clo = SCRN_BUF_CHARS(screen, screen->cursor_row)[cursor_col]; - chi = SCRN_BUF_WIDEC(screen, screen->cursor_row)[cursor_col]; + clo = SCRN_BUF_CHARS(screen, screen->cursorp.row)[cursor_col]; + chi = SCRN_BUF_WIDEC(screen, screen->cursorp.row)[cursor_col]; } my_col = cursor_col; base = (chi << 8) | clo; if (iswide(base)) my_col += 1; - c1l = SCRN_BUF_COM1L(screen, screen->cursor_row)[my_col]; - c1h = SCRN_BUF_COM1H(screen, screen->cursor_row)[my_col]; - c2l = SCRN_BUF_COM2L(screen, screen->cursor_row)[my_col]; - c2h = SCRN_BUF_COM2H(screen, screen->cursor_row)[my_col]; + c1l = SCRN_BUF_COM1L(screen, screen->cursorp.row)[my_col]; + c1h = SCRN_BUF_COM1H(screen, screen->cursorp.row)[my_col]; + c2l = SCRN_BUF_COM2L(screen, screen->cursorp.row)[my_col]; + c2h = SCRN_BUF_COM2H(screen, screen->cursorp.row)[my_col]; }); if_OPT_EXT_COLORS(screen, { - fg_bg = (SCRN_BUF_FGRND(screen, screen->cursor_row)[cursor_col] << 8) - | (SCRN_BUF_BGRND(screen, screen->cursor_row)[cursor_col]); + fg_bg = (SCRN_BUF_FGRND(screen, screen->cursorp.row)[cursor_col] << 8) + | (SCRN_BUF_BGRND(screen, screen->cursorp.row)[cursor_col]); }); if_OPT_ISO_TRADITIONAL_COLORS(screen, { - fg_bg = SCRN_BUF_COLOR(screen, screen->cursor_row)[cursor_col]; + fg_bg = SCRN_BUF_COLOR(screen, screen->cursorp.row)[cursor_col]; }); - if (OutsideSelection(screen, screen->cursor_row, screen->cursor_col)) + if (OutsideSelection(screen, screen->cursorp.row, screen->cursorp.col)) in_selection = False; else in_selection = True; @@ -6468,11 +6824,11 @@ } TRACE(("HideCursor calling drawXtermText cur(%d,%d)\n", - screen->cursor_row, screen->cursor_col)); + screen->cursorp.row, screen->cursorp.col)); drawXtermText(screen, flags & DRAWX_MASK, currentGC, - x = CurCursorX(screen, screen->cursor_row, cursor_col), - y = CursorY(screen, screen->cursor_row), - curXtermChrSet(screen->cursor_row), + x = CurCursorX(screen, screen->cursorp.row, cursor_col), + y = CursorY(screen, screen->cursorp.row), + curXtermChrSet(screen->cursorp.row), PAIRED_CHARS(&clo, &chi), 1, 0); #if OPT_WIDE_CHARS @@ -6525,7 +6881,7 @@ int col; Bool result = False; - for (col = 0; col < screen->max_col + 1; ++col) { + for (col = 0; col < MaxCols(screen); ++col) { if (attrs[col] & BLINK) { result = True; break; @@ -6600,7 +6956,7 @@ first_row, 0, last_row + 1 - first_row, - screen->max_col + 1, + MaxCols(screen), True); } } @@ -6629,6 +6985,11 @@ { TScreen *screen = &term->screen; + if (!XtIsRealized((Widget) term)) { + Bell(XkbBI_MinorError, 0); + return; + } + if (saved) { screen->savedlines = 0; ScrollBarDrawThumb(screen->scrollWidget); @@ -6695,17 +7056,26 @@ update_jumpscroll(); if (screen->c132 && (term->flags & IN132COLUMNS)) { - Dimension junk; + Dimension reqWidth = (80 * FontWidth(screen) + + 2 * screen->border + ScrollbarWidth(screen)); + Dimension reqHeight = (FontHeight(screen) + * MaxRows(screen) + 2 * screen->border); + Dimension replyWidth; + Dimension replyHeight; + + TRACE(("Making resize-request to restore 80-columns %dx%d\n", + reqHeight, reqWidth)); XtMakeResizeRequest((Widget) term, - (Dimension) 80 * FontWidth(screen) - + 2 * screen->border + ScrollbarWidth(screen), - (Dimension) FontHeight(screen) - * (screen->max_row + 1) + 2 * screen->border, - &junk, &junk); + reqWidth, + reqHeight, + &replyWidth, &replyHeight); + TRACE(("...result %dx%d\n", replyHeight, replyWidth)); + repairSizeHints(); XSync(screen->display, False); /* synchronize */ if (XtAppPending(app_con)) xevents(); } + CursorSet(screen, 0, 0, term->flags); CursorSave(term); } else { /* DECSTR */ @@ -6917,7 +7287,7 @@ Cardinal *param_count GCC_UNUSED) { /* do nothing, but check for funny escape sequences */ - (void) SendMousePosition(w, event); + (void) SendMousePosition((XtermWidget) w, event); } /* ARGSUSED */ @@ -6946,7 +7316,7 @@ we are a little more liberal here. */ if (len > 1000 || strchr(val, '\n')) return; - if (!xtermLoadFont(&term->screen, + if (!xtermLoadFont(term, xtermFontName(val), True, fontMenu_fontsel)) @@ -6978,7 +7348,7 @@ target = XmuInternAtom(XtDisplay(term), *pAtom); if (justprobe) { - term->screen.menu_font_names[fontMenu_fontsel] = + term->screen.MenuFontName(fontMenu_fontsel) = XGetSelectionOwner(XtDisplay(term), target) ? _Font_Selected_ : 0; } else { XtGetSelectionValue((Widget) term, target, XA_STRING, @@ -7000,6 +7370,7 @@ GC new_cursorFillGC = NULL; GC new_reversecursorGC = NULL; GC new_cursoroutlineGC = NULL; + Boolean changed = False; /* * Let's see, there are three things that have "color": @@ -7023,6 +7394,7 @@ * above by setting cursor color to foreground. */ + TRACE(("set_cursor_gcs cc=%#lx, fg=%#lx, bg=%#lx\n", cc, fg, bg)); #if OPT_ISO_COLORS /* * If we're using ANSI colors, the functions manipulating the SGR code will @@ -7033,9 +7405,9 @@ * not be set before the widget's realized, so it's tested separately). */ if (screen->colorMode) { - if (VWindow(screen) != 0 && (cc != bg) && (cc != fg)) { + if (VWindow(screen) != 0 && (cc != bg)) { /* we might have a colored foreground/background later */ - xgcv.font = screen->fnt_norm->fid; + xgcv.font = screen->fnts[fNorm]->fid; mask = (GCForeground | GCBackground | GCFont); xgcv.foreground = fg; xgcv.background = cc; @@ -7059,12 +7431,14 @@ new_cursoroutlineGC = XCreateGC(screen->display, VWindow(screen), mask, &xgcv); } + releaseCursorGCs(screen); + changed = True; } } else #endif - if (cc != fg && cc != bg) { + if (VWindow(screen) != 0 && (cc != bg)) { /* we have a colored cursor */ - xgcv.font = screen->fnt_norm->fid; + xgcv.font = screen->fnts[fNorm]->fid; mask = (GCForeground | GCBackground | GCFont); xgcv.foreground = fg; @@ -7086,32 +7460,24 @@ xgcv.background = bg; new_cursoroutlineGC = XtGetGC((Widget) term, mask, &xgcv); } + releaseCursorGCs(screen); + changed = True; } -#if OPT_ISO_COLORS - if (screen->colorMode) { - if (screen->cursorGC) - XFreeGC(screen->display, screen->cursorGC); - if (screen->fillCursorGC) - XFreeGC(screen->display, screen->fillCursorGC); - if (screen->reversecursorGC) - XFreeGC(screen->display, screen->reversecursorGC); - if (screen->cursoroutlineGC) - XFreeGC(screen->display, screen->cursoroutlineGC); - } else -#endif - { - if (screen->cursorGC) - XtReleaseGC((Widget) term, screen->cursorGC); - if (screen->fillCursorGC) - XtReleaseGC((Widget) term, screen->fillCursorGC); - if (screen->reversecursorGC) - XtReleaseGC((Widget) term, screen->reversecursorGC); - if (screen->cursoroutlineGC) - XtReleaseGC((Widget) term, screen->cursoroutlineGC); + + if (changed) { + TRACE(("...set_cursor_gcs - done\n")); + screen->cursorGC = new_cursorGC; + screen->fillCursorGC = new_cursorFillGC; + screen->reversecursorGC = new_reversecursorGC; + screen->cursoroutlineGC = new_cursoroutlineGC; } +} - screen->cursorGC = new_cursorGC; - screen->fillCursorGC = new_cursorFillGC; - screen->reversecursorGC = new_reversecursorGC; - screen->cursoroutlineGC = new_cursoroutlineGC; +#ifdef NO_LEAKS +void +noleaks_charproc(void) +{ + if (v_buffer != 0) + free(v_buffer); } +#endif Index: xc/programs/xterm/config.guess diff -u xc/programs/xterm/config.guess:1.21 xc/programs/xterm/config.guess:1.24 --- xc/programs/xterm/config.guess:1.21 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/config.guess Tue Jan 3 21:10:20 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-11-12' +timestamp='2005-11-11' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,13 +17,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,7 +55,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +68,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -123,7 +125,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -196,62 +198,27 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in - *4.0) + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -297,40 +264,43 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; *:z/VM:*:*) echo s390-ibm-zvmoe - exit 0 ;; + exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit 0 ;; + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -338,32 +308,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; + exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -372,10 +342,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -387,10 +357,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -401,40 +371,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -458,32 +428,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -499,29 +470,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -529,7 +500,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -544,14 +515,18 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; + exit ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -565,28 +540,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -648,9 +623,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -658,11 +643,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -690,158 +675,166 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; + exit ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) + exit ;; + x86:Interix*:[345]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit 0 ;; + exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit 0 ;; + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -859,7 +852,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -878,14 +871,17 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -899,7 +895,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -907,25 +903,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -943,15 +939,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -979,15 +975,18 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -995,27 +994,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1023,15 +1022,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1123,92 +1123,98 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1219,41 +1225,44 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) echo i386-pc-xenix - exit 0 ;; + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1285,7 +1294,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1374,11 +1383,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1387,22 +1397,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1413,7 +1423,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be Index: xc/programs/xterm/config.sub diff -u xc/programs/xterm/config.sub:1.21 xc/programs/xterm/config.sub:1.24 --- xc/programs/xterm/config.sub:1.21 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/config.sub Tue Jan 3 21:10:21 2006 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-11-30' +timestamp='2005-11-13' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +21,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,7 +71,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +84,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +100,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -170,6 +171,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -186,6 +191,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -231,13 +240,14 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +256,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,15 +265,17 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | ms1 \ | msp430 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -271,6 +284,9 @@ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -283,8 +299,8 @@ # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; + basic_machine=$basic_machine-pc + ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -298,7 +314,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bs2000-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -310,7 +326,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +335,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -327,6 +344,7 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -334,9 +352,10 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ @@ -348,6 +367,8 @@ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -364,7 +385,7 @@ basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -758,9 +779,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1086,12 +1106,9 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1136,8 +1153,8 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1178,7 +1195,8 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | haiku*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1196,7 +1214,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1217,7 +1235,7 @@ -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1266,7 +1284,7 @@ -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1339,9 +1357,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1385,10 +1403,13 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) @@ -1556,7 +1577,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) Index: xc/programs/xterm/configure diff -u xc/programs/xterm/configure:3.84 xc/programs/xterm/configure:3.92 --- xc/programs/xterm/configure:3.84 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/configure Sun Apr 9 20:34:36 2006 @@ -1,26 +1,155 @@ #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13.20030927 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# Generated by Autoconf 2.52.20030208. # +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# Defaults: -ac_help= +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Name of the executable. +as_me=`echo "$0" |sed 's,.*[\\/],,'` + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +as_executable_p="test -f" + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +# NLS nuisances. +$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } + +# Name of the host. +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +exec 6>&1 + +# +# Initializations. +# ac_default_prefix=/usr/local -# Any additions from configure.in: +cross_compiling=no +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Maximum number of lines to put in a shell here document. +# This variable seems obsolete. It should probably be removed, and +# only ac_max_sed_lines should be used. +: ${ac_max_here_lines=38} + +ac_unique_file="charproc.c" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# include +#endif" # Initialize some variables set by options. +ac_init_help= +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -build=NONE -cache_file=./config.cache +cache_file=/dev/null exec_prefix=NONE -host=NONE no_create= -nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -29,10 +158,15 @@ silent= site= srcdir= -target=NONE verbose= x_includes=NONE x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' @@ -46,17 +180,16 @@ infodir='${prefix}/info' mandir='${prefix}/man' -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= ac_prev= for ac_option do - # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -64,59 +197,59 @@ continue fi - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; + bindir=$ac_optarg ;; -build | --build | --buil | --bui | --bu) - ac_prev=build ;; + ac_prev=build_alias ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; + build_alias=$ac_optarg ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | --da=*) - datadir="$ac_optarg" ;; + datadir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "enable_${ac_feature}='$ac_optarg'" ;; + eval "enable_$ac_feature='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -125,162 +258,47 @@ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; + exec_prefix=$ac_optarg ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF -cat <<\EOF ---enable and --with options recognized: - --disable-full-tgetent disable check for full tgetent function - --disable-setuid disable setuid in xterm, do not install setuid - --with-utempter use utempter library for access to utmp - --with-x use the X Window System - --with-Xaw3d link with Xaw 3d library - --with-neXtaw link with neXT Athena library - --with-XawPlus link with Athena-Plus library - --disable-imake disable use of imake for definitions - --with-terminal-id[=V] set default decTerminalID (default: vt100) - --with-terminal-type=T set default \$TERM (default: xterm) - --with-own-terminfo=P set default \$TERMINFO (default: from environment) -Optional Features: - --disable-active-icon disable X11R6.3 active-icon feature -EOF -cat <<\EOF - --disable-ansi-color disable ANSI color - --disable-16-color disable 16-color support - --enable-256-color enable 256-color support - --enable-88-color enable 88-color support - --disable-blink-cursor disable support for blinking cursor - --enable-broken-osc allow broken Linux OSC-strings - --enable-broken-st allow broken string-terminators - --disable-c1-print disallow -k8 option for printable 128-159 - --disable-bold-color disable PC-style mapping of bold colors - --disable-color-class disable separate color class resources - --disable-color-mode disable default colorMode resource - --disable-highlighting disable support for color highlighting -EOF -cat <<\EOF - --disable-doublechars disable support for double-size chars - --disable-boxchars disable fallback-support for box chars - --disable-freetype disable freetype library-support - --with-freetype-cflags -D/-I options for compiling with FreeType - --with-freetype-libs -L/-l options to link FreeType - --enable-hp-fkeys enable support for HP-style function keys - --enable-sco-fkeys enable support for SCO-style function keys - --disable-i18n disable internationalization - --disable-initial-erase disable setup for stty erase - --disable-input-method disable input-method - --enable-load-vt-fonts enable load-vt-fonts() action - --enable-logging enable logging -EOF -cat <<\EOF - --enable-logfile-exec enable exec'd logfile filter - --disable-maximize disable actions for iconify/deiconify/maximize/restore - --disable-num-lock disable NumLock keypad support - --disable-pty-handshake disable pty-handshake support - --disable-rightbar disable right-scrollbar support - --disable-samename disable check for redundant name-change - --disable-session-mgt disable support for session management - --enable-tcap-query compile-in termcap-query support - --disable-tek4014 disable tek4014 emulation - --enable-toolbar compile-in toolbar for pulldown menus - --disable-vt52 disable VT52 emulation - --enable-mini-luit enable mini-luit (built-in Latin9 support) -EOF -cat <<\EOF - --enable-luit enable luit filter (Unicode translation) - --enable-wide-chars enable wide-character support - --enable-dabbrev enable dynamic-abbreviation support - --enable-dec-locator enable DECterm Locator support - --disable-ziconbeep disable -ziconbeep option -Testing/development Options: - --enable-trace test: set to enable debugging traces - --disable-echo display "compiling" commands - --enable-xmc-glitch test: enable xmc magic-cookie emulation - --enable-warnings test: turn on GCC compiler warnings -EOF - exit 0 ;; + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; -host | --host | --hos | --ho) - ac_prev=host ;; + ac_prev=host_alias ;; -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; + host_alias=$ac_optarg ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; + includedir=$ac_optarg ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; + infodir=$ac_optarg ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; + libdir=$ac_optarg ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; + libexecdir=$ac_optarg ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ | --localstate | --localstat | --localsta | --localst \ @@ -289,12 +307,12 @@ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; + localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; + mandir=$ac_optarg ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. @@ -315,26 +333,26 @@ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; + oldincludedir=$ac_optarg ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; + prefix=$ac_optarg ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; + program_prefix=$ac_optarg ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; + program_suffix=$ac_optarg ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -351,7 +369,7 @@ | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; + program_transform_name=$ac_optarg ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -361,7 +379,7 @@ ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; + sbindir=$ac_optarg ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -372,58 +390,57 @@ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; + sharedstatedir=$ac_optarg ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; + site=$ac_optarg ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; + srcdir=$ac_optarg ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; + sysconfdir=$ac_optarg ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; + ac_prev=target_alias ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; + target_alias=$ac_optarg ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13.20030927" - exit 0 ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac - eval "with_${ac_package}='$ac_optarg'" ;; + eval "with_$ac_package='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; --x) # Obsolete; use --with-x. @@ -434,98 +451,98 @@ ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; + x_includes=$ac_optarg ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; + x_libraries=$ac_optarg ;; - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" + export $ac_envvar ;; + *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac done if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -exec 5>./config.log -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix +do + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; + esac +done -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg +# Be sure to have absolute paths. +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; + eval ac_val=$`echo $ac_var` + case $ac_val in + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac done -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: should be removed in autoconf 3.0. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=charproc.c +test "$silent" = yes && exec 6>/dev/null # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then @@ -536,353 +553,1194 @@ fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { (exit 1); exit 1; }; } else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" + { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { (exit 1); exit 1; }; } fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file fi +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +ac_env_build_alias_set=${build_alias+set} +ac_env_build_alias_value=$build_alias +ac_cv_env_build_alias_set=${build_alias+set} +ac_cv_env_build_alias_value=$build_alias +ac_env_host_alias_set=${host_alias+set} +ac_env_host_alias_value=$host_alias +ac_cv_env_host_alias_set=${host_alias+set} +ac_cv_env_host_alias_value=$host_alias +ac_env_target_alias_set=${target_alias+set} +ac_env_target_alias_value=$target_alias +ac_cv_env_target_alias_set=${target_alias+set} +ac_cv_env_target_alias_value=$target_alias +ac_env_CC_set=${CC+set} +ac_env_CC_value=$CC +ac_cv_env_CC_set=${CC+set} +ac_cv_env_CC_value=$CC +ac_env_CFLAGS_set=${CFLAGS+set} +ac_env_CFLAGS_value=$CFLAGS +ac_cv_env_CFLAGS_set=${CFLAGS+set} +ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_LDFLAGS_set=${LDFLAGS+set} +ac_env_LDFLAGS_value=$LDFLAGS +ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS +ac_env_CPP_set=${CPP+set} +ac_env_CPP_value=$CPP +ac_cv_env_CPP_set=${CPP+set} +ac_cv_env_CPP_value=$CPP -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +Defaults for the options are specified in brackets. +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] -if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi +EOF -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:621: checking host system type" >&5 + cat <&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 +For better control, use the options below. - system_name="$host_os" -else - system_name="`(uname -s -r) 2>/dev/null`" - if test -z "$system_name" ; then - system_name="`(hostname) 2>/dev/null`" - fi -fi -test -n "$system_name" && cat >> confdefs.h <&6 -else - cf_cv_system_name="$system_name" -fi + cat <<\EOF +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names -test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$ac_t""Configuring for $cf_cv_system_name" 1>&6 +X features: + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR -if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$ac_t""Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" 1>&6 - { echo "configure: error: "Please remove config.cache and try again."" 1>&2; exit 1; } +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST build programs to run on HOST [BUILD] +EOF fi +if test -n "$ac_init_help"; then -### checks for alternative programs + cat <<\EOF -case "$host_os" in -openedition) : ${CFLAGS="-O2 -Wc,dll -Wl,EDIT=NO"} - : ${CPPFLAGS="-D_ALL_SOURCE"} - : ${LIBS="/usr/lib/Xaw.x /usr/lib/SM.x /usr/lib/ICE.x /usr/lib/X11.x"} - : ${CC=c89};; -darwin*) - : ${LDFLAGS}="${LDFLAGS} -Wl,-bind_at_load";; -esac +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:682: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:712: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" +Compile/Install Options: + --disable-full-tgetent disable check for full tgetent function + --with-app-defaults=DIR directory in which to install resource files (default: EPREFIX/lib/X11/app-defaults) + --with-reference=XXX program to use as permissions-reference + --with-xterm-symlink=XXX make symbolic link to installed xterm + --disable-setuid disable setuid in xterm, do not install setuid + --with-setuid=XXX use the given setuid user + --with-utmp-setgid=XXX use setgid to match utmp/utmpx file + --with-utempter use utempter library for access to utmp + --with-tty-group=XXX use XXX for the tty-group + --with-x use the X Window System + --with-Xaw3d link with Xaw 3d library + --with-neXtaw link with neXT Athena library + --with-XawPlus link with Athena-Plus library + --enable-narrowproto enable narrow prototypes for X libraries + --disable-imake disable use of imake for definitions +Terminal Configuration: + --with-terminal-id=V set default decTerminalID (default: vt100) + --with-terminal-type=T set default $TERM (default: xterm) + --with-own-terminfo=P set default $TERMINFO (default: from environment) +Optional Features: + --disable-active-icon disable X11R6.3 active-icon feature + --disable-ansi-color disable ANSI color + --disable-16-color disable 16-color support + --enable-256-color enable 256-color support + --enable-88-color enable 88-color support + --disable-blink-cursor disable support for blinking cursor + --enable-broken-osc allow broken Linux OSC-strings + --enable-broken-st allow broken string-terminators + --disable-c1-print disallow -k8 option for printable 128-159 + --disable-bold-color disable PC-style mapping of bold colors + --disable-color-class disable separate color class resources + --disable-color-mode disable default colorMode resource + --disable-highlighting disable support for color highlighting + --disable-doublechars disable support for double-size chars + --disable-boxchars disable fallback-support for box chars + --disable-freetype disable freetype library-support + --with-freetype-cflags -D/-I options for compiling with FreeType + --with-freetype-libs -L/-l options to link FreeType + --enable-hp-fkeys enable support for HP-style function keys + --enable-sco-fkeys enable support for SCO-style function keys + --disable-i18n disable internationalization + --disable-initial-erase disable setup for stty erase + --disable-input-method disable input-method + --enable-load-vt-fonts enable load-vt-fonts() action + --enable-logging enable logging + --enable-logfile-exec enable exec'd logfile filter + --disable-maximize disable actions for iconify/deiconify/maximize/restore + --disable-num-lock disable NumLock keypad support + --enable-paste64 enable get/set base64 selection data + --disable-pty-handshake disable pty-handshake support + --enable-readline-mouse enable support for mouse in readline applications + --disable-regex disable regular-expression selections + --with-pcre use PCRE for regular-expressions + --disable-rightbar disable right-scrollbar support + --disable-samename disable check for redundant name-change + --disable-session-mgt disable support for session management + --enable-tcap-query compile-in termcap-query support + --disable-tek4014 disable tek4014 emulation + --enable-toolbar compile-in toolbar for pulldown menus + --disable-vt52 disable VT52 emulation + --enable-mini-luit enable mini-luit (built-in Latin9 support) + --enable-luit enable luit filter (Unicode translation) + --enable-wide-chars enable wide-character support + --enable-dabbrev enable dynamic-abbreviation support + --enable-dec-locator enable DECterm Locator support + --disable-ziconbeep disable -ziconbeep option +Testing/development Options: + --enable-trace test: set to enable debugging traces + --disable-leaks test: set to test memory leaks + --disable-echo display "compiling" commands + --enable-xmc-glitch test: enable xmc magic-cookie emulation + --enable-warnings test: turn on GCC compiler warnings + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +EOF +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + ac_popdir=`pwd` + for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue + cd $ac_subdir + # A "../" for each directory in /$ac_subdir. + ac_dots=`echo $ac_subdir | + sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` + + case $srcdir in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_subdir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure.gnu; then + echo + $SHELL $ac_sub_srcdir/configure.gnu --help=recursive + elif test -f $ac_sub_srcdir/configure; then + echo + $SHELL $ac_sub_srcdir/configure --help=recursive + elif test -f $ac_sub_srcdir/configure.ac || + test -f $ac_sub_srcdir/configure.in; then + echo + $ac_configure --help + else + echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 + fi + cd $ac_popdir + done +fi + +test -n "$ac_init_help" && exit 0 +if $ac_init_version; then + cat <<\EOF + +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +EOF + exit 0 +fi +exec 5>config.log +cat >&5 </dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +PATH = $PATH + +_ASUNAME +} >&5 + +cat >&5 <\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + ac_sep=" " ;; + *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" + ac_sep=" " ;; + esac + # Get rid of the leading space. +done + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + echo >&5 + echo "## ----------------- ##" >&5 + echo "## Cache variables. ##" >&5 + echo "## ----------------- ##" >&5 + echo >&5 + # The following way of writing the cache mishandles newlines in values, +{ + (set) 2>&1 | + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) + sed -n \ + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + ;; + *) + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} >&5 + sed "/^$/d" confdefs.h >conftest.log + if test -s conftest.log; then + echo >&5 + echo "## ------------ ##" >&5 + echo "## confdefs.h. ##" >&5 + echo "## ------------ ##" >&5 + echo >&5 + cat conftest.log >&5 + fi + (echo; echo) >&5 + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" >&5 + echo "$as_me: exit $exit_status" >&5 + rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && + exit $exit_status + ' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo >confdefs.h + +# Let the site file select an alternate cache file if it wants to. +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + { echo "$as_me:950: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + cat "$ac_site_file" >&5 + . "$ac_site_file" fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:961: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . $cache_file;; + *) . ./$cache_file;; + esac + fi +else + { echo "$as_me:969: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:985: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:989: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + { echo "$as_me:995: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:997: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:999: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. It doesn't matter if + # we pass some twice (in addition to the command line arguments). + if test "$ac_new_set" = set; then + case $ac_new_val in + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" + ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:1018: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:1020: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac +echo "#! $SHELL" >conftest.sh +echo "exit 0" >>conftest.sh +chmod +x conftest.sh +if { (echo "$as_me:1040: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? + echo "$as_me:1043: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' +else + ac_path_separator=: fi +PATH_SEPARATOR="$ac_path_separator" +rm -f conftest.sh + +ac_config_headers="$ac_config_headers xtermcfg.h:xtermcfg.hin" + +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f $ac_dir/shtool; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { { echo "$as_me:1071: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } +fi +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:1081: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:1085: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:1094: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:1098: error: $ac_config_sub $ac_cv_build_alias failed." >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1103: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then + echo "$as_me:1111: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:1120: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:1125: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + system_name="$host_os" +else + system_name="`(uname -s -r) 2>/dev/null`" + if test -z "$system_name" ; then + system_name="`(hostname) 2>/dev/null`" + fi fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 +test -n "$system_name" && cat >>confdefs.h <&6 else - echo "$ac_t""no" 1>&6 + cf_cv_system_name="$system_name" +fi + +test -z "$system_name" && system_name="$cf_cv_system_name" +test -n "$cf_cv_system_name" && echo "$as_me:1150: result: Configuring for $cf_cv_system_name" >&5 +echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 + +if test ".$system_name" != ".$cf_cv_system_name" ; then + echo "$as_me:1154: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 +echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 + { { echo "$as_me:1156: error: \"Please remove config.cache and try again.\"" >&5 +echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} + { (exit 1); exit 1; }; } fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:763: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +### checks for alternative programs + +case "$host_os" in +openedition) : ${CFLAGS="-O2 -Wc,dll -Wl,EDIT=NO"} + : ${CPPFLAGS="-D_ALL_SOURCE"} + : ${LIBS="/usr/lib/Xaw.x /usr/lib/SM.x /usr/lib/ICE.x /usr/lib/X11.x"} + : ${CC=c89};; +darwin*) + : ${LDFLAGS}="${LDFLAGS} -Wl,-bind_at_load";; +esac + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +echo "$as_me:1180: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="${ac_tool_prefix}gcc" +echo "$as_me:1195: found $ac_dir/$ac_word" >&5 +break +done + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + echo "$as_me:1203: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:1206: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo "$as_me:1215: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="gcc" +echo "$as_me:1230: found $ac_dir/$ac_word" >&5 +break +done -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1238: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1241: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi -cat > conftest.$ac_ext << EOF +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +echo "$as_me:1254: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="${ac_tool_prefix}cc" +echo "$as_me:1269: found $ac_dir/$ac_word" >&5 +break +done -#line 806 "configure" -#include "confdefs.h" +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1277: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 +else + echo "$as_me:1280: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -main(){return(0);} -EOF -if { (eval echo configure:811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:1289: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="cc" +echo "$as_me:1304: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1312: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:1315: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:1328: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +fi +ac_cv_prog_CC="cc" +echo "$as_me:1348: found $ac_dir/$ac_word" >&5 +break +done + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" ${1+"$@"} + shift + ac_cv_prog_CC="$@" fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1370: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no + echo "$as_me:1373: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:1384: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +echo "$as_me:1399: found $ac_dir/$ac_word" >&5 +break +done -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:842: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + echo "$as_me:1407: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes + echo "$as_me:1410: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:1423: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="$ac_prog" +echo "$as_me:1438: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:1446: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - ac_cv_prog_gcc=no + echo "$as_me:1449: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + + test -n "$ac_ct_CC" && break +done + + CC=$ac_ct_CC fi -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 +fi + +test -z "$CC" && { { echo "$as_me:1461: error: no acceptable cc found in \$PATH" >&5 +echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + +# Provide some information about the compiler. +echo "$as_me:1466:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:1469: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 + ac_status=$? + echo "$as_me:1472: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1474: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:1477: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:1479: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:1482: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +#line 1486 "configure" +#include "confdefs.h" + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.exe" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +echo "$as_me:1502: checking for C compiler default output" >&5 +echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +if { (eval echo "$as_me:1505: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? + echo "$as_me:1508: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. +for ac_file in `ls a.exe conftest.exe 2>/dev/null; + ls a.out conftest 2>/dev/null; + ls a.* conftest.* 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + a.out ) # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool --akim. + export ac_cv_exeext + break;; + * ) break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:1531: error: C compiler cannot create executables" >&5 +echo "$as_me: error: C compiler cannot create executables" >&2;} + { (exit 77); exit 77; }; } +fi + +ac_exeext=$ac_cv_exeext +echo "$as_me:1537: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 + +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:1542: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (eval echo "$as_me:1548: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1551: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:1558: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&5 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'." >&2;} + { (exit 1); exit 1; }; } + fi + fi +fi +echo "$as_me:1566: result: yes" >&5 +echo "${ECHO_T}yes" >&6 -if test $ac_cv_prog_gcc = yes; then - GCC=yes +rm -f a.out a.exe conftest$ac_cv_exeext +ac_clean_files=$ac_clean_files_save +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:1573: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:1575: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:1578: checking for executable suffix" >&5 +echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +if { (eval echo "$as_me:1580: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:1583: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext + break;; + * ) break;; + esac +done else - GCC= + { { echo "$as_me:1599: error: cannot compute EXEEXT: cannot compile and link" >&5 +echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { (exit 1); exit 1; }; } fi -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:870: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +rm -f conftest$ac_cv_exeext +echo "$as_me:1605: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +echo "$as_me:1611: checking for object suffix" >&5 +echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes + cat >conftest.$ac_ext <<_ACEOF +#line 1617 "configure" +#include "confdefs.h" + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (eval echo "$as_me:1629: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1632: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done else - ac_cv_prog_cc_g=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +{ { echo "$as_me:1644: error: cannot compute OBJEXT: cannot compile" >&5 +echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} + { (exit 1); exit 1; }; } fi -rm -f conftest* +rm -f conftest.$ac_cv_objext conftest.$ac_ext fi +echo "$as_me:1651: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +echo "$as_me:1655: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 1661 "configure" +#include "confdefs.h" -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1676: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1679: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1682: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1685: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_compiler_gnu=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_compiler_gnu=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +echo "$as_me:1697: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +CFLAGS="-g" +echo "$as_me:1703: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 1709 "configure" +#include "confdefs.h" + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1721: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1724: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1727: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1730: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_prog_cc_g=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:1740: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" + CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -896,129 +1754,355 @@ CFLAGS= fi fi +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1767: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1770: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1773: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1776: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +#line 1788 "configure" +#include "confdefs.h" +#include +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1801: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1804: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1807: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1810: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +continue +fi +rm -f conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +#line 1820 "configure" +#include "confdefs.h" +$ac_declaration +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:1832: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:1835: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:1838: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:1841: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:902: checking how to run the C preprocessor" >&5 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:1873: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 1894 "configure" #include "confdefs.h" #include -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then + Syntax error +_ACEOF +if { (eval echo "$as_me:1899: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:1905: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 1928 "configure" #include "confdefs.h" -#include -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : +#include +_ACEOF +if { (eval echo "$as_me:1932: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:1938: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <&5 +echo "${ECHO_T}$CPP" >&6 +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +#line 1985 "configure" #include "confdefs.h" #include -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:957: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then + Syntax error +_ACEOF +if { (eval echo "$as_me:1990: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:1996: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then : else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp + # Broken: fails on valid input. +continue fi -rm -f conftest* -fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether non-existent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +#line 2019 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:2023: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:2029: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" +if test -z "$ac_cpp_err"; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + # Passes both tests. +ac_preproc_ok=: +break fi - CPP="$ac_cv_prog_CPP" +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : else - ac_cv_prog_CPP="$CPP" + { { echo "$as_me:2057: error: C preprocessor \"$CPP\" fails sanity check" >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} + { (exit 1); exit 1; }; } fi -echo "$ac_t""$CPP" 1>&6 -if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:983: checking whether ${CC-cc} needs -traditional" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test $ac_cv_c_compiler_gnu = yes; then + echo "$as_me:2069: checking whether $CC needs -traditional" >&5 +echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 +if test "${ac_cv_prog_gcc_traditional+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2076 "configure" #include "confdefs.h" #include -Autoconf TIOCGETP -EOF +int Autoconf = TIOCGETP; +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_prog_gcc_traditional=yes else - rm -rf conftest* ac_cv_prog_gcc_traditional=no fi rm -f conftest* - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2091 "configure" #include "confdefs.h" #include -Autoconf TCGETA -EOF +int Autoconf = TCGETA; +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "$ac_pattern" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_prog_gcc_traditional=yes fi rm -f conftest* fi fi - -echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 +echo "$as_me:2104: result: $ac_cv_prog_gcc_traditional" >&5 +echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi @@ -1026,36 +2110,39 @@ for ac_prog in mawk gawk nawk awk do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1033: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:2115: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AWK="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_AWK="$ac_prog" +echo "$as_me:2130: found $ac_dir/$ac_word" >&5 +break +done + fi fi -AWK="$ac_cv_prog_AWK" +AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$ac_t""$AWK" 1>&6 + echo "$as_me:2138: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:2141: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$AWK" && break + test -n "$AWK" && break done # Find a good install program. We prefer a C program (faster), @@ -1065,31 +2152,39 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1074: checking for a BSD compatible install" >&5 +echo "$as_me:2160: checking for a BSD compatible install" >&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" + ac_save_IFS=$IFS; IFS=$ac_path_separator for ac_dir in $PATH; do + IFS=$ac_save_IFS # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + case $ac_dir/ in + / | ./ | .// | /cC/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root # by default. for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + if $as_executable_p "$ac_dir/$ac_prog"; then if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : + elif test $ac_prog = install && + grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -1099,116 +2194,115 @@ ;; esac done - IFS="$ac_save_IFS" fi if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" + INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. We don't cache a # path for INSTALL within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the path is relative. - INSTALL="$ac_install_sh" + INSTALL=$ac_install_sh fi fi -echo "$ac_t""$INSTALL" 1>&6 +echo "$as_me:2209: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -if test "$program_transform_name" = s,x,x,; then - program_transform_name= -else - # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g -EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" - rm -f conftestsed -fi test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},; $program_transform_name" + program_transform_name="s,^,$program_prefix,;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" - -# sed with no file args requires a program. -test "$program_transform_name" = "" && program_transform_name="s,x,x," + program_transform_name="s,\$,$program_suffix,;$program_transform_name" +# Double any \ or $. echo might interpret backslashes. +# By default was `s,x,x', remove it if useless. +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm conftest.sed for ac_prog in tdlint lint alint do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1150: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:2237: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_LINT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$LINT"; then ac_cv_prog_LINT="$LINT" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LINT="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LINT="$ac_prog" +echo "$as_me:2252: found $ac_dir/$ac_word" >&5 +break +done + fi fi -LINT="$ac_cv_prog_LINT" +LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$ac_t""$LINT" 1>&6 + echo "$as_me:2260: result: $LINT" >&5 +echo "${ECHO_T}$LINT" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:2263: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$LINT" && break + test -n "$LINT" && break done - ### checks for UNIX variants that set C preprocessor variables -echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1182: checking for AIX" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for AIX... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 2275 "configure" #include "confdefs.h" #ifdef _AIX yes #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF + echo "$as_me:2284: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +cat >>confdefs.h <<\EOF #define _ALL_SOURCE 1 EOF else - rm -rf conftest* - echo "$ac_t""no" 1>&6 + echo "$as_me:2291: result: no" >&5 +echo "${ECHO_T}no" >&6 fi rm -f conftest* - -echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1206: checking for POSIXized ISC" >&5 +echo "$as_me:2296: checking for POSIXized ISC" >&5 +echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then - echo "$ac_t""yes" 1>&6 + echo "$as_me:2301: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ISC=yes # If later tests want to check for ISC. - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define _POSIX_SOURCE 1 EOF @@ -1218,19 +2312,19 @@ CC="$CC -Xp" fi else - echo "$ac_t""no" 1>&6 + echo "$as_me:2315: result: no" >&5 +echo "${ECHO_T}no" >&6 ISC= fi - ### checks for compiler characteristics -echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1230: checking for ${CC-cc} option to accept ANSI C" >&5 -if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:2322: checking for ${CC-cc} option to accept ANSI C" >&5 +echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 +if test "${cf_cv_ansi_cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_ansi_cc=no cf_save_CFLAGS="$CFLAGS" cf_save_CPPFLAGS="$CPPFLAGS" @@ -1249,7 +2343,7 @@ "-Aa -D_HPUX_SOURCE" \ -Xc do - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -1304,25 +2398,22 @@ done if test -n "$cf_new_cflags" ; then - + CFLAGS="$CFLAGS $cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi if test -n "$cf_new_extra_cppflags" ; then - + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - - - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2416 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -1331,32 +2422,46 @@ #endif #endif -int main() { +int +main () +{ int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; -; return 0; } -EOF -if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2437: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2440: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2443: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2446: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_ansi_cc="$cf_arg"; break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext done CFLAGS="$cf_save_CFLAGS" CPPFLAGS="$cf_save_CPPFLAGS" fi - -echo "$ac_t""$cf_cv_ansi_cc" 1>&6 +echo "$as_me:2459: result: $cf_cv_ansi_cc" >&5 +echo "${ECHO_T}$cf_cv_ansi_cc" >&6 if test "$cf_cv_ansi_cc" != "no"; then if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -1411,169 +2516,211 @@ done if test -n "$cf_new_cflags" ; then - + CFLAGS="$CFLAGS $cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi if test -n "$cf_new_extra_cppflags" ; then - + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - - - else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define CC_HAS_PROTOS 1 EOF fi fi -echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1441: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line 2549 "configure" #include "confdefs.h" - -int main() { - -/* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x; -/* SunOS 4.1.1 cc rejects this. */ -char const *const *ccp; -char **p; -/* NEC SVR4.0.2 mips cc rejects this. */ -struct point {int x, y;}; -static struct point const zero = {0,0}; -/* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in an arm - of an if-expression whose if-part is not a constant expression */ -const char *g = "string"; -ccp = &g + (g ? g-g : 0); -/* HPUX 7.0 cc rejects these. */ -++ccp; -p = (char**) ccp; -ccp = (char const *const *) p; -{ /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; -} -{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; -} -{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; -} -{ /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; } -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; } - -; return 0; } -EOF -if { (eval echo configure:1495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:2598: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2601: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2604: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2607: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi - -echo "$ac_t""$ac_cv_c_const" 1>&6 -if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const -EOF +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC fi -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1516: checking for Cygwin environment" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:2624: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:2627: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + +echo "$as_me:2632: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2638 "configure" #include "confdefs.h" -int main() { - -#ifndef __CYGWIN__ -#define __CYGWIN__ __CYGWIN32__ +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } #endif -return __CYGWIN__; -; return 0; } -EOF -if { (eval echo configure:1532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_cygwin" 1>&6 -CYGWIN= -test "$ac_cv_cygwin" = yes && CYGWIN=yes -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1549: checking for mingw32 environment" >&5 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2696: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2699: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2702: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2705: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_const=no fi -rm -f conftest* -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:2715: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 +if test $ac_cv_c_const = no; then -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes +cat >>confdefs.h <<\EOF +#define const +EOF +fi case $cf_cv_system_name in os2*) @@ -1586,113 +2733,65 @@ ;; esac - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1593: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - -echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1624: checking for object suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftest* -echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; - esac - done -else - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } -fi -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_objext" 1>&6 -OBJEXT=$ac_cv_objext -ac_objext=$ac_cv_objext - - PROG_EXT="$EXEEXT" -test -n "$PROG_EXT" && cat >> confdefs.h <>confdefs.h <&5 +echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6 +if test "${cf_cv_cc_u_d_options+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - - - -INTEL_COMPILER=no - -if test "$GCC" = yes ; then - case $host_os in - linux*|gnu*) - echo $ac_n "checking if this is really Intel compiler""... $ac_c" 1>&6 -echo "configure:1664: checking if this is really Intel compiler" >&5 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -no-gcc" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2751 "configure" #include "confdefs.h" -int main() { +int +main () +{ -#ifdef __INTEL_COMPILER -#else -make an error +#ifndef U_D_OPTIONS +make an undefined-error +#endif +#ifdef D_U_OPTIONS +make a defined-error #endif -; return 0; } -EOF -if { (eval echo configure:1680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2770: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2773: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2776: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2779: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + cf_cv_cc_u_d_options=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - CFLAGS="$cf_save_CFLAGS" - echo "$ac_t""$INTEL_COMPILER" 1>&6 - ;; - esac + cf_cv_cc_u_d_options=no fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$cf_save_CPPFLAGS" - +fi +echo "$as_me:2793: result: $cf_cv_cc_u_d_options" >&5 +echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6 cf_XOPEN_SOURCE=500 cf_POSIX_C_SOURCE=199506L @@ -1716,67 +2815,89 @@ CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE" ;; linux*|gnu*) #(vi - - -if test "$INTEL_COMPILER" = no ; then -echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1725: checking if we must define _GNU_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:2819: checking if we must define _GNU_SOURCE" >&5 +echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_gnu_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2826 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ #ifndef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:1741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2841: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2844: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2847: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2850: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_gnu_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_save="$CPPFLAGS" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2859 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ #ifdef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:1761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2874: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2877: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2880: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2883: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_gnu_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_gnu_source=yes + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_gnu_source=yes fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save" - -fi -rm -f conftest* fi +rm -f conftest.$ac_objext conftest.$ac_ext -echo "$ac_t""$cf_cv_gnu_source" 1>&6 -test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" fi +echo "$as_me:2898: result: $cf_cv_gnu_source" >&5 +echo "${ECHO_T}$cf_cv_gnu_source" >&6 +test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" ;; mirbsd*) #(vi @@ -1791,6 +2912,9 @@ osf[45]*) #(vi CPPFLAGS="$CPPFLAGS -D_OSF_SOURCE" ;; +nto-qnx*) #(vi + CPPFLAGS="$CPPFLAGS -D_QNX_SOURCE" + ;; sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; @@ -1798,98 +2922,165 @@ CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" ;; *) - echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 -echo "configure:1803: checking if we should define _XOPEN_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_xopen_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 2932 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ #ifndef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:1819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2947: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2950: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2953: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2956: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xopen_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_save="$CPPFLAGS" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 2965 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ #ifdef _XOPEN_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:1839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2980: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2983: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2986: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2989: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xopen_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_xopen_source=$cf_XOPEN_SOURCE + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_xopen_source=$cf_XOPEN_SOURCE fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save" - + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:3004: result: $cf_cv_xopen_source" >&5 +echo "${ECHO_T}$cf_cv_xopen_source" >&6 + if test "$cf_cv_xopen_source" != no ; then + +# remove _XOPEN_SOURCE symbol from $CFLAGS +CFLAGS=`echo "$CFLAGS" | \ + sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'` + +# remove _XOPEN_SOURCE symbol from $CPPFLAGS +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]_XOPEN_SOURCE\(=[^ ]*\)\?$//g'` + + test "$cf_cv_cc_u_d_options" = yes && \ + CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_cv_xopen_source" + fi -echo "$ac_t""$cf_cv_xopen_source" 1>&6 -test "$cf_cv_xopen_source" != no && CPPFLAGS="$CPPFLAGS -U_XOPEN_SOURCE -D_XOPEN_SOURCE=$cf_cv_xopen_source" - cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:1861: checking if we should define _POSIX_C_SOURCE" >&5 -if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - -echo "(line 1867) testing if the symbol is already defined go no further ..." 1>&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 +if test "${cf_cv_posix_c_source+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +echo "(line 3044) testing if the symbol is already defined go no further ..." 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 3047 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ #ifndef _POSIX_C_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:1880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3062: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3065: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3068: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3071: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_posix_c_source=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in - .[12]??*) - cf_cv_posix_c_source="-U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_want_posix_source=no + case .$cf_POSIX_C_SOURCE in #(vi + .[12]??*) #(vi + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ;; - .2) - cf_cv_posix_c_source="-U_POSIX_C_SOURCE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + .2) #(vi + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" cf_want_posix_source=yes ;; .*) @@ -1897,196 +3088,483 @@ ;; esac if test "$cf_want_posix_source" = yes ; then - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3092 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ #ifdef _POSIX_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:1912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3107: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3110: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3113: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3116: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_c_source="$cf_cv_posix_c_source -U_POSIX_SOURCE -D_POSIX_SOURCE" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "(line 1923) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" - -echo "(line 1928) testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "(line 3127) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" - cat > conftest.$ac_ext <&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 3135 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ #ifndef _POSIX_C_SOURCE make an error #endif -; return 0; } -EOF -if { (eval echo configure:1941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3150: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3153: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3156: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3159: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_c_source=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_c_source=no fi -rm -f conftest* - CPPFLAGS="$cf_save" - +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:3175: result: $cf_cv_posix_c_source" >&5 +echo "${ECHO_T}$cf_cv_posix_c_source" >&6 -echo "$ac_t""$cf_cv_posix_c_source" 1>&6 -test "$cf_cv_posix_c_source" != no && CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" +if test "$cf_cv_posix_c_source" != no ; then + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" + if test "$cf_cv_cc_u_d_options" = yes ; then + cf_temp_posix_c_source=`echo "$cf_cv_posix_c_source" | \ + sed -e 's/-D/-U/g' -e 's/=[^ ]*//g'` + CPPFLAGS="$CPPFLAGS $cf_temp_posix_c_source" + fi + CPPFLAGS="$CPPFLAGS $cf_cv_posix_c_source" +fi ;; esac +echo "$as_me:3192: checking if SIGWINCH is defined" >&5 +echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 +if test "${cf_cv_define_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 3199 "configure" +#include "confdefs.h" + +#include +#include + +int +main () +{ +int x = xSIGWINCH + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3214: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3217: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3223: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cat >conftest.$ac_ext <<_ACEOF +#line 3230 "configure" +#include "confdefs.h" + +#undef _XOPEN_SOURCE +#undef _POSIX_SOURCE +#undef _POSIX_C_SOURCE +#include +#include + +int +main () +{ +int x = SIGWINCH + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3248: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3251: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3254: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3257: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_define_sigwinch=maybe +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_define_sigwinch=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:3271: result: $cf_cv_define_sigwinch" >&5 +echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 + +if test "$cf_cv_define_sigwinch" = maybe ; then +echo "$as_me:3275: checking to fixup SIGWINCH definition" >&5 +echo $ECHO_N "checking to fixup SIGWINCH definition... $ECHO_C" >&6 +if test "${cf_cv_fixup_sigwinch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cf_cv_fixup_sigwinch=unknown +cf_sigwinch=32 +while test $cf_sigwinch != 1 +do + cat >conftest.$ac_ext <<_ACEOF +#line 3286 "configure" +#include "confdefs.h" + +#undef _XOPEN_SOURCE +#undef _POSIX_SOURCE +#undef _POSIX_C_SOURCE +#include +#include + +int +main () +{ + +#if SIGWINCH != $cf_sigwinch +make an error +#endif +int x = SIGWINCH + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3308: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3311: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3314: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3317: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_fixup_sigwinch=$cf_sigwinch + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +cf_sigwinch=`expr $cf_sigwinch - 1` +done + +fi +echo "$as_me:3331: result: $cf_cv_fixup_sigwinch" >&5 +echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then + CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch" + fi +fi ### checks for header files -for ac_hdr in \ + +for ac_header in \ ncurses/term.h \ stdlib.h \ termios.h \ unistd.h \ +wchar.h \ do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1974: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 3356 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:3360: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:3366: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:3385: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2011: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3395: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3401 "configure" #include "confdefs.h" #include #include #include -int main() { -struct tm *tp; -; return 0; } -EOF -if { (eval echo configure:2025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3417: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3420: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3423: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3426: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_time=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_time=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_time=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_time" 1>&6 +echo "$as_me:3436: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define TIME_WITH_SYS_TIME 1 EOF fi - - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:2047: checking for nl_langinfo and CODESET" >&5 -if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:3446: checking for nl_langinfo and CODESET" >&5 +echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 +if test "${am_cv_langinfo_codeset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3452 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ char* cs = nl_langinfo(CODESET); -; return 0; } -EOF -if { (eval echo configure:2059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3464: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3467: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3470: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3473: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - am_cv_langinfo_codeset=no -fi -rm -f conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +am_cv_langinfo_codeset=no fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 +fi +echo "$as_me:3484: result: $am_cv_langinfo_codeset" >&5 +echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_LANGINFO_CODESET 1 EOF fi - ### checks for typedefs -echo $ac_n "checking for size_t in or ""... $ac_c" 1>&6 -echo "configure:2084: checking for size_t in or " >&5 -if eval "test \"`echo '$''{'cf_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 +if test "${cf_cv_sig_atomic_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + for cf_type in \ + "volatile sig_atomic_t" \ + "sig_atomic_t" \ + "int" + do + cat >conftest.$ac_ext <<_ACEOF +#line 3508 "configure" +#include "confdefs.h" + +#include +#include +#include + +extern $cf_type x; +$cf_type x; +static void handler(int sig) +{ + x = 5; +} +int +main () +{ +signal(SIGINT, handler); + x = 1 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3531: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3534: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3537: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3540: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sig_atomic_t=$cf_type +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sig_atomic_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + test "$cf_cv_sig_atomic_t" != no && break + done + +fi + +echo "$as_me:3554: result: $cf_cv_sig_atomic_t" >&5 +echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 +test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h < or " >&5 +echo $ECHO_N "checking for size_t in or ... $ECHO_C" >&6 +if test "${cf_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 3567 "configure" #include "confdefs.h" #include @@ -2095,69 +3573,93 @@ #include #endif #include -int main() { +int +main () +{ size_t x -; return 0; } -EOF -if { (eval echo configure:2103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3585: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3588: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3591: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3594: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_type_size_t=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_type_size_t=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_type_size_t=no fi -rm -f conftest* - +rm -f conftest.$ac_objext conftest.$ac_ext + fi -echo "$ac_t""$cf_cv_type_size_t" 1>&6 -test $cf_cv_type_size_t = no && cat >> confdefs.h <<\EOF +echo "$as_me:3606: result: $cf_cv_type_size_t" >&5 +echo "${ECHO_T}$cf_cv_type_size_t" >&6 +test $cf_cv_type_size_t = no && cat >>confdefs.h <<\EOF #define size_t unsigned EOF - -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2123: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3612: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3618 "configure" #include "confdefs.h" #include #include #include #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + +_ACEOF +if { (eval echo "$as_me:3626: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:3632: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest* +rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3654 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "memchr" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -2166,16 +3668,16 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3672 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "free" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -2184,347 +3686,520 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3693 "configure" #include "confdefs.h" #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif -EOF -if { (eval echo configure:2203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:3719: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:3722: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:3724: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3727: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_stdc=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 +echo "$as_me:3740: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define STDC_HEADERS 1 EOF fi -echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:2227: checking for time_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:3756: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 3762 "configure" +#include "confdefs.h" +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3768: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3771: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3774: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3777: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:3787: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 | - egrep "(^|[^a-zA-Z_0-9])time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* + +fi +done + +echo "$as_me:3797: checking for time_t" >&5 +echo $ECHO_N "checking for time_t... $ECHO_C" >&6 +if test "${ac_cv_type_time_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 3803 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((time_t *) 0) + return 0; +if (sizeof (time_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3818: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3821: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3824: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3827: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_time_t=yes else - rm -rf conftest* - ac_cv_type_time_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_time_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:3837: result: $ac_cv_type_time_t" >&5 +echo "${ECHO_T}$ac_cv_type_time_t" >&6 +if test $ac_cv_type_time_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_time_t" 1>&6 -if test $ac_cv_type_time_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:2260: checking for mode_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +echo "$as_me:3849: checking for mode_t" >&5 +echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 +if test "${ac_cv_type_mode_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 3855 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((mode_t *) 0) + return 0; +if (sizeof (mode_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3870: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3873: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3876: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3879: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_mode_t=yes else - rm -rf conftest* - ac_cv_type_mode_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_mode_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:3889: result: $ac_cv_type_mode_t" >&5 +echo "${ECHO_T}$ac_cv_type_mode_t" >&6 +if test $ac_cv_type_mode_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_mode_t" 1>&6 -if test $ac_cv_type_mode_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:2293: checking for pid_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* +echo "$as_me:3901: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 3907 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +if ((pid_t *) 0) + return 0; +if (sizeof (pid_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:3922: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:3925: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:3928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3931: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else - rm -rf conftest* - ac_cv_type_pid_t=no -fi -rm -f conftest* + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_type_pid_t=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:3941: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +if test $ac_cv_type_pid_t = yes; then + : +else -fi -echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -if test $ac_cv_type_pid_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <&6 -echo "configure:2326: checking for uid_t in sys/types.h" >&5 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:3953: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 +if test "${ac_cv_type_uid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 3959 "configure" #include "confdefs.h" #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "uid_t" >/dev/null 2>&1; then - rm -rf conftest* ac_cv_type_uid_t=yes else - rm -rf conftest* ac_cv_type_uid_t=no fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_type_uid_t" 1>&6 +echo "$as_me:3973: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define uid_t int EOF - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\EOF #define gid_t int EOF fi - ### checks for library functions + for ac_func in \ bcopy \ gethostname \ getlogin \ memmove \ putenv \ + sched_yield \ strerror \ strftime \ tcgetattr \ waitpid \ - + wcswidth \ + wcwidth do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2374: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:4004: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4010 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif -; return 0; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4041: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4044: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4047: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4050: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:4060: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done - -echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:2428: checking for memmove" >&5 -if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4070: checking for memmove" >&5 +echo $ECHO_N "checking for memmove... $ECHO_C" >&6 +if test "${ac_cv_func_memmove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4076 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char memmove(); below. */ + which can conflict with char memmove (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char memmove(); - -int main() { + builtin and then its argument prototype would still apply. */ +char memmove (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_memmove) || defined (__stub___memmove) choke me #else -memmove(); +f = memmove; #endif -; return 0; } -EOF -if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_memmove=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_memmove=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'memmove`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4107: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4110: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4113: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4116: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_memmove=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_memmove=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:4126: result: $ac_cv_func_memmove" >&5 +echo "${ECHO_T}$ac_cv_func_memmove" >&6 +if test $ac_cv_func_memmove = yes; then : else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:2475: checking for bcopy" >&5 -if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4132: checking for bcopy" >&5 +echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 +if test "${ac_cv_func_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4138 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bcopy(); below. */ + which can conflict with char bcopy (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char bcopy(); - -int main() { + builtin and then its argument prototype would still apply. */ +char bcopy (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_bcopy) || defined (__stub___bcopy) choke me #else -bcopy(); +f = bcopy; #endif -; return 0; } -EOF -if { (eval echo configure:2503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_bcopy=yes" + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4169: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4172: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4175: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4178: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_bcopy=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_bcopy=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:4188: result: $ac_cv_func_bcopy" >&5 +echo "${ECHO_T}$ac_cv_func_bcopy" >&6 +if test $ac_cv_func_bcopy = yes; then + + echo "$as_me:4192: checking if bcopy does overlapping moves" >&5 +echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 +if test "${cf_cv_good_bcopy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_bcopy=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'bcopy`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:2519: checking if bcopy does overlapping moves" >&5 -if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then cf_cv_good_bcopy=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4202 "configure" #include "confdefs.h" int main() { @@ -2535,314 +4210,107 @@ bcopy(temp+5, temp+15, 10); exit (strcmp(temp, "klmnopqrstuwwxypqrstuwwxyz")); } - -EOF -if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:4216: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4219: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:4221: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4224: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_good_bcopy=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_good_bcopy=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_good_bcopy=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi +echo "$as_me:4237: result: $cf_cv_good_bcopy" >&5 +echo "${ECHO_T}$cf_cv_good_bcopy" >&6 -echo "$ac_t""$cf_cv_good_bcopy" 1>&6 - else - echo "$ac_t""no" 1>&6 -cf_cv_good_bcopy=no + cf_cv_good_bcopy=no fi if test "$cf_cv_good_bcopy" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_OK_BCOPY 1 EOF - else - cat >> confdefs.h <<\EOF -#define USE_MY_MEMMOVE 1 -EOF - - fi - -fi - - -# compute a reasonable value for $TERM to give tgetent(), since we may be -# running in 'screen', which sets $TERMCAP to a specific entry that is not -# necessarily in /etc/termcap - unsetenv is not portable, so we cannot simply -# discard $TERMCAP. -cf_TERMVAR=vt100 -test -n "$TERMCAP" && cf_TERMVAR="$TERM" -test -z "$cf_TERMVAR" && cf_TERMVAR=vt100 - -echo $ac_n "checking if we want full tgetent function""... $ac_c" 1>&6 -echo "configure:2587: checking if we want full tgetent function" >&5 - -# Check whether --enable-full-tgetent or --disable-full-tgetent was given. -if test "${enable_full_tgetent+set}" = set; then - enableval="$enable_full_tgetent" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - cf_full_tgetent=no - else - cf_full_tgetent=yes - fi -else - enableval=yes - cf_full_tgetent=yes - -fi - -echo "$ac_t""$cf_full_tgetent" 1>&6 - -if test "$cf_full_tgetent" = yes ; then - cf_test_message="full tgetent" -else - cf_test_message="tgetent" -fi - -echo $ac_n "checking for $cf_test_message function""... $ac_c" 1>&6 -echo "configure:2613: checking for $cf_test_message function" >&5 -if eval "test \"`echo '$''{'cf_cv_lib_tgetent'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cf_save_LIBS="$LIBS" -cf_cv_lib_tgetent=no -if test "$cf_full_tgetent" = yes ; then - cf_TERMLIB="termcap termlib ncurses curses" - cf_TERMTST="buffer0 == 0" -else - cf_TERMLIB="termlib ncurses curses" - cf_TERMTST="0" -fi -for cf_termlib in '' $cf_TERMLIB ; do - LIBS="$cf_save_LIBS" - test -n "$cf_termlib" && LIBS="$LIBS -l$cf_termlib" - if test "$cross_compiling" = yes; then - echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5 -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5 - if test -n "$cf_termlib" ; then - cf_cv_lib_tgetent="-l$cf_termlib" - else - cf_cv_lib_tgetent=yes - fi - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - echo "no, there is no termcap/tgetent in $cf_termlib" 1>&5 -fi -rm -fr conftest* -fi - -done -LIBS="$cf_save_LIBS" - -fi - -echo "$ac_t""$cf_cv_lib_tgetent" 1>&6 - -# If we found a working tgetent(), set LIBS and check for termcap.h. -# (LIBS cannot be set inside AC_CACHE_CHECK; the commands there should -# not have side effects other than setting the cache variable, because -# they are not executed when a cached value exists.) -if test "$cf_cv_lib_tgetent" != no ; then - test "$cf_cv_lib_tgetent" != yes && LIBS="$LIBS $cf_cv_lib_tgetent" - cat >> confdefs.h <<\EOF -#define USE_TERMCAP 1 -EOF - - cat > conftest.$ac_ext < -int main() { - -#ifdef NCURSES_VERSION -make an error -#endif -; return 0; } -EOF -if { (eval echo configure:2695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cat >> confdefs.h <<\EOF -#define HAVE_TERMCAP_H 1 -EOF - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -else - # If we didn't find a tgetent() that supports the buffer - # argument, look again to see whether we can find even - # a crippled one. A crippled tgetent() is still useful to - # validate values for the TERM environment variable given to - # child processes. - echo $ac_n "checking for partial tgetent function""... $ac_c" 1>&6 -echo "configure:2713: checking for partial tgetent function" >&5 -if eval "test \"`echo '$''{'cf_cv_lib_part_tgetent'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cf_cv_lib_part_tgetent=no - for cf_termlib in $cf_TERMLIB ; do - LIBS="$cf_save_LIBS -l$cf_termlib" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "there is a terminfo/tgetent in $cf_termlib" 1>&5 - cf_cv_lib_part_tgetent="-l$cf_termlib" - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - done - LIBS="$cf_save_LIBS" - -fi - -echo "$ac_t""$cf_cv_lib_part_tgetent" 1>&6 - - if test "$cf_cv_lib_part_tgetent" != no ; then - LIBS="$LIBS $cf_cv_lib_part_tgetent" - for ac_hdr in termcap.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2752: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - - # If this is linking against ncurses, we'll trigger the - # ifdef in resize.c that turns the termcap stuff back off. - cat >> confdefs.h <<\EOF -#define USE_TERMINFO 1 + else + cat >>confdefs.h <<\EOF +#define USE_MY_MEMMOVE 1 EOF fi -fi +fi -for ac_hdr in lastlog.h paths.h +for ac_header in lastlog.h paths.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2803: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 4267 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:4271: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:4277: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:4296: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done -echo $ac_n "checking for lastlog path""... $ac_c" 1>&6 -echo "configure:2840: checking for lastlog path" >&5 -if eval "test \"`echo '$''{'cf_cv_path_lastlog'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4306: checking for lastlog path" >&5 +echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6 +if test "${cf_cv_path_lastlog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4313 "configure" #include "confdefs.h" #include @@ -2853,42 +4321,51 @@ #include #endif #endif -int main() { +int +main () +{ char *path = _PATH_LASTLOG -; return 0; } -EOF -if { (eval echo configure:2861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4333: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4336: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4339: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4342: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_path_lastlog="_PATH_LASTLOG" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - if test -f /usr/adm/lastlog ; then + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +if test -f /usr/adm/lastlog ; then cf_cv_path_lastlog=/usr/adm/lastlog else cf_cv_path_lastlog=no fi fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_path_lastlog" 1>&6 -test $cf_cv_path_lastlog != no && cat >> confdefs.h <<\EOF +echo "$as_me:4357: result: $cf_cv_path_lastlog" >&5 +echo "${ECHO_T}$cf_cv_path_lastlog" >&6 +test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF #define USE_LASTLOG 1 EOF - - - - -echo $ac_n "checking for utmp implementation""... $ac_c" 1>&6 -echo "configure:2888: checking for utmp implementation" >&5 -if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:4363: checking for utmp implementation" >&5 +echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6 +if test "${cf_cv_have_utmp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_cv_have_utmp=no for cf_header in utmpx utmp ; do cf_utmp_includes=" @@ -2899,381 +4376,1156 @@ #include /* may conflict with utmpx.h on Linux */ #endif " - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 4380 "configure" #include "confdefs.h" $cf_utmp_includes -int main() { +int +main () +{ struct $cf_header x; char *name = x.ut_name; /* utmp.h and compatible definitions */ - -; return 0; } -EOF -if { (eval echo configure:2913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4394: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4397: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4400: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4403: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_have_utmp=$cf_header break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 4412 "configure" #include "confdefs.h" $cf_utmp_includes -int main() { +int +main () +{ struct $cf_header x; char *name = x.ut_user; /* utmpx.h must declare this */ - -; return 0; } -EOF -if { (eval echo configure:2932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4426: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4429: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4432: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4435: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_have_utmp=$cf_header break - + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done + +fi +echo "$as_me:4450: result: $cf_cv_have_utmp" >&5 +echo "${ECHO_T}$cf_cv_have_utmp" >&6 + +if test $cf_cv_have_utmp != no ; then + cat >>confdefs.h <<\EOF +#define HAVE_UTMP 1 +EOF + + test $cf_cv_have_utmp = utmpx && cat >>confdefs.h <<\EOF +#define UTMPX_FOR_UTMP 1 +EOF + +if test $cf_cv_have_utmp != no ; then +echo "$as_me:4463: checking if utmp.ut_host is declared" >&5 +echo $ECHO_N "checking if utmp.ut_host is declared... $ECHO_C" >&6 +if test "${cf_cv_have_utmp_ut_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 4470 "configure" +#include "confdefs.h" + +#include +#include <${cf_cv_have_utmp}.h> +int +main () +{ +struct $cf_cv_have_utmp x; char *y = &x.ut_host[0] + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4484: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4487: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4490: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4493: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_host=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_utmp_ut_host=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi + +echo "$as_me:4505: result: $cf_cv_have_utmp_ut_host" >&5 +echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6 +test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF +#define HAVE_UTMP_UT_HOST 1 +EOF + +fi + +if test $cf_cv_have_utmp != no ; then +echo "$as_me:4514: checking if utmp.ut_name is declared" >&5 +echo $ECHO_N "checking if utmp.ut_name is declared... $ECHO_C" >&6 +if test "${cf_cv_have_utmp_ut_name+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cf_cv_have_utmp_ut_name=no +cf_utmp_includes=" +#include +#include <${cf_cv_have_utmp}.h> +#define getutent getutxent +#ifdef USE_LASTLOG +#include /* may conflict with utmpx.h on Linux */ +#endif +" +for cf_header in ut_name ut_user ; do + cat >conftest.$ac_ext <<_ACEOF +#line 4531 "configure" +#include "confdefs.h" +$cf_utmp_includes +int +main () +{ +struct $cf_cv_have_utmp x; + char *name = x.$cf_header; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4545: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4548: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4551: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4554: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_name=$cf_header + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done + +fi +echo "$as_me:4566: result: $cf_cv_have_utmp_ut_name" >&5 +echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6 + +case $cf_cv_have_utmp_ut_name in #(vi +no) #(vi + { { echo "$as_me:4571: error: Cannot find declaration for ut.ut_name" >&5 +echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;} + { (exit 1); exit 1; }; } + ;; +ut_user) + cat >>confdefs.h <<\EOF +#define ut_name ut_user +EOF + + ;; +esac +fi + +if test $cf_cv_have_utmp != no ; then +echo "$as_me:4585: checking for exit-status in $cf_cv_have_utmp" >&5 +echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6 +if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +for cf_result in \ + ut_exit.__e_exit \ + ut_exit.e_exit \ + ut_exit.ut_e_exit \ + ut_exit.ut_exit +do +cat >conftest.$ac_ext <<_ACEOF +#line 4598 "configure" +#include "confdefs.h" + +#include +#include <${cf_cv_have_utmp}.h> +int +main () +{ +struct $cf_cv_have_utmp x; long y = x.$cf_result = 0 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4612: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4615: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4618: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4621: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_xstatus=$cf_result + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_utmp_ut_xstatus=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done + +fi +echo "$as_me:4634: result: $cf_cv_have_utmp_ut_xstatus" >&5 +echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6 +if test $cf_cv_have_utmp_ut_xstatus != no ; then + cat >>confdefs.h <<\EOF +#define HAVE_UTMP_UT_XSTATUS 1 +EOF + + cat >>confdefs.h <&5 +echo $ECHO_N "checking if utmp.ut_xtime is declared... $ECHO_C" >&6 +if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 4656 "configure" +#include "confdefs.h" + +#include +#include <${cf_cv_have_utmp}.h> +int +main () +{ +struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4670: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4673: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4676: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4679: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_xtime=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cat >conftest.$ac_ext <<_ACEOF +#line 4686 "configure" +#include "confdefs.h" + +#include +#include <${cf_cv_have_utmp}.h> +int +main () +{ +struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4700: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4703: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4706: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4709: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_xtime=define +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_utmp_ut_xtime=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:4723: result: $cf_cv_have_utmp_ut_xtime" >&5 +echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6 +if test $cf_cv_have_utmp_ut_xtime != no ; then + cat >>confdefs.h <<\EOF +#define HAVE_UTMP_UT_XTIME 1 +EOF + + if test $cf_cv_have_utmp_ut_xtime = define ; then + cat >>confdefs.h <<\EOF +#define ut_xtime ut_tv.tv_sec +EOF + + fi +fi +fi + +if test $cf_cv_have_utmp != no ; then +echo "$as_me:4740: checking if utmp.ut_session is declared" >&5 +echo $ECHO_N "checking if utmp.ut_session is declared... $ECHO_C" >&6 +if test "${cf_cv_have_utmp_ut_session+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 4747 "configure" +#include "confdefs.h" + +#include +#include <${cf_cv_have_utmp}.h> +int +main () +{ +struct $cf_cv_have_utmp x; long y = x.ut_session + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:4764: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:4767: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4770: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utmp_ut_session=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_utmp_ut_session=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:4781: result: $cf_cv_have_utmp_ut_session" >&5 +echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6 +if test $cf_cv_have_utmp_ut_session != no ; then + cat >>confdefs.h <<\EOF +#define HAVE_UTMP_UT_SESSION 1 +EOF + +fi +fi + +echo "$as_me:4791: checking if $cf_cv_have_utmp is SYSV flavor" >&5 +echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6 +if test "${cf_cv_sysv_utmp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" +cat >conftest.$ac_ext <<_ACEOF +#line 4799 "configure" +#include "confdefs.h" + +#include +#include <${cf_cv_have_utmp}.h> +int +main () +{ + +struct $cf_cv_have_utmp x; + set${cf_prefix}ent (); + get${cf_prefix}id(&x); + put${cf_prefix}line(&x); + end${cf_prefix}ent(); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4818: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4821: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4824: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4827: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_sysv_utmp=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sysv_utmp=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +fi +echo "$as_me:4838: result: $cf_cv_sysv_utmp" >&5 +echo "${ECHO_T}$cf_cv_sysv_utmp" >&6 +test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF +#define USE_SYSV_UTMP 1 +EOF + +fi + +for ac_header in lastlog.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:4849: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 4855 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:4859: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:4865: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:4884: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6 +if test "${cf_cv_struct_lastlog+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +if test "$cross_compiling" = yes; then + +cf_cv_struct_lastlog=unknown +else + cat >conftest.$ac_ext <<_ACEOF +#line 4905 "configure" +#include "confdefs.h" + +#include +#include +#include + +int main() +{ + struct lastlog data; + return (sizeof(data.ll_time) != sizeof(time_t)); +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:4919: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4922: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:4924: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4927: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +cf_cv_struct_lastlog=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + +cf_cv_struct_lastlog=no fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:4941: result: $cf_cv_struct_lastlog" >&5 +echo "${ECHO_T}$cf_cv_struct_lastlog" >&6 + +test $cf_cv_struct_lastlog != no && cat >>confdefs.h <<\EOF +#define USE_STRUCT_LASTLOG 1 +EOF -echo "$ac_t""$cf_cv_have_utmp" 1>&6 +# compute a reasonable value for $TERM to give tgetent(), since we may be +# running in 'screen', which sets $TERMCAP to a specific entry that is not +# necessarily in /etc/termcap - unsetenv is not portable, so we cannot simply +# discard $TERMCAP. +cf_TERMVAR=vt100 +test -n "$TERMCAP" && cf_TERMVAR="$TERM" +test -z "$cf_TERMVAR" && cf_TERMVAR=vt100 -if test $cf_cv_have_utmp != no ; then - cat >> confdefs.h <<\EOF -#define HAVE_UTMP 1 -EOF +echo "$as_me:4956: checking if we want full tgetent function" >&5 +echo $ECHO_N "checking if we want full tgetent function... $ECHO_C" >&6 - test $cf_cv_have_utmp = utmpx && cat >> confdefs.h <<\EOF -#define UTMPX_FOR_UTMP 1 -EOF +# Check whether --enable-full-tgetent or --disable-full-tgetent was given. +if test "${enable_full_tgetent+set}" = set; then + enableval="$enable_full_tgetent" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + cf_full_tgetent=no + else + cf_full_tgetent=yes + fi +else + enableval=yes + cf_full_tgetent=yes - -if test $cf_cv_have_utmp != no ; then -echo $ac_n "checking if utmp.ut_host is declared""... $ac_c" 1>&6 -echo "configure:2962: checking if utmp.ut_host is declared" >&5 -if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_host'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +echo "${ECHO_T}$cf_full_tgetent" >&6 -#include -#include <${cf_cv_have_utmp}.h> -int main() { -struct $cf_cv_have_utmp x; char *y = &x.ut_host[0] -; return 0; } -EOF -if { (eval echo configure:2977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_have_utmp_ut_host=yes +if test "$cf_full_tgetent" = yes ; then + cf_test_message="full tgetent" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_have_utmp_ut_host=no -fi -rm -f conftest* - + cf_test_message="tgetent" fi -echo "$ac_t""$cf_cv_have_utmp_ut_host" 1>&6 -test $cf_cv_have_utmp_ut_host != no && cat >> confdefs.h <<\EOF -#define HAVE_UTMP_UT_HOST 1 -EOF +echo "$as_me:4982: checking for $cf_test_message function" >&5 +echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6 +if test "${cf_cv_lib_tgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else +cf_save_LIBS="$LIBS" +cf_cv_lib_tgetent=no +if test "$cf_full_tgetent" = yes ; then + cf_TERMLIB="termcap termlib ncurses curses" + cf_TERMTST="buffer[0] == 0" +else + cf_TERMLIB="termlib ncurses curses" + cf_TERMTST="0" fi - - -if test $cf_cv_have_utmp != no ; then -echo $ac_n "checking if utmp.ut_name is declared""... $ac_c" 1>&6 -echo "configure:3000: checking if utmp.ut_name is declared" >&5 -if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_name'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +for cf_termlib in '' $cf_TERMLIB ; do + LIBS="$cf_save_LIBS" + test -n "$cf_termlib" && LIBS="$LIBS -l$cf_termlib" + if test "$cross_compiling" = yes; then + echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5 else - - cf_cv_have_utmp_ut_name=no -cf_utmp_includes=" -#include -#include <${cf_cv_have_utmp}.h> -#define getutent getutxent -#ifdef USE_LASTLOG -#include /* may conflict with utmpx.h on Linux */ -#endif -" -for cf_header in ut_name ut_user ; do - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5004 "configure" #include "confdefs.h" -$cf_utmp_includes -int main() { -struct $cf_cv_have_utmp x; - char *name = x.$cf_header; - -; return 0; } -EOF -if { (eval echo configure:3025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_have_utmp_ut_name=$cf_header + +/* terminfo implementations ignore the buffer argument, making it useless for + * the xterm application, which uses this information to make a new TERMCAP + * environment variable. + */ +int main() +{ + char buffer[1024]; + buffer[0] = 0; + tgetent(buffer, "$cf_TERMVAR"); + exit($cf_TERMTST); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:5019: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5022: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:5024: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5027: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5 + if test -n "$cf_termlib" ; then + cf_cv_lib_tgetent="-l$cf_termlib" + else + cf_cv_lib_tgetent=yes + fi break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "no, there is no termcap/tgetent in $cf_termlib" 1>&5 +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest* done +LIBS="$cf_save_LIBS" fi +echo "$as_me:5048: result: $cf_cv_lib_tgetent" >&5 +echo "${ECHO_T}$cf_cv_lib_tgetent" >&6 + +# If we found a working tgetent(), set LIBS and check for termcap.h. +# (LIBS cannot be set inside AC_CACHE_CHECK; the commands there should +# not have side effects other than setting the cache variable, because +# they are not executed when a cached value exists.) +if test "$cf_cv_lib_tgetent" != no ; then + test "$cf_cv_lib_tgetent" != yes && LIBS="$LIBS $cf_cv_lib_tgetent" + cat >>confdefs.h <<\EOF +#define USE_TERMCAP 1 +EOF -echo "$ac_t""$cf_cv_have_utmp_ut_name" 1>&6 + cat >conftest.$ac_ext <<_ACEOF +#line 5062 "configure" +#include "confdefs.h" -case $cf_cv_have_utmp_ut_name in #(vi -no) #(vi - { echo "configure: error: Cannot find declaration for ut.ut_name" 1>&2; exit 1; } - ;; -ut_user) - cat >> confdefs.h <<\EOF -#define ut_name ut_user +#include +int +main () +{ + +#ifdef NCURSES_VERSION +make an error +#endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5078: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5081: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5084: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5087: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\EOF +#define HAVE_TERMCAP_H 1 EOF - ;; -esac +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi - - -if test $cf_cv_have_utmp != no ; then -echo $ac_n "checking for exit-status in $cf_cv_have_utmp""... $ac_c" 1>&6 -echo "configure:3056: checking for exit-status in $cf_cv_have_utmp" >&5 -if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xstatus'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +rm -f conftest.$ac_objext conftest.$ac_ext else - -for cf_result in \ - ut_exit.__e_exit \ - ut_exit.e_exit \ - ut_exit.ut_e_exit \ - ut_exit.ut_exit -do -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for partial tgetent function... $ECHO_C" >&6 +if test "${cf_cv_lib_part_tgetent+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cf_cv_lib_part_tgetent=no + for cf_termlib in $cf_TERMLIB ; do + LIBS="$cf_save_LIBS -l$cf_termlib" + cat >conftest.$ac_ext <<_ACEOF +#line 5114 "configure" #include "confdefs.h" -#include -#include <${cf_cv_have_utmp}.h> -int main() { -struct $cf_cv_have_utmp x; long y = x.$cf_result = 0 -; return 0; } -EOF -if { (eval echo configure:3077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_have_utmp_ut_xstatus=$cf_result - break +int +main () +{ +tgetent(0, "$cf_TERMVAR") + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5126: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5129: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5132: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5135: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "there is a terminfo/tgetent in $cf_termlib" 1>&5 + cf_cv_lib_part_tgetent="-l$cf_termlib" + break else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_have_utmp_ut_xstatus=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -rm -f conftest* -done +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done + LIBS="$cf_save_LIBS" fi +echo "$as_me:5149: result: $cf_cv_lib_part_tgetent" >&5 +echo "${ECHO_T}$cf_cv_lib_part_tgetent" >&6 -echo "$ac_t""$cf_cv_have_utmp_ut_xstatus" 1>&6 -if test $cf_cv_have_utmp_ut_xstatus != no ; then - cat >> confdefs.h <<\EOF -#define HAVE_UTMP_UT_XSTATUS 1 -EOF + if test "$cf_cv_lib_part_tgetent" != no ; then + LIBS="$LIBS $cf_cv_lib_part_tgetent" - cat >> confdefs.h <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 5164 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:5168: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:5174: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:5193: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <>confdefs.h <<\EOF +#define USE_TERMINFO 1 +EOF + + fi fi - -if test $cf_cv_have_utmp != no ; then -echo $ac_n "checking if utmp.ut_xtime is declared""... $ac_c" 1>&6 -echo "configure:3108: checking if utmp.ut_xtime is declared" >&5 -if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_xtime'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for directory to install resource files... $ECHO_C" >&6 -#include -#include <${cf_cv_have_utmp}.h> -int main() { -struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0 -; return 0; } -EOF -if { (eval echo configure:3123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_have_utmp_ut_xtime=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cat > conftest.$ac_ext < -#include <${cf_cv_have_utmp}.h> -int main() { -struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec -; return 0; } -EOF -if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_have_utmp_ut_xtime=define else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_have_utmp_ut_xtime=no -fi -rm -f conftest* - -fi -rm -f conftest* + withval="${appsdir-'\$(exec_prefix)/lib/X11/app-defaults'}" +fi; +case ".$withval" in #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +.\${*prefix}*) #(vi + eval withval="$withval" + case ".$withval" in #(vi + .NONE/*) + withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%` + ;; + esac + ;; #(vi +.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%` + ;; +*) + { { echo "$as_me:5241: error: expected a pathname, not \"$withval\"" >&5 +echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} + { (exit 1); exit 1; }; } + ;; +esac -fi +eval appsdir="$withval" -echo "$ac_t""$cf_cv_have_utmp_ut_xtime" 1>&6 -if test $cf_cv_have_utmp_ut_xtime != no ; then - cat >> confdefs.h <<\EOF -#define HAVE_UTMP_UT_XTIME 1 -EOF +echo "$as_me:5249: result: $appsdir" >&5 +echo "${ECHO_T}$appsdir" >&6 - if test $cf_cv_have_utmp_ut_xtime = define ; then - cat >> confdefs.h <<\EOF -#define ut_xtime ut_tv.tv_sec -EOF +no_appsdir= +test "$appsdir" = no && no_appsdir="#" - fi -fi -fi +# inherit SINSTALL_OPTS from environment to allow packager to customize it. - -if test $cf_cv_have_utmp != no ; then -echo $ac_n "checking if utmp.ut_session is declared""... $ac_c" 1>&6 -echo "configure:3174: checking if utmp.ut_session is declared" >&5 -if eval "test \"`echo '$''{'cf_cv_have_utmp_ut_session'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for install-permissions reference... $ECHO_C" >&6 -#include -#include <${cf_cv_have_utmp}.h> -int main() { -struct $cf_cv_have_utmp x; long y = x.ut_session -; return 0; } -EOF -if { (eval echo configure:3189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_have_utmp_ut_session=yes +# Check whether --with-reference or --without-reference was given. +if test "${with_reference+set}" = set; then + withval="$with_reference" + with_reference=$withval else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_have_utmp_ut_session=no + with_reference=xterm +fi; +echo "$as_me:5267: result: $with_reference" >&5 +echo "${ECHO_T}$with_reference" >&6 + +with_full_paths=yes + +test -z "$XTERM_PATH" && XTERM_PATH=$with_reference +for ac_prog in $XTERM_PATH $with_reference +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:5277: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XTERM_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $XTERM_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_XTERM_PATH="$XTERM_PATH" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_XTERM_PATH="$ac_dir/$ac_word" + echo "$as_me:5294: found $ac_dir/$ac_word" >&5 + break fi -rm -f conftest* +done + ;; +esac fi +XTERM_PATH=$ac_cv_path_XTERM_PATH -echo "$ac_t""$cf_cv_have_utmp_ut_session" 1>&6 -if test $cf_cv_have_utmp_ut_session != no ; then - cat >> confdefs.h <<\EOF -#define HAVE_UTMP_UT_SESSION 1 -EOF +if test -n "$XTERM_PATH"; then + echo "$as_me:5305: result: $XTERM_PATH" >&5 +echo "${ECHO_T}$XTERM_PATH" >&6 +else + echo "$as_me:5308: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$XTERM_PATH" && break +done +test -n "$XTERM_PATH" || XTERM_PATH="$XTERM_PATH" + +cf_path_prog="" +cf_path_args="" +IFS="${IFS= }"; cf_save_ifs="$IFS" +case $host_os in #(vi +os2*) #(vi + IFS="${IFS};" + ;; +*) + IFS="${IFS}:" + ;; +esac + +for cf_temp in $ac_cv_path_XTERM_PATH +do + if test -z "$cf_path_prog" ; then + if test "$with_full_paths" = yes ; then + +case ".$cf_temp" in #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +.\${*prefix}*) #(vi + eval cf_temp="$cf_temp" + case ".$cf_temp" in #(vi + .NONE/*) + cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%` + ;; + esac + ;; #(vi +.no|.NONE/*) + cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%` + ;; +*) + break + ;; +esac -fi -fi + cf_path_prog="$cf_temp" + else + cf_path_prog="`basename $cf_temp`" + fi + elif test -z "$cf_path_args" ; then + cf_path_args="$cf_temp" + else + cf_path_args="$cf_path_args $cf_temp" + fi +done +IFS="$cf_save_ifs" - -echo $ac_n "checking if $cf_cv_have_utmp is SYSV flavor""... $ac_c" 1>&6 -echo "configure:3213: checking if $cf_cv_have_utmp is SYSV flavor" >&5 -if eval "test \"`echo '$''{'cf_cv_sysv_utmp'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" -cat > conftest.$ac_ext < -#include <${cf_cv_have_utmp}.h> -int main() { +echo "(line 5370) testing defining path for ${cf_path_prog} ..." 1>&5 -struct $cf_cv_have_utmp x; - set${cf_prefix}ent (); - get${cf_prefix}id(&x); - put${cf_prefix}line(&x); - end${cf_prefix}ent(); -; return 0; } + cat >>confdefs.h <>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - cf_cv_sysv_utmp=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_sysv_utmp=no -fi -rm -f conftest* fi -echo "$ac_t""$cf_cv_sysv_utmp" 1>&6 -test $cf_cv_sysv_utmp = yes && cat >> confdefs.h <<\EOF -#define USE_SYSV_UTMP 1 -EOF +# If any of --program-prefix, --program-suffix or --program-transform-name is +# given, accept an option tell the makefile to create a symbolic link, e.g., +# to "xterm" on install. +XTERM_SYMLINK=NONE +if test "$program_transform_name" != "'s,,,'" ; then +cf_name=`echo "$program_transform_name" | sed -e 's,\\$\\$,$,g'` +cf_name=`echo xterm |sed -e "$cf_name"` +echo "$as_me:5390: checking for symbolic link to create to $cf_name" >&5 +echo $ECHO_N "checking for symbolic link to create to $cf_name... $ECHO_C" >&6 +# Check whether --with-xterm-symlink or --without-xterm-symlink was given. +if test "${with_xterm_symlink+set}" = set; then + withval="$with_xterm_symlink" + with_symlink=$withval +else + with_symlink=xterm +fi; +echo "$as_me:5400: result: $with_symlink" >&5 +echo "${ECHO_T}$with_symlink" >&6 +test -n "$with_symlink" && \ + test "$with_symlink" != no && \ + test "$with_symlink" != $cf_name && \ + XTERM_SYMLINK="$with_symlink" fi - -echo $ac_n "checking if you want to disable setuid""... $ac_c" 1>&6 -echo "configure:3257: checking if you want to disable setuid" >&5 +echo "$as_me:5408: checking if you want to disable setuid" >&5 +echo $ECHO_N "checking if you want to disable setuid... $ECHO_C" >&6 # Check whether --enable-setuid or --disable-setuid was given. if test "${enable_setuid+set}" = set; then enableval="$enable_setuid" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - disable_setuid=yes + disable_setuid=yes else disable_setuid=no fi else - enableval=yes + enableval=yes disable_setuid=no - + +fi; +echo "$as_me:5425: result: $disable_setuid" >&5 +echo "${ECHO_T}$disable_setuid" >&6 + +echo "$as_me:5428: checking if you want to run xterm setuid to a given user" >&5 +echo $ECHO_N "checking if you want to run xterm setuid to a given user... $ECHO_C" >&6 + +# Check whether --with-setuid or --without-setuid was given. +if test "${with_setuid+set}" = set; then + withval="$with_setuid" + use_given_setuid=$withval +else + use_given_setuid=no +fi; +echo "$as_me:5438: result: $use_given_setuid" >&5 +echo "${ECHO_T}$use_given_setuid" >&6 + +if test "$use_given_setuid" != no ; then + if test "$use_given_setuid" = yes ; then + cf_cv_given_setuid=root + else + cf_cv_given_setuid=$use_given_setuid + fi + SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid" +fi + +echo "$as_me:5450: checking if you want to run xterm setgid to match utmp/utmpx file" >&5 +echo $ECHO_N "checking if you want to run xterm setgid to match utmp/utmpx file... $ECHO_C" >&6 + +# Check whether --with-utmp-setgid or --without-utmp-setgid was given. +if test "${with_utmp_setgid+set}" = set; then + withval="$with_utmp_setgid" + use_utmp_setgid=$withval +else + use_utmp_setgid=no +fi; +echo "$as_me:5460: result: $use_utmp_setgid" >&5 +echo "${ECHO_T}$use_utmp_setgid" >&6 + +if test "$use_utmp_setgid" != no ; then + if test "$use_utmp_setgid" = yes ; then + +if test $cf_cv_have_utmp != no ; then +echo "$as_me:5467: checking for utmp/utmpx group" >&5 +echo $ECHO_N "checking for utmp/utmpx group... $ECHO_C" >&6 +if test "${cf_cv_utmp_group+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +for cf_utmp_path in /var/adm /var/run +do + for cf_utmp_file in utmpx utmp + do + if test -f $cf_utmp_path/$cf_utmp_file + then + cf_cv_utmp_group=root + + cf_option="-l -L" + + # Expect listing to have fields like this: + #-r--r--r-- 1 user group 34293 Jul 18 16:29 pathname + ls $cf_option $cf_utmp_path/$cf_utmp_file >conftest + read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest conftest + read cf_mode cf_links cf_usr cf_grp cf_size cf_date1 cf_date2 cf_date3 cf_rest &5 +echo "${ECHO_T}$cf_cv_utmp_group" >&6 +else + { { echo "$as_me:5512: error: cannot find utmp group" >&5 +echo "$as_me: error: cannot find utmp group" >&2;} + { (exit 1); exit 1; }; } fi -echo "$ac_t""$disable_setuid" 1>&6 + else + cf_cv_utmp_group=$use_utmp_setgid + fi + cat >>confdefs.h <<\EOF +#define USE_UTMP_SETGID 1 +EOF + + SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group" +fi -echo $ac_n "checking if you want to link with utempter""... $ac_c" 1>&6 -echo "configure:3277: checking if you want to link with utempter" >&5 +echo "$as_me:5527: checking if you want to link with utempter" >&5 +echo $ECHO_N "checking if you want to link with utempter... $ECHO_C" >&6 # Check whether --with-utempter or --without-utempter was given. if test "${with_utempter+set}" = set; then @@ -3281,52 +5533,65 @@ use_utempter=$withval else use_utempter=no -fi - -echo "$ac_t""$use_utempter" 1>&6 +fi; +echo "$as_me:5537: result: $use_utempter" >&5 +echo "${ECHO_T}$use_utempter" >&6 if test "$use_utempter" = yes ; then - -echo $ac_n "checking if we can link with utempter library""... $ac_c" 1>&6 -echo "configure:3292: checking if we can link with utempter library" >&5 -if eval "test \"`echo '$''{'cf_cv_have_utempter'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:5542: checking if we can link with utempter library" >&5 +echo $ECHO_N "checking if we can link with utempter library... $ECHO_C" >&6 +if test "${cf_cv_have_utempter+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_save_LIBS="$LIBS" LIBS="-lutempter $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5551 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ addToUtmp("/dev/tty", 0, 1); removeFromUtmp(); -; return 0; } -EOF -if { (eval echo configure:3312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5568: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5571: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5574: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5577: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_have_utempter=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + cf_cv_have_utempter=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" fi - -echo "$ac_t""$cf_cv_have_utempter" 1>&6 +echo "$as_me:5591: result: $cf_cv_have_utempter" >&5 +echo "${ECHO_T}$cf_cv_have_utempter" >&6 if test "$cf_cv_have_utempter" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_UTEMPTER 1 EOF @@ -3338,15 +5603,14 @@ ### checks for external data +echo "$as_me:5606: checking if external errno is declared" >&5 +echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else -echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:3344: checking if external errno is declared" >&5 -if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5613 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -3354,31 +5618,44 @@ #endif #include #include -#include -int main() { +#include +int +main () +{ long x = (long) errno -; return 0; } -EOF -if { (eval echo configure:3363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5631: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5634: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5637: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5640: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_dcl_errno=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_dcl_errno=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_dcl_errno" 1>&6 +echo "$as_me:5651: result: $cf_cv_dcl_errno" >&5 +echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then - + cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:3391: checking if external errno exists" >&5 -if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 +if test "${cf_cv_have_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 5673 "configure" #include "confdefs.h" #undef errno extern int errno; -int main() { +int +main () +{ errno = 2 -; return 0; } -EOF -if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5688: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5691: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5694: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5697: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_have_errno=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_have_errno=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_errno=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_have_errno" 1>&6 +echo "$as_me:5708: result: $cf_cv_have_errno" >&5 +echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then - + cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&5 +echo $ECHO_N "checking for explicit tty group name... $ECHO_C" >&6 - - - -echo $ac_n "checking for tty group name""... $ac_c" 1>&6 -echo "configure:3437: checking for tty group name" >&5 -if eval "test \"`echo '$''{'cf_cv_tty_group_name'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +# Check whether --with-tty-group or --without-tty-group was given. +if test "${with_tty_group+set}" = set; then + withval="$with_tty_group" + cf_tty_group=$withval +else + cf_tty_group=auto... +fi; +test -z "$cf_tty_group" && cf_tty_group=auto... +test "$cf_tty_group" = yes && cf_tty_group=auto... +echo "$as_me:5733: result: $cf_tty_group" >&5 +echo "${ECHO_T}$cf_tty_group" >&6 + +if test "$cf_tty_group" = "auto..." ; then +echo "$as_me:5737: checking for tty group name" >&5 +echo $ECHO_N "checking for tty group name... $ECHO_C" >&6 +if test "${cf_cv_tty_group_name+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # If we are configuring as root, it is hard to get a clue about the tty group. # But we'll guess based on how our connection is set up - assuming it is done # properly. cf_uid=`id | sed -e 's/^^=*=//' -e 's/(.*$//'` +# )vi if test "$cf_uid" != 0 ; then cf_cv_tty_group_name= cf_tty_name=`tty` @@ -3485,32 +5787,39 @@ fi fi +echo "$as_me:5790: result: $cf_cv_tty_group_name" >&5 +echo "${ECHO_T}$cf_cv_tty_group_name" >&6 +cf_tty_group="$cf_cv_tty_group_name" +else + # if configure option, always do this + cat >>confdefs.h <<\EOF +#define USE_TTY_GROUP 1 +EOF -echo "$ac_t""$cf_cv_tty_group_name" 1>&6 +fi -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:3502: checking if we may use $cf_cv_tty_group_name group" >&5 -if eval "test \"`echo '$''{'cf_cv_tty_group'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:5809: checking if we may use the $cf_tty_group group" >&5 +echo $ECHO_N "checking if we may use the $cf_tty_group group... $ECHO_C" >&6 +if test "${cf_cv_tty_group+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + cf_tty_name=`tty` if test "$cf_tty_name" != "not a tty" then if test "$cross_compiling" = yes; then cf_cv_tty_group=unknown else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5822 "configure" #include "confdefs.h" #include @@ -3533,20 +5842,28 @@ } exit(1); } - -EOF -if { (eval echo configure:3539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:5848: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5851: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:5853: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5856: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_tty_group=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - cf_cv_tty_group=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_tty_group=no fi -rm -fr conftest* +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - elif test "$cross_compiling" = yes; then cf_cv_tty_group=unknown else @@ -3554,68 +5871,86 @@ fi fi +echo "$as_me:5874: result: $cf_cv_tty_group" >&5 +echo "${ECHO_T}$cf_cv_tty_group" >&6 -echo "$ac_t""$cf_cv_tty_group" 1>&6 -test $cf_cv_tty_group = yes && cat >> confdefs.h <<\EOF +if test $cf_cv_tty_group = no ; then + { echo "$as_me:5878: WARNING: Cannot use $cf_tty_group group" >&5 +echo "$as_me: WARNING: Cannot use $cf_tty_group group" >&2;} +else + cat >>confdefs.h <<\EOF #define USE_TTY_GROUP 1 EOF - +fi ### checks for system services and user specified options -echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3569: checking for sys/wait.h that is POSIX.1 compatible" >&5 -if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:5889: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +if test "${ac_cv_header_sys_wait_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5895 "configure" #include "confdefs.h" #include #include #ifndef WEXITSTATUS -#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) #endif #ifndef WIFEXITED -#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -int main() { -int s; -wait (&s); -s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; -; return 0; } -EOF -if { (eval echo configure:3590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5917: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:5920: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5923: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5926: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_sys_wait_h=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_sys_wait_h=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 +echo "$as_me:5936: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 if test $ac_cv_header_sys_wait_h = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define HAVE_SYS_WAIT_H 1 EOF fi - - -echo $ac_n "checking for POSIX wait functions""... $ac_c" 1>&6 -echo "configure:3613: checking for POSIX wait functions" >&5 -if eval "test \"`echo '$''{'cf_cv_posix_wait'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:5946: checking for POSIX wait functions" >&5 +echo $ECHO_N "checking for POSIX wait functions... $ECHO_C" >&6 +if test "${cf_cv_posix_wait+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 5953 "configure" #include "confdefs.h" #include @@ -3625,43 +5960,53 @@ #include #endif -int main() { +int +main () +{ int stat_loc; pid_t pid = waitpid(-1, &stat_loc, WNOHANG|WUNTRACED); pid_t pid2 = wait(&stat_loc); -; return 0; } -EOF -if { (eval echo configure:3637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5976: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5979: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5982: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5985: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_posix_wait=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_posix_wait=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_posix_wait=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_posix_wait" 1>&6 -test "$cf_cv_posix_wait" = yes && cat >> confdefs.h <<\EOF +echo "$as_me:5996: result: $cf_cv_posix_wait" >&5 +echo "${ECHO_T}$cf_cv_posix_wait" >&6 +test "$cf_cv_posix_wait" = yes && cat >>confdefs.h <<\EOF #define USE_POSIX_WAIT 1 EOF +echo "$as_me:6002: checking if external sys_nerr is declared" >&5 +echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_sys_nerr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - - -echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:3659: checking if external sys_nerr is declared" >&5 -if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6009 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -3669,31 +6014,44 @@ #endif #include #include -#include -int main() { +#include +int +main () +{ long x = (long) sys_nerr -; return 0; } -EOF -if { (eval echo configure:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6027: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6030: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6033: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6036: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_dcl_sys_nerr=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_dcl_sys_nerr=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_dcl_sys_nerr=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_dcl_sys_nerr" 1>&6 +echo "$as_me:6047: result: $cf_cv_dcl_sys_nerr" >&5 +echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 if test "$cf_cv_dcl_sys_nerr" = no ; then - + cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:3706: checking if external sys_nerr exists" >&5 -if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 +if test "${cf_cv_have_sys_nerr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 6069 "configure" #include "confdefs.h" #undef sys_nerr extern int sys_nerr; -int main() { +int +main () +{ sys_nerr = 2 -; return 0; } -EOF -if { (eval echo configure:3722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6084: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6087: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6090: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6093: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_have_sys_nerr=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_have_sys_nerr=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_sys_nerr=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_have_sys_nerr" 1>&6 +echo "$as_me:6104: result: $cf_cv_have_sys_nerr" >&5 +echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 if test "$cf_cv_have_sys_nerr" = yes ; then - + cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&5 +echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_sys_errlist+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else - - -echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:3751: checking if external sys_errlist is declared" >&5 -if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6124 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -3761,31 +6129,44 @@ #endif #include #include -#include -int main() { +#include +int +main () +{ long x = (long) sys_errlist -; return 0; } -EOF -if { (eval echo configure:3770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6142: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6145: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6148: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6151: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_dcl_sys_errlist=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_dcl_sys_errlist=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_dcl_sys_errlist=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_dcl_sys_errlist" 1>&6 +echo "$as_me:6162: result: $cf_cv_dcl_sys_errlist" >&5 +echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 if test "$cf_cv_dcl_sys_errlist" = no ; then - + cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&6 -echo "configure:3798: checking if external sys_errlist exists" >&5 -if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 +if test "${cf_cv_have_sys_errlist+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 6184 "configure" #include "confdefs.h" #undef sys_errlist extern int sys_errlist; -int main() { +int +main () +{ sys_errlist = 2 -; return 0; } -EOF -if { (eval echo configure:3814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6199: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6202: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6205: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6208: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_have_sys_errlist=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_have_sys_errlist=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_have_sys_errlist=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_have_sys_errlist" 1>&6 +echo "$as_me:6219: result: $cf_cv_have_sys_errlist" >&5 +echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 if test "$cf_cv_have_sys_errlist" = yes ; then - + cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <>confdefs.h <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 6244 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:6248: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:6254: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:6273: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 -echo "configure:3844: checking if we should define SYSV" >&5 -if eval "test \"`echo '$''{'cf_cv_sysv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:6283: checking if we should define SYSV" >&5 +echo $ECHO_N "checking if we should define SYSV... $ECHO_C" >&6 +if test "${cf_cv_sysv+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6290 "configure" #include "confdefs.h" #undef SYSV @@ -3855,13 +6295,17 @@ #ifdef HAVE_STDLIB_H #include /* look for wchar_t */ #endif +#ifdef HAVE_X11_INTRINSIC_H #include /* Intrinsic.h has other traps... */ +#endif #include #include /* eliminate most BSD hacks */ #include /* declare sys_errlist on older systems */ #include /* eliminate most of the remaining ones */ -int main() { +int +main () +{ static struct termio d_tio; d_tio.c_cc[VINTR] = 0; @@ -3876,78 +6320,104 @@ sys_errlist[0] = ""; /* Cygwin mis-declares this */ #endif -; return 0; } -EOF -if { (eval echo configure:3882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6328: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6331: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6334: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6337: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_sysv=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_sysv=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_sysv=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_sysv" 1>&6 -test "$cf_cv_sysv" = yes && cat >> confdefs.h <<\EOF +echo "$as_me:6348: result: $cf_cv_sysv" >&5 +echo "${ECHO_T}$cf_cv_sysv" >&6 +test "$cf_cv_sysv" = yes && cat >>confdefs.h <<\EOF #define SYSV 1 EOF - - -echo $ac_n "checking for elf_begin in -lelf""... $ac_c" 1>&6 -echo "configure:3903: checking for elf_begin in -lelf" >&5 -ac_lib_var=`echo elf'_'elf_begin | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:6354: checking for elf_begin in -lelf" >&5 +echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6 +if test "${ac_cv_lib_elf_elf_begin+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lelf $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6362 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char elf_begin(); - -int main() { -elf_begin() -; return 0; } -EOF -if { (eval echo configure:3922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + builtin and then its argument prototype would still apply. */ +char elf_begin (); +int +main () +{ +elf_begin (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6381: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6384: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6387: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6390: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_elf_elf_begin=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_elf_elf_begin=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6401: result: $ac_cv_lib_elf_elf_begin" >&5 +echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6 +if test $ac_cv_lib_elf_elf_begin = yes; then + +echo "$as_me:6405: checking if this is an SVR4 system" >&5 +echo $ECHO_N "checking if this is an SVR4 system... $ECHO_C" >&6 +if test "${cf_cv_svr4+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - -echo $ac_n "checking if this is an SVR4 system""... $ac_c" 1>&6 -echo "configure:3939: checking if this is an SVR4 system" >&5 -if eval "test \"`echo '$''{'cf_cv_svr4'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6412 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ static struct termio d_tio; d_tio.c_cc[VINTR] = 0; @@ -3960,46 +6430,48 @@ d_tio.c_cc[VTIME] = 0; d_tio.c_cc[VLNEXT] = 0; -; return 0; } -EOF -if { (eval echo configure:3966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6438: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6441: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6444: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6447: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_svr4=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_svr4=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_svr4=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:6458: result: $cf_cv_svr4" >&5 +echo "${ECHO_T}$cf_cv_svr4" >&6 -echo "$ac_t""$cf_cv_svr4" 1>&6 - -else - echo "$ac_t""no" 1>&6 fi -test "$cf_cv_svr4" = yes && cat >> confdefs.h <<\EOF +test "$cf_cv_svr4" = yes && cat >>confdefs.h <<\EOF #define SVR4 1 EOF - -# If we find X, set shell vars x_includes and x_libraries to the -# paths, otherwise set no_x=yes. -# Uses ac_ vars as temps to allow command line to override cache and checks. -# --without-x overrides everything else, but does not touch the cache. -echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3995: checking for X" >&5 - +echo "$as_me:6467: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then withval="$with_x" - : -fi +fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. @@ -4009,16 +6481,16 @@ # Both variables are already set. have_x=yes else -if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. -ac_x_includes=NO ac_x_libraries=NO -rm -fr conftestdir -if mkdir conftestdir; then - cd conftestdir +ac_x_includes=no ac_x_libraries=no +rm -fr conftest.dir +if mkdir conftest.dir; then + cd conftest.dir # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' + cat >Imakefile <<'EOF' acfindx: @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' EOF @@ -4028,174 +6500,155 @@ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + test -f $ac_im_libdir/libX11.$ac_extension; then ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. - case "$ac_im_incroot" in + case $ac_im_incroot in /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac - case "$ac_im_usrlibdir" in + case $ac_im_usrlibdir in /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi cd .. - rm -fr conftestdir + rm -fr conftest.dir fi -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 + +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6564 "configure" #include "confdefs.h" -#include <$x_direct_test_include> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* +#include +_ACEOF +if { (eval echo "$as_me:6568: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:6574: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # We can compile using X headers with no special include directory. ac_x_includes= else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - # Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Intrinsic.h"; then + ac_x_includes=$ac_dir + break + fi +done fi -rm -f conftest* -fi # $ac_x_includes = NO +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no -if test "$ac_x_libraries" = NO; then +if test "$ac_x_libraries" = no; then # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - # See if we find them without any special options. # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6607 "configure" #include "confdefs.h" - -int main() { -${x_direct_test_function}() -; return 0; } -EOF -if { (eval echo configure:4139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" +#include +int +main () +{ +XtMalloc (0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6619: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6622: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6625: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6628: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ - /usr/X11/lib \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11 \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11/lib \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11 \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - /lib/usr/lib/X11 \ - \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - ; \ + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do + # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -f conftest* -fi # $ac_x_libraries = NO +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no -if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then +if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then # Didn't find X anywhere. Cache the known absence of X. ac_cv_have_x="have_x=no" else @@ -4204,12 +6657,14 @@ ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi fi + fi eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$ac_t""$have_x" 1>&6 + echo "$as_me:6666: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6 no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -4218,12 +6673,14 @@ # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 + echo "$as_me:6676: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\EOF #define X_DISPLAY_MISSING 1 EOF @@ -4238,60 +6695,89 @@ X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case "`(uname -sr) 2>/dev/null`" in + case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:4245: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >conftest.$ac_ext <<_ACEOF +#line 6704 "configure" #include "confdefs.h" -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6716: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6719: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6722: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6725: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_R_nospace=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_R_nospace=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_R_nospace=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$ac_t""no" 1>&6 + echo "$as_me:6735: result: no" >&5 +echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6741 "configure" #include "confdefs.h" -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:4278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6753: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6756: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6759: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6762: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_R_space=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_R_space=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_R_space=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$ac_t""yes" 1>&6 + echo "$as_me:6772: result: yes" >&5 +echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$ac_t""neither works" 1>&6 + echo "$as_me:6776: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6 fi fi - LIBS="$ac_xsave_LIBS" + LIBS=$ac_xsave_LIBS esac fi @@ -4302,529 +6788,756 @@ if test "$ISC" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" else - # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And karl@cs.umb.edu says + # Martyn Johnson says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4310: checking for dnet_ntoa in -ldnet" >&5 -ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-ldnet $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6796 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa(); - -int main() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +int +main () +{ +XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6815: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6818: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6821: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6824: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:6830: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldnet $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 6838 "configure" +#include "confdefs.h" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main () +{ +dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6857: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6860: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6863: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6866: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_dnet_ntoa=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dnet_dnet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6877: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -else - echo "$ac_t""no" 1>&6 fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:4351: checking for dnet_ntoa in -ldnet_stub" >&5 -ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:6884: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6892 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dnet_ntoa(); - -int main() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char dnet_ntoa (); +int +main () +{ +dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6911: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6914: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6917: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6920: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dnet_stub_dnet_ntoa=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6931: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -else - echo "$ac_t""no" 1>&6 fi fi +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, # to get the SysV transport functions. - # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) + # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) # needs -lnsl. # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4399: checking for gethostbyname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # on Irix 5.2, according to T.E. Dickey. + # The functions gethostbyname, getservbyname, and inet_addr are + # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. + echo "$as_me:6950: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 +if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 6956 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ + which can conflict with char gethostbyname (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) choke me #else -gethostbyname(); +f = gethostbyname; #endif -; return 0; } -EOF -if { (eval echo configure:4427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethostbyname=no" -fi -rm -f conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6987: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6990: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6993: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6996: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_gethostbyname=no fi - -if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:7006: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4448: checking for gethostbyname in -lnsl" >&5 -ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7010: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7018 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); - -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:4467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main () +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7037: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7040: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7043: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7046: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_nsl_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_nsl_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7057: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -else - echo "$ac_t""no" 1>&6 + if test $ac_cv_lib_nsl_gethostbyname = no; then + echo "$as_me:7064: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 7072 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +int +main () +{ +gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7091: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7094: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7097: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7100: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_bsd_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_bsd_gethostbyname=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7111: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi + fi fi # lieder@skyler.mavd.honeywell.com says without -lsocket, # socket/setsockopt and other routines are undefined under SCO ODT # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says simon@lia.di.epfl.ch: it contains - # gethostby* variants that don't use the nameserver (or something). - # -lsocket must be given before -lnsl if both are needed. - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:4497: checking for connect" >&5 -if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # on later versions), says Simon Leinen: it contains gethostby* + # variants that don't use the nameserver (or something). -lsocket + # must be given before -lnsl if both are needed. We assume that + # if connect needs -lnsl, so does gethostbyname. + echo "$as_me:7127: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6 +if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7133 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect(); below. */ + which can conflict with char connect (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); - -int main() { + builtin and then its argument prototype would still apply. */ +char connect (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_connect) || defined (__stub___connect) choke me #else -connect(); +f = connect; #endif -; return 0; } -EOF -if { (eval echo configure:4525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_connect=no" -fi -rm -f conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7164: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7167: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7170: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7173: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_connect=no fi - -if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:7183: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4546: checking for connect in -lsocket" >&5 -ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7187: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7195 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); - -int main() { -connect() -; return 0; } -EOF -if { (eval echo configure:4565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char connect (); +int +main () +{ +connect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7214: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7217: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7220: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7223: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_socket_connect=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_socket_connect=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7234: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -else - echo "$ac_t""no" 1>&6 fi fi - # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:4589: checking for remove" >&5 -if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # Guillermo Gomez says -lposix is necessary on A/UX. + echo "$as_me:7243: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6 +if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7249 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove(); below. */ + which can conflict with char remove (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove(); - -int main() { + builtin and then its argument prototype would still apply. */ +char remove (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_remove) || defined (__stub___remove) choke me #else -remove(); +f = remove; #endif -; return 0; } -EOF -if { (eval echo configure:4617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_remove=no" -fi -rm -f conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7280: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7283: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7286: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7289: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_remove=no fi - -if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:7299: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4638: checking for remove in -lposix" >&5 -ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7303: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 +if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7311 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove(); - -int main() { -remove() -; return 0; } -EOF -if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char remove (); +int +main () +{ +remove (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7330: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7333: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7336: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7339: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_posix_remove=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_posix_remove=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7350: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -else - echo "$ac_t""no" 1>&6 fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4681: checking for shmat" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7359: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6 +if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7365 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat(); below. */ + which can conflict with char shmat (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat(); - -int main() { + builtin and then its argument prototype would still apply. */ +char shmat (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shmat) || defined (__stub___shmat) choke me #else -shmat(); +f = shmat; #endif -; return 0; } -EOF -if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shmat=no" -fi -rm -f conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7396: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7399: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7402: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7405: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_shmat=no fi - -if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:7415: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4730: checking for shmat in -lipc" >&5 -ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:7419: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7427 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat(); - -int main() { -shmat() -; return 0; } -EOF -if { (eval echo configure:4749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char shmat (); +int +main () +{ +shmat (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7446: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7449: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7452: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7455: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ipc_shmat=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ipc_shmat=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7466: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -else - echo "$ac_t""no" 1>&6 fi fi fi # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS="$LDFLAGS" + ac_save_LDFLAGS=$LDFLAGS test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE. # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4782: checking for IceConnectionNumber in -lICE" >&5 -ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # John Interrante, Karl Berry + echo "$as_me:7484: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7492 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char IceConnectionNumber(); - -int main() { -IceConnectionNumber() -; return 0; } -EOF -if { (eval echo configure:4801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char IceConnectionNumber (); +int +main () +{ +IceConnectionNumber (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7511: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7514: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7517: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7520: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_ICE_IceConnectionNumber=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_ICE_IceConnectionNumber=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7531: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -else - echo "$ac_t""no" 1>&6 fi - LDFLAGS="$ac_save_LDFLAGS" + LDFLAGS=$ac_save_LDFLAGS fi - - - - # SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` cf_have_X_LIBS=no @@ -4907,25 +7620,36 @@ EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - - - if test "$cf_check_cflags" != "$CFLAGS" ; then -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7625 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ printf("Hello world"); -; return 0; } -EOF -if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7637: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7640: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7643: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7646: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 @@ -4933,345 +7657,420 @@ fi CFLAGS="$cf_check_flags" fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 -echo "configure:4942: checking for XOpenDisplay" >&5 -if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7663: checking for XOpenDisplay" >&5 +echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 +if test "${ac_cv_func_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7669 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XOpenDisplay(); below. */ + which can conflict with char XOpenDisplay (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay(); - -int main() { + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay) choke me #else -XOpenDisplay(); +f = XOpenDisplay; #endif -; return 0; } -EOF -if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_XOpenDisplay=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_XOpenDisplay=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'XOpenDisplay`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7700: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7703: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7706: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7709: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XOpenDisplay=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_XOpenDisplay=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:7719: result: $ac_cv_func_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 +if test $ac_cv_func_XOpenDisplay = yes; then : else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:4989: checking for XOpenDisplay in -lX11" >&5 -ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7725: checking for XOpenDisplay in -lX11" >&5 +echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 +if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7733 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay(); - -int main() { -XOpenDisplay() -; return 0; } -EOF -if { (eval echo configure:5008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +int +main () +{ +XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7752: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7755: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7758: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7761: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_X11_XOpenDisplay=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_X11_XOpenDisplay=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7772: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 +if test $ac_cv_lib_X11_XOpenDisplay = yes; then LIBS="-lX11 $LIBS" -else - echo "$ac_t""no" 1>&6 fi fi - -echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 -echo "configure:5032: checking for XtAppInitialize" >&5 -if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7780: checking for XtAppInitialize" >&5 +echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 +if test "${ac_cv_func_XtAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7786 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char XtAppInitialize(); below. */ + which can conflict with char XtAppInitialize (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XtAppInitialize(); - -int main() { + builtin and then its argument prototype would still apply. */ +char XtAppInitialize (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize) choke me #else -XtAppInitialize(); +f = XtAppInitialize; #endif -; return 0; } -EOF -if { (eval echo configure:5060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_XtAppInitialize=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_XtAppInitialize=no" -fi -rm -f conftest* -fi - -if eval "test \"`echo '$ac_cv_func_'XtAppInitialize`\" = yes"; then - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7817: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7820: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7823: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7826: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_XtAppInitialize=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_XtAppInitialize=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:7836: result: $ac_cv_func_XtAppInitialize" >&5 +echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 +if test $ac_cv_func_XtAppInitialize = yes; then : else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:5079: checking for XtAppInitialize in -lXt" >&5 -ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:7842: checking for XtAppInitialize in -lXt" >&5 +echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 +if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 7850 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XtAppInitialize(); - -int main() { -XtAppInitialize() -; return 0; } -EOF -if { (eval echo configure:5098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char XtAppInitialize (); +int +main () +{ +XtAppInitialize (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7869: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7872: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7875: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7878: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xt_XtAppInitialize=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xt_XtAppInitialize=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7889: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 +if test $ac_cv_lib_Xt_XtAppInitialize = yes; then + cat >>confdefs.h <<\EOF #define HAVE_LIBXT 1 EOF cf_have_X_LIBS=Xt LIBS="-lXt $X_PRE_LIBS $LIBS" -else - echo "$ac_t""no" 1>&6 fi fi - if test $cf_have_X_LIBS = no ; then - echo "configure: warning: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:7903: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand -to makefile." 1>&2 +to makefile." >&5 +echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with +test program. You will have to check and add the proper libraries by hand +to makefile." >&2;} fi - -for ac_hdr in \ +for ac_header in \ X11/DECkeysym.h \ X11/Sunkeysym.h \ X11/Xpoll.h \ - -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5141: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 7924 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:7928: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:7934: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:7953: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&6 + fi done - - cf_x_athena=${cf_x_athena-Xaw} -echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 -echo "configure:5182: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:7965: checking if you want to link with Xaw 3d library" >&5 +echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= # Check whether --with-Xaw3d or --without-Xaw3d was given. if test "${with_Xaw3d+set}" = set; then withval="$with_Xaw3d" - : -fi +fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$ac_t""yes" 1>&6 + echo "$as_me:7976: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:7979: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 -echo "configure:5199: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:7983: checking if you want to link with neXT Athena library" >&5 +echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= # Check whether --with-neXtaw or --without-neXtaw was given. if test "${with_neXtaw+set}" = set; then withval="$with_neXtaw" - : -fi +fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$ac_t""yes" 1>&6 + echo "$as_me:7994: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:7997: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 -echo "configure:5216: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:8001: checking if you want to link with Athena-Plus library" >&5 +echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= # Check whether --with-XawPlus or --without-XawPlus was given. if test "${with_XawPlus+set}" = set; then withval="$with_XawPlus" - : -fi +fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$ac_t""yes" 1>&6 + echo "$as_me:8012: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:8015: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:5233: checking for XextCreateExtension in -lXext" >&5 -ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:8019: checking for XextCreateExtension in -lXext" >&5 +echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 +if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8027 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XextCreateExtension(); - -int main() { -XextCreateExtension() -; return 0; } -EOF -if { (eval echo configure:5252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + builtin and then its argument prototype would still apply. */ +char XextCreateExtension (); +int +main () +{ +XextCreateExtension (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8046: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8049: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8052: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8055: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xext_XextCreateExtension=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xext_XextCreateExtension=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8066: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 +if test $ac_cv_lib_Xext_XextCreateExtension = yes; then LIBS="-lXext $LIBS" -else - echo "$ac_t""no" 1>&6 fi - cf_x_athena_lib="" - cf_x_athena_root=$cf_x_athena cf_x_athena_include="" @@ -5286,33 +8085,47 @@ cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" - echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:5291: checking for $cf_test in $cf_path" >&5 + echo "$as_me:8088: checking for $cf_test in $cf_path" >&5 +echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:5294: checking for $cf_test" >&5 + echo "$as_me:8091: checking for $cf_test" >&5 +echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8095 "configure" #include "confdefs.h" #include #include <$cf_test> -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:5306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8109: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8112: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8115: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8118: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_result=no -fi -rm -f conftest* - echo "$ac_t""$cf_result" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:8127: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_include=$cf_path break @@ -5323,12 +8136,12 @@ done if test -z "$cf_x_athena_include" ; then - echo "configure: warning: Unable to successfully find Athena header files with test program" 1>&2 + { echo "$as_me:8139: WARNING: Unable to successfully find Athena header files with test program" >&5 +echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_include" != default ; then CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" fi - cf_x_athena_root=$cf_x_athena cf_x_athena_lib="" @@ -5348,34 +8161,48 @@ cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" - echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 -echo "configure:5353: checking for $cf_lib in $cf_path" >&5 + echo "$as_me:8164: checking for $cf_lib in $cf_path" >&5 +echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6 else LIBS="$cf_lib $LIBS" - echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 -echo "configure:5357: checking for $cf_test in $cf_lib" >&5 + echo "$as_me:8168: checking for $cf_test in $cf_lib" >&5 +echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6 fi cf_SAVE="$LIBS" LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8174 "configure" #include "confdefs.h" -int main() { +int +main () +{ $cf_test() -; return 0; } -EOF -if { (eval echo configure:5369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8186: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8189: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8192: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8195: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_result=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_result=no -fi -rm -f conftest* - echo "$ac_t""$cf_result" 1>&6 + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_result=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:8204: result: $cf_result" >&5 +echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_lib" LIBS="$cf_SAVE" @@ -5388,289 +8215,376 @@ done if test -z "$cf_x_athena_lib" ; then - { echo "configure: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" 1>&2; exit 1; } + { { echo "$as_me:8218: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 +echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} + { (exit 1); exit 1; }; } fi - cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:5406: checking for declaration of fd_set" >&5 -if eval "test \"`echo '$''{'cf_cv_type_fd_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:8229: checking for declaration of fd_set" >&5 +echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6 +if test "${cf_cv_type_fd_set+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else echo "trying sys/types alone" 1>&5 -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8236 "configure" #include "confdefs.h" #include -int main() { +int +main () +{ fd_set x -; return 0; } -EOF -if { (eval echo configure:5420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8249: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8252: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8255: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8258: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/types.h else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "trying X11/Xpoll.h" 1>&5 -cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +echo "trying X11/Xpoll.h" 1>&5 +cat >conftest.$ac_ext <<_ACEOF +#line 8266 "configure" #include "confdefs.h" #ifdef HAVE_X11_XPOLL_H #include #endif -int main() { +int +main () +{ fd_set x -; return 0; } -EOF -if { (eval echo configure:5439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8281: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8284: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8287: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8290: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_type_fd_set=X11/Xpoll.h else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "trying sys/select.h" 1>&5 -cat > conftest.$ac_ext <&5 +cat conftest.$ac_ext >&5 +echo "trying sys/select.h" 1>&5 +cat >conftest.$ac_ext <<_ACEOF +#line 8298 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ fd_set x -; return 0; } -EOF -if { (eval echo configure:5457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8312: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8315: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8318: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8321: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/select.h else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_type_fd_set=unknown + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_type_fd_set=unknown fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_type_fd_set" 1>&6 +echo "$as_me:8335: result: $cf_cv_type_fd_set" >&5 +echo "${ECHO_T}$cf_cv_type_fd_set" >&6 if test $cf_cv_type_fd_set = sys/select.h ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define USE_SYS_SELECT_H 1 EOF fi - -echo $ac_n "checking for IRIX 6.5 baud-rate redefinitions""... $ac_c" 1>&6 -echo "configure:5483: checking for IRIX 6.5 baud-rate redefinitions" >&5 -if eval "test \"`echo '$''{'cf_cv_termio_c_ispeed'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:8344: checking for IRIX 6.5 baud-rate redefinitions" >&5 +echo $ECHO_N "checking for IRIX 6.5 baud-rate redefinitions... $ECHO_C" >&6 +if test "${cf_cv_termio_c_ispeed+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8351 "configure" #include "confdefs.h" #include #include -int main() { +int +main () +{ struct termio foo; foo.c_ispeed = B38400; foo.c_ospeed = B9600; -; return 0; } -EOF -if { (eval echo configure:5502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:8369: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:8372: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:8375: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8378: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_termio_c_ispeed=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_termio_c_ispeed=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_termio_c_ispeed=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_termio_c_ispeed" 1>&6 -test "$cf_cv_termio_c_ispeed" = yes && cat >> confdefs.h <<\EOF +echo "$as_me:8390: result: $cf_cv_termio_c_ispeed" >&5 +echo "${ECHO_T}$cf_cv_termio_c_ispeed" >&6 +test "$cf_cv_termio_c_ispeed" = yes && cat >>confdefs.h <<\EOF #define HAVE_TERMIO_C_ISPEED 1 EOF - - LIBS="$LIBS $X_EXTRA_LIBS" # Check for openpty() in -lutil if the UNIX98-style pty functions are not # available. E.g. for GNU libc 2.0. case $host_os in #(vi -netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to work. - echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:5530: checking for openpty in -lutil" >&5 -ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +freebsd*|netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to work. + +echo "$as_me:8403: checking for openpty in -lutil" >&5 +echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 +if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8411 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char openpty(); - -int main() { -openpty() -; return 0; } -EOF -if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo util | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8433: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8436: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8439: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_util_openpty=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8450: result: $ac_cv_lib_util_openpty" >&5 +echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 +if test $ac_cv_lib_util_openpty = yes; then + cat >>confdefs.h <&6 fi ;; *) - for ac_func in grantpt + +for ac_func in grantpt do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5581: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:8467: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8473 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif -; return 0; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8504: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8507: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8510: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8513: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8523: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:5631: checking for openpty in -lutil" >&5 -ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:8532: checking for openpty in -lutil" >&5 +echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 +if test "${ac_cv_lib_util_openpty+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8540 "configure" #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char openpty(); - -int main() { -openpty() -; return 0; } -EOF -if { (eval echo configure:5650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo util | sed -e 's/^a-zA-Z0-9_/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8562: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8565: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8568: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_util_openpty=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_util_openpty=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:8579: result: $ac_cv_lib_util_openpty" >&5 +echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 +if test $ac_cv_lib_util_openpty = yes; then + cat >>confdefs.h <&6 fi fi @@ -5679,57 +8593,22 @@ ;; esac -# Extract the first word of "xterm", so it can be a program name with args. -set dummy xterm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5686: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_XTERM_PATH'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$XTERM_PATH" in - /*) - ac_cv_path_XTERM_PATH="$XTERM_PATH" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_XTERM_PATH="$XTERM_PATH" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_XTERM_PATH="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -XTERM_PATH="$ac_cv_path_XTERM_PATH" -if test -n "$XTERM_PATH"; then - echo "$ac_t""$XTERM_PATH" 1>&6 +echo "$as_me:8596: checking for XKB Bell extension" >&5 +echo $ECHO_N "checking for XKB Bell extension... $ECHO_C" >&6 +if test "${cf_cv_xkb_bell_ext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 -fi - - -echo $ac_n "checking for XKB Bell extension""... $ac_c" 1>&6 -echo "configure:5721: checking for XKB Bell extension" >&5 -if eval "test \"`echo '$''{'cf_cv_xkb_bell_ext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8603 "configure" #include "confdefs.h" #include /* has the prototype */ #include /* has the XkbBI_xxx definitions */ -int main() { +int +main () +{ int x = XkbBI_Info |XkbBI_MinorError @@ -5737,150 +8616,208 @@ |XkbBI_TerminalBell |XkbBI_MarginBell; -; return 0; } -EOF -if { (eval echo configure:5743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8624: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8627: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8630: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8633: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_xkb_bell_ext=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_xkb_bell_ext=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_xkb_bell_ext=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:8644: result: $cf_cv_xkb_bell_ext" >&5 +echo "${ECHO_T}$cf_cv_xkb_bell_ext" >&6 -echo "$ac_t""$cf_cv_xkb_bell_ext" 1>&6 - -test "$cf_cv_xkb_bell_ext" = yes && cat >> confdefs.h <<\EOF +test "$cf_cv_xkb_bell_ext" = yes && cat >>confdefs.h <<\EOF #define HAVE_XKB_BELL_EXT 1 EOF - for ac_func in Xutf8LookupString do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5766: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:8654: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 8660 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ + which can conflict with char $ac_func (); below. */ #include /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { + builtin and then its argument prototype would still apply. */ +char $ac_func (); +char (*f) (); +int +main () +{ /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif -; return 0; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:8691: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:8694: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:8697: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:8700: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:8710: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 -EXTRAHDRS="$EXTRAHDRS xutf8.h" + + EXTRAHDRS="$EXTRAHDRS xutf8.h" EXTRASRCS="$EXTRASRCS xutf8.c" EXTRAOBJS="$EXTRAOBJS xutf8.o" fi done +echo "$as_me:8726: checking if you want narrow prototypes for X libraries" >&5 +echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6 +case `$ac_config_guess` in #(vi +*cygwin*|*freebsd*|*gnu*|*irix5*|*irix6*|*linux-gnu*|*netbsd*|*openbsd*|*qnx*|*sco*|*sgi*) #(vi + cf_default_narrowproto=yes + ;; +*) + cf_default_narrowproto=no + ;; +esac + +# Check whether --enable-narrowproto or --disable-narrowproto was given. +if test "${enable_narrowproto+set}" = set; then + enableval="$enable_narrowproto" + test "$enableval" != no && enableval=yes + if test "$enableval" != "$cf_default_narrowproto" ; then + enable_narrowproto=$enableval + else + enable_narrowproto=$cf_default_narrowproto + fi +else + enableval=$cf_default_narrowproto + enable_narrowproto=$cf_default_narrowproto + +fi; +echo "$as_me:8752: result: $enable_narrowproto" >&5 +echo "${ECHO_T}$enable_narrowproto" >&6 -echo $ac_n "checking if we should use imake to help""... $ac_c" 1>&6 -echo "configure:5825: checking if we should use imake to help" >&5 +echo "$as_me:8755: checking if we should use imake to help" >&5 +echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6 # Check whether --enable-imake or --disable-imake was given. if test "${enable_imake+set}" = set; then enableval="$enable_imake" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_imake=no + enable_imake=no else enable_imake=yes fi else - enableval=yes + enableval=yes enable_imake=yes - -fi -echo "$ac_t""$enable_imake" 1>&6 +fi; +echo "$as_me:8772: result: $enable_imake" >&5 +echo "${ECHO_T}$enable_imake" >&6 + if test "$enable_imake" = yes ; then - + for ac_prog in xmkmf imake do -# Extract the first word of "$ac_prog", so it can be a program name with args. + # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5850: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_IMAKE'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +echo "$as_me:8781: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_IMAKE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$IMAKE" in - /*) + case $IMAKE in + [\\/]* | ?:[\\/]*) ac_cv_path_IMAKE="$IMAKE" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_IMAKE="$IMAKE" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_IMAKE="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_IMAKE="$ac_dir/$ac_word" + echo "$as_me:8798: found $ac_dir/$ac_word" >&5 + break +fi +done + ;; esac fi -IMAKE="$ac_cv_path_IMAKE" +IMAKE=$ac_cv_path_IMAKE + if test -n "$IMAKE"; then - echo "$ac_t""$IMAKE" 1>&6 + echo "$as_me:8809: result: $IMAKE" >&5 +echo "${ECHO_T}$IMAKE" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:8812: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -test -n "$IMAKE" && break + test -n "$IMAKE" && break done +if test -n "$IMAKE" ; then + case $IMAKE in # (vi */imake) cf_imake_opts="-DUseInstalled=YES" # (vi @@ -5896,7 +8833,6 @@ # If it's installed properly, imake (or its wrapper, xmkmf) will point to the # config directory. -if test -n "$IMAKE" ; then if mkdir conftestdir; then CDPATH=; export CDPATH cf_makefile=`cd $srcdir;pwd`/Imakefile @@ -5946,7 +8882,8 @@ esac done if test -z "$cf_config" ; then - echo "configure: warning: Could not find imake config-directory" 1>&2 + { echo "$as_me:8885: WARNING: Could not find imake config-directory" >&5 +echo "$as_me: WARNING: Could not find imake config-directory" >&2;} else cf_imake_opts="$cf_imake_opts -I$cf_config" if ( $IMAKE -v $cf_imake_opts 2>&5) @@ -5954,7 +8891,8 @@ test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6 else - echo "configure: warning: Cannot run $IMAKE" 1>&2 + { echo "$as_me:8894: WARNING: Cannot run $IMAKE" >&5 +echo "$as_me: WARNING: Cannot run $IMAKE" >&2;} fi fi fi @@ -6002,7 +8940,6 @@ fi fi fi -fi # Some imake configurations define PROJECTROOT with an empty value. Remove # the empty definition. @@ -6014,15 +8951,16 @@ ;; esac +fi + test -n "$verbose" && echo " IMAKE_CFLAGS $IMAKE_CFLAGS" 1>&6 test -n "$verbose" && echo " IMAKE_LOADFLAGS $IMAKE_LOADFLAGS" 1>&6 +fi +if test -n "$IMAKE" && test -n "$IMAKE_CFLAGS" ; then - - - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -6077,29 +9015,25 @@ done if test -n "$cf_new_cflags" ; then - + CFLAGS="$CFLAGS $cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi if test -n "$cf_new_extra_cppflags" ; then - + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - - - else IMAKE_CFLAGS= IMAKE_LOADFLAGS= test -n "$verbose" && echo " make fallback definitions" 1>&6 - # We prefer config.guess' values when we can get them, to avoid # inconsistent results with uname (AIX for instance). However, # config.guess is not always consistent either. @@ -6127,10 +9061,9 @@ IMAKE_CFLAGS="-DFUNCPROTO=15 $IMAKE_CFLAGS" # If this is not set properly, Xaw's scrollbars will not work - case `$ac_config_guess` in - *freebsd*|*gnu*|*irix5*|*irix6*|*linux-gnu*|*netbsd*|*openbsd*) + if test "$enable_narrowproto" = yes ; then IMAKE_CFLAGS="-DNARROWPROTO=1 $IMAKE_CFLAGS" - esac + fi # Other special definitions: case $host_os in @@ -6144,7 +9077,6 @@ ;; esac - cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -6199,31 +9131,24 @@ done if test -n "$cf_new_cflags" ; then - + CFLAGS="$CFLAGS $cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi if test -n "$cf_new_extra_cppflags" ; then - + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - - - - - - fi - -echo $ac_n "checking for default terminal-id""... $ac_c" 1>&6 -echo "configure:6227: checking for default terminal-id" >&5 +echo "$as_me:9150: checking for default terminal-id" >&5 +echo $ECHO_N "checking for default terminal-id... $ECHO_C" >&6 # Check whether --with-terminal-id or --without-terminal-id was given. if test "${with_terminal_id+set}" = set; then @@ -6231,20 +9156,19 @@ default_termid=$withval else default_termid=vt100 -fi - -echo "$ac_t""$default_termid" 1>&6 +fi; +echo "$as_me:9160: result: $default_termid" >&5 +echo "${ECHO_T}$default_termid" >&6 case $default_termid in vt*) default_termid=`echo $default_termid | sed -e 's/^..//'` ;; esac -cat >> confdefs.h <>confdefs.h <&6 -echo "configure:6248: checking for default terminal-type" >&5 +echo "$as_me:9170: checking for default terminal-type" >&5 +echo $ECHO_N "checking for default terminal-type... $ECHO_C" >&6 # Check whether --with-terminal-type or --without-terminal-type was given. if test "${with_terminal_type+set}" = set; then @@ -6252,16 +9176,15 @@ default_TERM=$withval else default_TERM=xterm -fi - -echo "$ac_t""$default_TERM" 1>&6 -cat >> confdefs.h <&5 +echo "${ECHO_T}$default_TERM" >&6 +cat >>confdefs.h <&6 -echo "configure:6265: checking for private terminfo-directory" >&5 +echo "$as_me:9186: checking for private terminfo-directory" >&5 +echo $ECHO_N "checking for private terminfo-directory... $ECHO_C" >&6 # Check whether --with-own-terminfo or --without-own-terminfo was given. if test "${with_own_terminfo+set}" = set; then @@ -6269,19 +9192,21 @@ TERMINFO_DIR=$withval else TERMINFO_DIR=${TERMINFO-none} -fi - -echo "$ac_t""$TERMINFO_DIR" 1>&6 +fi; +echo "$as_me:9196: result: $TERMINFO_DIR" >&5 +echo "${ECHO_T}$TERMINFO_DIR" >&6 if test "$TERMINFO_DIR" = yes ; then - echo "configure: warning: no value given" 1>&2 + { echo "$as_me:9199: WARNING: no value given" >&5 +echo "$as_me: WARNING: no value given" >&2;} elif test "$TERMINFO_DIR" != none ; then if test -d $TERMINFO_DIR ; then - cat >> confdefs.h <>confdefs.h <&2 + { echo "$as_me:9208: WARNING: not a directory" >&5 +echo "$as_me: WARNING: not a directory" >&2;} fi elif test "$prefix" != NONE ; then TERMINFO_DIR='${prefix}/lib/terminfo' @@ -6296,137 +9221,132 @@ SET_TERMINFO='TERMINFO=$(TERMINFO_DIR)' fi - - ############################################################################### - -echo $ac_n "checking if you want active-icons""... $ac_c" 1>&6 -echo "configure:6306: checking if you want active-icons" >&5 +echo "$as_me:9226: checking if you want active-icons" >&5 +echo $ECHO_N "checking if you want active-icons... $ECHO_C" >&6 # Check whether --enable-active-icon or --disable-active-icon was given. if test "${enable_active_icon+set}" = set; then enableval="$enable_active_icon" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_active_icon=no + enable_active_icon=no else enable_active_icon=yes fi else - enableval=yes + enableval=yes enable_active_icon=yes - -fi -echo "$ac_t""$enable_active_icon" 1>&6 +fi; +echo "$as_me:9243: result: $enable_active_icon" >&5 +echo "${ECHO_T}$enable_active_icon" >&6 if test "$enable_active_icon" = no ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define NO_ACTIVE_ICON 1 EOF fi -echo $ac_n "checking if you want ANSI color""... $ac_c" 1>&6 -echo "configure:6332: checking if you want ANSI color" >&5 +echo "$as_me:9252: checking if you want ANSI color" >&5 +echo $ECHO_N "checking if you want ANSI color... $ECHO_C" >&6 # Check whether --enable-ansi-color or --disable-ansi-color was given. if test "${enable_ansi_color+set}" = set; then enableval="$enable_ansi_color" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_ansi_color=no + enable_ansi_color=no else enable_ansi_color=yes fi else - enableval=yes + enableval=yes enable_ansi_color=yes - -fi -echo "$ac_t""$enable_ansi_color" 1>&6 -test "$enable_ansi_color" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:9269: result: $enable_ansi_color" >&5 +echo "${ECHO_T}$enable_ansi_color" >&6 +test "$enable_ansi_color" = no && cat >>confdefs.h <<\EOF #define OPT_ISO_COLORS 0 EOF - if test "$enable_ansi_color" = yes ; then - echo $ac_n "checking if you want 16 colors like aixterm""... $ac_c" 1>&6 -echo "configure:6358: checking if you want 16 colors like aixterm" >&5 - + echo "$as_me:9277: checking if you want 16 colors like aixterm" >&5 +echo $ECHO_N "checking if you want 16 colors like aixterm... $ECHO_C" >&6 + # Check whether --enable-16-color or --disable-16-color was given. if test "${enable_16_color+set}" = set; then enableval="$enable_16_color" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_16_color=no + enable_16_color=no else enable_16_color=yes fi else - enableval=yes + enableval=yes enable_16_color=yes - -fi - echo "$ac_t""$enable_16_color" 1>&6 - test "$enable_16_color" = no && cat >> confdefs.h <<\EOF +fi; + echo "$as_me:9294: result: $enable_16_color" >&5 +echo "${ECHO_T}$enable_16_color" >&6 + test "$enable_16_color" = no && cat >>confdefs.h <<\EOF #define OPT_AIX_COLORS 0 EOF + echo "$as_me:9300: checking if you want 256 colors" >&5 +echo $ECHO_N "checking if you want 256 colors... $ECHO_C" >&6 - echo $ac_n "checking if you want 256 colors""... $ac_c" 1>&6 -echo "configure:6382: checking if you want 256 colors" >&5 - # Check whether --enable-256-color or --disable-256-color was given. if test "${enable_256_color+set}" = set; then enableval="$enable_256_color" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_256_color=yes + enable_256_color=yes else enable_256_color=no fi else - enableval=no + enableval=no enable_256_color=no - -fi - echo "$ac_t""$enable_256_color" 1>&6 +fi; + echo "$as_me:9317: result: $enable_256_color" >&5 +echo "${ECHO_T}$enable_256_color" >&6 if test "$enable_256_color" = yes ; then CHARPROC_DEPS="$CHARPROC_DEPS 256colres.h" EXTRAHDRS="$EXTRAHDRS 256colres.h" - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_256_COLORS 1 EOF else - echo $ac_n "checking if you want 88 colors""... $ac_c" 1>&6 -echo "configure:6409: checking if you want 88 colors" >&5 - + echo "$as_me:9327: checking if you want 88 colors" >&5 +echo $ECHO_N "checking if you want 88 colors... $ECHO_C" >&6 + # Check whether --enable-88-color or --disable-88-color was given. if test "${enable_88_color+set}" = set; then enableval="$enable_88_color" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_88_color=yes + enable_88_color=yes else enable_88_color=no fi else - enableval=no + enableval=no enable_88_color=no - -fi - echo "$ac_t""$enable_88_color" 1>&6 +fi; + echo "$as_me:9344: result: $enable_88_color" >&5 +echo "${ECHO_T}$enable_88_color" >&6 if test "$enable_88_color" = yes ; then CHARPROC_DEPS="$CHARPROC_DEPS 88colres.h" EXTRAHDRS="$EXTRAHDRS 88colres.h" - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_88_COLORS 1 EOF @@ -6435,32 +9355,31 @@ fi -echo $ac_n "checking if you want blinking cursor""... $ac_c" 1>&6 -echo "configure:6440: checking if you want blinking cursor" >&5 +echo "$as_me:9358: checking if you want blinking cursor" >&5 +echo $ECHO_N "checking if you want blinking cursor... $ECHO_C" >&6 # Check whether --enable-blink-cursor or --disable-blink-cursor was given. if test "${enable_blink_cursor+set}" = set; then enableval="$enable_blink_cursor" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_blink_curs=no + enable_blink_curs=no else enable_blink_curs=yes fi else - enableval=yes + enableval=yes enable_blink_curs=yes - -fi -echo "$ac_t""$enable_blink_curs" 1>&6 -test "$enable_blink_curs" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:9375: result: $enable_blink_curs" >&5 +echo "${ECHO_T}$enable_blink_curs" >&6 +test "$enable_blink_curs" = no && cat >>confdefs.h <<\EOF #define OPT_BLINK_CURS 0 EOF - -echo $ac_n "checking if you want to ignore Linux's broken palette-strings""... $ac_c" 1>&6 -echo "configure:6464: checking if you want to ignore Linux's broken palette-strings" >&5 +echo "$as_me:9381: checking if you want to ignore Linux's broken palette-strings" >&5 +echo $ECHO_N "checking if you want to ignore Linux's broken palette-strings... $ECHO_C" >&6 case $host_os in #(vi linux*) @@ -6469,331 +9388,377 @@ assume_broken_osc=no ;; esac - # Check whether --enable-broken-osc or --disable-broken-osc was given. if test "${enable_broken_osc+set}" = set; then enableval="$enable_broken_osc" test "$enableval" != no && enableval=yes if test "$enableval" != "$assume_broken_osc" ; then - enable_broken_osc=$enableval + enable_broken_osc=$enableval else enable_broken_osc=$enableval fi else - enableval=$assume_broken_osc + enableval=$assume_broken_osc enable_broken_osc=$enableval - -fi -echo "$ac_t""$enable_broken_osc" 1>&6 +fi; +echo "$as_me:9405: result: $enable_broken_osc" >&5 +echo "${ECHO_T}$enable_broken_osc" >&6 if test "$enable_broken_osc" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_BROKEN_OSC 1 EOF else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_BROKEN_OSC 0 EOF fi -echo $ac_n "checking if you want to allow broken string-terminators""... $ac_c" 1>&6 -echo "configure:6503: checking if you want to allow broken string-terminators" >&5 +echo "$as_me:9419: checking if you want to allow broken string-terminators" >&5 +echo $ECHO_N "checking if you want to allow broken string-terminators... $ECHO_C" >&6 # Check whether --enable-broken-st or --disable-broken-st was given. if test "${enable_broken_st+set}" = set; then enableval="$enable_broken_st" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_broken_st=yes + enable_broken_st=yes else enable_broken_st=no fi else - enableval=no + enableval=no enable_broken_st=no - -fi -echo "$ac_t""$enable_broken_st" 1>&6 -test "$enable_broken_st" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:9436: result: $enable_broken_st" >&5 +echo "${ECHO_T}$enable_broken_st" >&6 +test "$enable_broken_st" = no && cat >>confdefs.h <<\EOF #define OPT_BROKEN_ST 0 EOF - -echo $ac_n "checking if you want printable 128-159""... $ac_c" 1>&6 -echo "configure:6527: checking if you want printable 128-159" >&5 +echo "$as_me:9442: checking if you want printable 128-159" >&5 +echo $ECHO_N "checking if you want printable 128-159... $ECHO_C" >&6 # Check whether --enable-c1-print or --disable-c1-print was given. if test "${enable_c1_print+set}" = set; then enableval="$enable_c1_print" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_c1_print=no + enable_c1_print=no else enable_c1_print=yes fi else - enableval=yes + enableval=yes enable_c1_print=yes - -fi -echo "$ac_t""$enable_c1_print" 1>&6 -test "$enable_c1_print" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:9459: result: $enable_c1_print" >&5 +echo "${ECHO_T}$enable_c1_print" >&6 +test "$enable_c1_print" = no && cat >>confdefs.h <<\EOF #define OPT_C1_PRINT 0 EOF - if test "$enable_ansi_color" = yes ; then - echo $ac_n "checking if you want bold colors mapped like IBM PC""... $ac_c" 1>&6 -echo "configure:6553: checking if you want bold colors mapped like IBM PC" >&5 - + echo "$as_me:9467: checking if you want bold colors mapped like IBM PC" >&5 +echo $ECHO_N "checking if you want bold colors mapped like IBM PC... $ECHO_C" >&6 + # Check whether --enable-bold-color or --disable-bold-color was given. if test "${enable_bold_color+set}" = set; then enableval="$enable_bold_color" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_pc_color=no + enable_pc_color=no else enable_pc_color=yes fi else - enableval=yes + enableval=yes enable_pc_color=yes - -fi - echo "$ac_t""$enable_pc_color" 1>&6 - test "$enable_pc_color" = no && cat >> confdefs.h <<\EOF +fi; + echo "$as_me:9484: result: $enable_pc_color" >&5 +echo "${ECHO_T}$enable_pc_color" >&6 + test "$enable_pc_color" = no && cat >>confdefs.h <<\EOF #define OPT_PC_COLORS 0 EOF + echo "$as_me:9490: checking if you want separate color-classes" >&5 +echo $ECHO_N "checking if you want separate color-classes... $ECHO_C" >&6 - echo $ac_n "checking if you want separate color-classes""... $ac_c" 1>&6 -echo "configure:6577: checking if you want separate color-classes" >&5 - # Check whether --enable-color-class or --disable-color-class was given. if test "${enable_color_class+set}" = set; then enableval="$enable_color_class" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_color_class=no + enable_color_class=no else enable_color_class=yes fi else - enableval=yes + enableval=yes enable_color_class=yes - -fi - echo "$ac_t""$enable_color_class" 1>&6 - test "$enable_color_class" = no && cat >> confdefs.h <<\EOF +fi; + echo "$as_me:9507: result: $enable_color_class" >&5 +echo "${ECHO_T}$enable_color_class" >&6 + test "$enable_color_class" = no && cat >>confdefs.h <<\EOF #define OPT_COLOR_CLASS FALSE EOF + echo "$as_me:9513: checking if you want color-mode enabled by default" >&5 +echo $ECHO_N "checking if you want color-mode enabled by default... $ECHO_C" >&6 - echo $ac_n "checking if you want color-mode enabled by default""... $ac_c" 1>&6 -echo "configure:6601: checking if you want color-mode enabled by default" >&5 - # Check whether --enable-color-mode or --disable-color-mode was given. if test "${enable_color_mode+set}" = set; then enableval="$enable_color_mode" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - default_colormode=no + default_colormode=no else default_colormode=yes fi else - enableval=yes + enableval=yes default_colormode=yes - -fi - echo "$ac_t""$default_colormode" 1>&6 - test "$default_colormode" = no && cat >> confdefs.h <<\EOF +fi; + echo "$as_me:9530: result: $default_colormode" >&5 +echo "${ECHO_T}$default_colormode" >&6 + test "$default_colormode" = no && cat >>confdefs.h <<\EOF #define DFT_COLORMODE FALSE EOF - fi -echo $ac_n "checking if you want support for color highlighting""... $ac_c" 1>&6 -echo "configure:6627: checking if you want support for color highlighting" >&5 +echo "$as_me:9538: checking if you want support for color highlighting" >&5 +echo $ECHO_N "checking if you want support for color highlighting... $ECHO_C" >&6 # Check whether --enable-highlighting or --disable-highlighting was given. if test "${enable_highlighting+set}" = set; then enableval="$enable_highlighting" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - default_highlight=no + default_highlight=no else default_highlight=yes fi else - enableval=yes + enableval=yes default_highlight=yes - -fi -echo "$ac_t""$default_highlight" 1>&6 -test "$default_highlight" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:9555: result: $default_highlight" >&5 +echo "${ECHO_T}$default_highlight" >&6 +test "$default_highlight" = no && cat >>confdefs.h <<\EOF #define OPT_HIGHLIGHT_COLOR 0 EOF - -echo $ac_n "checking if you want support for doublesize characters""... $ac_c" 1>&6 -echo "configure:6651: checking if you want support for doublesize characters" >&5 +echo "$as_me:9561: checking if you want support for doublesize characters" >&5 +echo $ECHO_N "checking if you want support for doublesize characters... $ECHO_C" >&6 # Check whether --enable-doublechars or --disable-doublechars was given. if test "${enable_doublechars+set}" = set; then enableval="$enable_doublechars" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_doublechars=no + enable_doublechars=no else enable_doublechars=yes fi else - enableval=yes + enableval=yes enable_doublechars=yes - -fi -echo "$ac_t""$enable_doublechars" 1>&6 -test "$enable_doublechars" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:9578: result: $enable_doublechars" >&5 +echo "${ECHO_T}$enable_doublechars" >&6 +test "$enable_doublechars" = no && cat >>confdefs.h <<\EOF #define OPT_DEC_CHRSET 0 EOF - -echo $ac_n "checking if you want fallback-support for box characters""... $ac_c" 1>&6 -echo "configure:6675: checking if you want fallback-support for box characters" >&5 +echo "$as_me:9584: checking if you want fallback-support for box characters" >&5 +echo $ECHO_N "checking if you want fallback-support for box characters... $ECHO_C" >&6 # Check whether --enable-boxchars or --disable-boxchars was given. if test "${enable_boxchars+set}" = set; then enableval="$enable_boxchars" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_boxchars=no + enable_boxchars=no else enable_boxchars=yes fi else - enableval=yes + enableval=yes enable_boxchars=yes - -fi -echo "$ac_t""$enable_boxchars" 1>&6 -test "$enable_boxchars" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:9601: result: $enable_boxchars" >&5 +echo "${ECHO_T}$enable_boxchars" >&6 +test "$enable_boxchars" = no && cat >>confdefs.h <<\EOF #define OPT_BOX_CHARS 0 EOF - -echo $ac_n "checking if you want to use FreeType library""... $ac_c" 1>&6 -echo "configure:6699: checking if you want to use FreeType library" >&5 +echo "$as_me:9607: checking if you want to use FreeType library" >&5 +echo $ECHO_N "checking if you want to use FreeType library... $ECHO_C" >&6 # Check whether --enable-freetype or --disable-freetype was given. if test "${enable_freetype+set}" = set; then enableval="$enable_freetype" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_freetype=no + enable_freetype=no else enable_freetype=yes fi else - enableval=yes - enable_freetype=yes - + enableval=yes + enable_freetype=yes + +fi; +echo "$as_me:9624: result: $enable_freetype" >&5 +echo "${ECHO_T}$enable_freetype" >&6 +if test "$enable_freetype" = yes ; then + +cf_extra_freetype_libs= +FREETYPE_CONFIG= +FREETYPE_PARAMS= + +# Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo "$as_me:9634: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_FREETYPE_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $FREETYPE_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_FREETYPE_PKG_CONFIG="$FREETYPE_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FREETYPE_PKG_CONFIG="$ac_dir/$ac_word" + echo "$as_me:9651: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_FREETYPE_PKG_CONFIG" && ac_cv_path_FREETYPE_PKG_CONFIG="none" + ;; +esac +fi +FREETYPE_PKG_CONFIG=$ac_cv_path_FREETYPE_PKG_CONFIG + +if test -n "$FREETYPE_PKG_CONFIG"; then + echo "$as_me:9663: result: $FREETYPE_PKG_CONFIG" >&5 +echo "${ECHO_T}$FREETYPE_PKG_CONFIG" >&6 +else + echo "$as_me:9666: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$ac_t""$enable_freetype" 1>&6 -if test "$enable_freetype" = yes ; then - -cf_extra_freetype_libs= -# Extract the first word of "xft-config", so it can be a program name with args. +if test "$FREETYPE_PKG_CONFIG" != none && "$FREETYPE_PKG_CONFIG" --exists xft; then + FREETYPE_CONFIG=$FREETYPE_PKG_CONFIG + FREETYPE_PARAMS=xft +else + # Extract the first word of "xft-config", so it can be a program name with args. set dummy xft-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6723: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_FREETYPE_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$FREETYPE_CONFIG" in - /*) - ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a dos path. +echo "$as_me:9676: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_FREETYPE_XFT_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $FREETYPE_XFT_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_FREETYPE_XFT_CONFIG="$FREETYPE_XFT_CONFIG" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_FREETYPE_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_FREETYPE_CONFIG" && ac_cv_path_FREETYPE_CONFIG="none" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FREETYPE_XFT_CONFIG="$ac_dir/$ac_word" + echo "$as_me:9693: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_FREETYPE_XFT_CONFIG" && ac_cv_path_FREETYPE_XFT_CONFIG="none" ;; esac fi -FREETYPE_CONFIG="$ac_cv_path_FREETYPE_CONFIG" -if test -n "$FREETYPE_CONFIG"; then - echo "$ac_t""$FREETYPE_CONFIG" 1>&6 +FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG + +if test -n "$FREETYPE_XFT_CONFIG"; then + echo "$as_me:9705: result: $FREETYPE_XFT_CONFIG" >&5 +echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:9708: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -if test "$FREETYPE_CONFIG" = none; then - cf_extra_freetype_libs="-lXft" - # Extract the first word of "freetype-config", so it can be a program name with args. + if test "$FREETYPE_XFT_CONFIG" != none; then + FREETYPE_CONFIG=$FREETYPE_XFT_CONFIG + else + cf_extra_freetype_libs="-lXft" + # Extract the first word of "freetype-config", so it can be a program name with args. set dummy freetype-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6761: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_FREETYPE_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$FREETYPE_CONFIG" in - /*) - ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a dos path. +echo "$as_me:9718: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_FREETYPE_OLD_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $FREETYPE_OLD_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_FREETYPE_OLD_CONFIG="$FREETYPE_OLD_CONFIG" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_FREETYPE_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_FREETYPE_CONFIG" && ac_cv_path_FREETYPE_CONFIG="none" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FREETYPE_OLD_CONFIG="$ac_dir/$ac_word" + echo "$as_me:9735: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_FREETYPE_OLD_CONFIG" && ac_cv_path_FREETYPE_OLD_CONFIG="none" ;; esac fi -FREETYPE_CONFIG="$ac_cv_path_FREETYPE_CONFIG" -if test -n "$FREETYPE_CONFIG"; then - echo "$ac_t""$FREETYPE_CONFIG" 1>&6 +FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG + +if test -n "$FREETYPE_OLD_CONFIG"; then + echo "$as_me:9747: result: $FREETYPE_OLD_CONFIG" >&5 +echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:9750: result: no" >&5 +echo "${ECHO_T}no" >&6 fi + if test "$FREETYPE_OLD_CONFIG" != none; then + FREETYPE_CONFIG=$FREETYPE_OLD_CONFIG + fi + fi fi -if test "$FREETYPE_CONFIG" != none ; then - +if test -n "$FREETYPE_CONFIG" ; then +withval= # Check whether --with-freetype-cflags or --without-freetype-cflags was given. if test "${with_freetype_cflags+set}" = set; then @@ -6801,23 +9766,21 @@ cf_cv_x_freetype_incs="$withval" test -n "$verbose" && echo " freetype-cflags $cf_cv_x_freetype_incs" 1>&6 - else - -echo $ac_n "checking for X FreeType headers""... $ac_c" 1>&6 -echo "configure:6809: checking for X FreeType headers" >&5 -if eval "test \"`echo '$''{'cf_cv_x_freetype_incs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:9771: checking for X FreeType headers" >&5 +echo $ECHO_N "checking for X FreeType headers... $ECHO_C" >&6 +if test "${cf_cv_x_freetype_incs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cf_cv_x_freetype_incs="`$FREETYPE_CONFIG --cflags 2>/dev/null`" -fi + cf_cv_x_freetype_incs="`$FREETYPE_CONFIG $FREETYPE_PARAMS --cflags 2>/dev/null`" -echo "$ac_t""$cf_cv_x_freetype_incs" 1>&6 fi - - +echo "$as_me:9780: result: $cf_cv_x_freetype_incs" >&5 +echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 +fi; +withval= # Check whether --with-freetype-libs or --without-freetype-libs was given. if test "${with_freetype_libs+set}" = set; then @@ -6825,58 +9788,69 @@ cf_cv_x_freetype_libs="$withval" test -n "$verbose" && echo " freetype-libs $cf_cv_x_freetype_libs" 1>&6 - else - -echo $ac_n "checking for X FreeType libraries""... $ac_c" 1>&6 -echo "configure:6833: checking for X FreeType libraries" >&5 -if eval "test \"`echo '$''{'cf_cv_x_freetype_libs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +echo "$as_me:9793: checking for X FreeType libraries" >&5 +echo $ECHO_N "checking for X FreeType libraries... $ECHO_C" >&6 +if test "${cf_cv_x_freetype_libs+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cf_save_LIBS="$LIBS" cf_save_INCS="$CPPFLAGS" -cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG --libs 2>/dev/null`" +cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG $FREETYPE_PARAMS --libs 2>/dev/null`" LIBS="$cf_cv_x_freetype_libs $LIBS" CPPFLAGS="$cf_cv_x_freetype_incs $CPPFLAGS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 9808 "configure" #include "confdefs.h" #include #include #include -int main() { +int +main () +{ XftPattern *pat = XftNameParse ("name"); - -; return 0; } -EOF -if { (eval echo configure:6860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:9825: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9828: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9831: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9834: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_x_freetype_libs= + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_x_freetype_libs= fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" CPPFLAGS="$cf_save_INCS" fi - -echo "$ac_t""$cf_cv_x_freetype_libs" 1>&6 -fi - +echo "$as_me:9847: result: $cf_cv_x_freetype_libs" >&5 +echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 +fi; if test -n "$cf_cv_x_freetype_libs" ; then LIBS="$cf_cv_x_freetype_libs $LIBS" - + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -6931,175 +9905,174 @@ done if test -n "$cf_new_cflags" ; then - + CFLAGS="$CFLAGS $cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi if test -n "$cf_new_extra_cppflags" ; then - + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi - - - - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define XRENDERFONT 1 EOF else + { echo "$as_me:9927: WARNING: No libraries found for FreeType" >&5 +echo "$as_me: WARNING: No libraries found for FreeType" >&2;} CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi + else + { echo "$as_me:9933: WARNING: Cannot find FreeType configuration program" >&5 +echo "$as_me: WARNING: Cannot find FreeType configuration program" >&2;} CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi # FIXME: revisit this if needed - - - else CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi -echo $ac_n "checking if you want support for HP-style function keys""... $ac_c" 1>&6 -echo "configure:6973: checking if you want support for HP-style function keys" >&5 +echo "$as_me:9944: checking if you want support for HP-style function keys" >&5 +echo $ECHO_N "checking if you want support for HP-style function keys... $ECHO_C" >&6 # Check whether --enable-hp-fkeys or --disable-hp-fkeys was given. if test "${enable_hp_fkeys+set}" = set; then enableval="$enable_hp_fkeys" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_hp_fkeys=yes + enable_hp_fkeys=yes else enable_hp_fkeys=no fi else - enableval=no + enableval=no enable_hp_fkeys=no - -fi -echo "$ac_t""$enable_hp_fkeys" 1>&6 +fi; +echo "$as_me:9961: result: $enable_hp_fkeys" >&5 +echo "${ECHO_T}$enable_hp_fkeys" >&6 if test "$enable_hp_fkeys" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_HP_FUNC_KEYS 1 EOF fi -echo $ac_n "checking if you want support for SCO-style function keys""... $ac_c" 1>&6 -echo "configure:6999: checking if you want support for SCO-style function keys" >&5 +echo "$as_me:9970: checking if you want support for SCO-style function keys" >&5 +echo $ECHO_N "checking if you want support for SCO-style function keys... $ECHO_C" >&6 # Check whether --enable-sco-fkeys or --disable-sco-fkeys was given. if test "${enable_sco_fkeys+set}" = set; then enableval="$enable_sco_fkeys" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_sco_fkeys=yes + enable_sco_fkeys=yes else enable_sco_fkeys=no fi else - enableval=no + enableval=no enable_sco_fkeys=no - -fi -echo "$ac_t""$enable_sco_fkeys" 1>&6 +fi; +echo "$as_me:9987: result: $enable_sco_fkeys" >&5 +echo "${ECHO_T}$enable_sco_fkeys" >&6 if test "$enable_sco_fkeys" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_SCO_FUNC_KEYS 1 EOF fi -echo $ac_n "checking if you want support for internationalization""... $ac_c" 1>&6 -echo "configure:7025: checking if you want support for internationalization" >&5 +echo "$as_me:9996: checking if you want support for internationalization" >&5 +echo $ECHO_N "checking if you want support for internationalization... $ECHO_C" >&6 # Check whether --enable-i18n or --disable-i18n was given. if test "${enable_i18n+set}" = set; then enableval="$enable_i18n" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_i18n=no + enable_i18n=no else enable_i18n=yes fi else - enableval=yes + enableval=yes enable_i18n=yes - -fi -echo "$ac_t""$enable_i18n" 1>&6 +fi; +echo "$as_me:10013: result: $enable_i18n" >&5 +echo "${ECHO_T}$enable_i18n" >&6 if test "$enable_i18n" = no ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_I18N_SUPPORT 0 EOF fi -echo $ac_n "checking if you want support for initial-erase setup""... $ac_c" 1>&6 -echo "configure:7051: checking if you want support for initial-erase setup" >&5 +echo "$as_me:10022: checking if you want support for initial-erase setup" >&5 +echo $ECHO_N "checking if you want support for initial-erase setup... $ECHO_C" >&6 # Check whether --enable-initial-erase or --disable-initial-erase was given. if test "${enable_initial_erase+set}" = set; then enableval="$enable_initial_erase" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_ie=no + enable_ie=no else enable_ie=yes fi else - enableval=yes + enableval=yes enable_ie=yes - -fi -echo "$ac_t""$enable_ie" 1>&6 +fi; +echo "$as_me:10039: result: $enable_ie" >&5 +echo "${ECHO_T}$enable_ie" >&6 if test "$enable_ie" = no ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_INITIAL_ERASE 0 EOF fi -echo $ac_n "checking if you want support for input-method""... $ac_c" 1>&6 -echo "configure:7077: checking if you want support for input-method" >&5 +echo "$as_me:10048: checking if you want support for input-method" >&5 +echo $ECHO_N "checking if you want support for input-method... $ECHO_C" >&6 # Check whether --enable-input-method or --disable-input-method was given. if test "${enable_input_method+set}" = set; then enableval="$enable_input_method" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_ximp=no + enable_ximp=no else enable_ximp=yes fi else - enableval=yes + enableval=yes enable_ximp=yes - -fi - -echo "$ac_t""$enable_ximp" 1>&6 -echo $ac_n "checking if X libraries support input-method""... $ac_c" 1>&6 -echo "configure:7097: checking if X libraries support input-method" >&5 -if eval "test \"`echo '$''{'cf_cv_input_method'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +fi; +echo "$as_me:10065: result: $enable_ximp" >&5 +echo "${ECHO_T}$enable_ximp" >&6 + +echo "$as_me:10068: checking if X libraries support input-method" >&5 +echo $ECHO_N "checking if X libraries support input-method... $ECHO_C" >&6 +if test "${cf_cv_input_method+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +#line 10075 "configure" #include "confdefs.h" #include @@ -7109,7 +10082,9 @@ #include #include -int main() { +int +main () +{ { XIM xim; @@ -7124,306 +10099,716 @@ input_style = (XIMPreeditNothing | XIMStatusNothing); } -; return 0; } -EOF -if { (eval echo configure:7130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10107: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10110: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10113: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10116: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then cf_cv_input_method=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cf_cv_input_method=no + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_input_method=no fi -rm -f conftest* +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - -echo "$ac_t""$cf_cv_input_method" 1>&6 +echo "$as_me:10126: result: $cf_cv_input_method" >&5 +echo "${ECHO_T}$cf_cv_input_method" >&6 test "$cf_cv_input_method" = no && enable_ximp=no if test "$enable_ximp" = no ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_INPUT_METHOD 0 EOF fi -echo $ac_n "checking if you want support for load-vt-fonts""... $ac_c" 1>&6 -echo "configure:7153: checking if you want support for load-vt-fonts" >&5 +echo "$as_me:10137: checking if you want support for load-vt-fonts" >&5 +echo $ECHO_N "checking if you want support for load-vt-fonts... $ECHO_C" >&6 # Check whether --enable-load-vt-fonts or --disable-load-vt-fonts was given. if test "${enable_load_vt_fonts+set}" = set; then enableval="$enable_load_vt_fonts" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_load_vt_fonts=yes + enable_load_vt_fonts=yes else enable_load_vt_fonts=no fi else - enableval=no + enableval=no enable_load_vt_fonts=no - -fi -echo "$ac_t""$enable_load_vt_fonts" 1>&6 +fi; +echo "$as_me:10154: result: $enable_load_vt_fonts" >&5 +echo "${ECHO_T}$enable_load_vt_fonts" >&6 if test "$enable_load_vt_fonts" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_LOAD_VTFONTS 1 EOF fi -echo $ac_n "checking if you want support for logging""... $ac_c" 1>&6 -echo "configure:7179: checking if you want support for logging" >&5 +echo "$as_me:10163: checking if you want support for logging" >&5 +echo $ECHO_N "checking if you want support for logging... $ECHO_C" >&6 # Check whether --enable-logging or --disable-logging was given. if test "${enable_logging+set}" = set; then enableval="$enable_logging" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_logging=yes + enable_logging=yes else enable_logging=no fi else - enableval=no + enableval=no enable_logging=no - -fi -echo "$ac_t""$enable_logging" 1>&6 +fi; +echo "$as_me:10180: result: $enable_logging" >&5 +echo "${ECHO_T}$enable_logging" >&6 if test "$enable_logging" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define ALLOWLOGGING 1 EOF - echo $ac_n "checking if you want to allow logging via a pipe""... $ac_c" 1>&6 -echo "configure:7203: checking if you want to allow logging via a pipe" >&5 - + echo "$as_me:10187: checking if you want to allow logging via a pipe" >&5 +echo $ECHO_N "checking if you want to allow logging via a pipe... $ECHO_C" >&6 + # Check whether --enable-logfile-exec or --disable-logfile-exec was given. if test "${enable_logfile_exec+set}" = set; then enableval="$enable_logfile_exec" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_log_exec=yes + enable_log_exec=yes else enable_log_exec=no fi else - enableval=no + enableval=no enable_log_exec=no - -fi - echo "$ac_t""$enable_log_exec" 1>&6 +fi; + echo "$as_me:10204: result: $enable_log_exec" >&5 +echo "${ECHO_T}$enable_log_exec" >&6 if test "$enable_log_exec" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define ALLOWLOGFILEEXEC 1 EOF fi fi -echo $ac_n "checking if you want support for iconify/maximize translations""... $ac_c" 1>&6 -echo "configure:7230: checking if you want support for iconify/maximize translations" >&5 +echo "$as_me:10214: checking if you want support for iconify/maximize translations" >&5 +echo $ECHO_N "checking if you want support for iconify/maximize translations... $ECHO_C" >&6 # Check whether --enable-maximize or --disable-maximize was given. if test "${enable_maximize+set}" = set; then enableval="$enable_maximize" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_maximize=no + enable_maximize=no else enable_maximize=yes fi else - enableval=yes + enableval=yes enable_maximize=yes - -fi -echo "$ac_t""$enable_maximize" 1>&6 -test "$enable_maximize" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:10231: result: $enable_maximize" >&5 +echo "${ECHO_T}$enable_maximize" >&6 +test "$enable_maximize" = no && cat >>confdefs.h <<\EOF #define OPT_MAXIMIZE 0 EOF - -echo $ac_n "checking if you want NumLock to override keyboard tables""... $ac_c" 1>&6 -echo "configure:7254: checking if you want NumLock to override keyboard tables" >&5 +echo "$as_me:10237: checking if you want NumLock to override keyboard tables" >&5 +echo $ECHO_N "checking if you want NumLock to override keyboard tables... $ECHO_C" >&6 # Check whether --enable-num-lock or --disable-num-lock was given. if test "${enable_num_lock+set}" = set; then enableval="$enable_num_lock" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_numlock=no + enable_numlock=no else enable_numlock=yes fi else - enableval=yes + enableval=yes enable_numlock=yes - -fi -echo "$ac_t""$enable_numlock" 1>&6 -test "$enable_numlock" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:10254: result: $enable_numlock" >&5 +echo "${ECHO_T}$enable_numlock" >&6 +test "$enable_numlock" = no && cat >>confdefs.h <<\EOF #define OPT_NUM_LOCK 0 EOF +echo "$as_me:10260: checking if you want support for get/set of base64 selection data" >&5 +echo $ECHO_N "checking if you want support for get/set of base64 selection data... $ECHO_C" >&6 -echo $ac_n "checking if you want support for pty-handshaking""... $ac_c" 1>&6 -echo "configure:7278: checking if you want support for pty-handshaking" >&5 +# Check whether --enable-paste64 or --disable-paste64 was given. +if test "${enable_paste64+set}" = set; then + enableval="$enable_paste64" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_paste64=yes + else + enable_paste64=no + fi +else + enableval=no + enable_paste64=no + +fi; +echo "$as_me:10277: result: $enable_paste64" >&5 +echo "${ECHO_T}$enable_paste64" >&6 +if test "$enable_paste64" = yes ; then + cat >>confdefs.h <<\EOF +#define OPT_PASTE64 1 +EOF + +else + cat >>confdefs.h <<\EOF +#define OPT_PASTE64 0 +EOF + +fi +echo "$as_me:10291: checking if you want support for pty-handshaking" >&5 +echo $ECHO_N "checking if you want support for pty-handshaking... $ECHO_C" >&6 # Check whether --enable-pty-handshake or --disable-pty-handshake was given. if test "${enable_pty_handshake+set}" = set; then enableval="$enable_pty_handshake" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_pty_handshake=no + enable_pty_handshake=no else enable_pty_handshake=yes fi else - enableval=yes + enableval=yes enable_pty_handshake=yes - -fi -echo "$ac_t""$enable_pty_handshake" 1>&6 +fi; +echo "$as_me:10308: result: $enable_pty_handshake" >&5 +echo "${ECHO_T}$enable_pty_handshake" >&6 if test "$enable_pty_handshake" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_PTY_HANDSHAKE 1 EOF else - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_PTY_HANDSHAKE 0 EOF fi -echo $ac_n "checking if you want support for right-scrollbar""... $ac_c" 1>&6 -echo "configure:7310: checking if you want support for right-scrollbar" >&5 +echo "$as_me:10322: checking if you want support for mouse in readline applications" >&5 +echo $ECHO_N "checking if you want support for mouse in readline applications... $ECHO_C" >&6 + +# Check whether --enable-readline-mouse or --disable-readline-mouse was given. +if test "${enable_readline_mouse+set}" = set; then + enableval="$enable_readline_mouse" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_readline_mouse=yes + else + enable_readline_mouse=no + fi +else + enableval=no + enable_readline_mouse=no + +fi; +echo "$as_me:10339: result: $enable_readline_mouse" >&5 +echo "${ECHO_T}$enable_readline_mouse" >&6 +if test "$enable_readline_mouse" = yes ; then + cat >>confdefs.h <<\EOF +#define OPT_READLINE 1 +EOF + +fi + +echo "$as_me:10348: checking if you want support for regular-expression selections" >&5 +echo $ECHO_N "checking if you want support for regular-expression selections... $ECHO_C" >&6 + +# Check whether --enable-regex or --disable-regex was given. +if test "${enable_regex+set}" = set; then + enableval="$enable_regex" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + enable_regex=no + else + enable_regex=yes + fi +else + enableval=yes + enable_regex=yes + +fi; +echo "$as_me:10365: result: $enable_regex" >&5 +echo "${ECHO_T}$enable_regex" >&6 +if test "$enable_regex" = yes ; then + +echo "$as_me:10369: checking if you want to use PCRE for regular-expressions" >&5 +echo $ECHO_N "checking if you want to use PCRE for regular-expressions... $ECHO_C" >&6 + +# Check whether --with-pcre or --without-pcre was given. +if test "${with_pcre+set}" = set; then + withval="$with_pcre" + +fi; +test -z "$with_pcre" && with_pcre=no +echo "$as_me:10378: result: $with_pcre" >&5 +echo "${ECHO_T}$with_pcre" >&6 + +if test "$with_pcre" != no ; then + echo "$as_me:10382: checking for pcre_compile in -lpcre" >&5 +echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6 +if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcre $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 10390 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pcre_compile (); +int +main () +{ +pcre_compile (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10409: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10412: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10415: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10418: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcre_pcre_compile=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pcre_pcre_compile=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:10429: result: $ac_cv_lib_pcre_pcre_compile" >&5 +echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6 +if test $ac_cv_lib_pcre_pcre_compile = yes; then + echo "$as_me:10432: checking for pcreposix.h" >&5 +echo $ECHO_N "checking for pcreposix.h... $ECHO_C" >&6 +if test "${ac_cv_header_pcreposix_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 10438 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:10442: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:10448: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_pcreposix_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_pcreposix_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:10467: result: $ac_cv_header_pcreposix_h" >&5 +echo "${ECHO_T}$ac_cv_header_pcreposix_h" >&6 +if test $ac_cv_header_pcreposix_h = yes; then + echo "$as_me:10470: checking for pcreposix_regcomp in -lpcreposix" >&5 +echo $ECHO_N "checking for pcreposix_regcomp in -lpcreposix... $ECHO_C" >&6 +if test "${ac_cv_lib_pcreposix_pcreposix_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpcreposix "-lpcre" $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 10478 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pcreposix_regcomp (); +int +main () +{ +pcreposix_regcomp (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10497: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10500: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10503: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10506: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pcreposix_pcreposix_regcomp=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pcreposix_pcreposix_regcomp=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:10517: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5 +echo "${ECHO_T}$ac_cv_lib_pcreposix_pcreposix_regcomp" >&6 +if test $ac_cv_lib_pcreposix_pcreposix_regcomp = yes; then + cat >>confdefs.h <<\EOF +#define HAVE_LIB_PCRE 1 +EOF + + cat >>confdefs.h <<\EOF +#define HAVE_PCREPOSIX_H 1 +EOF + + LIBS="-lpcreposix -lpcre $LIBS" +else + { { echo "$as_me:10530: error: Cannot find PCRE POSIX library" >&5 +echo "$as_me: error: Cannot find PCRE POSIX library" >&2;} + { (exit 1); exit 1; }; } +fi + +else + { { echo "$as_me:10536: error: Cannot find PCRE POSIX header" >&5 +echo "$as_me: error: Cannot find PCRE POSIX header" >&2;} + { (exit 1); exit 1; }; } +fi + +else + { { echo "$as_me:10542: error: Cannot find PCRE library" >&5 +echo "$as_me: error: Cannot find PCRE library" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + + if test "$with_pcre" = no ; then + +echo "$as_me:10551: checking for regular-expression headers" >&5 +echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 +if test "${cf_cv_regex+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 10558 "configure" +#include "confdefs.h" +#include +#include +int +main () +{ + + regex_t *p; + int x = regcomp(p, "", 0); + int y = regexec(p, "", 0, 0, 0); + regfree(p); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10576: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10579: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10582: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10585: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_regex="regex.h" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 10593 "configure" +#include "confdefs.h" +#include +int +main () +{ + + char *p = compile("", "", "", 0); + int x = step("", ""); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10608: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10611: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10614: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10617: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_regex="regexp.h" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + + cf_save_LIBS="$LIBS" + LIBS="-lgen $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 10627 "configure" +#include "confdefs.h" +#include +int +main () +{ + + char *p = compile("", "", ""); + int x = step("", ""); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:10642: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:10645: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:10648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:10651: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_regex="regexpr.h" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +LIBS="$cf_save_LIBS" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + +fi + +echo "$as_me:10667: result: $cf_cv_regex" >&5 +echo "${ECHO_T}$cf_cv_regex" >&6 +case $cf_cv_regex in + regex.h) cat >>confdefs.h <<\EOF +#define HAVE_REGEX_H_FUNCS 1 +EOF + ;; + regexp.h) cat >>confdefs.h <<\EOF +#define HAVE_REGEXP_H_FUNCS 1 +EOF + ;; + regexpr.h) cat >>confdefs.h <<\EOF +#define HAVE_REGEXPR_H_FUNCS 1 +EOF + ;; +esac + + if test "X$cf_cv_regex" != "Xregex.h" ; then + { { echo "$as_me:10685: error: Only POSIX or PCRE regular expressions are supported" >&5 +echo "$as_me: error: Only POSIX or PCRE regular expressions are supported" >&2;} + { (exit 1); exit 1; }; } + fi + fi + cat >>confdefs.h <<\EOF +#define OPT_SELECT_REGEX 1 +EOF + +fi + +echo "$as_me:10696: checking if you want support for right-scrollbar" >&5 +echo $ECHO_N "checking if you want support for right-scrollbar... $ECHO_C" >&6 # Check whether --enable-rightbar or --disable-rightbar was given. if test "${enable_rightbar+set}" = set; then enableval="$enable_rightbar" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_rightbar=no + enable_rightbar=no else enable_rightbar=yes fi else - enableval=yes + enableval=yes enable_rightbar=yes - -fi -echo "$ac_t""$enable_rightbar" 1>&6 +fi; +echo "$as_me:10713: result: $enable_rightbar" >&5 +echo "${ECHO_T}$enable_rightbar" >&6 if test "$enable_rightbar" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define SCROLLBAR_RIGHT 1 EOF fi -echo $ac_n "checking if you want check for redundant name-change""... $ac_c" 1>&6 -echo "configure:7336: checking if you want check for redundant name-change" >&5 +echo "$as_me:10722: checking if you want check for redundant name-change" >&5 +echo $ECHO_N "checking if you want check for redundant name-change... $ECHO_C" >&6 # Check whether --enable-samename or --disable-samename was given. if test "${enable_samename+set}" = set; then enableval="$enable_samename" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_samename=no + enable_samename=no else enable_samename=yes fi else - enableval=yes + enableval=yes enable_samename=yes - -fi -echo "$ac_t""$enable_samename" 1>&6 -test "$enable_samename" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:10739: result: $enable_samename" >&5 +echo "${ECHO_T}$enable_samename" >&6 +test "$enable_samename" = no && cat >>confdefs.h <<\EOF #define OPT_SAME_NAME 0 EOF - -echo $ac_n "checking if you want support for session management""... $ac_c" 1>&6 -echo "configure:7360: checking if you want support for session management" >&5 +echo "$as_me:10745: checking if you want support for session management" >&5 +echo $ECHO_N "checking if you want support for session management... $ECHO_C" >&6 # Check whether --enable-session-mgt or --disable-session-mgt was given. if test "${enable_session_mgt+set}" = set; then enableval="$enable_session_mgt" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_session_mgt=no + enable_session_mgt=no else enable_session_mgt=yes fi else - enableval=yes + enableval=yes enable_session_mgt=yes - -fi -echo "$ac_t""$enable_session_mgt" 1>&6 -test "$enable_session_mgt" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:10762: result: $enable_session_mgt" >&5 +echo "${ECHO_T}$enable_session_mgt" >&6 +test "$enable_session_mgt" = no && cat >>confdefs.h <<\EOF #define OPT_SESSION_MGT 0 EOF - -echo $ac_n "checking if you want to use termcap-query/report""... $ac_c" 1>&6 -echo "configure:7384: checking if you want to use termcap-query/report" >&5 +echo "$as_me:10768: checking if you want to use termcap-query/report" >&5 +echo $ECHO_N "checking if you want to use termcap-query/report... $ECHO_C" >&6 # Check whether --enable-tcap-query or --disable-tcap-query was given. if test "${enable_tcap_query+set}" = set; then enableval="$enable_tcap_query" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_tcap_query=yes + enable_tcap_query=yes else enable_tcap_query=no fi else - enableval=no + enableval=no enable_tcap_query=no - -fi -echo "$ac_t""$enable_tcap_query" 1>&6 -test "$enable_tcap_query" = yes && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:10785: result: $enable_tcap_query" >&5 +echo "${ECHO_T}$enable_tcap_query" >&6 +test "$enable_tcap_query" = yes && cat >>confdefs.h <<\EOF #define OPT_TCAP_QUERY 1 EOF - -echo $ac_n "checking if you want support for tek4014""... $ac_c" 1>&6 -echo "configure:7408: checking if you want support for tek4014" >&5 +echo "$as_me:10791: checking if you want support for tek4014" >&5 +echo $ECHO_N "checking if you want support for tek4014... $ECHO_C" >&6 # Check whether --enable-tek4014 or --disable-tek4014 was given. if test "${enable_tek4014+set}" = set; then enableval="$enable_tek4014" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_tek4014=no + enable_tek4014=no else enable_tek4014=yes fi else - enableval=yes + enableval=yes enable_tek4014=yes - -fi -echo "$ac_t""$enable_tek4014" 1>&6 +fi; +echo "$as_me:10808: result: $enable_tek4014" >&5 +echo "${ECHO_T}$enable_tek4014" >&6 if test "$enable_tek4014" = no ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_TEK4014 0 EOF @@ -7433,129 +10818,238 @@ EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o" fi -echo $ac_n "checking if you want pulldown menus with a toolbar""... $ac_c" 1>&6 -echo "configure:7438: checking if you want pulldown menus with a toolbar" >&5 +echo "$as_me:10821: checking if you want pulldown menus with a toolbar" >&5 +echo $ECHO_N "checking if you want pulldown menus with a toolbar... $ECHO_C" >&6 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then enableval="$enable_toolbar" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_toolbar=yes + enable_toolbar=yes else enable_toolbar=no fi else - enableval=no + enableval=no enable_toolbar=no - -fi -echo "$ac_t""$enable_toolbar" 1>&6 +fi; +echo "$as_me:10838: result: $enable_toolbar" >&5 +echo "${ECHO_T}$enable_toolbar" >&6 if test "$enable_toolbar" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_TOOLBAR 1 EOF fi -echo $ac_n "checking if you want VT52 emulation""... $ac_c" 1>&6 -echo "configure:7464: checking if you want VT52 emulation" >&5 +echo "$as_me:10847: checking if you want VT52 emulation" >&5 +echo $ECHO_N "checking if you want VT52 emulation... $ECHO_C" >&6 # Check whether --enable-vt52 or --disable-vt52 was given. if test "${enable_vt52+set}" = set; then enableval="$enable_vt52" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_vt52=no + enable_vt52=no else enable_vt52=yes fi else - enableval=yes + enableval=yes enable_vt52=yes - -fi -echo "$ac_t""$enable_vt52" 1>&6 -test "$enable_vt52" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:10864: result: $enable_vt52" >&5 +echo "${ECHO_T}$enable_vt52" >&6 +test "$enable_vt52" = no && cat >>confdefs.h <<\EOF #define OPT_VT52_MODE 0 EOF - -echo $ac_n "checking if you want to use mini-luit/Latin9 built-in support""... $ac_c" 1>&6 -echo "configure:7488: checking if you want to use mini-luit/Latin9 built-in support" >&5 +echo "$as_me:10870: checking if you want to use mini-luit/Latin9 built-in support" >&5 +echo $ECHO_N "checking if you want to use mini-luit/Latin9 built-in support... $ECHO_C" >&6 # Check whether --enable-mini-luit or --disable-mini-luit was given. if test "${enable_mini_luit+set}" = set; then enableval="$enable_mini_luit" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_mini_luit=yes + enable_mini_luit=yes else enable_mini_luit=no fi else - enableval=no + enableval=no enable_mini_luit=no - -fi -echo "$ac_t""$enable_mini_luit" 1>&6 +fi; +echo "$as_me:10887: result: $enable_mini_luit" >&5 +echo "${ECHO_T}$enable_mini_luit" >&6 if test "$enable_mini_luit" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_MINI_LUIT 1 EOF fi -echo $ac_n "checking if you want to use luit""... $ac_c" 1>&6 -echo "configure:7514: checking if you want to use luit" >&5 +echo "$as_me:10896: checking if you want to use luit" >&5 +echo $ECHO_N "checking if you want to use luit... $ECHO_C" >&6 + +# Check whether --enable-luit or --disable-luit was given. +if test "${enable_luit+set}" = set; then + enableval="$enable_luit" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_luit=yes + else + enable_luit=$enable_mini_luit + fi +else + enableval=no + enable_luit=$enable_mini_luit + +fi; +echo "$as_me:10913: result: $enable_luit" >&5 +echo "${ECHO_T}$enable_luit" >&6 +if test "$enable_luit" = yes ; then + cat >>confdefs.h <<\EOF +#define OPT_LUIT_PROG 1 +EOF + +test -z "$LUIT" && LUIT=luit +for ac_prog in $LUIT luit +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:10925: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_LUIT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $LUIT in + [\\/]* | ?:[\\/]*) + ac_cv_path_LUIT="$LUIT" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_LUIT="$ac_dir/$ac_word" + echo "$as_me:10942: found $ac_dir/$ac_word" >&5 + break +fi +done + + ;; +esac +fi +LUIT=$ac_cv_path_LUIT + +if test -n "$LUIT"; then + echo "$as_me:10953: result: $LUIT" >&5 +echo "${ECHO_T}$LUIT" >&6 +else + echo "$as_me:10956: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$LUIT" && break +done +test -n "$LUIT" || LUIT="$LUIT" + +cf_path_prog="" +cf_path_args="" +IFS="${IFS= }"; cf_save_ifs="$IFS" +case $host_os in #(vi +os2*) #(vi + IFS="${IFS};" + ;; +*) + IFS="${IFS}:" + ;; +esac + +for cf_temp in $ac_cv_path_LUIT +do + if test -z "$cf_path_prog" ; then + if test "$with_full_paths" = yes ; then + +case ".$cf_temp" in #(vi +.\$\(*\)*|.\'*\'*) #(vi + ;; +..|./*|.\\*) #(vi + ;; +.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX + ;; +.\${*prefix}*) #(vi + eval cf_temp="$cf_temp" + case ".$cf_temp" in #(vi + .NONE/*) + cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%` + ;; + esac + ;; #(vi +.no|.NONE/*) + cf_temp=`echo $cf_temp | sed -e s%NONE%$ac_default_prefix%` + ;; +*) + break + ;; +esac + + cf_path_prog="$cf_temp" + else + cf_path_prog="`basename $cf_temp`" + fi + elif test -z "$cf_path_args" ; then + cf_path_args="$cf_temp" + else + cf_path_args="$cf_path_args $cf_temp" + fi +done +IFS="$cf_save_ifs" + +if test -n "$cf_path_prog" ; then + +echo "(line 11018) testing defining path for ${cf_path_prog} ..." 1>&5 -# Check whether --enable-luit or --disable-luit was given. -if test "${enable_luit+set}" = set; then - enableval="$enable_luit" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - enable_luit=yes - else - enable_luit=$enable_mini_luit - fi -else - enableval=no - enable_luit=$enable_mini_luit - -fi + cat >>confdefs.h <&6 -if test "$enable_luit" = yes ; then - cat >> confdefs.h <<\EOF -#define OPT_LUIT_PROG 1 + test -n "$cf_path_args" && cat >>confdefs.h <&6 -echo "configure:7540: checking if you want wide-character support" >&5 +fi + +echo "$as_me:11032: checking if you want wide-character support" >&5 +echo $ECHO_N "checking if you want wide-character support... $ECHO_C" >&6 # Check whether --enable-wide-chars or --disable-wide-chars was given. if test "${enable_wide_chars+set}" = set; then enableval="$enable_wide_chars" test "$enableval" != no && enableval=yes if test "$enableval" != "$enable_luit" ; then - enable_wchar=yes + enable_wchar=yes else enable_wchar=$enable_luit fi else - enableval=$enable_luit + enableval=$enable_luit enable_wchar=$enable_luit - -fi -echo "$ac_t""$enable_wchar" 1>&6 +fi; +echo "$as_me:11049: result: $enable_wchar" >&5 +echo "${ECHO_T}$enable_wchar" >&6 if test "$enable_wchar" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_WIDE_CHARS 1 EOF @@ -7564,106 +11058,104 @@ EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o" fi -echo $ac_n "checking if you want dynamic-abbreviation support""... $ac_c" 1>&6 -echo "configure:7569: checking if you want dynamic-abbreviation support" >&5 +echo "$as_me:11061: checking if you want dynamic-abbreviation support" >&5 +echo $ECHO_N "checking if you want dynamic-abbreviation support... $ECHO_C" >&6 -# Check whether --enable-dec-locator or --disable-dec-locator was given. -if test "${enable_dec_locator+set}" = set; then - enableval="$enable_dec_locator" +# Check whether --enable-dabbrev or --disable-dabbrev was given. +if test "${enable_dabbrev+set}" = set; then + enableval="$enable_dabbrev" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_dabbrev=yes + enable_dabbrev=yes else enable_dabbrev=no fi else - enableval=no + enableval=no enable_dabbrev=no - -fi -echo "$ac_t""$enable_dabbrev" 1>&6 +fi; +echo "$as_me:11078: result: $enable_dabbrev" >&5 +echo "${ECHO_T}$enable_dabbrev" >&6 if test "$enable_dabbrev" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_DABBREV 1 EOF fi -echo $ac_n "checking if you want DECterm Locator support""... $ac_c" 1>&6 -echo "configure:7595: checking if you want DECterm Locator support" >&5 +echo "$as_me:11087: checking if you want DECterm Locator support" >&5 +echo $ECHO_N "checking if you want DECterm Locator support... $ECHO_C" >&6 # Check whether --enable-dec-locator or --disable-dec-locator was given. if test "${enable_dec_locator+set}" = set; then enableval="$enable_dec_locator" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_dec_locator=yes + enable_dec_locator=yes else enable_dec_locator=no fi else - enableval=no + enableval=no enable_dec_locator=no - -fi -echo "$ac_t""$enable_dec_locator" 1>&6 +fi; +echo "$as_me:11104: result: $enable_dec_locator" >&5 +echo "${ECHO_T}$enable_dec_locator" >&6 if test "$enable_dec_locator" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_DEC_LOCATOR 1 EOF fi -echo $ac_n "checking if you want -ziconbeep option""... $ac_c" 1>&6 -echo "configure:7621: checking if you want -ziconbeep option" >&5 +echo "$as_me:11113: checking if you want -ziconbeep option" >&5 +echo $ECHO_N "checking if you want -ziconbeep option... $ECHO_C" >&6 # Check whether --enable-ziconbeep or --disable-ziconbeep was given. if test "${enable_ziconbeep+set}" = set; then enableval="$enable_ziconbeep" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - enable_ziconbeep=no + enable_ziconbeep=no else enable_ziconbeep=yes fi else - enableval=yes + enableval=yes enable_ziconbeep=yes - -fi -echo "$ac_t""$enable_ziconbeep" 1>&6 -test "$enable_ziconbeep" = no && cat >> confdefs.h <<\EOF +fi; +echo "$as_me:11130: result: $enable_ziconbeep" >&5 +echo "${ECHO_T}$enable_ziconbeep" >&6 +test "$enable_ziconbeep" = no && cat >>confdefs.h <<\EOF #define OPT_ZICONBEEP 0 EOF - ############################################################################### - -echo $ac_n "checking if you want debugging traces""... $ac_c" 1>&6 -echo "configure:7648: checking if you want debugging traces" >&5 +echo "$as_me:11138: checking if you want debugging traces" >&5 +echo $ECHO_N "checking if you want debugging traces... $ECHO_C" >&6 # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_trace=yes + enable_trace=yes else enable_trace=no fi else - enableval=no + enableval=no enable_trace=no - -fi -echo "$ac_t""$enable_trace" 1>&6 +fi; +echo "$as_me:11155: result: $enable_trace" >&5 +echo "${ECHO_T}$enable_trace" >&6 if test "$enable_trace" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_TRACE 1 EOF @@ -7671,24 +11163,49 @@ EXTRAOBJS="$EXTRAOBJS trace.o" fi +echo "$as_me:11166: checking if you want to test memory leaks" >&5 +echo $ECHO_N "checking if you want to test memory leaks... $ECHO_C" >&6 + +# Check whether --enable-leaks or --disable-leaks was given. +if test "${enable_leaks+set}" = set; then + enableval="$enable_leaks" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + disable_leaks=yes + else + disable_leaks=no + fi +else + enableval=yes + disable_leaks=no + +fi; +echo "$as_me:11183: result: $disable_leaks" >&5 +echo "${ECHO_T}$disable_leaks" >&6 +if test "$disable_leaks" = yes ; then + cat >>confdefs.h <<\EOF +#define NO_LEAKS 1 +EOF + +fi -echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:7677: checking if you want to see long compiling messages" >&5 +echo "$as_me:11192: checking if you want to see long compiling messages" >&5 +echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then enableval="$enable_echo" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - + ECHO_LT='--silent' ECHO_LD='@echo linking $@;' RULE_CC=' @echo compiling $<' SHOW_CC=' @echo compiling $@' ECHO_CC='@' - + else - + ECHO_LT='' ECHO_LD='' RULE_CC='# compiling' @@ -7697,46 +11214,39 @@ fi else - enableval=yes - + enableval=yes + ECHO_LT='' ECHO_LD='' RULE_CC='# compiling' SHOW_CC='# compiling' ECHO_CC='' - -fi - -echo "$ac_t""$enableval" 1>&6 - - - - - - +fi; +echo "$as_me:11226: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 -echo $ac_n "checking if you want magic cookie emulation""... $ac_c" 1>&6 -echo "configure:7721: checking if you want magic cookie emulation" >&5 +echo "$as_me:11229: checking if you want magic cookie emulation" >&5 +echo $ECHO_N "checking if you want magic cookie emulation... $ECHO_C" >&6 # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. if test "${enable_xmc_glitch+set}" = set; then enableval="$enable_xmc_glitch" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - enable_xmc=yes + enable_xmc=yes else enable_xmc=no fi else - enableval=no + enableval=no enable_xmc=no - -fi -echo "$ac_t""$enable_xmc" 1>&6 +fi; +echo "$as_me:11246: result: $enable_xmc" >&5 +echo "${ECHO_T}$enable_xmc" >&6 if test "$enable_xmc" = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define OPT_XMC_GLITCH 1 EOF @@ -7745,28 +11255,28 @@ fi if test -n "$GCC" ; then -echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:7750: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:11258: checking if you want to turn on gcc warnings" >&5 +echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" test "$enableval" != yes && enableval=no if test "$enableval" != "no" ; then - with_warnings=yes + with_warnings=yes else with_warnings=no fi else - enableval=no + enableval=no with_warnings=no - -fi -echo "$ac_t""$with_warnings" 1>&6 +fi; +echo "$as_me:11275: result: $with_warnings" >&5 +echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = yes then - + if test "$GCC" = yes then cat > conftest.i <&6 -echo "configure:7790: checking for $CC __attribute__ directives" >&5 + { echo "$as_me:11298: checking for $CC __attribute__ directives..." >&5 +echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 case $cf_attribute in scanf|printf) cat >conftest.h <conftest.h <&5; (eval $ac_compile) 2>&5; }; then - test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6 + if { (eval echo "$as_me:11339: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11342: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:11344: result: ... $cf_attribute" >&5 +echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h fi done @@ -7837,46 +11352,121 @@ rm -rf conftest* fi - - GCC_VERSION=none if test "$GCC" = yes ; then - echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:7846: checking version of $CC" >&5 - GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + echo "$as_me:11357: checking version of $CC" >&5 +echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 + GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$ac_t""$GCC_VERSION" 1>&6 + echo "$as_me:11361: result: $GCC_VERSION" >&5 +echo "${ECHO_T}$GCC_VERSION" >&6 fi +INTEL_COMPILER=no + +if test "$GCC" = yes ; then + case $host_os in + linux*|gnu*) + echo "$as_me:11370: checking if this is really Intel C compiler" >&5 +echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -no-gcc" + cat >conftest.$ac_ext <<_ACEOF +#line 11375 "configure" +#include "confdefs.h" + +int +main () +{ + +#ifdef __INTEL_COMPILER +#else +make an error +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:11392: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11395: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:11398: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:11401: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + INTEL_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CFLAGS="$cf_save_CFLAGS" + echo "$as_me:11412: result: $INTEL_COMPILER" >&5 +echo "${ECHO_T}$INTEL_COMPILER" >&6 + ;; + esac +fi +cat > conftest.$ac_ext <&5 +echo "$as_me: checking for $CC warning options..." >&6;} + cf_save_CFLAGS="$CFLAGS" + EXTRA_CFLAGS="-Wall" + for cf_opt in \ + wd1419 \ + wd1682 \ + wd1683 \ + wd1684 \ + wd193 \ + wd279 \ + wd593 \ + wd810 \ + wd869 \ + wd981 + do + CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" + if { (eval echo "$as_me:11454: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11457: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:11459: result: ... -$cf_opt" >&5 +echo "${ECHO_T}... -$cf_opt" >&6 + EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" + fi + done + CFLAGS="$cf_save_CFLAGS" + elif test "$GCC" = yes then - cat > conftest.$ac_ext <&6 -echo "configure:7880: checking for $CC warning options" >&5 + { echo "$as_me:11468: checking for $CC warning options..." >&5 +echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -7892,11 +11482,16 @@ Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_warn_CONST + Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:7899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 + if { (eval echo "$as_me:11488: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:11491: \$? = $ac_status" >&5 + (exit $ac_status); }; then + test -n "$verbose" && echo "$as_me:11493: result: ... -$cf_opt" >&5 +echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES" @@ -7913,24 +11508,17 @@ EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi done - rm -f conftest* CFLAGS="$cf_save_CFLAGS" fi - +rm -f conftest* fi fi - - - - - - if test $disable_setuid = yes ; then MAY_SETUID="#" NOT_SETUID= - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\EOF #define DISABLE_SETUID 1 EOF @@ -7939,9 +11527,6 @@ NOT_SETUID="#" fi - - - ### remove from CPPFLAGS the optional features we define in xtermcfg.h ### or other conflicting symbols that may be defined via imake: for cf_def in \ @@ -7959,401 +11544,869 @@ done ### output Makefile and xtermcfg.h -trap '' 1 2 15 -cat > confcache <<\EOF +ac_config_files="$ac_config_files Makefile" +cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. # -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. # -EOF +# `ac_cv_env_foo' variables (set or unset) will be overriden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. # So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else +{ + (set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} | + sed ' + t clear + : clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + cat confcache >$cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' fi -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - DEFS=-DHAVE_CONFIG_H -# Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL # Generated automatically by configure. # Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# # Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. +# configure, is in config.log if it exists. -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option +debug=false +SHELL=\${CONFIG_SHELL-$SHELL} +ac_cs_invocation="\$0 \$@" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi + +# Name of the executable. +as_me=`echo "$0" |sed 's,.*[\\/],,'` + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +as_executable_p="test -f" + +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + +# NLS nuisances. +$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } + +exec 6>&1 + +_ACEOF + +# Files that config.status was made for. +if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +fi + +if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +fi + +cat >>$CONFIG_STATUS <<\EOF + +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number, then exit + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Report bugs to ." +EOF + +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 do - case "\$ac_option" in + case $1 in + --*=*) + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + shift + set dummy "$ac_option" "$ac_optarg" ${1+"$@"} + shift + ;; + -*);; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_need_defaults=false;; + esac + + case $1 in + # Handling of the options. +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:11800: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + shift + CONFIG_FILES="$CONFIG_FILES $1" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + shift + CONFIG_HEADERS="$CONFIG_HEADERS $1" + ac_need_defaults=false;; + + # This is an error. + -*) { { echo "$as_me:11819: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" ;; + esac + shift done -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" +exec 5>>config.log +cat >&5 << _ACEOF -trap 'rm -fr `echo "Makefile xtermcfg.h:xtermcfg.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +## ----------------------- ## +## Running config.status. ## +## ----------------------- ## + +This file was extended by $as_me 2.52.20030208, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + > $ac_cs_invocation +on `(hostname || uname -n) 2>/dev/null | sed 1q` + +_ACEOF EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@CC@%$CC%g -s%@CPP@%$CPP%g -s%@AWK@%$AWK%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@LINT@%$LINT%g -s%@EXTRA_CPPFLAGS@%$EXTRA_CPPFLAGS%g -s%@EXEEXT@%$EXEEXT%g -s%@OBJEXT@%$OBJEXT%g -s%@PROG_EXT@%$PROG_EXT%g -s%@X_CFLAGS@%$X_CFLAGS%g -s%@X_PRE_LIBS@%$X_PRE_LIBS%g -s%@X_LIBS@%$X_LIBS%g -s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -s%@XTERM_PATH@%$XTERM_PATH%g -s%@IMAKE@%$IMAKE%g -s%@IMAKE_CFLAGS@%$IMAKE_CFLAGS%g -s%@IMAKE_LOADFLAGS@%$IMAKE_LOADFLAGS%g -s%@TERMINFO_DIR@%$TERMINFO_DIR%g -s%@SET_TERMINFO@%$SET_TERMINFO%g -s%@FREETYPE_CONFIG@%$FREETYPE_CONFIG%g -s%@XRENDERFONT@%$XRENDERFONT%g -s%@HAVE_TYPE_FCCHAR32@%$HAVE_TYPE_FCCHAR32%g -s%@HAVE_TYPE_XFTCHARSPEC@%$HAVE_TYPE_XFTCHARSPEC%g -s%@ECHO_LT@%$ECHO_LT%g -s%@ECHO_LD@%$ECHO_LD%g -s%@RULE_CC@%$RULE_CC%g -s%@SHOW_CC@%$SHOW_CC%g -s%@ECHO_CC@%$ECHO_CC%g -s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g -s%@CHARPROC_DEPS@%$CHARPROC_DEPS%g -s%@EXTRAHDRS@%$EXTRAHDRS%g -s%@EXTRASRCS@%$EXTRASRCS%g -s%@EXTRAOBJS@%$EXTRAOBJS%g -s%@MAY_SETUID@%$MAY_SETUID%g -s%@NOT_SETUID@%$NOT_SETUID%g +cat >>$CONFIG_STATUS <<\EOF +for ac_config_target in $ac_config_targets +do + case "$ac_config_target" in + # Handling of arguments. + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;; + *) { { echo "$as_me:11856: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers +fi + +# Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. +: ${TMPDIR=/tmp} +{ + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=$TMPDIR/cs$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in $TMPDIR" >&2 + { (exit 1); exit 1; } +} -CEOF EOF -cat >> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS < conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" +# +# CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "\$CONFIG_FILES"; then + # Protect against being on the right side of a sed subst in config.status. + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t +s,@ECHO_C@,$ECHO_C,;t t +s,@ECHO_N@,$ECHO_N,;t t +s,@ECHO_T@,$ECHO_T,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@DEFS@,$DEFS,;t t +s,@LIBS@,$LIBS,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@CPP@,$CPP,;t t +s,@AWK@,$AWK,;t t +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t +s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@LINT@,$LINT,;t t +s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t +s,@PROG_EXT@,$PROG_EXT,;t t +s,@appsdir@,$appsdir,;t t +s,@no_appsdir@,$no_appsdir,;t t +s,@XTERM_PATH@,$XTERM_PATH,;t t +s,@XTERM_SYMLINK@,$XTERM_SYMLINK,;t t +s,@SINSTALL_OPTS@,$SINSTALL_OPTS,;t t +s,@X_CFLAGS@,$X_CFLAGS,;t t +s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t +s,@X_LIBS@,$X_LIBS,;t t +s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t +s,@IMAKE@,$IMAKE,;t t +s,@IMAKE_CFLAGS@,$IMAKE_CFLAGS,;t t +s,@IMAKE_LOADFLAGS@,$IMAKE_LOADFLAGS,;t t +s,@TERMINFO_DIR@,$TERMINFO_DIR,;t t +s,@SET_TERMINFO@,$SET_TERMINFO,;t t +s,@FREETYPE_PKG_CONFIG@,$FREETYPE_PKG_CONFIG,;t t +s,@FREETYPE_XFT_CONFIG@,$FREETYPE_XFT_CONFIG,;t t +s,@FREETYPE_OLD_CONFIG@,$FREETYPE_OLD_CONFIG,;t t +s,@XRENDERFONT@,$XRENDERFONT,;t t +s,@HAVE_TYPE_FCCHAR32@,$HAVE_TYPE_FCCHAR32,;t t +s,@HAVE_TYPE_XFTCHARSPEC@,$HAVE_TYPE_XFTCHARSPEC,;t t +s,@LUIT@,$LUIT,;t t +s,@ECHO_LT@,$ECHO_LT,;t t +s,@ECHO_LD@,$ECHO_LD,;t t +s,@RULE_CC@,$RULE_CC,;t t +s,@SHOW_CC@,$SHOW_CC,;t t +s,@ECHO_CC@,$ECHO_CC,;t t +s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t +s,@CHARPROC_DEPS@,$CHARPROC_DEPS,;t t +s,@EXTRAHDRS@,$EXTRAHDRS,;t t +s,@EXTRASRCS@,$EXTRASRCS,;t t +s,@EXTRAOBJS@,$EXTRAOBJS,;t t +s,@MAY_SETUID@,$MAY_SETUID,;t t +s,@NOT_SETUID@,$NOT_SETUID,;t t +CEOF + +EOF + + cat >>$CONFIG_STATUS <<\EOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF +fi # test -n "$CONFIG_FILES" -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +cat >>$CONFIG_STATUS <<\EOF +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || mkdir "$as_incr_dir" + ;; + esac +done; } + + ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` else ac_dir_suffix= ac_dots= fi - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + case $srcdir in + .) ac_srcdir=. + if test -z "$ac_dots"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; + ac_srcdir=$ac_dots$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_dots$srcdir ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_dots$INSTALL ;; esac - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac + if test x"$ac_file" != x-; then + { echo "$as_me:12107: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated automatically by config.status. */ + configure_input="Generated automatically from `echo $ac_file_in | + sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:12125: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:12138: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@INSTALL@,$ac_INSTALL,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + mv $tmp/out $ac_file + else + cat $tmp/out + rm -f $tmp/out + fi + +done +EOF +cat >>$CONFIG_STATUS <<\EOF - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* +# +# CONFIG_HEADER section. +# # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_i turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +ac_iA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_iB='\([ ]\),\1#\2define\3' +ac_iC=' ' +ac_iD='\4,;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' +ac_uD=',;t' -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - echo creating $ac_file + test x"$ac_file" != x- && { echo "$as_me:12204: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:12215: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:12228: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `end' is used to avoid that the second main sed command (meant for +# 0-ary CPP macros) applies to n-ary macro definitions. +# See the Autoconf documentation for `clear'. +cat >confdef2sed.sed <<\EOF +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +EOF +# If some macros were called several times there might be several times +# the same #defines, which is useless. Nevertheless, we may not want to +# sort them, since we want the *last* AC-DEFINE to be honored. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +sed 's/ac_d/ac_i/g' conftest.defines >>conftest.undefs +rm -f confdef2sed.sed # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +cat >>conftest.undefs <<\EOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, EOF -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. - +# Break up conftest.defines because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS rm -f conftest.tail -while : +while grep . conftest.defines >/dev/null do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h - else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # egrep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS + +# Break up conftest.undefs because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.undefs >/dev/null +do + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs +done +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\EOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated automatically by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated automatically by configure. */" >$tmp/config.h + else + echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then + { echo "$as_me:12346: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || mkdir "$as_incr_dir" + ;; + esac +done; } + + fi + rm -f $ac_file + mv $tmp/config.h $ac_file fi - rm -f $ac_file - mv conftest.h $ac_file + else + cat $tmp/config.h + rm -f $tmp/config.h fi -fi; done - +done EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -# Extra commands, if any +cat >>$CONFIG_STATUS <<\EOF -exit 0 +{ (exit 0); exit 0; } EOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + exec 5>/dev/null + $SHELL $CONFIG_STATUS || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi Index: xc/programs/xterm/configure.in diff -u xc/programs/xterm/configure.in:3.68 xc/programs/xterm/configure.in:3.76 --- xc/programs/xterm/configure.in:3.68 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/configure.in Sun Apr 9 20:34:36 2006 @@ -1,10 +1,10 @@ -dnl $XTermId: configure.in,v 1.180 2005/01/13 23:33:54 tom Exp $ +dnl $XTermId: configure.in,v 1.209 2006/04/02 20:10:26 tom Exp $ dnl -dnl $XFree86: xc/programs/xterm/configure.in,v 3.68 2005/01/14 01:50:02 dickey Exp $ +dnl $XFree86: xc/programs/xterm/configure.in,v 3.76 2006/04/10 00:34:36 dickey Exp $ dnl dnl --------------------------------------------------------------------------- dnl -dnl Copyright 1997-2004,2005 by Thomas E. Dickey +dnl Copyright 1997-2005,2006 by Thomas E. Dickey dnl dnl All Rights Reserved dnl @@ -28,7 +28,7 @@ dnl --------------------------------------------------------------------------- dnl Process this file with autoconf to produce a configure script. dnl -AC_PREREQ(2.13.20020210) +AC_PREREQ(2.13.20030927) AC_INIT(charproc.c) AC_CONFIG_HEADER(xtermcfg.h:xtermcfg.hin) CF_CHECK_CACHE @@ -63,6 +63,7 @@ AC_CONST CF_PROG_EXT CF_XOPEN_SOURCE +CF_SIGWINCH ### checks for header files AC_CHECK_HEADERS( \ @@ -70,11 +71,13 @@ stdlib.h \ termios.h \ unistd.h \ +wchar.h \ ) AC_HEADER_TIME AM_LANGINFO_CODESET ### checks for typedefs +CF_SIG_ATOMIC_T CF_SIZE_T AC_CHECK_TYPE(time_t, long) AC_TYPE_MODE_T @@ -88,14 +91,63 @@ getlogin \ memmove \ putenv \ + sched_yield \ strerror \ strftime \ tcgetattr \ waitpid \ - ) + wcswidth \ + wcwidth ) CF_FUNC_MEMMOVE -CF_FUNC_TGETENT CF_UTMP +CF_STRUCT_LASTLOG + +CF_HELP_MESSAGE(Compile/Install Options:) +CF_FUNC_TGETENT + +AC_MSG_CHECKING(for directory to install resource files) +CF_WITH_PATH(app-defaults, + [ --with-app-defaults=DIR directory in which to install resource files], + [appsdir],[EPREFIX/lib/X11/app-defaults], + ['\$(exec_prefix)/lib/X11/app-defaults']) +AC_MSG_RESULT($appsdir) +AC_SUBST(appsdir) + +no_appsdir= +test "$appsdir" = no && no_appsdir="#" +AC_SUBST(no_appsdir) + +# inherit SINSTALL_OPTS from environment to allow packager to customize it. + +AC_MSG_CHECKING(for install-permissions reference) +AC_ARG_WITH(reference, + [ --with-reference=XXX program to use as permissions-reference], + [with_reference=$withval], + [with_reference=xterm]) +AC_MSG_RESULT($with_reference) + +with_full_paths=yes +CF_PATH_PROG(XTERM_PATH,$with_reference) + +# If any of --program-prefix, --program-suffix or --program-transform-name is +# given, accept an option tell the makefile to create a symbolic link, e.g., +# to "xterm" on install. +XTERM_SYMLINK=NONE +AC_SUBST(XTERM_SYMLINK) +if test "$program_transform_name" != "'s,,,'" ; then +cf_name=`echo "$program_transform_name" | sed -e '[s,\\$\\$,$,g]'` +cf_name=`echo xterm |sed -e "$cf_name"` +AC_MSG_CHECKING(for symbolic link to create to $cf_name) +AC_ARG_WITH(xterm-symlink, + [ --with-xterm-symlink=XXX make symbolic link to installed xterm], + [with_symlink=$withval], + [with_symlink=xterm]) +AC_MSG_RESULT($with_symlink) +test -n "$with_symlink" && \ + test "$with_symlink" != no && \ + test "$with_symlink" != $cf_name && \ + XTERM_SYMLINK="$with_symlink" +fi AC_MSG_CHECKING(if you want to disable setuid) CF_ARG_DISABLE(setuid, @@ -105,6 +157,41 @@ no) AC_MSG_RESULT($disable_setuid) +AC_MSG_CHECKING(if you want to run xterm setuid to a given user) +AC_ARG_WITH(setuid, + [ --with-setuid=XXX use the given setuid user], + [use_given_setuid=$withval], + [use_given_setuid=no]) +AC_MSG_RESULT($use_given_setuid) + +if test "$use_given_setuid" != no ; then + if test "$use_given_setuid" = yes ; then + cf_cv_given_setuid=root + else + cf_cv_given_setuid=$use_given_setuid + fi + SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid" +fi + +AC_MSG_CHECKING(if you want to run xterm setgid to match utmp/utmpx file) +AC_ARG_WITH(utmp-setgid, + [ --with-utmp-setgid=XXX use setgid to match utmp/utmpx file], + [use_utmp_setgid=$withval], + [use_utmp_setgid=no]) +AC_MSG_RESULT($use_utmp_setgid) + +if test "$use_utmp_setgid" != no ; then + if test "$use_utmp_setgid" = yes ; then + CF_UTMP_GROUP + else + cf_cv_utmp_group=$use_utmp_setgid + fi + AC_DEFINE(USE_UTMP_SETGID) + SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group" +fi + +AC_SUBST(SINSTALL_OPTS) + AC_MSG_CHECKING(if you want to link with utempter) AC_ARG_WITH(utempter, [ --with-utempter use utempter library for access to utmp], @@ -143,7 +230,7 @@ # Check for openpty() in -lutil if the UNIX98-style pty functions are not # available. E.g. for GNU libc 2.0. case $host_os in #(vi -netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to work. +freebsd*|netbsd*) # 2004/8/15 - revisit this if/when grantpt is known to work. AC_CHECK_LIB(util,openpty) ;; *) @@ -151,8 +238,6 @@ ;; esac -AC_PATH_PROG(XTERM_PATH,xterm) - CF_XKB_BELL_EXT AC_CHECK_FUNCS(Xutf8LookupString, [],[ EXTRAHDRS="$EXTRAHDRS xutf8.h" @@ -162,9 +247,11 @@ CF_WITH_IMAKE_CFLAGS($(MAIN_DEFINES) $(VENDORMANDEFS)) +CF_HELP_MESSAGE(Terminal Configuration:) + AC_MSG_CHECKING(for default terminal-id) AC_ARG_WITH(terminal-id, - [ --with-terminal-id[=V] set default decTerminalID (default: vt100)], + [ --with-terminal-id=V set default decTerminalID (default: vt100)], [default_termid=$withval], [default_termid=vt100]) AC_MSG_RESULT($default_termid) @@ -176,7 +263,7 @@ AC_MSG_CHECKING(for default terminal-type) AC_ARG_WITH(terminal-type, - [ --with-terminal-type=T set default \$TERM (default: xterm)], + [ --with-terminal-type=T set default $TERM (default: xterm)], [default_TERM=$withval], [default_TERM=xterm]) AC_MSG_RESULT($default_TERM) @@ -184,7 +271,7 @@ AC_MSG_CHECKING(for private terminfo-directory) AC_ARG_WITH(own-terminfo, - [ --with-own-terminfo=P set default \$TERMINFO (default: from environment)], + [ --with-own-terminfo=P set default $TERMINFO (default: from environment)], [TERMINFO_DIR=$withval], [TERMINFO_DIR=${TERMINFO-none}]) AC_MSG_RESULT($TERMINFO_DIR) @@ -474,6 +561,19 @@ AC_MSG_RESULT($enable_numlock) test "$enable_numlock" = no && AC_DEFINE(OPT_NUM_LOCK,0) +AC_MSG_CHECKING(if you want support for get/set of base64 selection data) + +CF_ARG_ENABLE(paste64, + [ --enable-paste64 enable get/set base64 selection data], + [enable_paste64=yes], + [enable_paste64=no]) +AC_MSG_RESULT($enable_paste64) +if test "$enable_paste64" = yes ; then + AC_DEFINE(OPT_PASTE64,1) +else + AC_DEFINE(OPT_PASTE64,0) +fi + AC_MSG_CHECKING(if you want support for pty-handshaking) CF_ARG_DISABLE(pty-handshake, @@ -487,6 +587,33 @@ AC_DEFINE(OPT_PTY_HANDSHAKE,0) fi +AC_MSG_CHECKING(if you want support for mouse in readline applications) +CF_ARG_ENABLE(readline-mouse, + [ --enable-readline-mouse enable support for mouse in readline applications], + [enable_readline_mouse=yes], + [enable_readline_mouse=no]) +AC_MSG_RESULT($enable_readline_mouse) +if test "$enable_readline_mouse" = yes ; then + AC_DEFINE(OPT_READLINE,1) +fi + +AC_MSG_CHECKING(if you want support for regular-expression selections) +CF_ARG_DISABLE(regex, + [ --disable-regex disable regular-expression selections], + [enable_regex=no], + [enable_regex=yes]) +AC_MSG_RESULT($enable_regex) +if test "$enable_regex" = yes ; then + CF_WITH_PCRE + if test "$with_pcre" = no ; then + CF_REGEX + if test "X$cf_cv_regex" != "Xregex.h" ; then + AC_MSG_ERROR(Only POSIX or PCRE regular expressions are supported) + fi + fi + AC_DEFINE(OPT_SELECT_REGEX) +fi + AC_MSG_CHECKING(if you want support for right-scrollbar) CF_ARG_DISABLE(rightbar, [ --disable-rightbar disable right-scrollbar support], @@ -571,6 +698,7 @@ AC_MSG_RESULT($enable_luit) if test "$enable_luit" = yes ; then AC_DEFINE(OPT_LUIT_PROG,1) + CF_PATH_PROG(LUIT,luit) fi AC_MSG_CHECKING(if you want wide-character support) @@ -588,7 +716,7 @@ fi AC_MSG_CHECKING(if you want dynamic-abbreviation support) -CF_ARG_ENABLE(dec-locator, +CF_ARG_ENABLE(dabbrev, [ --enable-dabbrev enable dynamic-abbreviation support], [enable_dabbrev=yes], [enable_dabbrev=no]) @@ -630,6 +758,16 @@ EXTRAOBJS="$EXTRAOBJS trace.o" fi +AC_MSG_CHECKING(if you want to test memory leaks) +CF_ARG_DISABLE(leaks, + [ --disable-leaks test: set to test memory leaks], + [disable_leaks=yes], + [disable_leaks=no]) +AC_MSG_RESULT($disable_leaks) +if test "$disable_leaks" = yes ; then + AC_DEFINE(NO_LEAKS) +fi + CF_DISABLE_ECHO AC_MSG_CHECKING(if you want magic cookie emulation) Index: xc/programs/xterm/cursor.c diff -u xc/programs/xterm/cursor.c:3.16 xc/programs/xterm/cursor.c:3.20 --- xc/programs/xterm/cursor.c:3.16 Tue Nov 30 20:27:46 2004 +++ xc/programs/xterm/cursor.c Sun Feb 12 20:14:58 2006 @@ -1,13 +1,9 @@ -/* $XTermId: cursor.c,v 1.31 2004/11/26 18:09:23 tom Exp $ */ +/* $XTermId: cursor.c,v 1.38 2006/02/12 22:43:56 tom Exp $ */ -/* - * $Xorg: cursor.c,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/cursor.c,v 3.16 2004/12/01 01:27:46 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/cursor.c,v 3.20 2006/02/13 01:14:58 dickey Exp $ */ /* - * Copyright 2002,2004 by Thomas E. Dickey + * Copyright 2002-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -61,6 +57,9 @@ #include #include +#include + +#include /* * Moves the cursor to the specified position, checking for bounds. @@ -74,14 +73,14 @@ int max_row; col = (col < 0 ? 0 : col); - screen->cur_col = (col <= screen->max_col ? col : screen->max_col); + set_cur_col(screen, (col <= screen->max_col ? col : screen->max_col)); max_row = screen->max_row; if (flags & ORIGIN) { use_row += screen->top_marg; max_row = screen->bot_marg; } use_row = (use_row < 0 ? 0 : use_row); - screen->cur_row = (use_row <= max_row ? use_row : max_row); + set_cur_row(screen, (use_row <= max_row ? use_row : max_row)); screen->do_wrap = 0; TRACE(("CursorSet(%d,%d) margins [%d..%d] -> %d,%d %s\n", @@ -107,15 +106,15 @@ n--; if ((screen->cur_col -= n) < 0) { if (rev) { - if ((i = ((j = screen->max_col + 1) + if ((i = ((j = MaxCols(screen)) * screen->cur_row) + screen->cur_col) < 0) { - k = j * (screen->max_row + 1); + k = j * MaxRows(screen); i += ((-i) / k + 1) * k; } - screen->cur_row = i / j; - screen->cur_col = i % j; + set_cur_row(screen, i / j); + set_cur_col(screen, i % j); } else - screen->cur_col = 0; + set_cur_col(screen, 0); } screen->do_wrap = 0; } @@ -126,9 +125,13 @@ void CursorForward(TScreen * screen, int n) { - screen->cur_col += n; - if (screen->cur_col > CurMaxCol(screen, screen->cur_row)) - screen->cur_col = CurMaxCol(screen, screen->cur_row); + int next = screen->cur_col + n; + int max = CurMaxCol(screen, screen->cur_row); + + if (next > max) + next = max; + + set_cur_col(screen, next); screen->do_wrap = 0; } @@ -140,13 +143,16 @@ CursorDown(TScreen * screen, int n) { int max; + int next = screen->cur_row + n; max = (screen->cur_row > screen->bot_marg ? screen->max_row : screen->bot_marg); + if (next > max) + next = max; + if (next > screen->max_row) + next = screen->max_row; - screen->cur_row += n; - if (screen->cur_row > max) - screen->cur_row = max; + set_cur_row(screen, next); screen->do_wrap = 0; } @@ -158,14 +164,17 @@ CursorUp(TScreen * screen, int n) { int min; + int next = screen->cur_row - n; min = ((screen->cur_row < screen->top_marg) ? 0 : screen->top_marg); + if (next < min) + next = min; + if (next < 0) + next = 0; - screen->cur_row -= n; - if (screen->cur_row < min) - screen->cur_row = min; + set_cur_row(screen, next); screen->do_wrap = 0; } @@ -220,7 +229,7 @@ void CarriageReturn(TScreen * screen) { - screen->cur_col = 0; + set_cur_col(screen, 0); screen->do_wrap = 0; } @@ -286,6 +295,7 @@ SGR_Foreground(tw->flags & FG_COLOR ? sc->cur_foreground : -1); SGR_Background(tw->flags & BG_COLOR ? sc->cur_background : -1); #endif + update_autowrap(); } /* @@ -309,3 +319,25 @@ CarriageReturn(screen); do_xevents(); } + +#if OPT_TRACE +int +set_cur_row(TScreen * screen, int value) +{ + assert(screen != 0); + assert(value >= 0); + assert(value <= screen->max_row); + screen->cur_row = value; + return value; +} + +int +set_cur_col(TScreen * screen, int value) +{ + assert(screen != 0); + assert(value >= 0); + assert(value <= screen->max_col); + screen->cur_col = value; + return value; +} +#endif /* OPT_TRACE */ Index: xc/programs/xterm/data.c diff -u xc/programs/xterm/data.c:3.30 xc/programs/xterm/data.c:3.34 --- xc/programs/xterm/data.c:3.30 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/data.c Sun Feb 12 20:14:58 2006 @@ -1,13 +1,9 @@ -/* $XTermId: data.c,v 1.70 2005/01/09 23:59:24 tom Exp $ */ +/* $XTermId: data.c,v 1.78 2006/02/12 22:45:50 tom Exp $ */ -/* - * $Xorg: data.c,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/data.c,v 3.30 2005/01/14 01:50:02 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/data.c,v 3.34 2006/02/13 01:14:58 dickey Exp $ */ /* - * Copyright 2002-2004,2005 by Thomas E. Dickey + * Copyright 2002-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -88,7 +84,7 @@ XTERM_RESOURCE resource; -PtyData VTbuffer; +PtyData *VTbuffer; jmp_buf VTend; @@ -99,7 +95,9 @@ XtAppContext app_con; XtermWidget term; /* master data structure for client */ char *xterm_name; /* argv[0] */ + int hold_screen; +SIG_ATOMIC_T need_cleanup = FALSE; #if OPT_ZICONBEEP int zIconBeep; /* non-zero means beep; see charproc.c for details -IAN! */ @@ -121,5 +119,5 @@ char *ptydev; char *ttydev; -int waitingForTrackInfo = 0; +Boolean waitingForTrackInfo = False; EventMode eventMode = NORMAL; Index: xc/programs/xterm/data.h diff -u xc/programs/xterm/data.h:3.35 xc/programs/xterm/data.h:3.39 --- xc/programs/xterm/data.h:3.35 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/data.h Sun Feb 12 20:14:58 2006 @@ -1,13 +1,9 @@ -/* $XTermId: data.h,v 1.82 2005/01/12 22:08:00 tom Exp $ */ +/* $XTermId: data.h,v 1.93 2006/02/12 22:45:50 tom Exp $ */ -/* - * $Xorg: data.h,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/data.h,v 3.35 2005/01/14 01:50:02 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/data.h,v 3.39 2006/02/13 01:14:58 dickey Exp $ */ /* - * Copyright 2002-2004,2005 by Thomas E. Dickey + * Copyright 2002-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -107,7 +103,7 @@ extern Boolean sameName; #endif -extern PtyData VTbuffer; +extern PtyData *VTbuffer; extern int am_slave; extern int max_plus1; extern jmp_buf VTend; @@ -120,18 +116,20 @@ extern PtySelect X_mask; extern PtySelect pty_mask; -extern int waitingForTrackInfo; +extern Boolean waitingForTrackInfo; extern EventMode eventMode; extern XtermWidget term; +extern SIG_ATOMIC_T need_cleanup; + #if defined(HAVE_XKB_BELL_EXT) #include /* has the prototype */ #include /* has the XkbBI_xxx definitions */ #endif -#ifndef XkbBI_Info +#ifndef XkbBI_Info #define XkbBI_Info 0 #define XkbBI_MinorError 1 #define XkbBI_MajorError 2 @@ -145,17 +143,23 @@ extern Bool waiting_for_initial_map; extern Atom wm_delete_window; -typedef struct { +typedef struct XTERM_RESOURCE { char *xterm_name; char *icon_geometry; char *title; char *icon_name; char *term_name; char *tty_modes; + + int minBufSize; + int maxBufSize; + Boolean hold_screen; /* true if we keep window open */ Boolean utmpInhibit; Boolean utmpDisplayId; Boolean messages; + + String keyboardType; Boolean sunFunctionKeys; /* %%% should be widget resource? */ #if OPT_SUNPC_KBD Boolean sunKeyboard; @@ -166,6 +170,7 @@ #if OPT_SCO_FUNC_KEYS Boolean scoFunctionKeys; #endif + #if OPT_INITIAL_ERASE Boolean ptyInitialErase; /* if true, use pty's sense of erase char */ Boolean backarrow_is_erase; /* override backspace/delete */ @@ -188,6 +193,9 @@ #if OPT_SESSION_MGT Boolean sessionMgt; #endif +#if OPT_TOOLBAR + Boolean toolBar; +#endif } XTERM_RESOURCE; extern XTERM_RESOURCE resource; Index: xc/programs/xterm/doublechr.c diff -u xc/programs/xterm/doublechr.c:3.15 xc/programs/xterm/doublechr.c:3.18 --- xc/programs/xterm/doublechr.c:3.15 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/doublechr.c Sun Feb 12 20:14:58 2006 @@ -1,12 +1,12 @@ -/* $XTermId: doublechr.c,v 1.37 2005/01/09 23:11:07 tom Exp $ */ +/* $XTermId: doublechr.c,v 1.44 2006/02/11 00:39:27 tom Exp $ */ /* - * $XFree86: xc/programs/xterm/doublechr.c,v 3.15 2005/01/14 01:50:02 dickey Exp $ + * $XFree86: xc/programs/xterm/doublechr.c,v 3.18 2006/02/13 01:14:58 dickey Exp $ */ /************************************************************ -Copyright 1997-2004,2005 by Thomas E. Dickey +Copyright 1997-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -56,11 +56,11 @@ register TScreen *screen = &term->screen; int curcol = screen->cur_col; int currow = screen->cur_row; - unsigned len = screen->max_col + 1; + unsigned len = MaxCols(screen); int width = len; unsigned oldChrSet = SCRN_BUF_CSETS(screen, currow)[0]; - assert(screen->max_col >= 0); + assert(width > 0); /* * Ignore repetition. @@ -95,9 +95,9 @@ /* FIXME: do VT220 softchars allow double-sizes? */ memset(SCRN_BUF_CSETS(screen, currow), (Char) newChrSet, len); - screen->cur_col = 0; + set_cur_col(screen, 0); ScrnUpdate(screen, currow, 0, 1, (int) len, True); - screen->cur_col = curcol; + set_cur_col(screen, curcol); } #endif @@ -152,10 +152,7 @@ free(data->fn); data->fn = 0; } - if (data->fs != 0) { - XFreeFont(screen->display, data->fs); - data->fs = 0; - } + data->fs = xtermCloseFont(screen, data->fs); } int @@ -219,7 +216,7 @@ char *name; XTermFonts *data; - if ((name = xtermSpecialFont(flags, chrset)) == 0) + if ((name = xtermSpecialFont(screen, flags, chrset)) == 0) return 0; n = xterm_Double_index(chrset, flags); @@ -239,13 +236,13 @@ TRACE(("xterm_DoubleGC %s %d: %s\n", flags & BOLD ? "BOLD" : "NORM", n, name)); - if ((data->fs = XLoadQueryFont(screen->display, name)) == 0) { + if ((data->fs = xtermOpenFont(screen, name)) == 0) { /* Retry with * in resolutions */ - char *nname = xtermSpecialFont(flags | NORESOLUTION, chrset); + char *nname = xtermSpecialFont(screen, flags | NORESOLUTION, chrset); if (!nname) return 0; - if ((data->fs = XLoadQueryFont(screen->display, nname)) == 0) { + if ((data->fs = xtermOpenFont(screen, nname)) == 0) { XtFree(nname); return 0; } Index: xc/programs/xterm/error.h diff -u xc/programs/xterm/error.h:1.8 xc/programs/xterm/error.h:1.10 --- xc/programs/xterm/error.h:1.8 Fri Dec 27 16:05:22 2002 +++ xc/programs/xterm/error.h Sun Feb 12 20:14:58 2006 @@ -1,9 +1,7 @@ -/* - * $Xorg: error.h,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ - */ +/* $XTermId: error.h,v 1.17 2006/02/12 22:43:55 tom Exp $ */ -/* $XFree86: xc/programs/xterm/error.h,v 1.8 2002/12/27 21:05:22 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/error.h,v 1.10 2006/02/13 01:14:58 dickey Exp $ */ /* * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. * Index: xc/programs/xterm/fontutils.c diff -u xc/programs/xterm/fontutils.c:1.49 xc/programs/xterm/fontutils.c:1.60 --- xc/programs/xterm/fontutils.c:1.49 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/fontutils.c Sun Apr 30 17:55:39 2006 @@ -1,12 +1,12 @@ -/* $XTermId: fontutils.c,v 1.135 2005/01/10 22:52:58 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.202 2006/04/30 17:33:03 tom Exp $ */ /* - * $XFree86: xc/programs/xterm/fontutils.c,v 1.49 2005/01/14 01:50:02 dickey Exp $ + * $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey Exp $ */ /************************************************************ -Copyright 1998-2004,2005 by Thomas E. Dickey +Copyright 1998-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -37,7 +37,7 @@ ********************************************************/ /* - * A portion of this module (for FontNameProperties) is adapted from EMU 1.3; + * A portion of this module (for FontNameProperties) was adapted from EMU 1.3; * it constructs font names with specific properties changed, e.g., for bold * and double-size characters. */ @@ -122,6 +122,46 @@ static void lookupOneFontSize(TScreen *, int); #endif +#if OPT_WIDE_CHARS +static Bool +countGlyphs(XFontStruct * fp) +{ + unsigned count = 0; + + if (fp != 0) { + if (fp->min_byte1 == 0 && fp->max_byte1 == 0) { + count = fp->max_char_or_byte2 - fp->min_char_or_byte2; + } else if (fp->min_char_or_byte2 < 256 + && fp->max_char_or_byte2 < 256) { + unsigned first = (fp->min_byte1 << 8) + fp->min_char_or_byte2; + unsigned last = (fp->max_byte1 << 8) + fp->max_char_or_byte2; + count = last + 1 - first; + } + } + return count; +} + +/* + * Verify that the wide-bold font is at least a bold font with roughly as many + * glyphs as the wide font. The counts should be the same, but settle for + * filtering out the worst of the font mismatches. + */ +static Bool +compatibleWideCounts(XFontStruct * wfs, XFontStruct * wbfs) +{ + unsigned count_w = countGlyphs(wfs); + unsigned count_wb = countGlyphs(wbfs); + if (count_w <= 256 || + count_wb <= 256 || + ((count_w / 4) * 3) > count_wb) { + TRACE(("...font server lied (count wide %u vs wide-bold %u)\n", + count_w, count_wb)); + return False; + } + return True; +} +#endif /* OPT_WIDE_CHARS */ + /* * Returns the fields from start to stop in a dash- separated string. This * function will modify the source, putting '\0's in the appropiate place and @@ -150,12 +190,12 @@ return 0; /* - * put a \0 at the end of the fields + * put a \0 at the end of the fields */ *(str1 - 1) = '\0'; /* - * move source forward + * move source forward */ *source = str1; @@ -199,8 +239,15 @@ if (last_name != 0) XFree(last_name); last_name = name; - if (result != 0) - strcpy(result, name); + + if (result != 0) { + if (strlen(name) < MAX_FONTNAME - 1) { + strcpy(result, name); + } else { + TRACE(("fontname too large: %s\n", name)); + return 0; + } + } /* * Now split it up into parts and put them in @@ -266,66 +313,101 @@ return &props; } +#define ALLOCHUNK(n) ((n | 127) + 1) + +static void +alloca_fontname(char **result, unsigned next) +{ + unsigned last = (*result != 0) ? strlen(*result) : 0; + unsigned have = (*result != 0) ? ALLOCHUNK(last) : 0; + unsigned want = last + next + 2; + + if (want >= have) { + want = ALLOCHUNK(want); + if (last != 0) { + *result = TypeRealloc(char, want, *result); + } else { + if ((*result = TypeMallocN(char, want)) != 0) + **result = '\0'; + } + } +} + +static void +append_fontname_str(char **result, char *value) +{ + if (value == 0) + value = "*"; + alloca_fontname(result, strlen(value)); + if (*result != 0) { + if (**result != '\0') + strcat(*result, "-"); + strcat(*result, value); + } +} + +static void +append_fontname_num(char **result, int value) +{ + if (value < 0) { + append_fontname_str(result, "*"); + } else { + char temp[100]; + sprintf(temp, "%d", value); + append_fontname_str(result, temp); + } +} + /* * Take the given font props and try to make a well formed font name specifying - * the same base font and size and everything, but in bold. The return value - * comes from a static variable, so be careful if you reuse it. + * the same base font and size and everything, but with different weight/width + * according to the parameters. The return value is allocated, should be freed + * by the caller. */ static char * -bold_font_name(FontNameProperties * props, Bool useWidth) -{ - static char ret[MAX_FONTNAME]; - char average_width[MAX_FONTNAME]; +derive_font_name(FontNameProperties * props, + char *use_weight, + int use_average_width, + char *use_encoding) +{ + char *result = 0; + + append_fontname_str(&result, props->beginning); + append_fontname_str(&result, use_weight); + append_fontname_str(&result, props->slant); + append_fontname_str(&result, 0); + append_fontname_str(&result, 0); + append_fontname_num(&result, props->pixel_size); + append_fontname_str(&result, props->point_size); + append_fontname_num(&result, props->res_x); + append_fontname_num(&result, props->res_y); + append_fontname_str(&result, props->spacing); + append_fontname_num(&result, use_average_width); + append_fontname_str(&result, use_encoding); - /* - * Put together something in the form - * "-bold-----"\ - * "--*-" - */ - if (useWidth) - sprintf(average_width, "%d", props->average_width); - else - strcpy(average_width, "*"); - sprintf(ret, "%s-bold-%s-%s-%s-%d-%s-%d-%d-%s-%s-%s", - props->beginning, - props->slant, - props->wideness, - props->add_style, - props->pixel_size, - props->point_size, - props->res_x, - props->res_y, - props->spacing, - average_width, - props->end); - return ret; + return result; +} + +static char * +bold_font_name(FontNameProperties * props, int use_average_width) +{ + return derive_font_name(props, "bold", use_average_width, props->end); } #if OPT_WIDE_CHARS -/* like bold_font_name, but doubles AVERAGE_WIDTH */ +#define derive_wide_font(props, weight) \ + derive_font_name(props, weight, props->average_width * 2, "ISO10646-1") + static char * wide_font_name(FontNameProperties * props) { - static char ret[MAX_FONTNAME]; - - /* - * Put together something in the form - * "-bold-----"\ - * "--*-" - */ - sprintf(ret, "%s-%s-%s-*-*-%d-%s-%d-%d-%s-%i-%s", - props->beginning, - props->weight, - props->slant, - props->pixel_size, - props->point_size, - props->res_x, - props->res_y, - props->spacing, - props->average_width * 2, - props->end); + return derive_wide_font(props, "medium"); +} - return ret; +static char * +widebold_font_name(FontNameProperties * props) +{ + return derive_wide_font(props, "bold"); } #endif /* OPT_WIDE_CHARS */ @@ -338,32 +420,30 @@ * fonts we double the pixel-size and Y-resolution */ char * -xtermSpecialFont(unsigned atts, unsigned chrset) +xtermSpecialFont(TScreen * screen, unsigned atts, unsigned chrset) { #if OPT_TRACE static char old_spacing[80]; static FontNameProperties old_props; #endif - TScreen *screen = &term->screen; FontNameProperties *props; - char tmp[MAX_FONTNAME]; - char *ret; - char *width; + char *result = 0; + char *weight; int pixel_size; int res_x; int res_y; - props = get_font_name_props(screen->display, screen->fnt_norm, (char *) 0); + props = get_font_name_props(screen->display, screen->fnts[fNorm], 0); if (props == 0) - return 0; + return result; pixel_size = props->pixel_size; res_x = props->res_x; res_y = props->res_y; if (atts & BOLD) - width = "bold"; + weight = "bold"; else - width = props->weight; + weight = props->weight; if (CSET_DOUBLE(chrset)) res_x *= 2; @@ -391,35 +471,20 @@ } #endif - if (atts & NORESOLUTION) - sprintf(tmp, "%s-%s-%s-%s-%s-%d-%s-*-*-%s-*-%s", - props->beginning, - width, - props->slant, - props->wideness, - props->add_style, - pixel_size, - props->point_size, - props->spacing, - props->end); - else - sprintf(tmp, "%s-%s-%s-%s-%s-%d-%s-%d-%d-%s-*-%s", - props->beginning, - width, - props->slant, - props->wideness, - props->add_style, - pixel_size, - props->point_size, - res_x, - res_y, - props->spacing, - props->end); - - ret = XtMalloc(strlen(tmp) + 1); - strcpy(ret, tmp); + append_fontname_str(&result, props->beginning); + append_fontname_str(&result, weight); + append_fontname_str(&result, props->slant); + append_fontname_str(&result, props->wideness); + append_fontname_str(&result, props->add_style); + append_fontname_num(&result, pixel_size); + append_fontname_str(&result, props->point_size); + append_fontname_num(&result, (atts & NORESOLUTION) ? -1 : res_x); + append_fontname_num(&result, (atts & NORESOLUTION) ? -1 : res_y); + append_fontname_str(&result, props->spacing); + append_fontname_str(&result, 0); + append_fontname_str(&result, props->end); - return ret; + return result; } #endif /* OPT_DEC_CHRSET */ @@ -482,14 +547,14 @@ * leave trash on the display when we mix normal and bold fonts. */ static int -same_font_size(XFontStruct * nfs, XFontStruct * bfs) +same_font_size(XtermWidget xw, XFontStruct * nfs, XFontStruct * bfs) { TRACE(("same_font_size height %d/%d, min %d/%d max %d/%d\n", nfs->ascent + nfs->descent, bfs->ascent + bfs->descent, nfs->min_bounds.width, bfs->min_bounds.width, nfs->max_bounds.width, bfs->max_bounds.width)); - return term->screen.free_bold_box + return xw->screen.free_bold_box || ((nfs->ascent + nfs->descent) == (bfs->ascent + bfs->descent) && (nfs->min_bounds.width == bfs->min_bounds.width || nfs->min_bounds.width == bfs->min_bounds.width + 1) @@ -542,7 +607,7 @@ #define FULL_WIDTH_CHAR1 0x4E00 /* CJK Ideograph 'number one' */ #define FULL_WIDTH_CHAR2 0xAC00 /* Korean script syllable 'Ka' */ -static int +static Bool is_double_width_font_xft(Display * dpy, XftFont * font) { XGlyphInfo gi1, gi2; @@ -553,7 +618,7 @@ /* Some Korean fonts don't have Chinese characters at all. */ if (!XftCharExists(dpy, font, FULL_WIDTH_CHAR1)) { if (!XftCharExists(dpy, font, FULL_WIDTH_CHAR2)) - return 0; /* Not a CJK font */ + return False; /* Not a CJK font */ else /* a Korean font without CJK Ideographs */ fwstr = FULL_WIDTH_TEST_STRING2; } @@ -561,7 +626,7 @@ XftTextExtents32(dpy, font, &c1, 1, &gi1); XftTextExtents32(dpy, font, &c2, 1, &gi2); if (gi1.xOff != gi2.xOff) /* Not a fixed-width font */ - return 0; + return False; XftTextExtentsUtf8(dpy, font, (FcChar8 *) hwstr, (int) strlen(hwstr), &gi1); XftTextExtentsUtf8(dpy, font, (FcChar8 *) fwstr, (int) strlen(fwstr), &gi2); @@ -597,21 +662,83 @@ return &data; } +static void +cache_menu_font_name(TScreen * screen, int fontnum, int which, const char *name) +{ + if (name != 0) { + char *last = screen->menu_font_names[fontnum][which]; + if (last != 0) { + if (strcmp(last, name)) { + free(last); + TRACE(("caching menu fontname %d.%d %s\n", fontnum, which, name)); + screen->menu_font_names[fontnum][which] = x_strdup(name); + } + } else { + TRACE(("caching menu fontname %d.%d %s\n", fontnum, which, name)); + screen->menu_font_names[fontnum][which] = x_strdup(name); + } + } +} + +/* + * Open the given font and verify that it is non-empty. Return a null on + * failure. + */ +XFontStruct * +xtermOpenFont(TScreen * screen, char *name) +{ + XFontStruct *nfs = 0; + + if (name != 0 + && (nfs = XLoadQueryFont(screen->display, name)) != 0) { + if (EmptyFont(nfs)) { + nfs = xtermCloseFont(screen, nfs); + } + } + return nfs; +} + +XFontStruct * +xtermCloseFont(TScreen * screen, XFontStruct * fnt) +{ + if (fnt != 0) { + XFreeFont(screen->display, fnt); + } + return 0; +} + +/* + * Close the listed fonts, noting that some may use copies of the pointer. + */ +void +xtermCloseFonts(TScreen * screen, XFontStruct ** fnts) +{ + int j, k; + + for (j = 0; j < fMAX; ++j) { + if (fnts[j] != 0) { + xtermCloseFont(screen, fnts[j]); + for (k = j + 1; k < fMAX; ++k) { + if (fnts[j] == fnts[k]) + fnts[k] = 0; + } + fnts[j] = 0; + } + } +} + int -xtermLoadFont(TScreen * screen, +xtermLoadFont(XtermWidget xw, const VTFontNames * fonts, Bool doresize, int fontnum) { + TScreen *screen = &(xw->screen); + VTFontNames myfonts; /* FIXME: use XFreeFontInfo */ FontNameProperties *fp; - XFontStruct *nfs = NULL; - XFontStruct *bfs = NULL; -#if OPT_WIDE_CHARS - XFontStruct *wfs = NULL; - XFontStruct *wbfs = NULL; -#endif + XFontStruct *fnts[fMAX]; XGCValues xgcv; unsigned long mask; GC new_normalGC = NULL; @@ -625,53 +752,57 @@ Bool proportional = False; memset(&myfonts, 0, sizeof(myfonts)); + memset(fnts, 0, sizeof(fnts)); + if (fonts != 0) myfonts = *fonts; if (myfonts.f_n == 0) return 0; if (fontnum == fontMenu_fontescape - && myfonts.f_n != screen->menu_font_names[fontnum]) { + && myfonts.f_n != screen->MenuFontName(fontnum)) { if ((tmpname = x_strdup(myfonts.f_n)) == 0) return 0; } TRACE(("xtermLoadFont #%d normal %s\n", fontnum, NonNull(myfonts.f_n))); TRACE(("xtermLoadFont #%d bold %s\n", fontnum, NonNull(myfonts.f_b))); +#if OPT_WIDE_CHARS + TRACE(("xtermLoadFont #%d wide %s\n", fontnum, NonNull(myfonts.f_w))); + TRACE(("xtermLoadFont #%d w/bold %s\n", fontnum, NonNull(myfonts.f_wb))); +#endif - if (!(nfs = XLoadQueryFont(screen->display, myfonts.f_n))) + if (!(fnts[fNorm] = xtermOpenFont(screen, myfonts.f_n))) goto bad; - if (EmptyFont(nfs)) - goto bad; /* can't use a 0-sized font */ strcpy(normal, myfonts.f_n); if (myfonts.f_b == 0) { - fp = get_font_name_props(screen->display, nfs, normal); + fp = get_font_name_props(screen->display, fnts[fNorm], normal); if (fp != 0) { - myfonts.f_b = bold_font_name(fp, True); - if ((bfs = XLoadQueryFont(screen->display, myfonts.f_b)) == 0) { - myfonts.f_b = bold_font_name(fp, False); - bfs = XLoadQueryFont(screen->display, myfonts.f_b); + myfonts.f_b = bold_font_name(fp, fp->average_width); + if ((fnts[fBold] = xtermOpenFont(screen, myfonts.f_b)) == 0) { + myfonts.f_b = bold_font_name(fp, -1); + fnts[fBold] = xtermOpenFont(screen, myfonts.f_b); } - TRACE(("...derived bold %s\n", myfonts.f_b)); + TRACE(("...derived bold %s\n", NonNull(myfonts.f_b))); } - if (fp == 0 || bfs == 0) { - bfs = nfs; + if (fp == 0 || fnts[fBold] == 0) { + fnts[fBold] = fnts[fNorm]; TRACE(("...cannot load a matching bold font\n")); - } else if (same_font_size(nfs, bfs) - && got_bold_font(screen->display, bfs, myfonts.f_b)) { + } else if (same_font_size(xw, fnts[fNorm], fnts[fBold]) + && got_bold_font(screen->display, fnts[fBold], myfonts.f_b)) { TRACE(("...got a matching bold font\n")); - screen->bold_font_names[fontnum] = x_strdup(myfonts.f_b); + cache_menu_font_name(screen, fontnum, fBold, myfonts.f_b); } else { - XFreeFont(screen->display, bfs); - bfs = nfs; + xtermCloseFont(screen, fnts[fBold]); + fnts[fBold] = fnts[fNorm]; TRACE(("...did not get a matching bold font\n")); } - } else if ((bfs = XLoadQueryFont(screen->display, myfonts.f_b)) == 0) { - bfs = nfs; - TRACE(("...cannot load bold font %s\n", myfonts.f_b)); + } else if ((fnts[fBold] = xtermOpenFont(screen, myfonts.f_b)) == 0) { + fnts[fBold] = fnts[fNorm]; + TRACE(("...cannot load bold font %s\n", NonNull(myfonts.f_b))); } else { - screen->bold_font_names[fontnum] = x_strdup(myfonts.f_b); + cache_menu_font_name(screen, fontnum, fBold, myfonts.f_b); } /* @@ -680,30 +811,61 @@ * and 12x13ja as the corresponding fonts for 9x18 and 6x13. */ if_OPT_WIDE_CHARS(screen, { - if (myfonts.f_w == 0 && !is_double_width_font(nfs)) { - fp = get_font_name_props(screen->display, nfs, normal); + Bool derived; + char bold[MAX_FONTNAME]; + + if (myfonts.f_w != 0) { + cache_menu_font_name(screen, fontnum, fWide, myfonts.f_w); + } else if (!is_double_width_font(fnts[fNorm])) { + fp = get_font_name_props(screen->display, fnts[fNorm], normal); if (fp != 0) { myfonts.f_w = wide_font_name(fp); - TRACE(("...derived wide %s\n", myfonts.f_w)); + TRACE(("...derived wide %s\n", NonNull(myfonts.f_w))); + cache_menu_font_name(screen, fontnum, fWide, myfonts.f_w); } } if (myfonts.f_w) { - wfs = XLoadQueryFont(screen->display, myfonts.f_w); + fnts[fWide] = xtermOpenFont(screen, myfonts.f_w); } else { - wfs = nfs; + fnts[fWide] = fnts[fNorm]; + } + + derived = False; + if (myfonts.f_wb == 0) { + fp = get_font_name_props(screen->display, fnts[fBold], bold); + if (fp != 0) { + myfonts.f_wb = widebold_font_name(fp); + derived = True; + } } if (myfonts.f_wb) { - wbfs = XLoadQueryFont(screen->display, myfonts.f_wb); - } else if (is_double_width_font(bfs)) { - wbfs = bfs; + + fnts[fWBold] = xtermOpenFont(screen, myfonts.f_wb); + + if (derived + && !compatibleWideCounts(fnts[fWide], fnts[fWBold])) { + fnts[fWBold] = xtermCloseFont(screen, fnts[fWBold]); + } + if (fnts[fWBold] == 0) { + free(myfonts.f_wb); + myfonts.f_wb = myfonts.f_w; + fnts[fWBold] = fnts[fWide]; + TRACE(("...cannot load wide-bold, use wide %s\n", NonNull(myfonts.f_w))); + } else { + TRACE(("...derived wide/bold %s\n", NonNull(myfonts.f_wb))); + cache_menu_font_name(screen, fontnum, fWBold, myfonts.f_wb); + } + } else if (is_double_width_font(fnts[fBold])) { + fnts[fWBold] = fnts[fBold]; + TRACE(("...bold font is double-width, use it %s\n", NonNull(myfonts.f_b))); } else { - wbfs = wfs; - TRACE(("...cannot load wide bold font %s\n", myfonts.f_wb)); + fnts[fWBold] = fnts[fWide]; + TRACE(("...cannot load wide bold font, use wide %s\n", NonNull(myfonts.f_w))); } - if (EmptyFont(wbfs)) + if (EmptyFont(fnts[fWBold])) goto bad; /* can't use a 0-sized font */ }); @@ -714,45 +876,24 @@ * * But if it did fail for some reason, then nevermind. */ - if (EmptyFont(bfs)) + if (EmptyFont(fnts[fBold])) goto bad; /* can't use a 0-sized font */ - if (!same_font_size(nfs, bfs) - && (is_fixed_font(nfs) && is_fixed_font(bfs))) { - XFreeFont(screen->display, bfs); - bfs = nfs; - TRACE(("...fixing mismatched normal/bold fonts\n")); - /* - * If we're given a nonnull bold fontname here, it came from a - * resource setting. Perhaps the user did something like set - * the "*font" in a resource file. But they would be startled - * to see a mismatched bold font. Try again, asking the font - * server for the appropriate font. - */ - if (myfonts.f_b != 0) { - myfonts.f_b = 0; /* throw if away! */ - return xtermLoadFont(screen, - &myfonts, - doresize, - fontnum); - } + if (!same_font_size(xw, fnts[fNorm], fnts[fBold]) + && (is_fixed_font(fnts[fNorm]) && is_fixed_font(fnts[fBold]))) { + TRACE(("...ignoring mismatched normal/bold fonts\n")); + xtermCloseFont(screen, fnts[fBold]); + fnts[fBold] = fnts[fNorm]; } if_OPT_WIDE_CHARS(screen, { - if (wfs != 0 - && wbfs != 0 - && !same_font_size(wfs, wbfs) - && (is_fixed_font(wfs) && is_fixed_font(wbfs))) { - XFreeFont(screen->display, wbfs); - wbfs = wfs; - TRACE(("...fixing mismatched normal/bold wide fonts\n")); - if (myfonts.f_wb != 0) { - myfonts.f_wb = 0; - return xtermLoadFont(screen, - &myfonts, - doresize, - fontnum); - } + if (fnts[fWide] != 0 + && fnts[fWBold] != 0 + && !same_font_size(xw, fnts[fWide], fnts[fWBold]) + && (is_fixed_font(fnts[fWide]) && is_fixed_font(fnts[fWBold]))) { + TRACE(("...ignoring mismatched normal/bold wide fonts\n")); + xtermCloseFont(screen, fnts[fWBold]); + fnts[fWBold] = fnts[fWide]; } }); @@ -760,28 +901,28 @@ * Normal/bold fonts should be the same width. Also, the min/max * values should be the same. */ - if (!is_fixed_font(nfs) - || !is_fixed_font(bfs) - || nfs->max_bounds.width != bfs->max_bounds.width) { + if (!is_fixed_font(fnts[fNorm]) + || !is_fixed_font(fnts[fBold]) + || fnts[fNorm]->max_bounds.width != fnts[fBold]->max_bounds.width) { TRACE(("Proportional font! normal %d/%d, bold %d/%d\n", - nfs->min_bounds.width, - nfs->max_bounds.width, - bfs->min_bounds.width, - bfs->max_bounds.width)); + fnts[fNorm]->min_bounds.width, + fnts[fNorm]->max_bounds.width, + fnts[fBold]->min_bounds.width, + fnts[fBold]->max_bounds.width)); proportional = True; } if_OPT_WIDE_CHARS(screen, { - if (wfs != 0 - && wbfs != 0 - && (!is_fixed_font(wfs) - || !is_fixed_font(wbfs) - || wfs->max_bounds.width != wbfs->max_bounds.width)) { + if (fnts[fWide] != 0 + && fnts[fWBold] != 0 + && (!is_fixed_font(fnts[fWide]) + || !is_fixed_font(fnts[fWBold]) + || fnts[fWide]->max_bounds.width != fnts[fWBold]->max_bounds.width)) { TRACE(("Proportional font! wide %d/%d, wide bold %d/%d\n", - wfs->min_bounds.width, - wfs->max_bounds.width, - wbfs->min_bounds.width, - wbfs->max_bounds.width)); + fnts[fWide]->min_bounds.width, + fnts[fWide]->max_bounds.width, + fnts[fWBold]->min_bounds.width, + fnts[fWBold]->max_bounds.width)); proportional = True; } }); @@ -792,51 +933,51 @@ mask = (GCFont | GCForeground | GCBackground | GCGraphicsExposures | GCFunction); - new_normal = getXtermForeground(term->flags, term->cur_foreground); - new_revers = getXtermBackground(term->flags, term->cur_background); + new_normal = getXtermForeground(xw->flags, xw->cur_foreground); + new_revers = getXtermBackground(xw->flags, xw->cur_background); - xgcv.font = nfs->fid; + xgcv.font = fnts[fNorm]->fid; xgcv.foreground = new_normal; xgcv.background = new_revers; xgcv.graphics_exposures = True; /* default */ xgcv.function = GXcopy; - new_normalGC = XtGetGC((Widget) term, mask, &xgcv); + new_normalGC = XtGetGC((Widget) xw, mask, &xgcv); if (!new_normalGC) goto bad; - if (nfs == bfs) { /* there is no bold font */ + if (fnts[fNorm] == fnts[fBold]) { /* there is no bold font */ new_normalboldGC = new_normalGC; } else { - xgcv.font = bfs->fid; - new_normalboldGC = XtGetGC((Widget) term, mask, &xgcv); + xgcv.font = fnts[fBold]->fid; + new_normalboldGC = XtGetGC((Widget) xw, mask, &xgcv); if (!new_normalboldGC) goto bad; } - xgcv.font = nfs->fid; + xgcv.font = fnts[fNorm]->fid; xgcv.foreground = new_revers; xgcv.background = new_normal; - new_reverseGC = XtGetGC((Widget) term, mask, &xgcv); + new_reverseGC = XtGetGC((Widget) xw, mask, &xgcv); if (!new_reverseGC) goto bad; - if (nfs == bfs) { /* there is no bold font */ + if (fnts[fNorm] == fnts[fBold]) { /* there is no bold font */ new_reverseboldGC = new_reverseGC; } else { - xgcv.font = bfs->fid; - new_reverseboldGC = XtGetGC((Widget) term, mask, &xgcv); + xgcv.font = fnts[fBold]->fid; + new_reverseboldGC = XtGetGC((Widget) xw, mask, &xgcv); if (!new_reverseboldGC) goto bad; } if (NormalGC(screen) != NormalBoldGC(screen)) - XtReleaseGC((Widget) term, NormalBoldGC(screen)); - XtReleaseGC((Widget) term, NormalGC(screen)); + XtReleaseGC((Widget) xw, NormalBoldGC(screen)); + XtReleaseGC((Widget) xw, NormalGC(screen)); if (ReverseGC(screen) != ReverseBoldGC(screen)) - XtReleaseGC((Widget) term, ReverseBoldGC(screen)); - XtReleaseGC((Widget) term, ReverseGC(screen)); + XtReleaseGC((Widget) xw, ReverseBoldGC(screen)); + XtReleaseGC((Widget) xw, ReverseGC(screen)); NormalGC(screen) = new_normalGC; NormalBoldGC(screen) = new_normalboldGC; @@ -848,19 +989,15 @@ * the memory that is associated with the old fonts. The * XLoadQueryFont call allocates a new XFontStruct. */ - if (screen->fnt_bold != 0 - && screen->fnt_bold != screen->fnt_norm) - XFreeFont(screen->display, screen->fnt_bold); - if (screen->fnt_norm != 0) - XFreeFont(screen->display, screen->fnt_norm); + xtermCloseFonts(screen, screen->fnts); - screen->fnt_norm = nfs; - screen->fnt_bold = bfs; + screen->fnts[fNorm] = fnts[fNorm]; + screen->fnts[fBold] = fnts[fBold]; #if OPT_WIDE_CHARS - screen->fnt_dwd = wfs; - if (wbfs == NULL) - wbfs = wfs; - screen->fnt_dwdb = wbfs; + screen->fnts[fWide] = fnts[fWide]; + if (fnts[fWBold] == NULL) + fnts[fWBold] = fnts[fWide]; + screen->fnts[fWBold] = fnts[fWBold]; #endif screen->fnt_prop = proportional; screen->fnt_boxes = True; @@ -872,7 +1009,7 @@ * (0) is special, and is not used. */ #if OPT_RENDERFONT - if (UsingRenderFont()) { + if (UsingRenderFont(xw)) { /* * FIXME: we shouldn't even be here if we're using Xft. */ @@ -892,12 +1029,12 @@ continue; } #endif - if (xtermMissingChar(n, nfs)) { + if (xtermMissingChar(xw, n, fnts[fNorm])) { TRACE(("missing normal char #%d\n", n)); screen->fnt_boxes = False; break; } - if (xtermMissingChar(n, bfs)) { + if (xtermMissingChar(xw, n, fnts[fBold])) { TRACE(("missing bold char #%d\n", n)); screen->fnt_boxes = False; break; @@ -909,7 +1046,7 @@ #endif screen->enbolden = screen->bold_mode - && ((nfs == bfs) || same_font_name(normal, myfonts.f_b)); + && ((fnts[fNorm] == fnts[fBold]) || same_font_name(normal, myfonts.f_b)); TRACE(("Will %suse 1-pixel offset/overstrike to simulate bold\n", screen->enbolden ? "" : "not ")); @@ -917,43 +1054,35 @@ screen->menu_font_number = fontnum; set_menu_font(True); if (tmpname) { /* if setting escape or sel */ - if (screen->menu_font_names[fontnum]) - free(screen->menu_font_names[fontnum]); - screen->menu_font_names[fontnum] = tmpname; + if (screen->MenuFontName(fontnum)) + free(screen->MenuFontName(fontnum)); + screen->MenuFontName(fontnum) = tmpname; if (fontnum == fontMenu_fontescape) { - set_sensitivity(term->screen.fontMenu, + set_sensitivity(xw->screen.fontMenu, fontMenuEntries[fontMenu_fontescape].widget, True); } #if OPT_SHIFT_FONTS - screen->menu_font_sizes[fontnum] = FontSize(nfs); + screen->menu_font_sizes[fontnum] = FontSize(fnts[fNorm]); #endif } set_cursor_gcs(screen); - xtermUpdateFontInfo(screen, doresize); + xtermUpdateFontInfo(xw, doresize); return 1; bad: if (tmpname) free(tmpname); if (new_normalGC) - XtReleaseGC((Widget) term, new_normalGC); + XtReleaseGC((Widget) xw, new_normalGC); if (new_normalboldGC && new_normalGC != new_normalboldGC) - XtReleaseGC((Widget) term, new_normalboldGC); + XtReleaseGC((Widget) xw, new_normalboldGC); if (new_reverseGC) - XtReleaseGC((Widget) term, new_reverseGC); + XtReleaseGC((Widget) xw, new_reverseGC); if (new_reverseboldGC && new_reverseGC != new_reverseboldGC) - XtReleaseGC((Widget) term, new_reverseboldGC); - if (nfs) - XFreeFont(screen->display, nfs); - if (bfs && nfs != bfs) - XFreeFont(screen->display, bfs); -#if OPT_WIDE_CHARS - if (wfs) - XFreeFont(screen->display, wfs); - if (wbfs && wbfs != wfs) - XFreeFont(screen->display, wbfs); -#endif + XtReleaseGC((Widget) xw, new_reverseboldGC); + + xtermCloseFonts(screen, fnts); return 0; } @@ -963,20 +1092,30 @@ */ typedef struct { VTFontNames default_font; - char *menu_font_names[fontMenu_lastBuiltin + 1]; + char *menu_font_names[fontMenu_lastBuiltin + 1][fMAX]; } SubResourceRec; -#define MERGE_SUBFONT(src,dst,name) if (dst.name == 0) dst.name = src.name +#define MERGE_SUBFONT(src,dst,name) \ + if (dst.name == 0) { \ + TRACE(("MERGE_SUBFONT " #dst "." #name " merge %s\n", NonNull(src.name))); \ + dst.name = src.name; \ + } else { \ + TRACE(("MERGE_SUBFONT " #dst "." #name " found %s\n", NonNull(dst.name))); \ + } #define COPY_MENU_FONTS(src,dst) \ - for (n = fontMenu_font1; n <= fontMenu_lastBuiltin; ++n) \ - dst.menu_font_names[n] = src.menu_font_names[n] + TRACE(("COPY_MENU_FONTS " #src " to " #dst "\n")); \ + for (n = fontMenu_fontdefault; n <= fontMenu_lastBuiltin; ++n) { \ + for (m = 0; m < fMAX; ++m) { \ + dst.menu_font_names[n][m] = src.menu_font_names[n][m]; \ + } \ + } /* * Load the "VT" font names from the given subresource name/class. These * correspond to the VT100 resources. */ -Bool +static Bool xtermLoadVTFonts(XtermWidget w, char *myName, char *myClass) { static Bool initialized = False; @@ -994,14 +1133,14 @@ Sres(XtNwideFont, XtCWideFont, default_font.f_w, DEFWIDEFONT), Sres(XtNwideBoldFont, XtCWideBoldFont, default_font.f_wb, DEFWIDEBOLDFONT), #endif - Sres(XtNfont1, XtCFont1, menu_font_names[fontMenu_font1], NULL), - Sres(XtNfont2, XtCFont2, menu_font_names[fontMenu_font2], NULL), - Sres(XtNfont3, XtCFont3, menu_font_names[fontMenu_font3], NULL), - Sres(XtNfont4, XtCFont4, menu_font_names[fontMenu_font4], NULL), - Sres(XtNfont5, XtCFont5, menu_font_names[fontMenu_font5], NULL), - Sres(XtNfont6, XtCFont6, menu_font_names[fontMenu_font6], NULL), + Sres(XtNfont1, XtCFont1, MenuFontName(fontMenu_font1), NULL), + Sres(XtNfont2, XtCFont2, MenuFontName(fontMenu_font2), NULL), + Sres(XtNfont3, XtCFont3, MenuFontName(fontMenu_font3), NULL), + Sres(XtNfont4, XtCFont4, MenuFontName(fontMenu_font4), NULL), + Sres(XtNfont5, XtCFont5, MenuFontName(fontMenu_font5), NULL), + Sres(XtNfont6, XtCFont6, MenuFontName(fontMenu_font6), NULL), }; - Cardinal n; + Cardinal n, m; Bool status = True; if (!initialized) { @@ -1017,7 +1156,7 @@ w->misc.default_font = original.default_font; COPY_MENU_FONTS(original, w->screen); for (n = 0; n < XtNumber(original.menu_font_names); ++n) - w->screen.menu_font_names[n] = original.menu_font_names[n]; + w->screen.MenuFontName(n) = original.MenuFontName(n); } else { TRACE(("xtermLoadVTFonts(%s, %s)\n", myName, myClass)); @@ -1027,6 +1166,7 @@ font_resources, (Cardinal) XtNumber(font_resources), NULL, (Cardinal) 0); + if (memcmp(&referenceRec, &subresourceRec, sizeof(referenceRec))) { /* @@ -1039,14 +1179,14 @@ MERGE_SUBFONT(w->misc, subresourceRec, default_font.f_wb); #endif for (n = fontMenu_font1; n <= fontMenu_lastBuiltin; ++n) - MERGE_SUBFONT(w->screen, subresourceRec, menu_font_names[n]); + MERGE_SUBFONT(w->screen, subresourceRec, MenuFontName(n)); /* * Finally, copy the subresource data to the widget. */ w->misc.default_font = subresourceRec.default_font; COPY_MENU_FONTS(subresourceRec, w->screen); - w->screen.menu_font_names[fontMenu_fontdefault] = w->misc.default_font.f_n; + w->screen.MenuFontName(fontMenu_fontdefault) = w->misc.default_font.f_n; } else { TRACE(("...no resources found\n")); status = False; @@ -1054,6 +1194,70 @@ } return status; } + +#if OPT_WIDE_CHARS +static Bool +isWideFont(XFontStruct * fp, char *tag, Bool nullOk) +{ + Bool result = False; + + (void) tag; + if (fp != 0) { + unsigned count = countGlyphs(fp); + TRACE(("isWideFont(%s) found %d cells\n", tag, count)); + result = (count > 256) ? True : False; + } else { + result = nullOk; + } + return result; +} + +/* + * If the current fonts are not wide, load the UTF8 fonts. + * + * Called during initialization (for wide-character mode), the fonts have not + * been setup, so we pass nullOk=True to isWideFont(). + * + * Called after initialization, e.g., in response to the UTF-8 menu entry + * (starting from narrow character mode), it checks if the fonts are not wide. + */ +Bool +xtermLoadWideFonts(XtermWidget xw, Bool nullOk) +{ + TScreen *screen = &(xw->screen); + Bool result; + + if (EmptyFont(screen->fnts[fWide])) { + result = (isWideFont(screen->fnts[fNorm], "normal", nullOk) + && isWideFont(screen->fnts[fBold], "bold", nullOk)); + } else { + result = (isWideFont(screen->fnts[fWide], "wide", nullOk) + && isWideFont(screen->fnts[fWBold], "wide-bold", nullOk)); + if (result && !screen->utf8_latin1) { + result = (isWideFont(screen->fnts[fNorm], "normal", nullOk) + && isWideFont(screen->fnts[fBold], "bold", nullOk)); + } + } + if (!result) { + TRACE(("current fonts are not all wide%s\n", nullOk ? " nullOk" : "")); + result = xtermLoadVTFonts(xw, "utf8Fonts", "Utf8Fonts"); + } + TRACE(("xtermLoadWideFonts:%d\n", result)); + return result; +} +#endif /* OPT_WIDE_CHARS */ + +/* + * Restore the default fonts, i.e., if we had switched to wide-fonts. + */ +Bool +xtermLoadDefaultFonts(XtermWidget w) +{ + Bool result; + result = xtermLoadVTFonts(w, NULL, NULL); + TRACE(("xtermLoadDefaultFonts:%d\n", result)); + return result; +} #endif /* OPT_LOAD_VTFONTS || OPT_WIDE_CHARS */ #if OPT_LOAD_VTFONTS @@ -1088,7 +1292,7 @@ font_number = fontMenu_lastBuiltin; for (n = 0; n < NMENUFONTS; ++n) term->screen.menu_font_sizes[n] = 0; - SetVTFont(font_number, True, + SetVTFont(term, font_number, True, ((font_number == fontMenu_fontdefault) ? &(term->misc.default_font) : NULL)); @@ -1126,15 +1330,43 @@ src->max_advance_width));\ } +#if OPT_RENDERFONT +static XftFont * +xtermOpenXft(Display * dpy, XftPattern * pat, const char *tag GCC_UNUSED) +{ + XftPattern *match; + XftResult status; + XftFont *result = 0; + + if (pat != 0) { + match = XftFontMatch(dpy, DefaultScreen(dpy), pat, &status); + if (match != 0) { + result = XftFontOpenPattern(dpy, match); + if (result != 0) { + TRACE(("...matched %s font\n", tag)); + } else { + TRACE(("...could did not open %s font\n", tag)); + XftPatternDestroy(match); + } + } else { + TRACE(("...did not match %s font\n", tag)); + } + } + return result; +} +#endif + /* * Compute useful values for the font/window sizes */ void -xtermComputeFontInfo(TScreen * screen, +xtermComputeFontInfo(XtermWidget xw, struct _vtwin *win, XFontStruct * font, int sbwidth) { + TScreen *screen = &(xw->screen); + int i, j, width, height; #if OPT_RENDERFONT @@ -1145,24 +1377,25 @@ * font-loading for fixed-fonts still goes on whether or not this chunk * overrides it. */ - if (term->misc.render_font && !IsIconWin(screen, win)) { + if (xw->misc.render_font && !IsIconWin(screen, win)) { Display *dpy = screen->display; int fontnum = screen->menu_font_number; XftFont *norm = screen->renderFontNorm[fontnum]; XftFont *bold = screen->renderFontBold[fontnum]; + XftFont *ital = screen->renderFontItal[fontnum]; #if OPT_RENDERWIDE XftFont *wnorm = screen->renderWideNorm[fontnum]; XftFont *wbold = screen->renderWideBold[fontnum]; + XftFont *wital = screen->renderWideItal[fontnum]; #endif - if (norm == 0 && term->misc.face_name) { - XftPattern *pat, *match; - XftResult result; - double face_size = term->misc.face_size; + if (norm == 0 && xw->misc.face_name) { + XftPattern *pat; + double face_size = xw->misc.face_size; TRACE(("xtermComputeFontInfo norm(face %s, size %f)\n", - term->misc.face_name, - term->misc.face_size)); + xw->misc.face_name, + xw->misc.face_size)); #if OPT_SHIFT_FONTS /* @@ -1182,79 +1415,104 @@ } #endif - pat = XftNameParse(term->misc.face_name); - XftPatternBuild(pat, - XFT_FAMILY, XftTypeString, "mono", - XFT_SIZE, XftTypeDouble, face_size, - XFT_SPACING, XftTypeInteger, XFT_MONO, - (void *) 0); - match = XftFontMatch(dpy, DefaultScreen(dpy), pat, &result); - norm = XftFontOpenPattern(dpy, match); - if ((norm == 0) && match) - XftPatternDestroy(match); - if (norm != 0) { + if ((pat = XftNameParse(xw->misc.face_name)) != 0) { XftPatternBuild(pat, - XFT_WEIGHT, XftTypeInteger, XFT_WEIGHT_BOLD, - XFT_CHAR_WIDTH, XftTypeInteger, norm->max_advance_width, + XFT_FAMILY, XftTypeString, "mono", + XFT_SIZE, XftTypeDouble, face_size, + XFT_SPACING, XftTypeInteger, XFT_MONO, (void *) 0); - match = XftFontMatch(dpy, DefaultScreen(dpy), pat, &result); - bold = XftFontOpenPattern(dpy, match); - if ((bold == 0) && match) - XftPatternDestroy(match); - - /* - * FIXME: just assume that the corresponding font has no - * graphics characters. - */ - if (screen->fnt_boxes) { - screen->fnt_boxes = False; - TRACE(("Xft opened - will %suse internal line-drawing characters\n", - screen->fnt_boxes ? "not " : "")); + norm = xtermOpenXft(dpy, pat, "normal"); + + if (norm != 0) { + XftPatternBuild(pat, + XFT_WEIGHT, XftTypeInteger, XFT_WEIGHT_BOLD, + XFT_CHAR_WIDTH, XftTypeInteger, norm->max_advance_width, + (void *) 0); + bold = xtermOpenXft(dpy, pat, "bold"); + +#if OPT_ISO_COLORS + if (screen->italicULMode) { + XftPatternBuild(pat, + XFT_SLANT, XftTypeInteger, XFT_SLANT_ITALIC, + XFT_CHAR_WIDTH, XftTypeInteger, norm->max_advance_width, + (void *) 0); + ital = xtermOpenXft(dpy, pat, "italic"); + } +#endif /* OPT_ISO_COLORS */ + + /* + * FIXME: just assume that the corresponding font has no + * graphics characters. + */ + if (screen->fnt_boxes) { + screen->fnt_boxes = False; + TRACE(("Xft opened - will %suse internal line-drawing characters\n", + screen->fnt_boxes ? "not " : "")); + } } - } - if (pat) XftPatternDestroy(pat); + } CACHE_XFT(screen->renderFontNorm, norm); CACHE_XFT(screen->renderFontBold, bold); + CACHE_XFT(screen->renderFontItal, ital); /* * See xtermXftDrawString(). */ #if OPT_RENDERWIDE - if (norm != 0 && wnorm == 0) { - char *face_name = (term->misc.face_wide_name - ? term->misc.face_wide_name - : term->misc.face_name); + if (norm != 0 && screen->wide_chars) { + char *face_name = (xw->misc.face_wide_name + ? xw->misc.face_wide_name + : xw->misc.face_name); int char_width = norm->max_advance_width * 2; TRACE(("xtermComputeFontInfo wide(face %s, char_width %d)\n", face_name, char_width)); - wnorm = XftFontOpen(dpy, DefaultScreen(dpy), + if ((pat = XftNameParse(xw->misc.face_name)) != 0) { + XftPatternBuild(pat, XFT_FAMILY, XftTypeString, face_name, XFT_SIZE, XftTypeDouble, face_size, XFT_SPACING, XftTypeInteger, XFT_MONO, XFT_CHAR_WIDTH, XftTypeInteger, char_width, (void *) 0); + wnorm = xtermOpenXft(dpy, pat, "wide"); - wbold = XftFontOpen(dpy, DefaultScreen(dpy), - XFT_FAMILY, XftTypeString, face_name, - XFT_SIZE, XftTypeDouble, face_size, - XFT_SPACING, XftTypeInteger, XFT_MONO, - XFT_CHAR_WIDTH, XftTypeInteger, char_width, - XFT_WEIGHT, XftTypeInteger, XFT_WEIGHT_BOLD, - (void *) 0); + if (wnorm != 0) { + XftPatternBuild(pat, + XFT_FAMILY, XftTypeString, face_name, + XFT_SIZE, XftTypeDouble, face_size, + XFT_SPACING, XftTypeInteger, XFT_MONO, + XFT_CHAR_WIDTH, XftTypeInteger, char_width, + XFT_WEIGHT, XftTypeInteger, XFT_WEIGHT_BOLD, + (void *) 0); + wbold = xtermOpenXft(dpy, pat, "wide-bold"); + + if (screen->italicULMode) { + XftPatternBuild(pat, + XFT_FAMILY, XftTypeString, face_name, + XFT_SIZE, XftTypeDouble, face_size, + XFT_SPACING, XftTypeInteger, XFT_MONO, + XFT_CHAR_WIDTH, XftTypeInteger, char_width, + XFT_SLANT, XftTypeInteger, XFT_SLANT_ITALIC, + (void *) 0); + wital = xtermOpenXft(dpy, pat, "wide-italic"); + } + } + XftPatternDestroy(pat); + } CACHE_XFT(screen->renderWideNorm, wnorm); CACHE_XFT(screen->renderWideBold, wbold); + CACHE_XFT(screen->renderWideItal, wital); } #endif } if (norm == 0) { - term->misc.render_font = False; + xw->misc.render_font = False; update_font_renderfont(); } else { win->f_width = norm->max_advance_width; @@ -1267,7 +1525,7 @@ win->f_width >>= 1; } } - if (!term->misc.render_font || IsIconWin(screen, win)) + if (!xw->misc.render_font || IsIconWin(screen, win)) #endif { if (is_double_width_font(font)) { @@ -1281,8 +1539,8 @@ } i = 2 * screen->border + sbwidth; j = 2 * screen->border; - width = (screen->max_col + 1) * win->f_width + i; - height = (screen->max_row + 1) * win->f_height + j; + width = MaxCols(screen) * win->f_width + i; + height = MaxRows(screen) * win->f_height + j; win->fullwidth = width; win->fullheight = height; win->width = width - i; @@ -1305,32 +1563,40 @@ { screen->fnt_wide = (font->max_bounds.width); screen->fnt_high = (font->ascent + font->descent); + TRACE(("xtermSaveFontInfo %dx%d\n", screen->fnt_high, screen->fnt_wide)); } /* * After loading a new font, update the structures that use its size. */ void -xtermUpdateFontInfo(TScreen * screen, Bool doresize) +xtermUpdateFontInfo(XtermWidget xw, Bool doresize) { + TScreen *screen = &(xw->screen); + int scrollbar_width; struct _vtwin *win = &(screen->fullVwin); - scrollbar_width = (term->misc.scrollbar - ? screen->scrollWidget->core.width + - screen->scrollWidget->core.border_width + scrollbar_width = (xw->misc.scrollbar + ? (screen->scrollWidget->core.width + + BorderWidth(screen->scrollWidget)) : 0); - xtermComputeFontInfo(screen, win, screen->fnt_norm, scrollbar_width); - xtermSaveFontInfo(screen, screen->fnt_norm); + xtermComputeFontInfo(xw, win, screen->fnts[fNorm], scrollbar_width); + xtermSaveFontInfo(screen, screen->fnts[fNorm]); if (doresize) { if (VWindow(screen)) { XClearWindow(screen->display, VWindow(screen)); } - DoResizeScreen(term); /* set to the new natural size */ + TRACE(("xtermUpdateFontInfo {{\n")); + DoResizeScreen(xw); /* set to the new natural size */ if (screen->scrollWidget) - ResizeScrollBar(screen); + ResizeScrollBar(xw); Redraw(); + TRACE(("... }} xtermUpdateFontInfo\n")); +#ifdef SCROLLBAR_RIGHT + updateRightScrollbar(term); +#endif } xtermSetCursorBox(screen); } @@ -1341,7 +1607,7 @@ * Returns true if the given character is missing from the specified font. */ Bool -xtermMissingChar(unsigned ch, XFontStruct * font) +xtermMissingChar(XtermWidget xw, unsigned ch, XFontStruct * font) { if (font != 0 && font->per_char != 0 @@ -1373,7 +1639,7 @@ } } if (ch < 32 - && term->screen.force_box_chars) { + && xw->screen.force_box_chars) { TRACE(("xtermMissingChar %#04x (forced off)\n", ch)); return True; } @@ -1390,8 +1656,8 @@ #define MID_HIGH (BOX_HIGH/2) #define MID_WIDE (BOX_WIDE/2) -#define CHR_WIDE (9*BOX_WIDE)/10 -#define CHR_HIGH (9*BOX_HIGH)/10 +#define CHR_WIDE ((9*BOX_WIDE)/10) +#define CHR_HIGH ((9*BOX_HIGH)/10) /* * ...since we'll scale the values anyway. @@ -1406,26 +1672,49 @@ * line-drawing character). */ void -xtermDrawBoxChar(TScreen * screen, +xtermDrawBoxChar(XtermWidget xw, unsigned ch, unsigned flags, GC gc, int x, int y) { + TScreen *screen = &(xw->screen); /* *INDENT-OFF* */ - static const short diamond[] = - { - SEG( MID_WIDE, BOX_HIGH/4, 3*BOX_WIDE/4, MID_WIDE), - SEG(3*BOX_WIDE/4, MID_WIDE, MID_WIDE, 3*BOX_HIGH/4), - SEG( MID_WIDE, 3*BOX_HIGH/4, BOX_WIDE/4, MID_HIGH), - SEG( BOX_WIDE/4, MID_HIGH, MID_WIDE, BOX_HIGH/4), - SEG( MID_WIDE, BOX_HIGH/3, 2*BOX_WIDE/3, MID_WIDE), - SEG(2*BOX_WIDE/3, MID_WIDE, MID_WIDE, 2*BOX_HIGH/3), - SEG( MID_WIDE, 2*BOX_HIGH/3, BOX_WIDE/3, MID_HIGH), - SEG( BOX_WIDE/3, MID_HIGH, MID_WIDE, BOX_HIGH/3), - SEG( BOX_WIDE/4, MID_HIGH, 3*BOX_WIDE/4, MID_HIGH), - SEG( MID_WIDE, BOX_HIGH/4, MID_WIDE, 3*BOX_HIGH/4), + static const short glyph_ht[] = { + SEG( 0, 0, 0, 5*MID_HIGH/6), /* H */ + SEG(6*BOX_WIDE/10, 0, 6*BOX_WIDE/10,5*MID_HIGH/6), + SEG( 0, 5*MID_HIGH/12,6*BOX_WIDE/10,5*MID_HIGH/12), + SEG(2*BOX_WIDE/10, MID_HIGH, CHR_WIDE, MID_HIGH), /* T */ + SEG(6*BOX_WIDE/10, MID_HIGH, 6*BOX_WIDE/10, CHR_HIGH), + -1 + }, glyph_ff[] = { + SEG( 0, 0, 6*BOX_WIDE/10, 0), /* F */ + SEG( 0, 5*MID_HIGH/12,6*CHR_WIDE/12,5*MID_HIGH/12), + SEG( 0, 0, 0*BOX_WIDE/3, 5*MID_HIGH/6), + SEG(1*BOX_WIDE/3, MID_HIGH, CHR_WIDE, MID_HIGH), /* F */ + SEG(1*BOX_WIDE/3, 8*MID_HIGH/6,10*CHR_WIDE/12,8*MID_HIGH/6), + SEG(1*BOX_WIDE/3, MID_HIGH, 1*BOX_WIDE/3, CHR_HIGH), + -1 + }, glyph_lf[] = { + SEG( 0, 0, 0, 5*MID_HIGH/6), /* L */ + SEG( 0, 5*MID_HIGH/6, 6*BOX_WIDE/10,5*MID_HIGH/6), + SEG(1*BOX_WIDE/3, MID_HIGH, CHR_WIDE, MID_HIGH), /* F */ + SEG(1*BOX_WIDE/3, 8*MID_HIGH/6,10*CHR_WIDE/12,8*MID_HIGH/6), + SEG(1*BOX_WIDE/3, MID_HIGH, 1*BOX_WIDE/3, CHR_HIGH), + -1 + }, glyph_nl[] = { + SEG( 0, 5*MID_HIGH/6, 0, 0), /* N */ + SEG( 0, 0, 5*BOX_WIDE/6, 5*MID_HIGH/6), + SEG(5*BOX_WIDE/6, 5*MID_HIGH/6, 5*BOX_WIDE/6, 0), + SEG(1*BOX_WIDE/3, MID_HIGH, 1*BOX_WIDE/3, CHR_HIGH), /* L */ + SEG(1*BOX_WIDE/3, CHR_HIGH, CHR_WIDE, CHR_HIGH), + -1 + }, glyph_vt[] = { + SEG( 0, 0, 5*BOX_WIDE/12,5*MID_HIGH/6), /* V */ + SEG(5*BOX_WIDE/12,5*MID_HIGH/6, 5*BOX_WIDE/6, 0), + SEG(2*BOX_WIDE/10, MID_HIGH, CHR_WIDE, MID_HIGH), /* T */ + SEG(6*BOX_WIDE/10, MID_HIGH, 6*BOX_WIDE/10, CHR_HIGH), -1 }, plus_or_minus[] = { @@ -1433,13 +1722,6 @@ SEG( MID_WIDE, 2*BOX_HIGH/6, MID_WIDE, 4*BOX_HIGH/6), SEG( 0, 3*BOX_HIGH/6, CHR_WIDE, 3*BOX_HIGH/6), -1 - }, degrees[] = - { - SEG( MID_WIDE, BOX_HIGH/4, 2*BOX_WIDE/3, 3*BOX_HIGH/8), - SEG(2*BOX_WIDE/3, 3*BOX_HIGH/8, MID_WIDE, MID_HIGH), - SEG( MID_WIDE, MID_HIGH, BOX_WIDE/3, 3*BOX_HIGH/8), - SEG( BOX_WIDE/3, 3*BOX_HIGH/8, MID_WIDE, BOX_HIGH/4), - -1 }, lower_right_corner[] = { SEG( 0, MID_HIGH, MID_WIDE, MID_HIGH), @@ -1533,29 +1815,22 @@ SEG( 0, 2*BOX_HIGH/3, CHR_WIDE, 2*BOX_HIGH/3), SEG( 0, MID_HIGH, CHR_WIDE, MID_HIGH), -1 - }, bullet[] = - { - SEG( MID_WIDE, BOX_HIGH/4, 5*BOX_WIDE/8, BOX_HIGH/4), - SEG(5*BOX_WIDE/8, BOX_HIGH/4, 5*BOX_WIDE/8, BOX_HIGH/3), - SEG(5*BOX_WIDE/8, BOX_HIGH/3, MID_WIDE, BOX_HIGH/3), - SEG( MID_WIDE, BOX_HIGH/3, MID_WIDE, BOX_HIGH/4), - -1 }; /* *INDENT-ON* */ static const short *lines[] = { 0, /* 00 (unused) */ - diamond, /* 01 */ + 0, /* 01 diamond */ 0, /* 02 box */ - 0, /* 03 HT */ - 0, /* 04 FF */ + glyph_ht, /* 03 HT */ + glyph_ff, /* 04 FF */ 0, /* 05 CR */ - 0, /* 06 LF */ - degrees, /* 07 */ + glyph_lf, /* 06 LF */ + 0, /* 07 degrees (small circle) */ plus_or_minus, /* 08 */ - 0, /* 09 NL */ - 0, /* 0A VT */ + glyph_nl, /* 09 */ + glyph_vt, /* 0A */ lower_right_corner, /* 0B */ upper_right_corner, /* 0C */ upper_left_corner, /* 0D */ @@ -1576,7 +1851,7 @@ greek_pi, /* 1C */ not_equal_to, /* 1D */ 0, /* 1E LB */ - bullet, /* 1F */ + 0, /* 1F bullet */ }; XGCValues values; @@ -1593,16 +1868,16 @@ */ if (screen->utf8_mode #if OPT_RENDERFONT - && !UsingRenderFont() + && !UsingRenderFont(xw) #endif && (ch > 127) && (ch != UCS_REPL)) { unsigned n; for (n = 1; n < 32; n++) { if (dec2ucs(n) == ch - && !xtermMissingChar(n, (flags & BOLD) - ? screen->fnt_bold - : screen->fnt_norm)) { + && !xtermMissingChar(xw, n, (flags & BOLD) + ? screen->fnts[fBold] + : screen->fnts[fNorm])) { TRACE(("...use xterm-style linedrawing\n")); ch = n; break; @@ -1617,15 +1892,17 @@ ? "-BAD" : ""))); + memset(&values, 0, sizeof(values)); if (!XGetGCValues(screen->display, gc, GCBackground, &values)) return; mask = GCForeground; if (ch == 2) { - values.tile = XmuCreateStippledPixmap(XtScreen((Widget) term), - T_COLOR(screen, TEXT_FG), - T_COLOR(screen, TEXT_BG), - term->core.depth); + values.tile = + XmuCreateStippledPixmap(XtScreen((Widget) xw), + getXtermForeground(xw->flags, xw->cur_foreground), + getXtermBackground(xw->flags, xw->cur_background), + xw->core.depth); if (values.stipple != XtUnspecifiedPixmap) { mask |= GCBackground | GCTile | GCFillStyle; values.fill_style = FillTiled; @@ -1659,8 +1936,66 @@ CapProjecting, JoinMiter); - if (ch == 2) { - XmuReleaseStippledPixmap(XtScreen((Widget) term), values.tile); + if (ch == 1) { /* diamond */ + XPoint points[5]; + int npoints = 5, n; + + points[0].x = MID_WIDE; + points[0].y = BOX_HIGH / 4; + + points[1].x = 3 * BOX_WIDE / 4; + points[1].y = MID_HIGH; + + points[2].x = points[0].x; + points[2].y = 3 * BOX_HIGH / 4; + + points[3].x = BOX_WIDE / 4; + points[3].y = points[1].y; + + points[4].x = points[0].x; + points[4].y = points[0].y; + + for (n = 0; n < npoints; ++n) { + SCALE_X(points[n].x); + SCALE_Y(points[n].y); + points[n].x += x; + points[n].y += y; + } + + XFillPolygon(screen->display, + VWindow(screen), gc2, + points, npoints, + Convex, CoordModeOrigin); + } else if (ch == 2) { /* box */ + XmuReleaseStippledPixmap(XtScreen((Widget) xw), values.tile); + } else if (ch == 7) { /* degrees */ + unsigned width = (BOX_WIDE / 3); + int x_coord = MID_WIDE - (width / 2); + int y_coord = MID_HIGH - width; + + SCALE_X(x_coord); + SCALE_Y(y_coord); + SCALE_X(width); + + XDrawArc(screen->display, + VWindow(screen), gc2, + x + x_coord, y + y_coord, width, width, + 0, + 360 * 64); + } else if (ch == 0x1f) { /* bullet */ + unsigned width = 7 * BOX_WIDE / 10; + int x_coord = MID_WIDE - (width / 3); + int y_coord = MID_HIGH - (width / 3); + + SCALE_X(x_coord); + SCALE_Y(y_coord); + SCALE_X(width); + + XFillArc(screen->display, + VWindow(screen), gc2, + x + x_coord, y + y_coord, width, width, + 0, + 360 * 64); } else if (ch < (sizeof(lines) / sizeof(lines[0])) && (p = lines[ch]) != 0) { int coord[4]; @@ -1697,14 +2032,17 @@ * see xc/lib/Xft/xftglyphs.c */ Bool -xtermXftMissing(XftFont * font, unsigned wc) +xtermXftMissing(XtermWidget xw, XftFont * font, unsigned wc) { - unsigned check = XftCharIndex(term->screen.display, font, wc); Bool result = False; - if (check == 0) { - TRACE(("missingXft %d (%d)\n", wc, ucs2dec(wc))); - result = True; + if (font != 0) { + unsigned check = XftCharIndex(xw->screen.display, font, wc); + + if (check == 0) { + TRACE(("missingXft %d (%d)\n", wc, ucs2dec(wc))); + result = True; + } } return result; } @@ -1847,17 +2185,7 @@ static XFontStruct * xtermFindFont(TScreen * screen, int fontnum) { - XFontStruct *nfs = 0; - char *name; - - if ((name = screen->menu_font_names[fontnum]) != 0 - && (nfs = XLoadQueryFont(screen->display, name)) != 0) { - if (EmptyFont(nfs)) { - XFreeFont(screen->display, nfs); - nfs = 0; - } - } - return nfs; + return xtermOpenFont(screen, screen->MenuFontName(fontnum)); } static void @@ -1870,7 +2198,7 @@ screen->menu_font_sizes[fontnum] = FontSize(fs); TRACE(("menu_font_sizes[%d] = %ld\n", fontnum, screen->menu_font_sizes[fontnum])); - XFreeFont(screen->display, fs); + xtermCloseFont(screen, fs); } } } @@ -1897,31 +2225,33 @@ { int n, m = -1; - lookupFontSizes(screen); - if (relative != 0) { - for (n = 0; n < NMENUFONTS; ++n) { - if (screen->menu_font_sizes[n] > 0 && - screen->menu_font_sizes[n] != screen->menu_font_sizes[old]) { - int cmp_0 = ((screen->menu_font_sizes[n] > - screen->menu_font_sizes[old]) - ? relative - : -relative); - int cmp_m = ((m < 0) - ? 1 - : ((screen->menu_font_sizes[n] < - screen->menu_font_sizes[m]) - ? relative - : -relative)); - if (cmp_0 > 0 && cmp_m > 0) { - m = n; + if (!IsIcon(screen)) { + lookupFontSizes(screen); + if (relative != 0) { + for (n = 0; n < NMENUFONTS; ++n) { + if (screen->menu_font_sizes[n] > 0 && + screen->menu_font_sizes[n] != screen->menu_font_sizes[old]) { + int cmp_0 = ((screen->menu_font_sizes[n] > + screen->menu_font_sizes[old]) + ? relative + : -relative); + int cmp_m = ((m < 0) + ? 1 + : ((screen->menu_font_sizes[n] < + screen->menu_font_sizes[m]) + ? relative + : -relative)); + if (cmp_0 > 0 && cmp_m > 0) { + m = n; + } } } - } - if (m >= 0) { - if (relative > 1) - m = lookupRelativeFontSize(screen, m, relative - 1); - else if (relative < -1) - m = lookupRelativeFontSize(screen, m, relative + 1); + if (m >= 0) { + if (relative > 1) + m = lookupRelativeFontSize(screen, m, relative - 1); + else if (relative < -1) + m = lookupRelativeFontSize(screen, m, relative + 1); + } } } return m; @@ -1940,7 +2270,7 @@ m = lookupRelativeFontSize(screen, screen->menu_font_number, 1); if (m >= 0) { - SetVTFont(m, True, NULL); + SetVTFont(term, m, True, NULL); } else { Bell(XkbBI_MinorError, 0); } @@ -1960,7 +2290,7 @@ m = lookupRelativeFontSize(screen, screen->menu_font_number, -1); if (m >= 0) { - SetVTFont(m, True, NULL); + SetVTFont(term, m, True, NULL); } else { Bell(XkbBI_MinorError, 0); } @@ -2049,38 +2379,51 @@ } } - SetVTFont(fontnum, True, &fonts); + SetVTFont(term, fontnum, True, &fonts); } void -SetVTFont(int i, +SetVTFont(XtermWidget xw, + int which, Bool doresize, const VTFontNames * fonts) { - TScreen *screen = &term->screen; + TScreen *screen = &xw->screen; - TRACE(("SetVTFont(i=%d, f_n=%s, f_b=%s)\n", i, + TRACE(("SetVTFont(which=%d, f_n=%s, f_b=%s)\n", which, (fonts && fonts->f_n) ? fonts->f_n : "", (fonts && fonts->f_b) ? fonts->f_b : "")); - if (i >= 0 && i < NMENUFONTS) { + if (IsIcon(screen)) { + Bell(XkbBI_MinorError, 0); + } else if (which >= 0 && which < NMENUFONTS) { VTFontNames myfonts; memset(&myfonts, 0, sizeof(myfonts)); if (fonts != 0) myfonts = *fonts; - if (i == fontMenu_fontsel) { /* go get the selection */ + if (which == fontMenu_fontsel) { /* go get the selection */ FindFontSelection(myfonts.f_n, False); return; } else { - if (myfonts.f_n == 0) - myfonts.f_n = screen->menu_font_names[i]; - if (myfonts.f_b == 0) - myfonts.f_b = screen->bold_font_names[i]; - if (xtermLoadFont(screen, +#define USE_CACHED(field, name) \ + if (myfonts.field == 0) { \ + myfonts.field = screen->menu_font_names[which][name]; \ + TRACE(("set myfonts." #field " from menu_font_names[%d][" #name "] %s\n", \ + which, NonNull(myfonts.field))); \ + } else { \ + TRACE(("set myfonts." #field " reused\n")); \ + } + USE_CACHED(f_n, fNorm); + USE_CACHED(f_b, fBold); +#if OPT_WIDE_CHARS + USE_CACHED(f_w, fWide); + USE_CACHED(f_wb, fWBold); +#endif + if (xtermLoadFont(xw, &myfonts, - doresize, i)) { + doresize, which)) { return; } } Index: xc/programs/xterm/fontutils.h diff -u xc/programs/xterm/fontutils.h:1.14 xc/programs/xterm/fontutils.h:1.17 --- xc/programs/xterm/fontutils.h:1.14 Thu Jan 13 20:50:02 2005 +++ xc/programs/xterm/fontutils.h Sun Feb 12 20:14:59 2006 @@ -1,10 +1,12 @@ +/* $XTermId: fontutils.h,v 1.56 2006/02/12 16:36:56 tom Exp $ */ + /* - * $XFree86: xc/programs/xterm/fontutils.h,v 1.14 2005/01/14 01:50:02 dickey Exp $ + * $XFree86: xc/programs/xterm/fontutils.h,v 1.17 2006/02/13 01:14:59 dickey Exp $ */ /************************************************************ -Copyright 1998-2004,2005 by Thomas E. Dickey +Copyright 1998-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -39,25 +41,29 @@ #include -extern const VTFontNames * xtermFontName(char *normal); -extern int lookupRelativeFontSize(TScreen * screen, int old, int relative); -extern int xtermLoadFont (TScreen *screen, - const VTFontNames *fonts, - Bool doresize, int fontnum); +extern Bool xtermLoadDefaultFonts (XtermWidget /* w */); +extern XFontStruct * xtermOpenFont (TScreen * /* screen */, char */* name */); +extern XFontStruct * xtermCloseFont(TScreen * /* screen */, XFontStruct * /* fnt */); +extern const VTFontNames * xtermFontName (char */* normal */); +extern int lookupRelativeFontSize (TScreen * /* screen */, int /* old */, int /* relative */); +extern int xtermLoadFont (XtermWidget /* xw */, + const VTFontNames */* fonts */, + Bool /* doresize */, int /* fontnum */); extern void HandleSetFont PROTO_XT_ACTIONS_ARGS; -extern void SetVTFont (int i, Bool doresize, const VTFontNames *fonts); -extern void xtermComputeFontInfo (TScreen *screen, struct _vtwin *win, XFontStruct *font, int sbwidth); -extern void xtermSaveFontInfo (TScreen *screen, XFontStruct *font); -extern void xtermSetCursorBox (TScreen *screen); -extern void xtermUpdateFontInfo (TScreen *screen, Bool doresize); +extern void SetVTFont (XtermWidget /* xw */, int /* i */, Bool /* doresize */, const VTFontNames */* fonts */); +extern void xtermCloseFonts(TScreen * /* screen */, XFontStruct ** /* fnts[fMAX] */); +extern void xtermComputeFontInfo (XtermWidget /* xw */, struct _vtwin */* win */, XFontStruct */* font */, int /* sbwidth */); +extern void xtermSaveFontInfo (TScreen */* screen */, XFontStruct */* font */); +extern void xtermSetCursorBox (TScreen */* screen */); +extern void xtermUpdateFontInfo (XtermWidget /* xw */, Bool /* doresize */); #if OPT_DEC_CHRSET -extern char *xtermSpecialFont(unsigned atts, unsigned chrset); +extern char *xtermSpecialFont (TScreen */* screen */, unsigned /* atts */, unsigned /* chrset */); #endif #if OPT_BOX_CHARS -extern Bool xtermMissingChar(unsigned ch, XFontStruct *font); -extern void xtermDrawBoxChar(TScreen *screen, unsigned ch, unsigned flags, GC gc, int x, int y); +extern Bool xtermMissingChar (XtermWidget /* xw */, unsigned /* ch */, XFontStruct */* font */); +extern void xtermDrawBoxChar (XtermWidget /* xw */, unsigned /* ch */, unsigned /* flags */, GC /* gc */, int /* x */, int /* y */); #endif #if OPT_LOAD_VTFONTS @@ -65,14 +71,14 @@ #endif #if OPT_LOAD_VTFONTS || OPT_WIDE_CHARS -extern Bool xtermLoadVTFonts(XtermWidget w, char *aName, char *cName); +extern Bool xtermLoadWideFonts (XtermWidget /* w */, Bool /* nullOk */); #endif -#define xtermIsDecGraphic(ch) ((ch) > 0 && (ch) < 32) +#define xtermIsDecGraphic(ch) ((ch) > 0 && (ch) < 32) #if OPT_RENDERFONT && OPT_WIDE_CHARS -extern Bool xtermIsLineDrawing(unsigned /* wc */); -extern Bool xtermXftMissing(XftFont * /* font */, unsigned /* wc */); +extern Bool xtermIsLineDrawing (unsigned /* wc */); +extern Bool xtermXftMissing (XtermWidget /* xw */, XftFont * /* font */, unsigned /* wc */); #endif #if OPT_SHIFT_FONTS @@ -81,8 +87,8 @@ #endif #if OPT_WIDE_CHARS -extern unsigned ucs2dec(unsigned); -extern unsigned dec2ucs(unsigned); +extern unsigned ucs2dec (unsigned); +extern unsigned dec2ucs (unsigned); #endif #endif /* included_fontutils_h */ Index: xc/programs/xterm/gen-pc-fkeys.pl diff -u xc/programs/xterm/gen-pc-fkeys.pl:1.1 xc/programs/xterm/gen-pc-fkeys.pl:1.2 --- xc/programs/xterm/gen-pc-fkeys.pl:1.1 Tue Jul 27 20:53:26 2004 +++ xc/programs/xterm/gen-pc-fkeys.pl Mon Mar 28 23:00:32 2005 @@ -1,6 +1,7 @@ #! /usr/bin/perl -w # Author: Thomas E. Dickey # $XTermId: gen-pc-fkeys.pl,v 1.4 2004/07/28 00:19:42 tom Exp $ +# $XFree86: xc/programs/xterm/gen-pc-fkeys.pl,v 1.2 2005/03/29 04:00:32 tsi Exp $ # # Construct a list of function-key definitions corresponding to xterm's # Sun/PC keyboard. This uses infocmp to obtain the strings to modify (and Index: xc/programs/xterm/input.c diff -u xc/programs/xterm/input.c:3.72 xc/programs/xterm/input.c:3.75 --- xc/programs/xterm/input.c:3.72 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/input.c Sun Feb 12 20:14:59 2006 @@ -1,13 +1,9 @@ -/* $XTermId: input.c,v 1.169 2005/01/10 00:36:38 tom Exp $ */ +/* $XTermId: input.c,v 1.175 2006/02/12 22:45:50 tom Exp $ */ -/* - * $Xorg: input.c,v 1.3 2000/08/17 19:55:08 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/input.c,v 3.72 2005/01/14 01:50:03 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/input.c,v 3.75 2006/02/13 01:14:59 dickey Exp $ */ /* - * Copyright 1999-2004,2005 by Thomas E. Dickey + * Copyright 1999-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -1144,7 +1140,7 @@ * Returns the (shift, control) state in *state. */ int -xtermcapKeycode(char *params, unsigned *state) +xtermcapKeycode(char **params, unsigned *state) { /* *INDENT-OFF* */ #define DATA(tc,ti,x,y) { tc, ti, x, y } @@ -1229,25 +1225,31 @@ unsigned len = 0; int code = -1; #define MAX_TNAME_LEN 6 - char name[MAX_TNAME_LEN]; + char name[MAX_TNAME_LEN + 1]; char *p; + TRACE(("xtermcapKeycode(%s)\n", *params)); + /* Convert hex encoded name to ascii */ - for (p = params; hex2int(p[0]) >= 0 && hex2int(p[1]) >= 0; p += 2) { - if (len == MAX_TNAME_LEN - 1) - return -1; + for (p = *params; hex2int(p[0]) >= 0 && hex2int(p[1]) >= 0; p += 2) { + if (len >= MAX_TNAME_LEN) + break; name[len++] = (hex2int(p[0]) << 4) + hex2int(p[1]); } - if (*p) - return -1; name[len] = 0; - for (n = 0; n < XtNumber(table); n++) { - if (!strcmp(table[n].ti, name) || !strcmp(table[n].tc, name)) { - code = table[n].code; - *state = table[n].state; - break; + *params = p; + + if (*p == 0 || *p == ';') { + for (n = 0; n < XtNumber(table); n++) { + if (!strcmp(table[n].ti, name) || !strcmp(table[n].tc, name)) { + code = table[n].code; + *state = table[n].state; + break; + } } } + + TRACE(("... xtermcapKeycode(%s, %u) -> %#06x\n", name, *state, code)); return code; } #endif Index: xc/programs/xterm/install.sh diff -u xc/programs/xterm/install.sh:3.6 xc/programs/xterm/install.sh:3.7 --- xc/programs/xterm/install.sh:3.6 Sun Dec 8 17:31:49 2002 +++ xc/programs/xterm/install.sh Sun Sep 18 19:48:12 2005 @@ -1,19 +1,37 @@ #! /bin/sh # # install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). # -# Copyright 1991 by the Massachusetts Institute of Technology +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. # -# 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, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. +# Copyright (C) 1994 X Consortium +# +# 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 +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent # `make' implicit rules from creating a file called install from it @@ -56,7 +74,7 @@ while [ x"$1" != x ]; do case $1 in - -c) instcmd="$cpprog" + -c) instcmd=$cpprog shift continue;; @@ -79,7 +97,7 @@ shift continue;; - -s) stripcmd="$stripprog" + -s) stripcmd=$stripprog shift continue;; @@ -106,7 +124,7 @@ if [ x"$src" = x ] then - echo "install: no input file specified" + echo "$0: no input file specified" >&2 exit 1 else : @@ -116,7 +134,7 @@ dst=$src src="" - if [ -d $dst ]; then + if [ -d "$dst" ]; then instcmd=: chmodcmd="" else @@ -128,17 +146,17 @@ # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. - if [ -f $src -o -d $src ] + if [ -f "$src" ] || [ -d "$src" ] then : else - echo "install: $src does not exist" + echo "$0: $src does not exist" >&2 exit 1 fi if [ x"$dst" = x ] then - echo "install: no destination specified" + echo "$0: no destination specified" >&2 exit 1 else : @@ -147,16 +165,16 @@ # If destination is a directory, append the input filename; if your system # does not like double slashes in filenames, you may need to add some logic - if [ -d $dst ] + if [ -d "$dst" ] then - dst="$dst"/`basename $src` + dst=$dst/`basename "$src"` else : fi fi ## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. # this part is taken from Noah Friedman's mkinstalldirs script @@ -165,48 +183,48 @@ if [ ! -d "$dstdir" ]; then defaultIFS=' ' -IFS="${IFS-${defaultIFS}}" +IFS="${IFS-$defaultIFS}" -oIFS="${IFS}" +oIFS=$IFS # Some sh's can't handle IFS=/ for some reason. IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" +set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` +IFS=$oIFS pathcomp='' while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" + pathcomp=$pathcomp$1 shift - if [ ! -d "${pathcomp}" ] ; + if [ ! -d "$pathcomp" ] ; then - $mkdirprog "${pathcomp}" + $mkdirprog "$pathcomp" else : fi - pathcomp="${pathcomp}/" + pathcomp=$pathcomp/ done fi if [ x"$dir_arg" != x ] then - $doit $instcmd $dst && + $doit $instcmd "$dst" && - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi + if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi else # If we're going to rename the final executable, determine the name now. if [ x"$transformarg" = x ] then - dstfile=`basename $dst` + dstfile=`basename "$dst"` else - dstfile=`basename $dst $transformbasename | + dstfile=`basename "$dst" $transformbasename | sed $transformarg`$transformbasename fi @@ -214,20 +232,24 @@ if [ x"$dstfile" = x ] then - dstfile=`basename $dst` + dstfile=`basename "$dst"` else : fi -# Make a temp file name in the proper directory. +# Make a couple of temp file names in the proper directory. dsttmp=$dstdir/#inst.$$# + rmtmp=$dstdir/#rm.$$# -# Move or copy the file name to the temp name +# Trap to clean up temp files at exit. - $doit $instcmd $src $dsttmp && + trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 + trap '(exit $?); exit' 1 2 13 15 - trap "rm -f ${dsttmp}" 0 && +# Move or copy the file name to the temp name + + $doit $instcmd "$src" "$dsttmp" && # and set any options; do chmod last to preserve setuid bits @@ -235,17 +257,38 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && + if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && + +# Now remove or move aside any old file at destination location. We try this +# two ways since rm can't unlink itself on some systems and the destination +# file might be busy for other reasons. In this case, the final cleanup +# might fail but the new file should still install successfully. + +{ + if [ -f "$dstdir/$dstfile" ] + then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || + $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || + { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit + } + else + : + fi +} && # Now rename the file to the real destination. - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" fi && +# The final little trick to "correctly" pass the exit status to the exit trap. -exit 0 +{ + (exit 0); exit +} Index: xc/programs/xterm/main.c diff -u xc/programs/xterm/main.c:3.191 xc/programs/xterm/main.c:3.210 --- xc/programs/xterm/main.c:3.191 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/main.c Sun Apr 9 20:34:36 2006 @@ -1,8 +1,4 @@ -/* $XTermId: main.c,v 1.430 2005/02/06 16:29:47 tom Exp $ */ - -#if !defined(lint) && 0 -static char *rid = "$Xorg: main.c,v 1.7 2001/02/09 02:06:02 xorgcvs Exp $"; -#endif /* lint */ +/* $XTermId: main.c,v 1.496 2006/04/02 21:35:06 tom Exp $ */ /* * W A R N I N G @@ -19,7 +15,7 @@ /*********************************************************** -Copyright 2002-2004,2005 by Thomas E. Dickey +Copyright 2002-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -91,7 +87,7 @@ ******************************************************************/ -/* $XFree86: xc/programs/xterm/main.c,v 3.191 2005/02/06 21:42:38 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/main.c,v 3.210 2006/04/10 00:34:36 dickey Exp $ */ /* main.c */ @@ -128,7 +124,6 @@ #if OPT_WIDE_CHARS #include -#include #endif #ifdef __osf__ @@ -176,7 +171,6 @@ #endif #ifdef __CYGWIN__ -#define LASTLOG #define WTMP #endif @@ -192,7 +186,7 @@ #define HAS_BSD_GROUPS #endif -#ifdef USE_TTY_GROUP +#if defined(USE_TTY_GROUP) || defined(USE_UTMP_SETGID) #include #endif @@ -224,7 +218,7 @@ #define USE_SYSV_SIGNALS #define USE_SYSV_PGRP -#if !defined(TIOCSWINSZ) +#if !defined(TIOCSWINSZ) || defined(__SCO__) || defined(__UNIXWARE__) #define USE_SYSV_ENVVARS /* COLUMNS/LINES vs. TERMCAP */ #endif @@ -283,7 +277,7 @@ #else -#ifdef __INTERIX +#if defined(__INTERIX) || defined(__APPLE__) #define setpgrp setpgid #endif @@ -348,36 +342,55 @@ #endif #if defined(USE_UTEMPTER) - #include +#endif -#elif defined(UTMPX_FOR_UTMP) +#if defined(UTMPX_FOR_UTMP) #include -#define setutent setutxent -#define getutid getutxid -#define endutent endutxent -#define pututline pututxline + +#define call_endutent endutxent +#define call_getutid getutxid +#define call_pututline pututxline +#define call_setutent setutxent +#define call_updwtmp updwtmpx #elif defined(HAVE_UTMP) #include + #if defined(_CRAY) && (OSMAJORVERSION < 8) extern struct utmp *getutid __((struct utmp * _Id)); #endif +#define call_endutent endutent +#define call_getutid getutid +#define call_pututline pututline +#define call_setutent setutent +#define call_updwtmp updwtmp + #endif #if defined(USE_LASTLOG) && defined(HAVE_LASTLOG_H) -#include +#include /* caution: glibc includes utmp.h here */ +#endif + +#ifndef USE_LASTLOGX +#if defined(_NETBSD_SOURCE) && defined(_PATH_LASTLOGX) +#define USE_LASTLOGX 1 +#endif #endif #ifdef PUCC_PTYD #include #endif /* PUCC_PTYD */ -#ifdef __OpenBSD__ -#include +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#include /* openpty() */ +#endif + +#ifdef __FreeBSD__ +#include /* openpty() */ #endif #if !defined(UTMP_FILENAME) @@ -420,6 +433,11 @@ #include #endif +#if defined(__SCO__) || defined(__UNIXWARE__) +#undef ECHOKE +#undef ECHOCTL +#endif + #ifdef X_NOT_POSIX extern long lseek(); #if defined(USG) || defined(SVR4) @@ -430,7 +448,7 @@ extern char *ttyname(); #endif -#ifdef SYSV +#if defined(SYSV) && defined(DECL_PTSNAME) extern char *ptsname(int); #endif @@ -460,14 +478,17 @@ static Bool added_utmp_entry = False; -#ifdef __OpenBSD__ -static gid_t utmpGid = -1; +#if defined(USE_UTMP_SETGID) +static int utmpGid = -1; +static int really_get_pty(int *pty, char *from); #endif #if defined(USE_SYSV_UTMP) && !defined(USE_UTEMPTER) static Bool xterm_exiting = False; #endif +static char *explicit_shname = NULL; + /* ** Ordinarily it should be okay to omit the assignment in the following ** statement. Apparently the c89 compiler on AIX 4.1.3 has a bug, or does @@ -546,24 +567,23 @@ #define CWERASE CONTROL('W') #endif -#ifndef VMS #ifdef USE_ANY_SYSV_TERMIO +#define TERMIO_STRUCT struct termio +#define ttySetAttr(fd, datap) ioctl(fd, TCSETA, datap) +#define ttyGetAttr(fd, datap) ioctl(fd, TCGETA, datap) +#elif defined(USE_POSIX_TERMIOS) +#define TERMIO_STRUCT struct termios +#define ttySetAttr(fd, datap) tcsetattr(fd, TCSANOW, datap) +#define ttyGetAttr(fd, datap) tcgetattr(fd, datap) +#endif /* USE_ANY_SYSV_TERMIO */ + +#ifndef VMS +#ifdef TERMIO_STRUCT /* The following structures are initialized in main() in order ** to eliminate any assumptions about the internal order of their ** contents. */ -static struct termio d_tio; - -#ifdef HAS_LTCHARS -static struct ltchars d_ltc; -#endif /* HAS_LTCHARS */ - -#ifdef TIOCLSET -static unsigned int d_lmode; -#endif /* TIOCLSET */ - -#elif defined(USE_POSIX_TERMIOS) -static struct termios d_tio; +static TERMIO_STRUCT d_tio; #ifdef HAS_LTCHARS static struct ltchars d_ltc; @@ -573,7 +593,7 @@ static unsigned int d_lmode; #endif /* TIOCLSET */ -#else /* !USE_ANY_SYSV_TERMIO && !USE_POSIX_TERMIOS */ +#else /* !TERMIO_STRUCT */ static struct sgttyb d_sg = { 0, 0, 0177, CKILL, (EVENP | ODDP | ECHO | XTABS | CRMOD) @@ -597,7 +617,7 @@ 'J', 'B' }; #endif /* sony */ -#endif /* USE_ANY_SYSV_TERMIO */ +#endif /* TERMIO_STRUCT */ #endif /* ! VMS */ /* @@ -670,8 +690,10 @@ #endif /* USE_SYSV_UTMP */ #ifndef USE_UTEMPTER -#ifdef USE_LASTLOG +#if defined(USE_LASTLOG) && defined(USE_STRUCT_LASTLOG) static char etc_lastlog[] = LASTLOG_FILENAME; +#else +#undef USE_LASTLOG #endif #ifdef WTMP @@ -691,7 +713,6 @@ static char bin_login[] = LOGIN_FILENAME; #endif -static int inhibit; static char passedPty[PTYCHARLEN + 1]; /* name if pty if slave */ #if defined(TIOCCONS) || defined(SRIOCSREDIR) @@ -737,6 +758,9 @@ Bres("utmpInhibit", "UtmpInhibit", utmpInhibit, False), Bres("utmpDisplayId", "UtmpDisplayId", utmpDisplayId, True), Bres("messages", "Messages", messages, True), + Ires("minBufSize", "MinBufSize", minBufSize, 4096), + Ires("maxBufSize", "MaxBufSize", maxBufSize, 32768), + Sres("keyboardType", "KeyboardType", keyboardType, "unknown"), Bres("sunFunctionKeys", "SunFunctionKeys", sunFunctionKeys, False), #if OPT_SUNPC_KBD Bres("sunKeyboard", "SunKeyboard", sunKeyboard, False), @@ -765,6 +789,9 @@ #if OPT_SESSION_MGT Bres("sessionMgt", "SessionMgt", sessionMgt, True), #endif +#if OPT_TOOLBAR + Bres(XtNtoolBar, XtCToolBar, toolBar, True), +#endif }; static char *fallback_resources[] = @@ -855,6 +882,8 @@ {"-k8", "*allowC1Printable", XrmoptionNoArg, (caddr_t) "on"}, {"+k8", "*allowC1Printable", XrmoptionNoArg, (caddr_t) "off"}, #endif +{"-kt", "*keyboardType", XrmoptionSepArg, (caddr_t) NULL}, +{"+kt", "*keyboardType", XrmoptionSepArg, (caddr_t) NULL}, /* parse logging options anyway for compatibility */ {"-l", "*logging", XrmoptionNoArg, (caddr_t) "on"}, {"+l", "*logging", XrmoptionNoArg, (caddr_t) "off"}, @@ -914,6 +943,8 @@ #endif {"-ulc", "*colorULMode", XrmoptionNoArg, (caddr_t) "off"}, {"+ulc", "*colorULMode", XrmoptionNoArg, (caddr_t) "on"}, +{"-ulit", "*italicULMode", XrmoptionNoArg, (caddr_t) "off"}, +{"+ulit", "*italicULMode", XrmoptionNoArg, (caddr_t) "on"}, {"-ut", "*utmpInhibit", XrmoptionNoArg, (caddr_t) "on"}, {"+ut", "*utmpInhibit", XrmoptionNoArg, (caddr_t) "off"}, {"-im", "*useInsertMode", XrmoptionNoArg, (caddr_t) "on"}, @@ -925,13 +956,15 @@ #if OPT_WIDE_CHARS {"-wc", "*wideChars", XrmoptionNoArg, (caddr_t) "on"}, {"+wc", "*wideChars", XrmoptionNoArg, (caddr_t) "off"}, +{"-mk_width", "*mkWidth", XrmoptionNoArg, (caddr_t) "on"}, +{"+mk_width", "*mkWidth", XrmoptionNoArg, (caddr_t) "off"}, {"-cjk_width", "*cjkWidth", XrmoptionNoArg, (caddr_t) "on"}, {"+cjk_width", "*cjkWidth", XrmoptionNoArg, (caddr_t) "off"}, #endif {"-wf", "*waitForMap", XrmoptionNoArg, (caddr_t) "on"}, {"+wf", "*waitForMap", XrmoptionNoArg, (caddr_t) "off"}, #if OPT_ZICONBEEP -{"-ziconbeep", "*zIconBeep", XrmoptionSepArg, (caddr_t) NULL}, +{"-ziconbeep", "*zIconBeep", XrmoptionSepArg, (caddr_t) NULL}, #endif #if OPT_SAME_NAME {"-samename", "*sameName", XrmoptionNoArg, (caddr_t) "on"}, @@ -941,6 +974,10 @@ {"-sm", "*sessionMgt", XrmoptionNoArg, (caddr_t) "on"}, {"+sm", "*sessionMgt", XrmoptionNoArg, (caddr_t) "off"}, #endif +#if OPT_TOOLBAR +{"-tb", "*"XtNtoolBar, XrmoptionNoArg, (caddr_t) "on"}, +{"+tb", "*"XtNtoolBar, XrmoptionNoArg, (caddr_t) "off"}, +#endif /* options that we process ourselves */ {"-help", NULL, XrmoptionSkipNArgs, (caddr_t) NULL}, {"-version", NULL, XrmoptionSkipNArgs, (caddr_t) NULL}, @@ -1024,6 +1061,7 @@ #if OPT_C1_PRINT { "-/+k8", "turn on/off C1-printable classification"}, #endif +{ "-kt keyboardtype", "set keyboard type:" KEYBOARD_TYPES }, #ifdef ALLOWLOGGING { "-/+l", "turn on/off logging" }, { "-lf filename", "logging filename" }, @@ -1058,6 +1096,9 @@ #if OPT_TEK4014 { "-/+t", "turn on/off Tek emulation window" }, #endif +#if OPT_TOOLBAR +{ "-/+tb", "turn on/off toolbar" }, +#endif { "-ti termid", "terminal identifier" }, { "-tm string", "terminal mode keywords and characters" }, { "-tn name", "TERM environment variable name" }, @@ -1069,6 +1110,7 @@ { "-lcc path", "filename of locale converter (" DEFLOCALEFILTER ")" }, #endif { "-/+ulc", "turn off/on display of underline as color" }, +{ "-/+ulit", "turn off/on display of underline as italics" }, #ifdef HAVE_UTMP { "-/+ut", "turn on/off utmp support" }, #else @@ -1078,6 +1120,7 @@ { "-/+pob", "turn on/off pop on bell" }, #if OPT_WIDE_CHARS { "-/+wc", "turn on/off wide-character mode" }, +{ "-/+mk_width", "turn on/off simple width convention" }, { "-/+cjk_width", "turn on/off legacy CJK width convention" }, #endif { "-/+wf", "turn on/off wait for map before command exec" }, @@ -1303,10 +1346,6 @@ } #endif /* OPT_SESSION_MGT */ -#if OPT_WIDE_CHARS -int (*my_wcwidth) (wchar_t); -#endif - /* * DeleteWindow(): Action proc to implement ICCCM delete_window. */ @@ -1429,7 +1468,7 @@ Bool code = False; if (leaf != option) { - if (leaf - option > 1 + if (leaf - option > 0 && isdigit(CharOf(*leaf)) && sscanf(leaf, "%d", &am_slave) == 1) { size_t len = leaf - option - 1; @@ -1452,7 +1491,7 @@ return code; } -#ifdef USE_SYSV_UTMP +#if defined(USE_SYSV_UTMP) && !defined(USE_UTEMPTER) /* * From "man utmp": * xterm and other terminal emulators directly create a USER_PROCESS record @@ -1468,22 +1507,51 @@ static char * my_utmp_id(char *device) { - static char result[PTYCHARLEN + 4]; + typedef struct UTMP_STR UTMP_STRUCT; +#define UTIDSIZE (sizeof(((UTMP_STRUCT *)NULL)->ut_id)) + static char result[UTIDSIZE + 1]; + +#if defined(__SCO__) || defined(__UNIXWARE__) + /* + * Legend does not support old-style pty's, has no related compatibility + * issues, and can use the available space in ut_id differently from the + * default convention. + * + * This scheme is intended to avoid conflicts both with other users of + * utmpx as well as between multiple xterms. First, Legend uses all of the + * characters of ut_id, and adds no terminating NUL is required (the + * default scheme may add a trailing NUL). Second, all xterm entries will + * start with the letter 'x' followed by three digits, which will be the + * last three digits of the device name, regardless of the format of the + * device name, with leading 0's added where necessary. For instance, an + * xterm on /dev/pts/3 will have a ut_id of x003; an xterm on /dev/pts123 + * will have a ut_id of x123. Under the other convention, /dev/pts/3 would + * have a ut_id of p3 and /dev/pts123 would have a ut_id of p123. + */ + int len, n; + + len = strlen(device); + n = UTIDSIZE; + result[n] = '\0'; + while ((n > 0) && (len > 0) && isdigit(device[len - 1])) + result[--n] = device[--len]; + while (n > 0) + result[--n] = '0'; + result[0] = 'x'; +#else char *name = my_pty_name(device); char *leaf = x_basename(name); + size_t len = strlen(leaf); + + if ((UTIDSIZE - 1) < len) + leaf = leaf + (len - (UTIDSIZE - 1)); + sprintf(result, "p%s", leaf); +#endif - if (name == leaf) { /* no '/' in the name */ - int len = strlen(leaf); - if (PTYCHARLEN < len) - leaf = leaf + (len - PTYCHARLEN); - strcpy(result, leaf); - } else { - sprintf(result, "p%s", leaf); - } TRACE(("my_utmp_id (%s) -> '%s'\n", device, result)); return result; } -#endif +#endif /* USE_SYSV_UTMP */ #ifdef USE_POSIX_SIGNALS @@ -1515,6 +1583,7 @@ main(int argc, char *argv[]ENVP_ARG) { Widget form_top, menu_top; + Dimension menu_high; TScreen *screen; int mode; char *my_class = DEFCLASS; @@ -1546,11 +1615,12 @@ strcpy(ptydev, PTYDEV); #endif -#ifdef __OpenBSD__ +#if defined(USE_UTMP_SETGID) get_pty(NULL, NULL); seteuid(getuid()); setuid(getuid()); -#endif /* __OpenBSD__ */ +#define get_pty(pty, from) really_get_pty(pty, from) +#endif /* Do these first, since we may not be able to open the display */ TRACE_OPTS(xtermOptions, optionDescList, XtNumber(optionDescList)); @@ -1587,7 +1657,7 @@ XtSetLanguageProc(NULL, NULL, NULL); #endif -#if defined(USE_ANY_SYSV_TERMIO) || defined(USE_POSIX_TERMIOS) /* { */ +#ifdef TERMIO_STRUCT /* { */ /* Initialization is done here rather than above in order * to prevent any assumptions about the order of the contents * of the various terminal structures (which may change from @@ -1681,6 +1751,9 @@ d_tio.c_cflag &= ~(HUPCL | PARENB); d_tio.c_iflag |= BRKINT | ISTRIP | IGNPAR; #endif +#ifdef __MVS__ + d_tio.c_cflag &= ~(HUPCL | PARENB); +#endif d_tio.c_cc[VINTR] = CONTROL('C'); /* '^C' */ d_tio.c_cc[VERASE] = 0x7f; /* DEL */ d_tio.c_cc[VKILL] = CONTROL('U'); /* '^U' */ @@ -1730,14 +1803,8 @@ int i; for (i = 0; i <= 2; i++) { -#ifndef USE_POSIX_TERMIOS - struct termio deftio; - if (ioctl(i, TCGETA, &deftio) == 0) -#else - struct termios deftio; - if (tcgetattr(i, &deftio) == 0) -#endif - { + TERMIO_STRUCT deftio; + if (ttyGetAttr(i, &deftio) == 0) { d_tio.c_cc[VINTR] = deftio.c_cc[VINTR]; d_tio.c_cc[VQUIT] = deftio.c_cc[VQUIT]; d_tio.c_cc[VERASE] = deftio.c_cc[VERASE]; @@ -1820,7 +1887,7 @@ d_lmode = 0; #endif /* } TIOCLSET */ #endif /* } macII, ATT, CRAY */ -#endif /* } USE_ANY_SYSV_TERMIO || USE_POSIX_TERMIOS */ +#endif /* } TERMIO_STRUCT */ /* Init the Toolkit. */ { @@ -1887,7 +1954,7 @@ } #endif -#ifdef __OpenBSD__ +#if defined(USE_UTMP_SETGID) if (resource.utmpInhibit) { /* Can totally revoke group privs */ setegid(getgid()); @@ -1960,8 +2027,18 @@ /* Parse the rest of the command line */ TRACE_ARGV("After XtOpenApplication", argv); for (argc--, argv++; argc > 0; argc--, argv++) { +#ifdef VMS if (**argv != '-') Syntax(*argv); +#else + if (**argv != '-') { + if (argc > 1) + Syntax(*argv); + if (command_to_exec == 0) /* if no "-e" option */ + explicit_shname = xtermFindShell(*argv, True); + continue; + } +#endif TRACE(("parsing %s\n", argv[0])); switch (argv[0][1]) { @@ -2028,7 +2105,7 @@ break; } - SetupMenus(toplevel, &form_top, &menu_top); + SetupMenus(toplevel, &form_top, &menu_top, &menu_high); term = (XtermWidget) XtVaCreateManagedWidget("vt100", xtermWidgetClass, form_top, @@ -2040,39 +2117,41 @@ XtNright, XawChainRight, XtNtop, XawChainTop, XtNbottom, XawChainBottom, + XtNmenuHeight, menu_high, #endif (XtPointer) 0); - /* this causes the initialize method to be called */ -#if OPT_TOOLBAR - SetupToolbar(toplevel); -#endif - -#if OPT_HP_FUNC_KEYS - init_keyboard_type(keyboardIsHP, resource.hpFunctionKeys); -#endif - init_keyboard_type(keyboardIsSun, resource.sunFunctionKeys); -#if OPT_SUNPC_KBD - init_keyboard_type(keyboardIsVT220, resource.sunKeyboard); -#endif + decode_keyboard_type(&resource); screen = &term->screen; + screen->inhibit = 0; - inhibit = 0; #ifdef ALLOWLOGGING if (term->misc.logInhibit) - inhibit |= I_LOG; + screen->inhibit |= I_LOG; #endif if (term->misc.signalInhibit) - inhibit |= I_SIGNAL; + screen->inhibit |= I_SIGNAL; #if OPT_TEK4014 if (term->misc.tekInhibit) - inhibit |= I_TEK; + screen->inhibit |= I_TEK; #endif -#if OPT_WIDE_CHARS - my_wcwidth = &mk_wcwidth; - if (term->misc.cjk_width) - my_wcwidth = &mk_wcwidth_cjk; + /* + * We might start by showing the tek4014 window. + */ +#if OPT_TEK4014 + if (screen->inhibit & I_TEK) + screen->TekEmu = False; + + if (screen->TekEmu && !TekInit()) + SysError(ERROR_INIT); +#endif + + /* + * Start the toolbar at this point, after the first window has been setup. + */ +#if OPT_TOOLBAR + ShowToolbar(resource.toolBar); #endif #if OPT_SESSION_MGT @@ -2138,13 +2217,6 @@ } } #endif -#if OPT_TEK4014 - if (inhibit & I_TEK) - screen->TekEmu = False; - - if (screen->TekEmu && !TekInit()) - SysError(ERROR_INIT); -#endif #ifdef DEBUG { @@ -2190,9 +2262,6 @@ sprintf(buf, "%lx\n", XtWindow(SHELL_OF(CURRENT_EMU(screen)))); write(screen->respond, buf, strlen(buf)); } - - screen->inhibit = inhibit; - #ifdef AIXV3 #if (OSMAJORVERSION < 4) /* In AIXV3, xterms started from /dev/console have CLOCAL set. @@ -2201,14 +2270,14 @@ */ { - struct termio tio; + TERMIO_STRUCT tio; - if (ioctl(screen->respond, TCGETA, &tio) == -1) + if (ttyGetAttr(screen->respond, &tio) == -1) SysError(ERROR_TIOCGETP); tio.c_cflag &= ~(CLOCAL); - if (ioctl(screen->respond, TCSETA, &tio) == -1) + if (ttySetAttr(screen->respond, &tio) == -1) SysError(ERROR_TIOCSETP); } #endif @@ -2231,7 +2300,7 @@ /* The erase character is used to delete the current completion */ #if OPT_DABBREV -#if defined(USE_ANY_SYSV_TERMIO) || defined(USE_POSIX_TERMIOS) +#ifdef TERMIO_STRUCT screen->dabbrev_erase_char = d_tio.c_cc[VERASE]; #else screen->dabbrev_erase_char = d_sg.sg_erase; @@ -2257,6 +2326,7 @@ XSetErrorHandler(xerror); XSetIOErrorHandler(xioerror); + initPtyData(&VTbuffer); #ifdef ALLOWLOGGING if (term->misc.log_on) { StartLog(screen); @@ -2275,7 +2345,6 @@ winToEmbedInto, 0, 0); } - initPtyData(&VTbuffer); for (;;) { #if OPT_TEK4014 if (screen->TekEmu) @@ -2286,6 +2355,11 @@ } } +#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#define USE_OPENPTY 1 +static int opened_tty = -1; +#endif + /* * This function opens up a pty master and stuffs its value into pty. * @@ -2299,37 +2373,15 @@ { int result = 1; -#ifdef __OpenBSD__ - static int m_tty = -1; - static int m_pty = -1; - struct group *ttygrp; - - if (pty == NULL) { - result = openpty(&m_pty, &m_tty, ttydev, NULL, NULL); - - seteuid(0); - if ((ttygrp = getgrnam(TTY_GROUP_NAME)) != 0) { - set_owner(ttydev, getuid(), ttygrp->gr_gid, 0600U); - } else { - set_owner(ttydev, getuid(), getgid(), 0600U); - } - seteuid(getuid()); - } else if (m_pty != -1) { - *pty = m_pty; - result = 0; - } else { - result = -1; - } -#elif defined(PUCC_PTYD) +#if defined(PUCC_PTYD) result = ((*pty = openrpty(ttydev, ptydev, (resource.utmpInhibit ? OPTY_NOP : OPTY_LOGIN), getuid(), from)) < 0); -#elif defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__NetBSD__) +#elif defined(USE_OPENPTY) - int tty; - result = openpty(pty, &tty, ttydev, NULL, NULL); + result = openpty(pty, &opened_tty, ttydev, NULL, NULL); #elif defined(__QNXNTO__) @@ -2471,6 +2523,57 @@ return result; } +static void +set_pty_permissions(uid_t uid, gid_t gid, mode_t mode) +{ +#ifdef USE_TTY_GROUP + struct group *ttygrp; + + if ((ttygrp = getgrnam(TTY_GROUP_NAME)) != 0) { + gid = ttygrp->gr_gid; + mode &= 0660U; + } + endgrent(); +#endif /* USE_TTY_GROUP */ + + set_owner(ttydev, uid, gid, mode); +} + +#ifdef get_pty /* USE_UTMP_SETGID */ +#undef get_pty +/* + * Call the real get_pty() before relinquishing root-setuid, caching the + * result. + */ +static int +get_pty(int *pty, char *from) +{ + static int m_pty = -1; + int result = -1; + + if (pty == NULL) { + result = really_get_pty(&m_pty, from); + + seteuid(0); + set_pty_permissions(getuid(), getgid(), 0600U); + seteuid(getuid()); + +#ifdef USE_OPENPTY + if (opened_tty >= 0) { + close(opened_tty); + opened_tty = -1; + } +#endif + } else if (m_pty != -1) { + *pty = m_pty; + result = 0; + } else { + result = -1; + } + return result; +} +#endif + /* * Called from get_pty to iterate over likely pseudo terminals * we might allocate. Used on those systems that do not have @@ -2686,14 +2789,41 @@ static void set_owner(char *device, uid_t uid, gid_t gid, mode_t mode) { + int why; + + TRACE(("set_owner(%s, uid=%d, gid=%d, mode=%#o\n", device, uid, gid, mode)); + if (chown(device, uid, gid) < 0) { - if (errno != ENOENT + why = errno; + if (why != ENOENT && getuid() == 0) { fprintf(stderr, "Cannot chown %s to %ld,%ld: %s\n", - device, (long) uid, (long) gid, strerror(errno)); + device, (long) uid, (long) gid, + strerror(why)); + } + TRACE(("...chown failed: %s\n", strerror(why))); + } + if (chmod(device, mode) < 0) { + why = errno; + if (why != ENOENT) { + struct stat sb; + if (stat(device, &sb) < 0) { + fprintf(stderr, "Cannot chmod %s to %03o: %s\n", + device, (unsigned) mode, + strerror(why)); + } else if (mode != (sb.st_mode & 0777U)) { + fprintf(stderr, + "Cannot chmod %s to %03lo currently %03lo: %s\n", + device, + (unsigned long) mode, + (unsigned long) (sb.st_mode & 0777U), + strerror(why)); + TRACE(("...stat uid=%d, gid=%d, mode=%#o\n", + sb.st_uid, sb.st_gid, sb.st_mode)); + } } + TRACE(("...chmod failed: %s\n", strerror(why))); } - chmod(device, mode); } #if defined(HAVE_UTMP) && defined(USE_SYSV_UTMP) && !defined(USE_UTEMPTER) @@ -2726,10 +2856,16 @@ #if defined(__digital__) && defined(__unix__) && (defined(OSMAJORVERSION) && OSMAJORVERSION < 5) working.ut_type = 0; #endif - if ((result = getutid(&working)) == 0) + if ((result = call_getutid(&working)) == 0) break; if (!strcmp(result->ut_line, tofind->ut_line)) break; + /* + * Solaris, IRIX64 and HPUX manpages say to fill the static area + * pointed to by the return-value to zeros if searching for multiple + * occurrences. Otherwise it will continue to return the same value. + */ + memset(result, 0, sizeof(*result)); } return result; } @@ -2737,13 +2873,13 @@ #define close_fd(fd) close(fd), fd = -1 -static int -spawn(void) /* * Inits pty and tty and forks a login process. * Does not close fd Xsocket. * If slave, the pty named in passedPty is already open for use */ +static int +spawn(void) { TScreen *screen = &term->screen; #if OPT_PTY_HANDSHAKE @@ -2756,23 +2892,18 @@ int rc = 0; int ttyfd = -1; -#ifdef USE_ANY_SYSV_TERMIO - struct termio tio; -#ifdef TIOCLSET - unsigned lmode; -#endif /* TIOCLSET */ -#ifdef HAS_LTCHARS - struct ltchars ltc; -#endif /* HAS_LTCHARS */ -#elif defined(USE_POSIX_TERMIOS) - struct termios tio; +#ifdef TERMIO_STRUCT + TERMIO_STRUCT tio; +#ifdef __MVS__ + TERMIO_STRUCT gio; +#endif /* __MVS__ */ #ifdef TIOCLSET unsigned lmode; #endif /* TIOCLSET */ #ifdef HAS_LTCHARS struct ltchars ltc; #endif /* HAS_LTCHARS */ -#else /* !USE_ANY_SYSV_TERMIO && !USE_POSIX_TERMIOS */ +#else /* !TERMIO_STRUCT */ int ldisc = 0; int discipline; unsigned lmode; @@ -2783,7 +2914,7 @@ int jmode; struct jtchars jtc; #endif /* sony */ -#endif /* USE_ANY_SYSV_TERMIO */ +#endif /* TERMIO_STRUCT */ char termcap[TERMCAP_SIZE]; char newtc[TERMCAP_SIZE]; @@ -2808,7 +2939,7 @@ struct lastlog lastlog; #endif #ifdef USE_LASTLOGX - struct lastlogx lastlog; + struct lastlogx lastlogx; #endif /* USE_LASTLOG */ #endif /* HAVE_UTMP */ #endif /* !USE_UTEMPTER */ @@ -2887,9 +3018,9 @@ #ifdef TIOCLSET lmode = d_lmode; #endif /* TIOCLSET */ -#if defined(USE_ANY_SYSV_TERMIO) || defined(USE_POSIX_TERMIOS) +#ifdef TERMIO_STRUCT tio = d_tio; -#else /* not USE_ANY_SYSV_TERMIO and not USE_POSIX_TERMIOS */ +#else /* !TERMIO_STRUCT */ sg = d_sg; tc = d_tc; discipline = d_disipline; @@ -2897,7 +3028,7 @@ jmode = d_jmode; jtc = d_jtc; #endif /* sony */ -#endif /* USE_ANY_SYSV_TERMIO or USE_POSIX_TERMIOS */ +#endif /* TERMIO_STRUCT */ } else { SysError(ERROR_OPDEVTTY); } @@ -2917,13 +3048,10 @@ if (ioctl(ttyfd, TIOCLGET, &lmode) == -1) lmode = d_lmode; #endif /* TIOCLSET */ -#ifdef USE_ANY_SYSV_TERMIO - if ((rc = ioctl(ttyfd, TCGETA, &tio)) == -1) +#ifdef TERMIO_STRUCT + if ((rc = ttyGetAttr(ttyfd, &tio)) == -1) tio = d_tio; -#elif defined(USE_POSIX_TERMIOS) - if ((rc = tcgetattr(ttyfd, &tio)) == -1) - tio = d_tio; -#else /* !USE_ANY_SYSV_TERMIO && !USE_POSIX_TERMIOS */ +#else /* !TERMIO_STRUCT */ if ((rc = ioctl(ttyfd, TIOCGETP, (char *) &sg)) == -1) sg = d_sg; if (ioctl(ttyfd, TIOCGETC, (char *) &tc) == -1) @@ -2936,7 +3064,7 @@ if (ioctl(ttyfd, TIOCKGETC, (char *) &jtc) == -1) jtc = d_jtc; #endif /* sony */ -#endif /* USE_ANY_SYSV_TERMIO */ +#endif /* TERMIO_STRUCT */ /* * If ptyInitialErase is set, we want to get the pty's @@ -2946,18 +3074,22 @@ */ #if OPT_INITIAL_ERASE if (resource.ptyInitialErase) { -#ifdef USE_ANY_SYSV_TERMIO +#ifdef TERMIO_STRUCT initial_erase = tio.c_cc[VERASE]; -#elif defined(USE_POSIX_TERMIOS) - initial_erase = tio.c_cc[VERASE]; -#else /* !USE_ANY_SYSV_TERMIO && !USE_POSIX_TERMIOS */ +#else /* !TERMIO_STRUCT */ initial_erase = sg.sg_erase; -#endif /* USE_ANY_SYSV_TERMIO */ +#endif /* TERMIO_STRUCT */ TRACE(("%s initial_erase:%d (from /dev/tty)\n", rc == 0 ? "OK" : "FAIL", initial_erase)); } #endif +#ifdef __MVS__ + if (ttyGetAttr(ttyfd, &gio) == 0) { + gio.c_cflag &= ~(HUPCL | PARENB); + ttySetAttr(ttyfd, &gio); + } +#endif /* __MVS__ */ close_fd(ttyfd); } @@ -2967,19 +3099,15 @@ } #if OPT_INITIAL_ERASE if (resource.ptyInitialErase) { -#ifdef USE_ANY_SYSV_TERMIO - struct termio my_tio; - if ((rc = ioctl(screen->respond, TCGETA, &my_tio)) == 0) +#ifdef TERMIO_STRUCT + TERMIO_STRUCT my_tio; + if ((rc = ttyGetAttr(screen->respond, &my_tio)) == 0) initial_erase = my_tio.c_cc[VERASE]; -#elif defined(USE_POSIX_TERMIOS) - struct termios my_tio; - if ((rc = tcgetattr(screen->respond, &my_tio)) == 0) - initial_erase = my_tio.c_cc[VERASE]; -#else /* !USE_ANY_SYSV_TERMIO && !USE_POSIX_TERMIOS */ +#else /* !TERMIO_STRUCT */ struct sgttyb my_sg; if ((rc = ioctl(screen->respond, TIOCGETP, (char *) &my_sg)) == 0) initial_erase = my_sg.sg_erase; -#endif /* USE_ANY_SYSV_TERMIO */ +#endif /* TERMIO_STRUCT */ TRACE(("%s initial_erase:%d (from pty)\n", (rc == 0) ? "OK" : "FAIL", initial_erase)); @@ -2988,7 +3116,7 @@ } /* avoid double MapWindow requests */ - XtSetMappedWhenManaged(XtParent(CURRENT_EMU(screen)), False); + XtSetMappedWhenManaged(SHELL_OF(CURRENT_EMU(screen)), False); wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", False); @@ -3004,7 +3132,7 @@ XmuGetHostname(mit_console_name + MIT_CONSOLE_LEN, 255); mit_console = XInternAtom(screen->display, mit_console_name, False); /* the user told us to be the console, so we can use CurrentTime */ - XtOwnSelection(XtParent(CURRENT_EMU(screen)), + XtOwnSelection(SHELL_OF(CURRENT_EMU(screen)), mit_console, CurrentTime, ConvertConsoleSelection, NULL, NULL); } @@ -3086,8 +3214,8 @@ } else #endif { - TTYSIZE_ROWS(ts) = screen->max_row + 1; - TTYSIZE_COLS(ts) = screen->max_col + 1; + TTYSIZE_ROWS(ts) = MaxRows(screen); + TTYSIZE_COLS(ts) = MaxCols(screen); #if defined(USE_STRUCT_WINSIZE) ts.ws_xpixel = FullWidth(screen); ts.ws_ypixel = FullHeight(screen); @@ -3167,7 +3295,9 @@ #endif /* SVR4 */ #endif /* I_PUSH */ ttyfd = ptyfd; +#ifndef __MVS__ close_fd(screen->respond); +#endif /* __MVS__ */ #ifdef TTYSIZE_STRUCT /* tell tty how big window is */ @@ -3182,8 +3312,8 @@ } else #endif /* OPT_TEK4014 */ { - TTYSIZE_ROWS(ts) = screen->max_row + 1; - TTYSIZE_COLS(ts) = screen->max_col + 1; + TTYSIZE_ROWS(ts) = MaxRows(screen); + TTYSIZE_COLS(ts) = MaxCols(screen); #ifdef USE_STRUCT_WINSIZE ts.ws_xpixel = FullWidth(screen); ts.ws_ypixel = FullHeight(screen); @@ -3223,7 +3353,9 @@ /* we don't need the socket, or the pty master anymore */ close(ConnectionNumber(screen->display)); +#ifndef __MVS__ close(screen->respond); +#endif /* __MVS__ */ /* Now is the time to set up our process group and * open up the pty slave. @@ -3239,8 +3371,16 @@ #if defined(__QNX__) && !defined(__QNXNTO__) qsetlogin(getlogin(), ttydev); #endif - if (ttyfd >= 0) + if (ttyfd >= 0) { +#ifdef __MVS__ + if (ttyGetAttr(ttyfd, &gio) == 0) { + gio.c_cflag &= ~(HUPCL | PARENB); + ttySetAttr(ttyfd, &gio); + } +#else /* !__MVS__ */ close_fd(ttyfd); +#endif /* __MVS__ */ + } while (1) { #if defined(TIOCNOTTY) && (!defined(__GLIBC__) || (__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))) @@ -3258,6 +3398,10 @@ /* make /dev/tty work */ ioctl(ttyfd, TCSETCTTY, 0); #endif +#if defined(__GNU__) && defined(TIOCSCTTY) + /* make /dev/tty work */ + ioctl(ttyfd, TIOCSCTTY, 0); +#endif #ifdef USE_SYSV_PGRP /* We need to make sure that we are actually * the process group leader for the pty. If @@ -3324,37 +3468,23 @@ } /* end of IsPts else clause */ #endif -#ifdef USE_TTY_GROUP - { - struct group *ttygrp; - if ((ttygrp = getgrnam(TTY_GROUP_NAME)) != 0) { - /* change ownership of tty to real uid, "tty" gid */ - set_owner(ttydev, screen->uid, ttygrp->gr_gid, - (resource.messages ? 0620U : 0600U)); - } else { - /* change ownership of tty to real group and user id */ - set_owner(ttydev, screen->uid, screen->gid, - (resource.messages ? 0622U : 0600U)); - } - endgrent(); - } -#else /* else !USE_TTY_GROUP */ - /* change ownership of tty to real group and user id */ - set_owner(ttydev, screen->uid, screen->gid, - (resource.messages ? 0622U : 0600U)); -#endif /* USE_TTY_GROUP */ + set_pty_permissions(screen->uid, + screen->gid, + (resource.messages + ? 0622U + : 0600U)); /* * set up the tty modes */ { -#if defined(USE_ANY_SYSV_TERMIO) || defined(USE_POSIX_TERMIOS) +#ifdef TERMIO_STRUCT #if defined(umips) || defined(CRAY) || defined(linux) /* If the control tty had its modes screwed around with, eg. by lineedit in the shell, or emacs, etc. then tio will have bad values. Let's just get termio from the new tty and tailor it. */ - if (ioctl(ttyfd, TCGETA, &tio) == -1) + if (ttyGetAttr(ttyfd, &tio) == -1) SysError(ERROR_TIOCGETP); tio.c_lflag |= ECHOE; #endif /* umips */ @@ -3412,11 +3542,6 @@ when the xterm ends */ tio.c_cflag &= ~CLOCAL; #endif /* USE_POSIX_TERMIOS */ - tio.c_cflag &= ~CSIZE; - if (screen->input_eight_bits) - tio.c_cflag |= CS8; - else - tio.c_cflag |= CS7; /* enable signals, canonical processing (erase, kill, etc), * echo */ @@ -3542,14 +3667,18 @@ if (ioctl(ttyfd, TIOCLSET, (char *) &lmode) == -1) HsSysError(cp_pipe[1], ERROR_TIOCLSET); #endif /* TIOCLSET */ -#ifndef USE_POSIX_TERMIOS - if (ioctl(ttyfd, TCSETA, &tio) == -1) - HsSysError(cp_pipe[1], ERROR_TIOCSETP); -#else /* USE_POSIX_TERMIOS */ - if (tcsetattr(ttyfd, TCSANOW, &tio) == -1) + if (ttySetAttr(ttyfd, &tio) == -1) HsSysError(cp_pipe[1], ERROR_TIOCSETP); -#endif /* USE_POSIX_TERMIOS */ -#else /* USE_ANY_SYSV_TERMIO or USE_POSIX_TERMIOS */ + + /* ignore errors here - some platforms don't work */ + tio.c_cflag &= ~CSIZE; + if (screen->input_eight_bits) + tio.c_cflag |= CS8; + else + tio.c_cflag |= CS7; + (void) ttySetAttr(ttyfd, &tio); + +#else /* !TERMIO_STRUCT */ sg.sg_flags &= ~(ALLDELAY | XTABS | CBREAK | RAW); sg.sg_flags |= ECHO | CRMOD; /* make sure speed is set on pty so that editors work right */ @@ -3603,7 +3732,7 @@ if (ioctl(ttyfd, TIOCKSETC, (char *) &jtc) == -1) HsSysError(cp_pipe[1], ERROR_TIOCKSETC); #endif /* sony */ -#endif /* !USE_ANY_SYSV_TERMIO */ +#endif /* TERMIO_STRUCT */ #if defined(TIOCCONS) || defined(SRIOCSREDIR) if (Console) { #ifdef TIOCCONS @@ -3656,23 +3785,15 @@ #if OPT_TRACE int old_erase; #endif -#ifdef USE_ANY_SYSV_TERMIO - if (ioctl(ttyfd, TCGETA, &tio) == -1) - tio = d_tio; -#if OPT_TRACE - old_erase = tio.c_cc[VERASE]; -#endif - tio.c_cc[VERASE] = initial_erase; - rc = ioctl(ttyfd, TCSETA, &tio); -#elif defined(USE_POSIX_TERMIOS) - if (tcgetattr(ttyfd, &tio) == -1) +#ifdef TERMIO_STRUCT + if (ttyGetAttr(ttyfd, &tio) == -1) tio = d_tio; #if OPT_TRACE old_erase = tio.c_cc[VERASE]; #endif tio.c_cc[VERASE] = initial_erase; - rc = tcsetattr(ttyfd, TCSANOW, &tio); -#else /* !USE_ANY_SYSV_TERMIO && !USE_POSIX_TERMIOS */ + rc = ttySetAttr(ttyfd, &tio); +#else /* !TERMIO_STRUCT */ if (ioctl(ttyfd, TIOCGETP, (char *) &sg) == -1) sg = d_sg; #if OPT_TRACE @@ -3680,17 +3801,17 @@ #endif sg.sg_erase = initial_erase; rc = ioctl(ttyfd, TIOCSETP, (char *) &sg); -#endif /* USE_ANY_SYSV_TERMIO */ +#endif /* TERMIO_STRUCT */ TRACE(("%s setting erase to %d (was %d)\n", rc ? "FAIL" : "OK", initial_erase, old_erase)); } #endif - /* copy the environment before Setenving */ + /* copy the environment before Setenv'ing */ for (i = 0; environ[i] != NULL; i++) ; /* compute number of xtermSetenv() calls below */ envsize = 1; /* (NULL terminating entry) */ - envsize += 3; /* TERM, WINDOWID, DISPLAY */ + envsize += 5; /* TERM, WINDOWID, DISPLAY, _SHELL, _VERSION */ #ifdef HAVE_UTMP envsize += 1; /* LOGNAME */ #endif /* HAVE_UTMP */ @@ -3719,6 +3840,8 @@ /* put the display into the environment of the shell */ xtermSetenv("DISPLAY=", XDisplayString(screen->display)); + xtermSetenv("XTERM_VERSION=", xtermVersion()); + signal(SIGTERM, SIG_DFL); /* this is the time to go and set up stdin, out, and err @@ -3767,11 +3890,11 @@ #ifdef Lynx { - struct termio t; - if (ioctl(0, TCGETA, &t) >= 0) { + TERMIO_STRUCT t; + if (ttyGetAttr(0, &t) >= 0) { /* this gets lost somewhere on our way... */ t.c_oflag |= OPOST; - ioctl(0, TCSETA, &t); + ttySetAttr(0, &t); } } #endif @@ -3826,16 +3949,16 @@ * - We need to do it before we go and change our * user and group id's. */ - (void) setutent(); + (void) call_setutent(); init_utmp(DEAD_PROCESS, &utmp); /* position to entry in utmp file */ /* Test return value: beware of entries left behind: PSz 9 Mar 00 */ if (!(utret = find_utmp(&utmp))) { - (void) setutent(); + (void) call_setutent(); init_utmp(USER_PROCESS, &utmp); if (!(utret = find_utmp(&utmp))) { - (void) setutent(); + (void) call_setutent(); } } #if OPT_TRACE @@ -3881,7 +4004,7 @@ /* write out the entry */ if (!resource.utmpInhibit) { errno = 0; - pututline(&utmp); + call_pututline(&utmp); TRACE(("pututline: id %s, line %s, pid %ld, errno %d %s\n", utmp.ut_id, utmp.ut_line, @@ -3894,7 +4017,7 @@ updwtmpx(WTMPX_FILE, &utmp); #elif defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)) if (term->misc.login_shell) - updwtmp(etc_wtmp, &utmp); + call_updwtmp(etc_wtmp, &utmp); #else if (term->misc.login_shell && (i = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) { @@ -3904,7 +4027,7 @@ #endif #endif /* close the file */ - (void) endutent(); + (void) call_endutent(); #else /* USE_SYSV_UTMP */ /* We can now get our ttyslot! We can also set the initial @@ -3924,8 +4047,7 @@ #ifdef HAVE_UTMP_UT_HOST SetUtmpHost(utmp.ut_host, screen); #endif - /* cast needed on Ultrix 4.4 */ - time((time_t *) & utmp.ut_time); + utmp.ut_time = time((time_t *) 0); lseek(i, (long) (tslot * sizeof(utmp)), 0); write(i, (char *) &utmp, sizeof(utmp)); close(i); @@ -3962,13 +4084,13 @@ #ifdef USE_LASTLOGX if (term->misc.login_shell) { - bzero((char *) &lastlog, sizeof(lastlog)); - (void) strncpy(lastlog.ll_line, + bzero((char *) &lastlogx, sizeof(lastlogx)); + (void) strncpy(lastlogx.ll_line, my_pty_name(ttydev), - sizeof(lastlog.ll_line)); - X_GETTIMEOFDAY(&lastlog.ll_tv); - SetUtmpHost(lastlog.ll_host, screen); - updlastlogx(_PATH_LASTLOGX, screen->uid, &lastlog); + sizeof(lastlogx.ll_line)); + X_GETTIMEOFDAY(&lastlogx.ll_tv); + SetUtmpHost(lastlogx.ll_host, screen); + updlastlogx(_PATH_LASTLOGX, screen->uid, &lastlogx); } #endif @@ -3980,19 +4102,20 @@ my_pty_name(ttydev), sizeof(lastlog.ll_line)); SetUtmpHost(lastlog.ll_host, screen); - time(&lastlog.ll_time); + lastlog.ll_time = time((time_t *) 0); lseek(i, (long) (screen->uid * sizeof(struct lastlog)), 0); write(i, (char *) &lastlog, sizeof(struct lastlog)); close(i); } #endif /* USE_LASTLOG */ -#ifdef __OpenBSD__ +#if defined(USE_UTMP_SETGID) /* Switch to real gid after writing utmp entry */ utmpGid = getegid(); if (getgid() != getegid()) { utmpGid = getegid(); setegid(getgid()); + TRACE(("switch to real gid %d after writing utmp\n", getgid())); } #endif @@ -4049,8 +4172,8 @@ set_max_row(screen, handshake.rows); set_max_col(screen, handshake.cols); #ifdef TTYSIZE_STRUCT - TTYSIZE_ROWS(ts) = screen->max_row + 1; - TTYSIZE_COLS(ts) = screen->max_col + 1; + TTYSIZE_ROWS(ts) = MaxRows(screen); + TTYSIZE_COLS(ts) = MaxCols(screen); #if defined(USE_STRUCT_WINSIZE) ts.ws_xpixel = FullWidth(screen); ts.ws_ypixel = FullHeight(screen); @@ -4064,9 +4187,9 @@ #ifdef USE_SYSV_ENVVARS { char numbuf[12]; - sprintf(numbuf, "%d", screen->max_col + 1); + sprintf(numbuf, "%d", MaxCols(screen)); xtermSetenv("COLUMNS=", numbuf); - sprintf(numbuf, "%d", screen->max_row + 1); + sprintf(numbuf, "%d", MaxRows(screen)); xtermSetenv("LINES=", numbuf); } #ifdef HAVE_UTMP @@ -4128,17 +4251,19 @@ #endif /* OPT_PTY_HANDSHAKE */ signal(SIGHUP, SIG_DFL); -#ifdef HAVE_UTMP - if (((ptr = getenv("SHELL")) == NULL || *ptr == 0) && - ((pw == NULL && (pw = getpwuid(screen->uid)) == NULL) || - *(ptr = pw->pw_shell) == 0)) -#else /* HAVE_UTMP */ - if (((ptr = getenv("SHELL")) == NULL || *ptr == 0) && - ((pw = getpwuid(screen->uid)) == NULL || - *(ptr = pw->pw_shell) == 0)) -#endif /* HAVE_UTMP */ - ptr = "/bin/sh"; + if ((ptr = explicit_shname) == NULL) { + if (((ptr = getenv("SHELL")) == NULL || *ptr == 0) && + ((pw == NULL && (pw = getpwuid(screen->uid)) == NULL) || + *(ptr = pw->pw_shell) == 0)) { + ptr = "/bin/sh"; + } + } else { + xtermSetenv("SHELL=", explicit_shname); + } + xtermSetenv("XTERM_SHELL=", ptr); + shname = x_basename(ptr); + TRACE(("shell path '%s' leaf '%s'\n", ptr, shname)); #if OPT_LUIT_PROG /* @@ -4147,6 +4272,8 @@ * to command that the user gave anyway. */ if (command_to_exec_with_luit) { + xtermSetenv("XTERM_SHELL=", + xtermFindShell(*command_to_exec_with_luit, False)); TRACE(("spawning command \"%s\"\n", *command_to_exec_with_luit)); execvp(*command_to_exec_with_luit, command_to_exec_with_luit); /* print error message on screen */ @@ -4157,6 +4284,8 @@ } #endif if (command_to_exec) { + xtermSetenv("XTERM_SHELL=", + xtermFindShell(*command_to_exec, False)); TRACE(("spawning command \"%s\"\n", *command_to_exec)); execvp(*command_to_exec, command_to_exec); if (command_to_exec[1] == 0) @@ -4170,14 +4299,14 @@ signal(SIGHUP, SIG_DFL); #endif - shname_minus = CastMallocN(char, strlen(shname) + 1); + shname_minus = CastMallocN(char, strlen(shname) + 2); (void) strcpy(shname_minus, "-"); (void) strcat(shname_minus, shname); -#if !defined(USE_ANY_SYSV_TERMIO) && !defined(USE_POSIX_TERMIOS) +#ifndef TERMIO_STRUCT ldisc = XStrCmp("csh", shname + strlen(shname) - 3) == 0 ? NTTYDISC : 0; ioctl(0, TIOCSETD, (char *) &ldisc); -#endif /* !USE_ANY_SYSV_TERMIO && !USE_POSIX_TERMIOS */ +#endif /* !TERMIO_STRUCT */ #ifdef USE_LOGIN_DASH_P if (term->misc.login_shell && pw && added_utmp_entry) @@ -4356,14 +4485,16 @@ && (resource.ptyHandshake && added_utmp_entry) #endif /* OPT_PTY_HANDSHAKE */ ) { -#ifdef __OpenBSD__ +#if defined(USE_UTMP_SETGID) if (utmpGid != -1) { /* Switch back to group utmp */ setegid(utmpGid); + TRACE(("switched back to group %d (check: %d)\n", + utmpGid, (int) getgid())); } #endif init_utmp(USER_PROCESS, &utmp); - (void) setutent(); + (void) call_setutent(); /* * We could use getutline() if we didn't support old systems. @@ -4381,7 +4512,7 @@ *utptr->ut_user = 0; utptr->ut_time = time((time_t *) 0); #endif - (void) pututline(utptr); + (void) call_pututline(utptr); #ifdef WTMP #if defined(WTMPX_FILE) && (defined(SVR4) || defined(__SCO__)) if (term->misc.login_shell) @@ -4389,7 +4520,7 @@ #elif defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && !(defined(__powerpc__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)) strncpy(utmp.ut_line, utptr->ut_line, sizeof(utmp.ut_line)); if (term->misc.login_shell) - updwtmp(etc_wtmp, utptr); + call_updwtmp(etc_wtmp, utptr); #else /* set wtmp entry if wtmp file exists */ if (term->misc.login_shell) { @@ -4405,7 +4536,7 @@ } memset(utptr, 0, sizeof(*utptr)); /* keep searching */ } - (void) endutent(); + (void) call_endutent(); } #else /* not USE_SYSV_UTMP */ int wfd; @@ -4423,7 +4554,7 @@ (void) strncpy(utmp.ut_line, my_pty_name(ttydev), sizeof(utmp.ut_line)); - time(&utmp.ut_time); + utmp.ut_time = time((time_t *) 0); write(wfd, (char *) &utmp, sizeof(utmp)); close(wfd); } @@ -4444,29 +4575,24 @@ set_owner(ptydev, 0, 0, 0666U); #endif } -#if OPT_TRACE || defined(NO_LEAKS) +#ifdef NO_LEAKS if (n == 0) { TRACE(("Freeing memory leaks\n")); if (term != 0) { Display *dpy = term->screen.display; - if (term->screen.sbuf_address) { - free(term->screen.sbuf_address); - TRACE(("freed screen.sbuf_address\n")); - } - if (term->screen.allbuf) { - free(term->screen.allbuf); - TRACE(("freed screen.allbuf\n")); - } - if (term->screen.xim) { - XCloseIM(term->screen.xim); - TRACE(("freed screen.xim\n")); - } if (toplevel) { XtDestroyWidget(toplevel); TRACE(("destroyed top-level widget\n")); } + sortedOpts(0, 0, 0); + noleaks_charproc(); + noleaks_ptydata(); +#if OPT_WIDE_CHARS + noleaks_CharacterClass(); +#endif XtCloseDisplay(dpy); + XtDestroyApplicationContext(app_con); TRACE(("closed display\n")); } TRACE((0)); @@ -4507,15 +4633,15 @@ strncpy(newtc, oldtc, i = ptr1 - oldtc); temp = newtc + i; sprintf(temp, "%d", (li_first - ? screen->max_row + 1 - : screen->max_col + 1)); + ? MaxRows(screen) + : MaxCols(screen))); temp += strlen(temp); ptr1 = strchr(ptr1, ':'); strncpy(temp, ptr1, i = ptr2 - ptr1); temp += i; sprintf(temp, "%d", (li_first - ? screen->max_col + 1 - : screen->max_row + 1)); + ? MaxCols(screen) + : MaxRows(screen))); ptr2 = strchr(ptr2, ':'); strcat(temp, ptr2); TRACE((" ==> %s\n", newtc)); @@ -4577,7 +4703,7 @@ fputs("Exiting\n", stderr); #endif if (!hold_screen) - Cleanup(0); + need_cleanup = TRUE; } } while ((pid = nonblocking_wait()) > 0); Index: xc/programs/xterm/main.h diff -u xc/programs/xterm/main.h:3.12 xc/programs/xterm/main.h:3.15 --- xc/programs/xterm/main.h:3.12 Tue Nov 30 20:27:47 2004 +++ xc/programs/xterm/main.h Sun Feb 12 20:14:59 2006 @@ -1,10 +1,6 @@ -/* $XTermId: main.h,v 1.26 2004/11/23 02:11:04 tom Exp $ */ +/* $XTermId: main.h,v 1.30 2006/02/12 22:43:55 tom Exp $ */ -/* - * $Xorg: main.h,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/main.h,v 3.12 2004/12/01 01:27:47 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/main.h,v 3.15 2006/02/13 01:14:59 dickey Exp $ */ /* * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -83,7 +79,14 @@ #define DEFLOCALEFILTER2(x) #x #endif +/* + * If the configure script finds luit, we have the path directly. + */ +#ifdef LUIT_PATH +#define DEFLOCALEFILTER LUIT_PATH +#else #define DEFLOCALEFILTER1(x) DEFLOCALEFILTER2(x) #define DEFLOCALEFILTER DEFLOCALEFILTER1(PROJECTROOT) "/bin/luit" +#endif #endif /* included_main_h */ Index: xc/programs/xterm/menu.c diff -u xc/programs/xterm/menu.c:3.58 xc/programs/xterm/menu.c:3.68 --- xc/programs/xterm/menu.c:3.58 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/menu.c Sun Apr 9 20:34:36 2006 @@ -1,9 +1,8 @@ -/* $XTermId: menu.c,v 1.153 2005/01/10 22:53:49 tom Exp $ */ +/* $XTermId: menu.c,v 1.205 2006/04/09 18:27:19 tom Exp $ */ -/* $Xorg: menu.c,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /* -Copyright 1999-2004,2005 by Thomas E. Dickey +Copyright 1999-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -47,7 +46,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xterm/menu.c,v 3.58 2005/01/14 01:50:03 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/menu.c,v 3.68 2006/04/10 00:34:36 dickey Exp $ */ #include #include @@ -124,7 +123,6 @@ static void do_backarrow PROTO_XT_CALLBACK_ARGS; static void do_clearsavedlines PROTO_XT_CALLBACK_ARGS; static void do_continue PROTO_XT_CALLBACK_ARGS; -static void do_cursesemul PROTO_XT_CALLBACK_ARGS; static void do_delete_del PROTO_XT_CALLBACK_ARGS; static void do_hardreset PROTO_XT_CALLBACK_ARGS; static void do_interrupt PROTO_XT_CALLBACK_ARGS; @@ -142,6 +140,7 @@ static void do_scrollkey PROTO_XT_CALLBACK_ARGS; static void do_scrollttyoutput PROTO_XT_CALLBACK_ARGS; static void do_securekbd PROTO_XT_CALLBACK_ARGS; +static void do_selectClipboard PROTO_XT_CALLBACK_ARGS; static void do_softreset PROTO_XT_CALLBACK_ARGS; static void do_sun_fkeys PROTO_XT_CALLBACK_ARGS; static void do_suspend PROTO_XT_CALLBACK_ARGS; @@ -180,6 +179,7 @@ #endif #if OPT_NUM_LOCK +static void do_alt_esc PROTO_XT_CALLBACK_ARGS; static void do_num_lock PROTO_XT_CALLBACK_ARGS; static void do_meta_esc PROTO_XT_CALLBACK_ARGS; #endif @@ -222,6 +222,7 @@ #if OPT_WIDE_CHARS static void do_font_utf8_mode PROTO_XT_CALLBACK_ARGS; +static void do_font_utf8_title PROTO_XT_CALLBACK_ARGS; #endif /* @@ -245,6 +246,7 @@ { "backarrow key", do_backarrow, NULL }, #if OPT_NUM_LOCK { "num-lock", do_num_lock, NULL }, + { "alt-esc", do_alt_esc, NULL }, { "meta-esc", do_meta_esc, NULL }, #endif { "delete-is-del", do_delete_del, NULL }, @@ -281,7 +283,7 @@ { "scrollkey", do_scrollkey, NULL }, { "scrollttyoutput",do_scrollttyoutput, NULL }, { "allow132", do_allow132, NULL }, - { "cursesemul", do_cursesemul, NULL }, + { "selectToClipboard",do_selectClipboard, NULL }, { "visualbell", do_visualbell, NULL }, { "poponbell", do_poponbell, NULL }, { "marginbell", do_marginbell, NULL }, @@ -338,6 +340,7 @@ #endif #if OPT_WIDE_CHARS { "utf8-mode", do_font_utf8_mode,NULL }, + { "utf8-title", do_font_utf8_title,NULL }, #endif #endif /* toggles for other font extensions */ @@ -382,7 +385,8 @@ * are initialized before the widget is created. */ typedef struct { - Widget w; + Widget b; /* the toolbar's buttons */ + Widget w; /* the popup shell activated by the button */ Cardinal entries; } MenuList; @@ -552,6 +556,7 @@ if (mw == 0) return False; + TRACE(("domenu(%s) %s\n", params[0], created ? "create" : "update")); switch (me) { case mainMenu: if (created) { @@ -563,9 +568,18 @@ update_8bit_control(); update_decbkm(); update_num_lock(); + update_alt_esc(); update_meta_esc(); update_delete_del(); update_keyboard_type(); + if (!xtermHasPrinter()) { + set_sensitivity(mw, + mainMenuEntries[mainMenu_print].widget, + False); + set_sensitivity(mw, + mainMenuEntries[mainMenu_print_redir].widget, + False); + } if (screen->terminal_id < 200) { set_sensitivity(mw, mainMenuEntries[mainMenu_8bit_ctrl].widget, @@ -608,6 +622,7 @@ update_scrollttyoutput(); update_allow132(); update_cursesemul(); + update_selectToClipboard(); update_visualbell(); update_poponbell(); update_marginbell(); @@ -669,10 +684,7 @@ #endif #if OPT_WIDE_CHARS update_font_utf8_mode(); - if (term->screen.utf8_mode > 1) - set_sensitivity(mw, - fontMenuEntries[fontMenu_wide_chars].widget, - False); + update_font_utf8_title(); #endif } FindFontSelection(NULL, True); @@ -703,6 +715,7 @@ String * params, /* mainMenu, vtMenu, or tekMenu */ Cardinal *param_count) /* 0 or 1 */ { + TRACE(("HandleCreateMenu\n")); (void) domenu(w, event, params, param_count); } @@ -712,6 +725,7 @@ String * params, /* mainMenu, vtMenu, or tekMenu */ Cardinal *param_count) /* 0 or 1 */ { + TRACE(("HandlePopupMenu\n")); if (domenu(w, event, params, param_count)) { #if OPT_TOOLBAR w = select_menu(w, mainMenu)->w; @@ -743,13 +757,6 @@ * action routines */ -/* ARGSUSED */ -void -DoSecureKeyboard(Time tp GCC_UNUSED) -{ - do_securekbd(vt_shell[mainMenu].w, (XtPointer) 0, (XtPointer) 0); -} - static void do_securekbd(Widget gw GCC_UNUSED, XtPointer closure GCC_UNUSED, @@ -763,7 +770,7 @@ ReverseVideo(term); screen->grabbedKbd = False; } else { - if (XGrabKeyboard(screen->display, XtWindow(term), + if (XGrabKeyboard(screen->display, XtWindow(CURRENT_EMU(screen)), True, GrabModeAsync, GrabModeAsync, now) != GrabSuccess) { Bell(XkbBI_MinorError, 100); @@ -775,6 +782,26 @@ update_securekbd(); } +/* ARGSUSED */ +void +HandleSecure(Widget w GCC_UNUSED, + XEvent * event GCC_UNUSED, /* unused */ + String * params GCC_UNUSED, /* [0] = volume */ + Cardinal *param_count GCC_UNUSED) /* 0 or 1 */ +{ +#if 0 + Time ev_time = CurrentTime; + + if ((event->xany.type == KeyPress) || + (event->xany.type == KeyRelease)) + ev_time = event->xkey.time; + else if ((event->xany.type == ButtonPress) || + (event->xany.type == ButtonRelease)) + ev_time = event->xbutton.time; +#endif + do_securekbd(vt_shell[mainMenu].w, (XtPointer) 0, (XtPointer) 0); +} + static void do_allowsends(Widget gw GCC_UNUSED, XtPointer closure GCC_UNUSED, @@ -886,6 +913,15 @@ } static void +do_alt_esc(Widget gw GCC_UNUSED, + XtPointer closure GCC_UNUSED, + XtPointer data GCC_UNUSED) +{ + term->screen.input_eight_bits = !term->screen.input_eight_bits; + update_alt_esc(); +} + +static void do_meta_esc(Widget gw GCC_UNUSED, XtPointer closure GCC_UNUSED, XtPointer data GCC_UNUSED) @@ -1133,6 +1169,17 @@ } static void +do_selectClipboard(Widget gw GCC_UNUSED, + XtPointer closure GCC_UNUSED, + XtPointer data GCC_UNUSED) +{ + TScreen *screen = &term->screen; + + screen->selectToClipboard = !screen->selectToClipboard; + update_selectToClipboard(); +} + +static void do_allow132(Widget gw GCC_UNUSED, XtPointer closure GCC_UNUSED, XtPointer data GCC_UNUSED) @@ -1172,6 +1219,7 @@ { TScreen *screen = &term->screen; + TRACE(("Show tek-window\n")); if (!screen->Tshow) { /* not showing, turn on */ set_tek_visibility(True); } else if (screen->Vshow || allowswitch) { /* is showing, turn off */ @@ -1303,7 +1351,7 @@ static void do_vtfont(Widget gw GCC_UNUSED, - XtPointer closure GCC_UNUSED, + XtPointer closure, XtPointer data GCC_UNUSED) { char *entryname = (char *) closure; @@ -1311,7 +1359,7 @@ for (i = 0; i < NMENUFONTS; i++) { if (strcmp(entryname, fontMenuEntries[i].name) == 0) { - SetVTFont(i, True, NULL); + SetVTFont(term, i, True, NULL); return; } } @@ -1362,14 +1410,14 @@ { TScreen *screen = &term->screen; int fontnum = screen->menu_font_number; - String name = term->screen.menu_font_names[fontnum]; + String name = term->screen.MenuFontName(fontnum); term->misc.render_font = !term->misc.render_font; update_font_renderfont(); - xtermLoadFont(screen, xtermFontName(name), True, fontnum); + xtermLoadFont(term, xtermFontName(name), True, fontnum); ScrnRefresh(screen, 0, 0, - screen->max_row + 1, - screen->max_col + 1, True); + MaxRows(screen), + MaxCols(screen), True); } #endif @@ -1381,14 +1429,37 @@ { TScreen *screen = &term->screen; + /* + * If xterm was started with -wc option, it might not have the wide fonts. + * If xterm was not started with -wc, it might not have wide cells. + */ + if (!screen->utf8_mode) { + if (screen->wide_chars) { + if (xtermLoadWideFonts(term, True)) { + SetVTFont(term, screen->menu_font_number, TRUE, NULL); + } + } else { + ChangeToWide(screen); + } + } switchPtyData(screen, !screen->utf8_mode); - update_font_utf8_mode(); /* * We don't repaint the screen when switching UTF-8 on/off. When switching * on - the Latin-1 codes should paint as-is. When switching off, that's * hard to do properly. */ } + +static void +do_font_utf8_title(Widget gw GCC_UNUSED, + XtPointer closure GCC_UNUSED, + XtPointer data GCC_UNUSED) +{ + TScreen *screen = &term->screen; + + screen->utf8_title = !screen->utf8_title; + update_font_utf8_title(); +} #endif /* @@ -1458,6 +1529,7 @@ { TScreen *screen = &term->screen; + TRACE(("Show vt-window\n")); if (!screen->Vshow) { /* not showing, turn on */ set_vt_visibility(True); } else if (screen->Tshow || allowswitch) { /* is showing, turn off */ @@ -1560,14 +1632,20 @@ return; } +#define handle_vt_toggle(proc, var, params, nparams, w) \ + handle_toggle(proc, (int) (var), params, nparams, w, (XtPointer)0, (XtPointer)0) + +#define handle_tek_toggle(proc, var, params, nparams, w) \ + handle_toggle(proc, (int) (var), params, nparams, w, (XtPointer)0, (XtPointer)0) + void HandleAllowSends(Widget w, XEvent * event GCC_UNUSED, String * params, Cardinal *param_count) { - handle_toggle(do_allowsends, (int) term->screen.allowSendEvents, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_allowsends, term->screen.allowSendEvents, + params, *param_count, w); } void @@ -1576,8 +1654,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_visualbell, (int) term->screen.visualbell, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_visualbell, term->screen.visualbell, + params, *param_count, w); } void @@ -1586,8 +1664,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_poponbell, (int) term->screen.poponbell, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_poponbell, term->screen.poponbell, + params, *param_count, w); } #ifdef ALLOWLOGGING @@ -1597,8 +1675,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_logging, (int) term->screen.logging, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_logging, term->screen.logging, + params, *param_count, w); } #endif @@ -1693,8 +1771,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_8bit_control, (int) term->screen.control_eight_bits, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_8bit_control, term->screen.control_eight_bits, + params, *param_count, w); } void @@ -1703,8 +1781,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_backarrow, (int) term->keyboard.flags & MODE_DECBKM, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_backarrow, term->keyboard.flags & MODE_DECBKM, + params, *param_count, w); } void @@ -1713,8 +1791,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_sun_fkeys, term->keyboard.type == keyboardIsSun, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_sun_fkeys, term->keyboard.type == keyboardIsSun, + params, *param_count, w); } #if OPT_NUM_LOCK @@ -1724,8 +1802,18 @@ String * params, Cardinal *param_count) { - handle_toggle(do_num_lock, (int) term->misc.real_NumLock, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_num_lock, term->misc.real_NumLock, + params, *param_count, w); +} + +void +HandleAltEsc(Widget w, + XEvent * event GCC_UNUSED, + String * params, + Cardinal *param_count) +{ + handle_vt_toggle(do_alt_esc, !term->screen.input_eight_bits, + params, *param_count, w); } void @@ -1734,8 +1822,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_meta_esc, (int) term->screen.meta_sends_esc, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_meta_esc, term->screen.meta_sends_esc, + params, *param_count, w); } #endif @@ -1745,8 +1833,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_delete_del, term->screen.delete_is_del, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_delete_del, term->screen.delete_is_del, + params, *param_count, w); } void @@ -1755,8 +1843,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_old_fkeys, term->keyboard.type == keyboardIsLegacy, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_old_fkeys, term->keyboard.type == keyboardIsLegacy, + params, *param_count, w); } #if OPT_SUNPC_KBD @@ -1766,8 +1854,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_sun_kbd, term->keyboard.type == keyboardIsVT220, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_sun_kbd, term->keyboard.type == keyboardIsVT220, + params, *param_count, w); } #endif @@ -1778,8 +1866,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_hp_fkeys, term->keyboard.type == keyboardIsHP, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_hp_fkeys, term->keyboard.type == keyboardIsHP, + params, *param_count, w); } #endif @@ -1790,8 +1878,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_sco_fkeys, term->keyboard.type == keyboardIsSCO, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_sco_fkeys, term->keyboard.type == keyboardIsSCO, + params, *param_count, w); } #endif @@ -1801,8 +1889,12 @@ String * params, Cardinal *param_count) { - handle_toggle(do_scrollbar, (int) term->screen.fullVwin.sb_info.width, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + if (IsIcon(&(term->screen))) { + Bell(XkbBI_MinorError, 0); + } else { + handle_vt_toggle(do_scrollbar, term->screen.fullVwin.sb_info.width, + params, *param_count, w); + } } void @@ -1811,8 +1903,18 @@ String * params, Cardinal *param_count) { - handle_toggle(do_jumpscroll, (int) term->screen.jumpscroll, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_jumpscroll, term->screen.jumpscroll, + params, *param_count, w); +} + +void +HandleSetSelect(Widget w, + XEvent * event GCC_UNUSED, + String * params, + Cardinal *param_count) +{ + handle_vt_toggle(do_selectClipboard, term->screen.selectToClipboard, + params, *param_count, w); } void @@ -1821,8 +1923,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_reversevideo, (int) (term->misc.re_verse0), - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_reversevideo, (term->misc.re_verse0), + params, *param_count, w); } void @@ -1831,8 +1933,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_autowrap, (int) (term->flags & WRAPAROUND), - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_autowrap, (term->flags & WRAPAROUND), + params, *param_count, w); } void @@ -1841,8 +1943,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_reversewrap, (int) (term->flags & REVERSEWRAP), - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_reversewrap, (term->flags & REVERSEWRAP), + params, *param_count, w); } void @@ -1851,8 +1953,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_autolinefeed, (int) (term->flags & LINEFEED), - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_autolinefeed, (term->flags & LINEFEED), + params, *param_count, w); } void @@ -1861,8 +1963,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_appcursor, (int) (term->keyboard.flags & MODE_DECCKM), - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_appcursor, (term->keyboard.flags & MODE_DECCKM), + params, *param_count, w); } void @@ -1871,8 +1973,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_appkeypad, (int) (term->keyboard.flags & MODE_DECKPAM), - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_appkeypad, (term->keyboard.flags & MODE_DECKPAM), + params, *param_count, w); } void @@ -1881,8 +1983,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_scrollkey, (int) term->screen.scrollkey, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_scrollkey, term->screen.scrollkey, + params, *param_count, w); } void @@ -1891,8 +1993,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_scrollttyoutput, (int) term->screen.scrollttyoutput, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_scrollttyoutput, term->screen.scrollttyoutput, + params, *param_count, w); } void @@ -1901,8 +2003,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_allow132, (int) term->screen.c132, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_allow132, term->screen.c132, + params, *param_count, w); } void @@ -1911,8 +2013,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_cursesemul, (int) term->screen.curses, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_cursesemul, term->screen.curses, + params, *param_count, w); } void @@ -1921,8 +2023,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_marginbell, (int) term->screen.marginbell, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_marginbell, term->screen.marginbell, + params, *param_count, w); } #if OPT_BLINK_CURS @@ -1933,8 +2035,8 @@ Cardinal *param_count) { /* eventually want to see if sensitive or not */ - handle_toggle(do_cursorblink, (int) term->screen.cursor_blink, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_cursorblink, term->screen.cursor_blink, + params, *param_count, w); } #endif @@ -1945,8 +2047,8 @@ Cardinal *param_count) { /* eventually want to see if sensitive or not */ - handle_toggle(do_altscreen, (int) term->screen.alternate, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_altscreen, term->screen.alternate, + params, *param_count, w); } void @@ -1956,8 +2058,8 @@ Cardinal *param_count) { /* eventually want to see if sensitive or not */ - handle_toggle(do_titeInhibit, !((int) term->misc.titeInhibit), - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_titeInhibit, !(term->misc.titeInhibit), + params, *param_count, w); } /* ARGSUSED */ @@ -1997,8 +2099,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_font_doublesize, (int) term->screen.font_doublesize, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_font_doublesize, term->screen.font_doublesize, + params, *param_count, w); } #endif @@ -2009,8 +2111,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_font_boxchars, (int) term->screen.force_box_chars, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_font_boxchars, term->screen.force_box_chars, + params, *param_count, w); } #endif @@ -2021,8 +2123,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_font_loadable, (int) term->misc.font_loadable, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_font_loadable, term->misc.font_loadable, + params, *param_count, w); } #endif @@ -2033,8 +2135,8 @@ String * params, Cardinal *param_count) { - handle_toggle(do_font_renderfont, term->misc.render_font, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_font_renderfont, term->misc.render_font, + params, *param_count, w); } #endif @@ -2045,8 +2147,18 @@ String * params, Cardinal *param_count) { - handle_toggle(do_font_utf8_mode, term->screen.utf8_mode, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + handle_vt_toggle(do_font_utf8_mode, term->screen.utf8_mode, + params, *param_count, w); +} + +void +HandleUTF8Title(Widget w, + XEvent * event GCC_UNUSED, + String * params, + Cardinal *param_count) +{ + handle_vt_toggle(do_font_utf8_title, term->screen.utf8_title, + params, *param_count, w); } #endif @@ -2087,15 +2199,13 @@ switch (params[0][0]) { case 'v': case 'V': - handle_toggle(do_vtonoff, (int) term->screen.Vshow, - params + 1, (*param_count) - 1, - w, (XtPointer) 0, (XtPointer) 0); + handle_tek_toggle(do_vtonoff, (int) term->screen.Vshow, + params + 1, (*param_count) - 1, w); break; case 't': case 'T': - handle_toggle(do_tekonoff, (int) term->screen.Tshow, - params + 1, (*param_count) - 1, - w, (XtPointer) 0, (XtPointer) 0); + handle_tek_toggle(do_tekonoff, (int) term->screen.Tshow, + params + 1, (*param_count) - 1, w); break; default: Bell(XkbBI_MinorError, 0); @@ -2221,14 +2331,17 @@ domenu(gw, (XEvent *) 0, params, &count); - XtRemoveCallback(gw, XtNpopupCallback, InitPopup, closure); + if (gw) + XtRemoveCallback(gw, XtNpopupCallback, InitPopup, closure); } -static void -SetupShell(Widget *menus, MenuList * shell, Widget *menu_tops, int n, int m) +static Dimension +SetupShell(Widget *menus, MenuList * shell, int n, int m) { char temp[80]; char *external_name = 0; + Dimension button_height; + Dimension button_border; shell[n].w = XtVaCreatePopupShell(menu_names[n].internal_name, simpleMenuWidgetClass, @@ -2247,29 +2360,38 @@ (long) shell[n].w)); sprintf(temp, "%sButton", menu_names[n].internal_name); - menu_tops[n] = XtVaCreateManagedWidget(temp, - menuButtonWidgetClass, - *menus, - XtNfromHoriz, ((m >= 0) - ? menu_tops[m] - : 0), - XtNmenuName, menu_names[n].internal_name, - XtNlabel, external_name, - (XtPointer) 0); -} + shell[n].b = XtVaCreateManagedWidget(temp, + menuButtonWidgetClass, + *menus, + XtNfromHoriz, ((m >= 0) + ? shell[m].b + : 0), + XtNmenuName, menu_names[n].internal_name, + XtNlabel, external_name, + (XtPointer) 0); + XtVaGetValues(shell[n].b, + XtNheight, &button_height, + XtNborderWidth, &button_border, + (XtPointer) 0); -#endif + return button_height + (button_border * 2); +} +#endif /* OPT_TOOLBAR */ void -SetupMenus(Widget shell, Widget *forms, Widget *menus) +SetupMenus(Widget shell, Widget *forms, Widget *menus, Dimension * menu_high) { #if OPT_TOOLBAR - int n; - Widget menu_tops[NUM_POPUP_MENUS]; + Dimension button_height; + Dimension toolbar_hSpace; + Dimension toolbar_border; + Arg args[10]; #endif TRACE(("SetupMenus(%s)\n", shell == toplevel ? "vt100" : "tek4014")); + *menu_high = 0; + if (shell == toplevel) { XawSimpleMenuAddGlobalActions(app_con); XtRegisterGrabAction(HandlePopupMenu, True, @@ -2288,27 +2410,50 @@ * the grip, because it's too easy to make the toolbar look bad that * way. */ - *menus = XtVaCreateManagedWidget("menubar", - boxWidgetClass, *forms, - XtNorientation, XtorientHorizontal, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - (XtPointer) 0); + XtSetArg(args[0], XtNorientation, XtorientHorizontal); + XtSetArg(args[1], XtNtop, XawChainTop); + XtSetArg(args[2], XtNbottom, XawChainTop); + XtSetArg(args[3], XtNleft, XawChainLeft); + XtSetArg(args[4], XtNright, XawChainLeft); + + if (resource.toolBar) { + *menus = XtCreateManagedWidget("menubar", boxWidgetClass, *forms, + args, 5); + } else { + *menus = XtCreateWidget("menubar", boxWidgetClass, *forms, args, 5); + } + + /* + * The toolbar widget's height is not necessarily known yet. If the + * toolbar is not created as a managed widget, we can still make a good + * guess about its height by collecting the widget's other resource values. + */ + XtVaGetValues(*menus, + XtNhSpace, &toolbar_hSpace, + XtNborderWidth, &toolbar_border, + (XtPointer) 0); if (shell == toplevel) { /* vt100 */ - for (n = mainMenu; n <= fontMenu; n++) { - SetupShell(menus, vt_shell, menu_tops, n, n - 1); + int j; + for (j = mainMenu; j <= fontMenu; j++) { + button_height = SetupShell(menus, vt_shell, j, j - 1); } } #if OPT_TEK4014 else { /* tek4014 */ - SetupShell(menus, tek_shell, menu_tops, mainMenu, -1); - SetupShell(menus, tek_shell, menu_tops, tekMenu, mainMenu); + button_height = SetupShell(menus, tek_shell, mainMenu, -1); + button_height = SetupShell(menus, tek_shell, tekMenu, mainMenu); } #endif + /* + * Tell the main program how high the toolbar is, to help with the initial + * layout. + */ + *menu_high = (button_height + 2 * (toolbar_hSpace + toolbar_border)); + TRACE(("...menuHeight:%d = (%d + 2 * (%d + %d))\n", + *menu_high, button_height, toolbar_hSpace, toolbar_border)); + #else *forms = shell; *menus = shell; @@ -2319,32 +2464,66 @@ TRACE(("...menus=%#lx\n", (long) *menus)); } -#if OPT_TOOLBAR void -SetupToolbar(Widget shell) +repairSizeHints(void) { - int n; - if (shell == toplevel) { /* vt100 */ - for (n = mainMenu; n <= fontMenu; n++) { - InitPopup(vt_shell[n].w, menu_names[n].internal_name, 0); - } + TScreen *screen = &term->screen; + + XSizeHints sizehints; + + if (XtIsRealized((Widget) term)) { + bzero(&sizehints, sizeof(sizehints)); + xtermSizeHints(term, &sizehints, ScrollbarWidth(screen)); + + XSetWMNormalHints(screen->display, XtWindow(SHELL_OF(term)), &sizehints); } +} + +#if OPT_TOOLBAR +#define INIT_POPUP(s, n) InitPopup(s[n].w, menu_names[n].internal_name, 0) + +static Bool +InitWidgetMenu(Widget shell) +{ + Bool result = False; + + TRACE(("InitWidgetMenu(%p)\n", shell)); + if (term != 0) { + if (shell == toplevel) { /* vt100 */ + if (!term->init_vt_menu) { + INIT_POPUP(vt_shell, mainMenu); + INIT_POPUP(vt_shell, vtMenu); + INIT_POPUP(vt_shell, fontMenu); + term->init_vt_menu = True; + TRACE(("...InitWidgetMenu(vt)\n")); + } + result = term->init_vt_menu; + } #if OPT_TEK4014 - else { /* tek4014 */ - InitPopup(tek_shell[mainMenu].w, menu_names[mainMenu].internal_name, 0); - InitPopup(tek_shell[tekMenu].w, menu_names[tekMenu].internal_name, 0); - } + else if (tekWidget) { /* tek4014 */ + if (!term->init_tek_menu) { + INIT_POPUP(tek_shell, mainMenu); + INIT_POPUP(tek_shell, tekMenu); + term->init_tek_menu = True; + TRACE(("...InitWidgetMenu(tek)\n")); + } + result = term->init_tek_menu; + } #endif - term->screen.toolbars = True; - update_toolbar(); + } + TRACE(("...InitWidgetMenu ->%d\n", result)); + return result; } static TbInfo * toolbar_info(Widget w) { - return ((w == (Widget) term) - ? &(WhichVWin(&(term->screen))->tb_info) - : &(tekWidget->tek.tb_info)); + TRACE(("...getting toolbar_info\n")); +#if OPT_TEK4014 + if (w != (Widget) term) + return &(tekWidget->tek.tb_info); +#endif + return &(WhichVWin(&(term->screen))->tb_info); } static void @@ -2353,13 +2532,19 @@ if (w != 0) { TbInfo *info = toolbar_info(w); - if (info->menu_bar != 0) { - if (XtIsRealized(info->menu_bar)) - XtUnmapWidget(info->menu_bar); - } + TRACE(("hiding toolbar\n")); XtVaSetValues(w, XtNfromVert, (Widget) 0, (XtPointer) 0); + + if (info->menu_bar != 0) { + repairSizeHints(); + XtUnmanageChild(info->menu_bar); + if (XtIsRealized(info->menu_bar)) { + XtUnmapWidget(info->menu_bar); + } + } + TRACE(("...hiding toolbar (done)\n")); } } @@ -2369,30 +2554,53 @@ if (w != 0) { TbInfo *info = toolbar_info(w); + TRACE(("showing toolbar\n")); if (info->menu_bar != 0) { + XtVaSetValues(w, + XtNfromVert, info->menu_bar, + (XtPointer) 0); if (XtIsRealized(info->menu_bar)) + repairSizeHints(); + XtManageChild(info->menu_bar); + if (XtIsRealized(info->menu_bar)) { XtMapWidget(info->menu_bar); + } } - XtVaSetValues(w, - XtNfromVert, info->menu_bar, - (XtPointer) 0); /* * This is needed to make the terminal widget move down below the * toolbar. */ XawFormDoLayout(XtParent(w), True); + TRACE(("...showing toolbar (done)\n")); } } +/* + * Make the toolbar visible or invisible in the current window(s). + */ void ShowToolbar(Bool enable) { - if (enable) { - show_toolbar((Widget) term); - show_toolbar((Widget) tekWidget); + TRACE(("ShowToolbar(%d)\n", enable)); + + if (IsIcon(&(term->screen))) { + Bell(XkbBI_MinorError, 0); } else { - hide_toolbar((Widget) term); - hide_toolbar((Widget) tekWidget); + if (enable) { + if (InitWidgetMenu(toplevel)) + show_toolbar((Widget) term); +#if OPT_TEK4014 + if (InitWidgetMenu(tekshellwidget)) + show_toolbar((Widget) tekWidget); +#endif + } else { + hide_toolbar((Widget) term); +#if OPT_TEK4014 + hide_toolbar((Widget) tekWidget); +#endif + } + resource.toolBar = enable; + update_toolbar(); } } @@ -2402,8 +2610,12 @@ String * params GCC_UNUSED, Cardinal *param_count GCC_UNUSED) { - handle_toggle(do_toolbar, (int) term->screen.toolbars, - params, *param_count, w, (XtPointer) 0, (XtPointer) 0); + if (IsIcon(&(term->screen))) { + Bell(XkbBI_MinorError, 0); + } else { + handle_vt_toggle(do_toolbar, resource.toolBar, + params, *param_count, w); + } } /* ARGSUSED */ @@ -2417,8 +2629,11 @@ * menu which contains the checkbox indicating whether the toolbar is * active. */ - ShowToolbar(term->screen.toolbars = !term->screen.toolbars); - update_toolbar(); + if (IsIcon(&(term->screen))) { + Bell(XkbBI_MinorError, 0); + } else { + ShowToolbar(resource.toolBar = !resource.toolBar); + } } void @@ -2426,7 +2641,7 @@ { update_menu_item(term->screen.mainMenu, mainMenuEntries[mainMenu_toolbar].widget, - term->screen.toolbars); + resource.toolBar); } #endif /* OPT_TOOLBAR */ @@ -2490,6 +2705,14 @@ } void +update_alt_esc(void) +{ + update_menu_item(term->screen.mainMenu, + mainMenuEntries[mainMenu_alt_esc].widget, + !term->screen.input_eight_bits); +} + +void update_meta_esc(void) { update_menu_item(term->screen.mainMenu, @@ -2633,6 +2856,14 @@ } void +update_selectToClipboard(void) +{ + update_menu_item(term->screen.vtMenu, + vtMenuEntries[vtMenu_selectToClipboard].widget, + term->screen.selectToClipboard); +} + +void update_allow132(void) { update_menu_item(term->screen.vtMenu, @@ -2643,9 +2874,11 @@ void update_cursesemul(void) { +#if 0 /* 2006-2-12: no longer menu entry */ update_menu_item(term->screen.vtMenu, vtMenuEntries[vtMenu_cursesemul].widget, term->screen.curses); +#endif } void @@ -2752,9 +2985,25 @@ void update_font_utf8_mode(void) { - update_menu_item(term->screen.fontMenu, - fontMenuEntries[fontMenu_wide_chars].widget, - term->screen.utf8_mode); + Widget iw = fontMenuEntries[fontMenu_wide_chars].widget; + Bool active = (term->screen.utf8_mode != uAlways); + Bool enable = (term->screen.utf8_mode != uFalse); + + TRACE(("update_font_utf8_mode active %d, enable %d\n", active, enable)); + set_sensitivity(term->screen.fontMenu, iw, active); + update_menu_item(term->screen.fontMenu, iw, enable); +} + +void +update_font_utf8_title(void) +{ + Widget iw = fontMenuEntries[fontMenu_wide_title].widget; + Bool active = (term->screen.utf8_mode != uFalse); + Bool enable = (term->screen.utf8_title); + + TRACE(("update_font_utf8_title active %d, enable %d\n", active, enable)); + set_sensitivity(term->screen.fontMenu, iw, active); + update_menu_item(term->screen.fontMenu, iw, enable); } #endif Index: xc/programs/xterm/menu.h diff -u xc/programs/xterm/menu.h:3.35 xc/programs/xterm/menu.h:3.41 --- xc/programs/xterm/menu.h:3.35 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/menu.h Sun Mar 12 20:27:59 2006 @@ -1,9 +1,8 @@ -/* $XTermId: menu.h,v 1.87 2005/01/10 00:30:46 tom Exp $ */ +/* $XTermId: menu.h,v 1.103 2006/03/07 14:29:22 tom Exp $ */ -/* $Xorg: menu.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /* -Copyright 1999-2004,2005 by Thomas E. Dickey +Copyright 1999-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -50,15 +49,13 @@ from The Open Group. */ -/* $XFree86: xc/programs/xterm/menu.h,v 3.35 2005/01/14 01:50:03 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/menu.h,v 3.41 2006/03/13 01:27:59 dickey Exp $ */ #ifndef included_menu_h #define included_menu_h #include -#include - typedef struct _MenuEntry { char *name; void (*function) PROTO_XT_CALLBACK_ARGS; @@ -74,6 +71,7 @@ extern void Handle8BitControl PROTO_XT_ACTIONS_ARGS; extern void HandleAllow132 PROTO_XT_ACTIONS_ARGS; extern void HandleAllowSends PROTO_XT_ACTIONS_ARGS; +extern void HandleAltEsc PROTO_XT_ACTIONS_ARGS; extern void HandleAltScreen PROTO_XT_ACTIONS_ARGS; extern void HandleAppCursor PROTO_XT_ACTIONS_ARGS; extern void HandleAppKeypad PROTO_XT_ACTIONS_ARGS; @@ -108,8 +106,10 @@ extern void HandleScrollKey PROTO_XT_ACTIONS_ARGS; extern void HandleScrollTtyOutput PROTO_XT_ACTIONS_ARGS; extern void HandleScrollbar PROTO_XT_ACTIONS_ARGS; +extern void HandleSecure PROTO_XT_ACTIONS_ARGS; extern void HandleSendSignal PROTO_XT_ACTIONS_ARGS; extern void HandleSetPopOnBell PROTO_XT_ACTIONS_ARGS; +extern void HandleSetSelect PROTO_XT_ACTIONS_ARGS; extern void HandleSetTekText PROTO_XT_ACTIONS_ARGS; extern void HandleSetTerminalType PROTO_XT_ACTIONS_ARGS; extern void HandleSetVisualBell PROTO_XT_ACTIONS_ARGS; @@ -122,13 +122,12 @@ extern void HandleTiteInhibit PROTO_XT_ACTIONS_ARGS; extern void HandleToolbar PROTO_XT_ACTIONS_ARGS; extern void HandleUTF8Mode PROTO_XT_ACTIONS_ARGS; +extern void HandleUTF8Title PROTO_XT_ACTIONS_ARGS; extern void HandleVisibility PROTO_XT_ACTIONS_ARGS; -extern void DoSecureKeyboard (Time tp); -extern void SetupMenus (Widget shell, Widget *forms, Widget *menus); +extern void SetupMenus (Widget /*shell*/, Widget */*forms*/, Widget */*menus*/, Dimension * /*menu_high*/); #if OPT_TOOLBAR -extern void SetupToolbar(Widget); extern void ShowToolbar(Bool); #endif @@ -158,6 +157,7 @@ mainMenu_backarrow, #if OPT_NUM_LOCK mainMenu_num_lock, + mainMenu_alt_esc, mainMenu_meta_esc, #endif mainMenu_delete_del, @@ -200,7 +200,7 @@ vtMenu_scrollkey, vtMenu_scrollttyoutput, vtMenu_allow132, - vtMenu_cursesemul, + vtMenu_selectToClipboard, vtMenu_visualbell, vtMenu_poponbell, vtMenu_marginbell, @@ -261,6 +261,7 @@ #endif #if OPT_WIDE_CHARS fontMenu_wide_chars, + fontMenu_wide_title, #endif #endif @@ -324,9 +325,11 @@ #if OPT_NUM_LOCK extern void update_num_lock(void); +extern void update_alt_esc(void); extern void update_meta_esc(void); #else #define update_num_lock() /*nothing*/ +#define update_alt_esc() /*nothing*/ #define update_meta_esc() /*nothing*/ #endif @@ -359,6 +362,7 @@ extern void update_appcursor(void); extern void update_appkeypad(void); extern void update_scrollkey(void); +extern void update_selectToClipboard(void); extern void update_scrollttyoutput(void); extern void update_allow132(void); extern void update_cursesemul(void); @@ -405,8 +409,10 @@ #if OPT_WIDE_CHARS extern void update_font_utf8_mode(void); +extern void update_font_utf8_title(void); #else #define update_font_utf8_mode() /* nothing */ +#define update_font_utf8_title() /* nothing */ #endif #if OPT_TEK4014 Index: xc/programs/xterm/minstall.sh diff -u xc/programs/xterm/minstall.sh:1.4 xc/programs/xterm/minstall.sh:1.5 --- xc/programs/xterm/minstall.sh:1.4 Fri Dec 27 16:05:22 2002 +++ xc/programs/xterm/minstall.sh Sun Apr 9 20:34:37 2006 @@ -1,5 +1,5 @@ #!/bin/sh -# $XFree86: xc/programs/xterm/minstall.sh,v 1.4 2002/12/27 21:05:22 dickey Exp $ +# $XFree86: xc/programs/xterm/minstall.sh,v 1.5 2006/04/10 00:34:37 dickey Exp $ # # Install manpages, substituting a reasonable section value since XFree86 4.x # doesn't use constants... @@ -8,17 +8,19 @@ # $1 = program to invoke as "install" # $2 = manpage to install # $3 = final installed-path +# $4 = app-defaults directory # MINSTALL="$1" OLD_FILE="$2" END_FILE="$3" +APPS_DIR="$4" suffix=`echo "$END_FILE" | sed -e 's%^[^.]*.%%'` NEW_FILE=temp$$ sed -e 's%__vendorversion__%"X Window System"%' \ - -e s%__apploaddir__%/usr/lib/X11/app-defaults% \ + -e s%__apploaddir__%$APPS_DIR% \ -e s%__mansuffix__%$suffix%g \ -e s%__miscmansuffix__%$suffix%g \ $OLD_FILE >$NEW_FILE Index: xc/programs/xterm/misc.c diff -u xc/programs/xterm/misc.c:3.95 xc/programs/xterm/misc.c:3.106 --- xc/programs/xterm/misc.c:3.95 Sat Jan 29 17:17:32 2005 +++ xc/programs/xterm/misc.c Sun Apr 9 20:34:37 2006 @@ -1,14 +1,10 @@ -/* $XTermId: misc.c,v 1.247 2005/01/29 22:05:32 tom Exp $ */ +/* $XTermId: misc.c,v 1.296 2006/04/02 21:35:06 tom Exp $ */ -/* - * $Xorg: misc.c,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/misc.c,v 3.95 2005/01/29 22:17:32 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/misc.c,v 3.106 2006/04/10 00:34:37 dickey Exp $ */ /* * - * Copyright 1999-2004,2005 by Thomas E. Dickey + * Copyright 1999-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -75,10 +71,17 @@ #include #include #include +#include #if HAVE_X11_SUNKEYSYM_H #include #endif +#ifdef HAVE_LANGINFO_CODESET +#include +#endif + +#include + #include #include #include @@ -145,6 +148,9 @@ XtInputMask input_mask; TScreen *screen = &term->screen; + if (need_cleanup) + Cleanup(0); + if (screen->scroll_amt) FlushScroll(screen); /* @@ -197,7 +203,7 @@ ) && event.xany.type == MotionNotify && event.xcrossing.window == XtWindow(term)) { - SendMousePosition((Widget) term, &event); + SendMousePosition(term, &event); continue; } @@ -321,15 +327,15 @@ if (*param_count == 1) { char *value = params[0]; int need = strlen(value); - int used = VTbuffer.next - VTbuffer.buffer; - int have = VTbuffer.last - VTbuffer.buffer; + int used = VTbuffer->next - VTbuffer->buffer; + int have = VTbuffer->last - VTbuffer->buffer; - if (have - used + need < (int) sizeof(VTbuffer.buffer)) { + if (have - used + need < BUF_SIZE) { - fillPtyData(&term->screen, &VTbuffer, value, (int) strlen(value)); + fillPtyData(&term->screen, VTbuffer, value, (int) strlen(value)); TRACE(("Interpret %s\n", value)); - VTbuffer.update++; + VTbuffer->update++; } } } @@ -339,6 +345,7 @@ { TScreen *screen = &term->screen; + TRACE(("DoSpecialEnterNotify(%d)\n", screen->select)); #ifdef ACTIVEWINDOWINPUTONLY if (ev->window == XtWindow(XtParent(CURRENT_EMU(screen)))) #endif @@ -356,6 +363,7 @@ Boolean * cont GCC_UNUSED) { /* NOP since we handled it above */ + TRACE(("HandleEnterWindow ignored\n")); } static void @@ -363,6 +371,7 @@ { TScreen *screen = &term->screen; + TRACE(("DoSpecialLeaveNotify(%d)\n", screen->select)); #ifdef ACTIVEWINDOWINPUTONLY if (ev->window == XtWindow(XtParent(CURRENT_EMU(screen)))) #endif @@ -380,6 +389,7 @@ Boolean * cont GCC_UNUSED) { /* NOP since we handled it above */ + TRACE(("HandleLeaveWindow ignored\n")); } /*ARGSUSED*/ @@ -392,10 +402,28 @@ XFocusChangeEvent *event = (XFocusChangeEvent *) ev; TScreen *screen = &term->screen; + TRACE(("HandleFocusChange type=%d, mode=%d, detail=%d\n", + event->type, + event->mode, + event->detail)); + if (event->type == FocusIn) { + /* + * NotifyNonlinear only happens (on FocusIn) if the pointer was not in + * one of our windows. Use this to reset a case where one xterm is + * partly obscuring another, and X gets (us) confused about whether the + * pointer was in the window. In particular, this can happen if the + * user is resizing the obscuring window, causing some events to not be + * delivered to the obscured window. + */ + if (event->detail == NotifyNonlinear + && (screen->select & INWINDOW) != 0) { + unselectwindow(screen, INWINDOW); + } selectwindow(screen, - (event->detail == NotifyPointer) ? INWINDOW : - FOCUS); + ((event->detail == NotifyPointer) + ? INWINDOW + : FOCUS)); } else { /* * XGrabKeyboard() will generate FocusOut/NotifyGrab event that we want @@ -403,8 +431,9 @@ */ if (event->mode != NotifyGrab) { unselectwindow(screen, - (event->detail == NotifyPointer) ? INWINDOW : - FOCUS); + ((event->detail == NotifyPointer) + ? INWINDOW + : FOCUS)); } if (screen->grabbedKbd && (event->mode == NotifyUngrab)) { Bell(XkbBI_Info, 100); @@ -418,6 +447,8 @@ static void selectwindow(TScreen * screen, int flag) { + TRACE(("selectwindow(%d) flag=%d\n", screen->select, flag)); + #if OPT_TEK4014 if (screen->TekEmu) { if (!Ttoggled) @@ -444,6 +475,8 @@ static void unselectwindow(TScreen * screen, int flag) { + TRACE(("unselectwindow(%d) flag=%d\n", screen->select, flag)); + if (screen->always_highlight) return; @@ -477,6 +510,9 @@ long now_msecs; TRACE(("BELL %d\n", percent)); + if (!XtIsRealized((Widget) term)) { + return; + } /* has enough time gone by that we are allowed to ring the bell again? */ @@ -624,7 +660,7 @@ return linep[*xp]; if (--*yp < 0) /* go to previous line */ break; - *xp = screen->max_col + 1; + *xp = MaxCols(screen); if (!((long) BUF_FLAGS(screen->allbuf, *yp) & LINEWRAPPED)) return ' '; /* treat lines as separate */ } @@ -766,8 +802,9 @@ } int -QueryMaximize(TScreen * screen, unsigned *width, unsigned *height) +QueryMaximize(XtermWidget termw, unsigned *width, unsigned *height) { + TScreen *screen = &termw->screen; XSizeHints hints; long supp = 0; Window root_win; @@ -777,7 +814,7 @@ unsigned root_depth; if (XGetGeometry(screen->display, - XDefaultRootWindow(screen->display), + RootWindowOfScreen(XtScreen(termw)), &root_win, &root_x, &root_y, @@ -825,7 +862,7 @@ if (maximize) { - if (QueryMaximize(screen, &root_width, &root_height)) { + if (QueryMaximize(termw, &root_width, &root_height)) { if (XGetWindowAttributes(screen->display, WMFrameWindow(termw), @@ -954,7 +991,7 @@ time_t tstamp; struct tm *tstruct; - time(&tstamp); + tstamp = time((time_t *) 0); tstruct = localtime(&tstamp); sprintf(dst, TIMESTAMP_FMT, src, @@ -1162,7 +1199,7 @@ time_t now; struct tm *ltm; - (void) time(&now); + now = time((time_t *) 0); ltm = (struct tm *) localtime(&now); if ((gethostname(hostname, sizeof(hostname)) == 0) && (strftime(yyyy_mm_dd_hh_mm_ss, @@ -1252,7 +1289,7 @@ return; } #endif /*VMS */ - screen->logstart = VTbuffer.next; + screen->logstart = VTbuffer->next; screen->logging = True; update_logging(); } @@ -1281,12 +1318,12 @@ return; tt_new_output = False; #endif /* VMS */ - cp = VTbuffer.next; + cp = VTbuffer->next; if (screen->logstart != 0 && (i = cp - screen->logstart) > 0) { write(screen->logfd, (char *) screen->logstart, (unsigned) i); } - screen->logstart = VTbuffer.next; + screen->logstart = VTbuffer->next; } } @@ -1506,6 +1543,85 @@ #define find_closest_color(display, cmap, def) 0 #endif /* OPT_ISO_COLORS */ +#if OPT_PASTE64 +static void +ManipulateSelectionData(TScreen * screen, char *buf, int final) +{ +#define PDATA(a,b) { a, #b } + static struct { + char given; + char *result; + } table[] = { + PDATA('s', SELECT), + PDATA('p', PRIMARY), + PDATA('c', CLIPBOARD), + PDATA('0', CUT_BUFFER0), + PDATA('1', CUT_BUFFER1), + PDATA('2', CUT_BUFFER2), + PDATA('3', CUT_BUFFER3), + PDATA('4', CUT_BUFFER4), + PDATA('5', CUT_BUFFER5), + PDATA('6', CUT_BUFFER6), + PDATA('7', CUT_BUFFER7), + }; + + char *base = buf; + char *used = x_strdup(base); + Cardinal j, n = 0; + char **select_args = 0; + + TRACE(("Manipulate selection data\n")); + + while (*buf != ';' && *buf != '\0') { + ++buf; + } + + if (*buf == ';') { + *buf++ = '\0'; + + if (*base == '\0') + base = "s0"; + if ((select_args = TypeCallocN(String, 1 + strlen(base))) == 0) + return; + while (*base != '\0') { + for (j = 0; j < XtNumber(table); ++j) { + if (*base == table[j].given) { + used[n] = *base; + select_args[n++] = table[j].result; + TRACE(("atom[%d] %s\n", n, table[j].result)); + break; + } + } + ++base; + } + used[n] = 0; + + if (!strcmp(buf, "?")) { + TRACE(("Getting selection\n")); + unparseputc1(OSC, screen->respond); + unparseputs("52", screen->respond); + unparseputc(';', screen->respond); + + unparseputs(used, screen->respond); + unparseputc(';', screen->respond); + + /* Tell xtermGetSelection data is base64 encoded */ + screen->base64_paste = n; + screen->base64_final = final; + + /* terminator will be written in this call */ + xtermGetSelection((Widget) term, 0, select_args, n, NULL); + } else { + TRACE(("Setting selection with %s\n", buf)); + ClearSelectionBuffer(screen); + while (*buf != '\0') + AppendToSelectionBuffer(screen, CharOf(*buf++)); + CompleteSelection(term, select_args, n); + } + } +} +#endif /* OPT_PASTE64 */ + /***====================================================================***/ void @@ -1517,6 +1633,8 @@ int state = 0; char *buf = 0; + TRACE(("do_osc %s\n", oscbuf)); + /* * Lines should be of the form number ; string , however * older xterms can accept as a final character. We will respond @@ -1530,14 +1648,18 @@ case 0: if (isdigit(*cp)) { mode = 10 * mode + (*cp - '0'); - if (mode > 65535) + if (mode > 65535) { + TRACE(("do_osc found unknown mode %d\n", mode)); return; + } break; } /* FALLTHRU */ case 1: - if (*cp != ';') + if (*cp != ';') { + TRACE(("do_osc did not find semicolon offset %d\n", cp - oscbuf)); return; + } state = 2; break; case 2: @@ -1545,8 +1667,26 @@ state = 3; /* FALLTHRU */ default: - if (ansi_table[CharOf(*cp)] != CASE_PRINT) - return; + if (ansi_table[CharOf(*cp)] != CASE_PRINT) { + switch (mode) { + case 0: + case 1: + case 2: +#if OPT_WIDE_CHARS + /* + * If we're running with UTF-8, it is possible for title + * strings to contain "nonprinting" text. + */ + if (xtermEnvUTF8()) +#endif + break; + default: + TRACE(("do_osc found nonprinting char %02X offset %d\n", + CharOf(*cp), + cp - oscbuf)); + return; + } + } } } if (buf == 0) @@ -1625,7 +1765,7 @@ unparseputc1(OSC, screen->respond); unparseputs("50", screen->respond); - if ((buf = screen->menu_font_names[num]) != 0) { + if ((buf = screen->MenuFontName(num)) != 0) { unparseputc(';', screen->respond); unparseputs(buf, screen->respond); } @@ -1670,19 +1810,25 @@ if (num < 0 || num > fontMenu_lastBuiltin - || (buf = screen->menu_font_names[num]) == 0) { + || (buf = screen->MenuFontName(num)) == 0) { Bell(XkbBI_MinorError, 0); break; } } fonts.f_n = buf; - SetVTFont(fontMenu_fontescape, True, &fonts); + SetVTFont(term, fontMenu_fontescape, True, &fonts); } break; case 51: - /* reserved for Emacs shell (Rob Myoff ) */ + /* reserved for Emacs shell (Rob Mayoff ) */ break; +#if OPT_PASTE64 + case 52: + if (screen->allowWindowOps && (buf != 0)) + ManipulateSelectionData(screen, buf, final); + break; +#endif /* * One could write code to send back the display and host names, * but that could potentially open a fairly nasty security hole. @@ -2038,38 +2184,56 @@ unsigned state; int code; char *tmp; + char *parsed = ++cp; - ++cp; - code = xtermcapKeycode(cp, &state); unparseputc1(DCS, screen->respond); + + code = xtermcapKeycode(&parsed, &state); unparseputc(code >= 0 ? '1' : '0', screen->respond); + unparseputc('+', screen->respond); unparseputc('r', screen->respond); - for (tmp = cp; *tmp; ++tmp) - unparseputc(*tmp, screen->respond); - if (code >= 0) { - unparseputc('=', screen->respond); - screen->tc_query = code; - /* XK_COLORS is a fake code for the "Co" entry (maximum - * number of colors) */ - if (code == XK_COLORS) { + + while (*cp != 0) { + if (cp == parsed) + break; /* no data found, error */ + + for (tmp = cp; tmp != parsed; ++tmp) + unparseputc(*tmp, screen->respond); + + if (code >= 0) { + unparseputc('=', screen->respond); + screen->tc_query = code; + /* XK_COLORS is a fake code for the "Co" entry (maximum + * number of colors) */ + if (code == XK_COLORS) { # if OPT_256_COLORS - unparseputc('2', screen->respond); - unparseputc('5', screen->respond); - unparseputc('6', screen->respond); + unparseputc('2', screen->respond); + unparseputc('5', screen->respond); + unparseputc('6', screen->respond); # elif OPT_88_COLORS - unparseputc('8', screen->respond); - unparseputc('8', screen->respond); + unparseputc('8', screen->respond); + unparseputc('8', screen->respond); # else - unparseputc('1', screen->respond); - unparseputc('6', screen->respond); + unparseputc('1', screen->respond); + unparseputc('6', screen->respond); # endif + } else { + XKeyEvent event; + event.state = state; + Input(&(term->keyboard), screen, &event, False); + } + screen->tc_query = -1; } else { - XKeyEvent event; - event.state = state; - Input(&(term->keyboard), screen, &event, False); + break; /* no match found, error */ + } + + cp = parsed; + if (*parsed == ';') { + unparseputc(*parsed++, screen->respond); + cp = parsed; + code = xtermcapKeycode(&parsed, &state); } - screen->tc_query = -1; } unparseputc1(ST, screen->respond); } @@ -2104,24 +2268,94 @@ static void ChangeGroup(String attribute, char *value) { +#if OPT_WIDE_CHARS + static Char *converted; /* NO_LEAKS */ +#endif Arg args[1]; - const char *name = (value != 0) ? (char *) value : ""; + char *original = (value != 0) ? value : ""; + char *name = original; + TScreen *screen = &term->screen; + Widget w = CURRENT_EMU(screen); + Widget top = SHELL_OF(w); + unsigned limit = strlen(name); TRACE(("ChangeGroup(attribute=%s, value=%s)\n", attribute, name)); + + /* + * Ignore titles that are too long to be plausible requests. + */ + if (limit >= 1024) + return; + +#if OPT_WIDE_CHARS + /* + * Title strings are limited to ISO-8859-1, which is consistent with the + * printable data in sos_table. However, if we're running in UTF-8 mode, + * it is likely that non-ASCII text in the string will be rejected because + * it is not printable in the current locale. So we convert it to UTF-8, + * allowing the X library to convert it back. + */ + if (xtermEnvUTF8() && !screen->utf8_title) { + int n; + + for (n = 0; name[n] != '\0'; ++n) { + if (CharOf(name[n]) > 127) { + if (converted != 0) + free(converted); + if ((converted = TypeMallocN(Char, 1 + (5 * limit))) != 0) { + Char *temp = converted; + while (*name != 0) { + temp = convertToUTF8(temp, CharOf(*name)); + ++name; + } + *temp = 0; + name = (char *) converted; + TRACE(("...converted{%s}\n", name)); + } + break; + } + } + } +#endif + #if OPT_SAME_NAME /* If the attribute isn't going to change, then don't bother... */ if (sameName) { char *buf; XtSetArg(args[0], attribute, &buf); - XtGetValues(toplevel, args, 1); + XtGetValues(top, args, 1); + TRACE(("...comparing{%s}\n", buf)); if (strcmp(name, buf) == 0) return; } #endif /* OPT_SAME_NAME */ + TRACE(("...updating %s\n", attribute)); XtSetArg(args[0], attribute, name); - XtSetValues(toplevel, args, 1); + XtSetValues(top, args, 1); + +#if OPT_WIDE_CHARS + if (xtermEnvUTF8()) { + Display *dpy = XtDisplay(term); + Atom my_atom; + char *propname = (!strcmp(attribute, XtNtitle) + ? "_NET_WM_NAME" + : "_NET_WM_ICON_NAME"); + if ((my_atom = XInternAtom(dpy, propname, False)) != None) { + if (screen->utf8_title) { + TRACE(("...updating %s\n", propname)); + XChangeProperty(dpy, VShellWindow, + my_atom, XA_UTF8_STRING(dpy), 8, + PropModeReplace, + (Char *) original, strlen(original)); + } else { + TRACE(("...deleting %s\n", propname)); + XDeleteProperty(dpy, VShellWindow, my_atom); + } + } + } +#endif } void @@ -2285,6 +2519,10 @@ return (True); } +/* + * This is part of ReverseVideo(). It reverses the data stored for the old + * "dynamic" colors that might have been retrieved using OSC 10-18. + */ void ReverseOldColors(void) { @@ -2301,9 +2539,7 @@ pOld->names[TEXT_CURSOR] = NULL; } if (pOld->names[TEXT_BG]) { - tmpName = XtMalloc(strlen(pOld->names[TEXT_BG]) + 1); - if (tmpName) { - strcpy(tmpName, pOld->names[TEXT_BG]); + if ((tmpName = x_strdup(pOld->names[TEXT_BG])) != 0) { pOld->names[TEXT_CURSOR] = tmpName; } } @@ -2337,9 +2573,10 @@ if (XParseColor(screen->display, cmap, name, &def) && (XAllocColor(screen->display, cmap, &def) || find_closest_color(screen->display, cmap, &def)) - && (newName = XtMalloc(strlen(name) + 1)) != 0) { + && (newName = x_strdup(name)) != 0) { + if (COLOR_DEFINED(pNew, ndx)) + free(pNew->names[ndx]); SET_COLOR_VALUE(pNew, ndx, def.pixel); - strcpy(newName, name); SET_COLOR_NAME(pNew, ndx, newName); TRACE(("AllocateTermColor #%d: %s (pixel %#lx)\n", ndx, newName, def.pixel)); return (True); @@ -2536,6 +2773,7 @@ } cleaning = True; + need_cleanup = FALSE; TRACE(("Cleanup %d\n", code)); @@ -2561,6 +2799,61 @@ Exit(code); } +#ifndef VMS +char * +xtermFindShell(char *leaf, Bool warning) +{ + char *s; + char *d; + char *tmp; + char *result = leaf; + + TRACE(("xtermFindShell(%s)\n", leaf)); + if (*result != '\0' && strchr("+/-", *result) == 0) { + /* find it in $PATH */ + if ((s = getenv("PATH")) != 0) { + if ((tmp = TypeMallocN(char, strlen(leaf) + strlen(s) + 1)) != 0) { + Bool found = False; + while (*s != '\0') { + strcpy(tmp, s); + for (d = tmp;; ++d) { + if (*d == ':' || *d == '\0') { + int skip = (*d != '\0'); + *d = '/'; + strcpy(d + 1, leaf); + if (skip) + ++d; + s += (d - tmp); + if (*tmp == '/' + && strstr(tmp, "..") == 0 + && access(tmp, X_OK) == 0) { + result = x_strdup(tmp); + found = True; + } + break; + } + if (found) + break; + } + if (found) + break; + } + free(tmp); + } + } + } + TRACE(("...xtermFindShell(%s)\n", result)); + if (*result != '/' + || strstr(result, "..") != 0 + || access(result, X_OK) != 0) { + if (warning) + fprintf(stderr, "No absolute path found for shell: %s\n", result); + result = 0; + } + return result; +} +#endif /* VMS */ + /* * sets the value of var to be arg in the Unix 4.2 BSD environment env. * Var should end with '=' (bindings are of the form "var=value"). @@ -2571,28 +2864,30 @@ void xtermSetenv(char *var, char *value) { - int envindex = 0; - size_t len = strlen(var); - - TRACE(("xtermSetenv(var=%s, value=%s)\n", var, value)); - - while (environ[envindex] != NULL) { - if (strncmp(environ[envindex], var, len) == 0) { - /* found it */ - environ[envindex] = CastMallocN(char, len + strlen(value)); - strcpy(environ[envindex], var); - strcat(environ[envindex], value); - return; + if (value != 0) { + int envindex = 0; + size_t len = strlen(var); + + TRACE(("xtermSetenv(var=%s, value=%s)\n", var, value)); + + while (environ[envindex] != NULL) { + if (strncmp(environ[envindex], var, len) == 0) { + /* found it */ + environ[envindex] = CastMallocN(char, len + strlen(value)); + strcpy(environ[envindex], var); + strcat(environ[envindex], value); + return; + } + envindex++; } - envindex++; - } - TRACE(("...expanding env to %d\n", envindex + 1)); + TRACE(("...expanding env to %d\n", envindex + 1)); - environ[envindex] = CastMallocN(char, len + strlen(value)); - (void) strcpy(environ[envindex], var); - strcat(environ[envindex], value); - environ[++envindex] = NULL; + environ[envindex] = CastMallocN(char, len + strlen(value)); + (void) strcpy(environ[envindex], var); + strcat(environ[envindex], value); + environ[++envindex] = NULL; + } } /*ARGSUSED*/ @@ -2672,6 +2967,7 @@ #if OPT_TOOLBAR /* we need both of these during initialization */ XtMapWidget(SHELL_OF(term)); + ShowToolbar(resource.toolBar); #endif screen->Vshow = True; } @@ -2680,7 +2976,7 @@ else { if (screen->Vshow && term) { withdraw_window(XtDisplay(term), - XtWindow(SHELL_OF(term)), + VShellWindow, XScreenNumberOfScreen(XtScreen(term))); screen->Vshow = False; } @@ -2722,7 +3018,7 @@ } else { if (screen->Tshow && tekWidget) { withdraw_window(XtDisplay(tekWidget), - XtWindow(SHELL_OF(tekWidget)), + TShellWindow, XScreenNumberOfScreen(XtScreen(tekWidget))); screen->Tshow = False; } @@ -2823,6 +3119,12 @@ { static XrmOptionDescRec *res_array = 0; +#ifdef NO_LEAKS + if (descs == 0 && res_array != 0) { + free(res_array); + res_array = 0; + } else +#endif if (res_array == 0) { Cardinal j; @@ -2846,6 +3148,13 @@ { static OptionHelp *opt_array = 0; +#ifdef NO_LEAKS + if (descs == 0 && opt_array != 0) { + sortedOptDescs(descs, numDescs); + free(opt_array); + opt_array = 0; + } else +#endif if (opt_array == 0) { Cardinal opt_count, j; #if OPT_TRACE @@ -2924,6 +3233,70 @@ } /* + * Report the locale that xterm was started in. + */ +char * +xtermEnvLocale(void) +{ + static char *result; + + if (result == 0) { + if ((result = getenv("LC_ALL")) == 0 || *result == '\0') + if ((result = getenv("LC_CTYPE")) == 0 || *result == '\0') + if ((result = getenv("LANG")) == 0 || *result == '\0') + result = ""; + TRACE(("xtermEnvLocale ->%s\n", result)); + } + return result; +} + +char * +xtermEnvEncoding(void) +{ + static char *result; + + if (result == 0) { +#ifdef HAVE_LANGINFO_CODESET + result = nl_langinfo(CODESET); +#else + char *locale = xtermEnvLocale(); + if (*locale == 0 || !strcmp(locale, "C") || !strcmp(locale, "POSIX")) { + result = "ASCII"; + } else { + result = "ISO-8859-1"; + } +#endif + TRACE(("xtermEnvEncoding ->%s\n", result)); + } + return result; +} + +#if OPT_WIDE_CHARS +/* + * Tell whether xterm was started in a locale that uses UTF-8 encoding for + * characters. That environment is inherited by subprocesses and used in + * various library calls. + */ +Bool +xtermEnvUTF8(void) +{ + static Bool init = False; + static Bool result = False; + + if (!init) { + init = True; +#ifdef HAVE_LANGINFO_CODESET + result = (strcmp(xtermEnvEncoding(), "UTF-8") == 0); +#else + result = (strstr(xtermEnvLocale(), "UTF-8") != NULL); +#endif + TRACE(("xtermEnvUTF8 ->%s\n", BtoS(result))); + } + return result; +} +#endif /* OPT_WIDE_CHARS */ + +/* * Returns the version-string used in the "-v' message as well as a few other * places. It is derived (when possible) from the __vendorversion__ symbol * that some newer imake configurations define. Index: xc/programs/xterm/mkdirs.sh diff -u xc/programs/xterm/mkdirs.sh:3.6 xc/programs/xterm/mkdirs.sh:3.7 --- xc/programs/xterm/mkdirs.sh:3.6 Wed May 17 20:33:21 2000 +++ xc/programs/xterm/mkdirs.sh Wed Jul 6 20:46:14 2005 @@ -23,7 +23,8 @@ if test ! -d "$pathcomp"; then echo "mkdir $pathcomp" 1>&2 case "$pathcomp" in - [a-zA-Z]: ) ;; # DOSISH systems + [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: ) + ;; # DOSISH systems * ) mkdir "$pathcomp" || errstatus=$? ;; esac fi Index: xc/programs/xterm/os2main.c diff -u xc/programs/xterm/os2main.c:3.75 xc/programs/xterm/os2main.c:3.86 --- xc/programs/xterm/os2main.c:3.75 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/os2main.c Sun Apr 9 20:34:37 2006 @@ -1,13 +1,10 @@ -/* $XTermId: os2main.c,v 1.190 2005/01/30 23:45:40 tom Exp $ */ +/* $XTermId: os2main.c,v 1.219 2006/04/08 22:08:35 tom Exp $ */ /* removed all foreign stuff to get the code more clear (hv) * and did some rewrite for the obscure OS/2 environment */ -#ifndef lint -static char *rid = "$XConsortium: main.c,v 1.227.1.2 95/06/29 18:13:15 kaleb Exp $"; -#endif /* lint */ -/* $XFree86: xc/programs/xterm/os2main.c,v 3.75 2005/02/06 21:42:38 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/os2main.c,v 3.86 2006/04/10 00:34:37 dickey Exp $ */ /*********************************************************** @@ -102,7 +99,6 @@ #if OPT_WIDE_CHARS #include -#include #endif int @@ -157,40 +153,40 @@ /* allow use of system default characters if defined and reasonable */ #ifndef CEOF -#define CEOF CONTROL('D') +#define CEOF CONTROL('D') #endif #ifndef CEOL #define CEOL 0 #endif #ifndef CFLUSH -#define CFLUSH CONTROL('O') +#define CFLUSH CONTROL('O') #endif #ifndef CLNEXT -#define CLNEXT CONTROL('V') +#define CLNEXT CONTROL('V') #endif #ifndef CNUL #define CNUL 0 #endif #ifndef CQUIT -#define CQUIT CONTROL('\\') +#define CQUIT CONTROL('\\') #endif #ifndef CRPRNT -#define CRPRNT CONTROL('R') +#define CRPRNT CONTROL('R') #endif #ifndef CSTART -#define CSTART CONTROL('Q') +#define CSTART CONTROL('Q') #endif #ifndef CSTOP -#define CSTOP CONTROL('S') +#define CSTOP CONTROL('S') #endif #ifndef CSUSP -#define CSUSP CONTROL('Z') +#define CSUSP CONTROL('Z') #endif #ifndef CSWTCH #define CSWTCH 0 #endif #ifndef CWERASE -#define CWERASE CONTROL('W') +#define CWERASE CONTROL('W') #endif /* @@ -247,7 +243,6 @@ static int parse_tty_modes(char *s, struct _xttymodes *modelist); -static int inhibit; static char passedPty[2]; /* name if pty if slave */ static int Console; @@ -272,7 +267,11 @@ Sres("ttyModes", "TtyModes", tty_modes, NULL), Bres("hold", "Hold", hold_screen, False), Bres("utmpInhibit", "UtmpInhibit", utmpInhibit, False), + Bres("utmpDisplayId", "UtmpDisplayId", utmpDisplayId, True), Bres("messages", "Messages", messages, True), + Ires("minBufSize", "MinBufSize", minBufSize, 4096), + Ires("maxBufSize", "MaxBufSize", maxBufSize, 32768), + Sres("keyboardType", "KeyboardType", keyboardType, "unknown"), Bres("sunFunctionKeys", "SunFunctionKeys", sunFunctionKeys, False), #if OPT_SUNPC_KBD Bres("sunKeyboard", "SunKeyboard", sunKeyboard, False), @@ -283,17 +282,27 @@ #if OPT_SCO_FUNC_KEYS Bres("scoFunctionKeys", "ScoFunctionKeys", scoFunctionKeys, False), #endif +#if OPT_INITIAL_ERASE + Bres("ptyInitialErase", "PtyInitialErase", ptyInitialErase, DEF_INITIAL_ERASE), + Bres("backarrowKeyIsErase", "BackarrowKeyIsErase", backarrow_is_erase, DEF_BACKARO_ERASE), +#endif Bres("waitForMap", "WaitForMap", wait_for_map, False), Bres("useInsertMode", "UseInsertMode", useInsertMode, False), #if OPT_ZICONBEEP Ires("zIconBeep", "ZIconBeep", zIconBeep, 0), #endif +#if OPT_PTY_HANDSHAKE + Bres("ptyHandshake", "PtyHandshake", ptyHandshake, True), +#endif #if OPT_SAME_NAME Bres("sameName", "SameName", sameName, True), #endif #if OPT_SESSION_MGT Bres("sessionMgt", "SessionMgt", sessionMgt, True), #endif +#if OPT_TOOLBAR + Bres(XtNtoolBar, XtCToolBar, toolBar, True), +#endif }; static char *fallback_resources[] = @@ -362,6 +371,9 @@ {"-fw", "*wideFont", XrmoptionSepArg, (caddr_t) NULL}, {"-fwb", "*wideBoldFont", XrmoptionSepArg, (caddr_t) NULL}, #endif +#if OPT_INPUT_METHOD +{"-fx", "*ximFont", XrmoptionSepArg, (caddr_t) NULL}, +#endif #if OPT_HIGHLIGHT_COLOR {"-hc", "*highlightColor", XrmoptionSepArg, (caddr_t) NULL}, #endif @@ -371,12 +383,18 @@ #endif {"-hold", "*hold", XrmoptionNoArg, (caddr_t) "on"}, {"+hold", "*hold", XrmoptionNoArg, (caddr_t) "off"}, +#if OPT_INITIAL_ERASE +{"-ie", "*ptyInitialErase", XrmoptionNoArg, (caddr_t) "on"}, +{"+ie", "*ptyInitialErase", XrmoptionNoArg, (caddr_t) "off"}, +#endif {"-j", "*jumpScroll", XrmoptionNoArg, (caddr_t) "on"}, {"+j", "*jumpScroll", XrmoptionNoArg, (caddr_t) "off"}, #if OPT_C1_PRINT {"-k8", "*allowC1Printable", XrmoptionNoArg, (caddr_t) "on"}, {"+k8", "*allowC1Printable", XrmoptionNoArg, (caddr_t) "off"}, #endif +{"-kt", "*keyboardType", XrmoptionSepArg, (caddr_t) NULL}, +{"+kt", "*keyboardType", XrmoptionSepArg, (caddr_t) NULL}, /* parse logging options anyway for compatibility */ {"-l", "*logging", XrmoptionNoArg, (caddr_t) "on"}, {"+l", "*logging", XrmoptionNoArg, (caddr_t) "off"}, @@ -429,13 +447,15 @@ {"+u8", "*utf8", XrmoptionNoArg, (caddr_t) "0"}, #endif #if OPT_LUIT_PROG -{"-lc", "*locale", XrmoptionNoArg, (caddr_t) "True"}, -{"+lc", "*locale", XrmoptionNoArg, (caddr_t) "False"}, +{"-lc", "*locale", XrmoptionNoArg, (caddr_t) "on"}, +{"+lc", "*locale", XrmoptionNoArg, (caddr_t) "off"}, {"-lcc", "*localeFilter",XrmoptionSepArg, (caddr_t) NULL}, {"-en", "*locale", XrmoptionSepArg, (caddr_t) NULL}, #endif {"-ulc", "*colorULMode", XrmoptionNoArg, (caddr_t) "off"}, {"+ulc", "*colorULMode", XrmoptionNoArg, (caddr_t) "on"}, +{"-ulit", "*italicULMode", XrmoptionNoArg, (caddr_t) "off"}, +{"+ulit", "*italicULMode", XrmoptionNoArg, (caddr_t) "on"}, {"-ut", "*utmpInhibit", XrmoptionNoArg, (caddr_t) "on"}, {"+ut", "*utmpInhibit", XrmoptionNoArg, (caddr_t) "off"}, {"-im", "*useInsertMode", XrmoptionNoArg, (caddr_t) "on"}, @@ -447,8 +467,10 @@ #if OPT_WIDE_CHARS {"-wc", "*wideChars", XrmoptionNoArg, (caddr_t) "on"}, {"+wc", "*wideChars", XrmoptionNoArg, (caddr_t) "off"}, -{"-cjk_width", "*cjkWidth", XrmoptionNoArg, (caddr_t) "on"}, -{"+cjk_width", "*cjkWidth", XrmoptionNoArg, (caddr_t) "off"}, +{"-mk_width", "*mkWidth", XrmoptionNoArg, (caddr_t) "on"}, +{"+mk_width", "*mkWidth", XrmoptionNoArg, (caddr_t) "off"}, +{"-cjk_width", "*cjkWidth", XrmoptionNoArg, (caddr_t) "on"}, +{"+cjk_width", "*cjkWidth", XrmoptionNoArg, (caddr_t) "off"}, #endif {"-wf", "*waitForMap", XrmoptionNoArg, (caddr_t) "on"}, {"+wf", "*waitForMap", XrmoptionNoArg, (caddr_t) "off"}, @@ -463,6 +485,10 @@ {"-sm", "*sessionMgt", XrmoptionNoArg, (caddr_t) "on"}, {"+sm", "*sessionMgt", XrmoptionNoArg, (caddr_t) "off"}, #endif +#if OPT_TOOLBAR +{"-tb", "*"XtNtoolBar, XrmoptionNoArg, (caddr_t) "on"}, +{"+tb", "*"XtNtoolBar, XrmoptionNoArg, (caddr_t) "off"}, +#endif /* options that we process ourselves */ {"-help", NULL, XrmoptionSkipNArgs, (caddr_t) NULL}, {"-version", NULL, XrmoptionSkipNArgs, (caddr_t) NULL}, @@ -505,6 +531,9 @@ { "-fw fontname", "doublewidth text font" }, { "-fwb fontname", "doublewidth bold text font" }, #endif +#if OPT_INPUT_METHOD +{ "-fx fontname", "XIM fontset" }, +#endif { "-iconic", "start iconic" }, { "-name string", "client instance, icon, and title strings" }, { "-class string", "class string (XTerm)" }, @@ -535,11 +564,15 @@ { "-/+hf", "turn on/off HP Function Key escape codes" }, #endif { "-/+hold", "turn on/off logic that retains window after exit" }, +#if OPT_INITIAL_ERASE +{ "-/+ie", "turn on/off initialization of 'erase' from pty" }, +#endif { "-/+im", "use insert mode for TERMCAP" }, { "-/+j", "turn on/off jump scroll" }, #if OPT_C1_PRINT { "-/+k8", "turn on/off C1-printable classification"}, #endif +{ "-kt keyboardtype", "set keyboard type:" KEYBOARD_TYPES }, #ifdef ALLOWLOGGING { "-/+l", "turn on/off logging" }, { "-lf filename", "logging filename" }, @@ -574,6 +607,9 @@ #if OPT_TEK4014 { "-/+t", "turn on/off Tek emulation window" }, #endif +#if OPT_TOOLBAR +{ "-/+tb", "turn on/off toolbar" }, +#endif { "-ti termid", "terminal identifier" }, { "-tm string", "terminal mode keywords and characters" }, { "-tn name", "TERM environment variable name" }, @@ -586,10 +622,12 @@ #endif { "-/+ulc", "turn off/on display of underline as color" }, { "-/+ut", "turn on/off utmp inhibit (not supported)" }, +{ "-/+ulit", "turn off/on display of underline as italics" }, { "-/+vb", "turn on/off visual bell" }, { "-/+pob", "turn on/off pop on bell" }, #if OPT_WIDE_CHARS { "-/+wc", "turn on/off wide-character mode" }, +{ "-/+mk_width", "turn on/off simple width convention" }, { "-/+cjk_width", "turn on/off legacy CJK width convention" }, #endif { "-/+wf", "turn on/off wait for map before command exec" }, @@ -824,10 +862,6 @@ } #endif /* OPT_SESSION_MGT */ -#if OPT_WIDE_CHARS -int (*my_wcwidth) (wchar_t); -#endif - /* * DeleteWindow(): Action proc to implement ICCCM delete_window. */ @@ -877,6 +911,7 @@ main(int argc, char **argv ENVP_ARG) { Widget form_top, menu_top; + Dimension menu_high; TScreen *screen; int mode; char *my_class = DEFCLASS; @@ -1101,7 +1136,7 @@ break; } - SetupMenus(toplevel, &form_top, &menu_top); + SetupMenus(toplevel, &form_top, &menu_top, &menu_high); term = (XtermWidget) XtVaCreateManagedWidget("vt100", xtermWidgetClass, form_top, @@ -1113,36 +1148,42 @@ XtNright, XawChainRight, XtNtop, XawChainTop, XtNbottom, XawChainBottom, + XtNmenuHeight, menu_high, #endif (XtPointer) 0); - /* this causes the initialize method to be called */ -#if OPT_HP_FUNC_KEYS - init_keyboard_type(keyboardIsHP, resource.hpFunctionKeys); -#endif - init_keyboard_type(keyboardIsSun, resource.sunFunctionKeys); -#if OPT_SUNPC_KBD - init_keyboard_type(keyboardIsVT220, resource.sunKeyboard); -#endif + decode_keyboard_type(&resource); screen = &term->screen; - inhibit = 0; + screen->inhibit = 0; #ifdef ALLOWLOGGING if (term->misc.logInhibit) - inhibit |= I_LOG; + screen->inhibit |= I_LOG; #endif if (term->misc.signalInhibit) - inhibit |= I_SIGNAL; + screen->inhibit |= I_SIGNAL; #if OPT_TEK4014 if (term->misc.tekInhibit) - inhibit |= I_TEK; + screen->inhibit |= I_TEK; #endif -#if OPT_WIDE_CHARS - my_wcwidth = &mk_wcwidth; - if (term->misc.cjk_width) - my_wcwidth = &mk_wcwidth_cjk; + /* + * We might start by showing the tek4014 window. + */ +#if OPT_TEK4014 + if (screen->inhibit & I_TEK) + screen->TekEmu = False; + + if (screen->TekEmu && !TekInit()) + exit(ERROR_INIT); +#endif + + /* + * Start the toolbar at this point, after the first window has been setup. + */ +#if OPT_TOOLBAR + ShowToolbar(resource.toolBar); #endif #if OPT_SESSION_MGT @@ -1208,13 +1249,6 @@ } } #endif -#if OPT_TEK4014 - if (inhibit & I_TEK) - screen->TekEmu = False; - - if (screen->TekEmu && !TekInit()) - exit(ERROR_INIT); -#endif #ifdef DEBUG { @@ -1253,8 +1287,6 @@ write(screen->respond, buf, strlen(buf)); } - screen->inhibit = inhibit; - if (0 > (mode = fcntl(screen->respond, F_GETFL, 0))) SysError(ERROR_F_GETFL); mode |= O_NDELAY; @@ -1280,6 +1312,7 @@ XSetErrorHandler(xerror); XSetIOErrorHandler(xioerror); + initPtyData(&VTbuffer); #ifdef ALLOWLOGGING if (term->misc.log_on) { StartLog(screen); @@ -1298,7 +1331,6 @@ winToEmbedInto, 0, 0); } - initPtyData(&VTbuffer); for (;;) { #if OPT_TEK4014 if (screen->TekEmu) @@ -1442,14 +1474,33 @@ static void set_owner(char *device, uid_t uid, gid_t gid, mode_t mode) { + int why; + if (chown(device, uid, gid) < 0) { - if (errno != ENOENT + why = errno; + if (why != ENOENT && getuid() == 0) { - fprintf(stderr, "Cannot chown %s to %d,%d: %s\n", - device, uid, gid, strerror(errno)); + fprintf(stderr, "Cannot chown %s to %ld,%ld: %s\n", + device, (long) uid, (long) gid, strerror(why)); + } + } +#ifndef __EMX__ +/* EMX can chmod files only, not devices */ + if (chmod(device, mode) < 0) { + why = errno; + if (why != ENOENT) { + struct stat sb; + if (stat(device, &sb) < 0) { + fprintf(stderr, "Cannot chmod %s to %03o: %s\n", + device, mode, strerror(why)); + } else { + fprintf(stderr, + "Cannot chmod %s to %03o currently %03o: %s\n", + device, mode, (sb.st_mode & S_IFMT), strerror(why)); + } } } - chmod(device, mode); +#endif } #define THE_PARENT 1 @@ -1575,7 +1626,7 @@ } /* avoid double MapWindow requests */ - XtSetMappedWhenManaged(XtParent(CURRENT_EMU(screen)), False); + XtSetMappedWhenManaged(SHELL_OF(CURRENT_EMU(screen)), False); wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", False); @@ -1591,7 +1642,7 @@ XmuGetHostname(mit_console_name + MIT_CONSOLE_LEN, 255); mit_console = XInternAtom(screen->display, mit_console_name, False); /* the user told us to be the console, so we can use CurrentTime */ - XtOwnSelection(XtParent(CURRENT_EMU(screen)), + XtOwnSelection(SHELL_OF(CURRENT_EMU(screen)), mit_console, CurrentTime, ConvertConsoleSelection, NULL, NULL); } @@ -1636,8 +1687,8 @@ } else #endif { - TTYSIZE_ROWS(ts) = screen->max_row + 1; - TTYSIZE_COLS(ts) = screen->max_col + 1; + TTYSIZE_ROWS(ts) = MaxRows(screen); + TTYSIZE_COLS(ts) = MaxCols(screen); ts.ws_xpixel = FullWidth(screen); ts.ws_ypixel = FullHeight(screen); } @@ -1732,12 +1783,12 @@ signal(SIGQUIT, SIG_DFL); signal(SIGTERM, SIG_DFL); - /* copy the environment before Setenving */ + /* copy the environment before Setenv'ing */ for (i = 0; gblenvp[i] != NULL; i++) ; /* compute number of xtermSetenv() calls below */ envsize = 1; /* (NULL terminating entry) */ - envsize += 3; /* TERM, WINDOWID, DISPLAY */ + envsize += 5; /* TERM, WINDOWID, DISPLAY, _SHELL, _VERSION */ envsize += 2; /* COLUMNS, LINES */ envnew = TypeCallocN(char *, (unsigned) i + envsize); @@ -1754,6 +1805,8 @@ /* put the display into the environment of the shell */ xtermSetenv("DISPLAY=", XDisplayString(screen->display)); + xtermSetenv("XTERM_VERSION=", xtermVersion()); + signal(SIGTERM, SIG_DFL); /* this is the time to go and set up stdin, out, and err @@ -1776,15 +1829,15 @@ if (handshake.rows > 0 && handshake.cols > 0) { set_max_row(screen, handshake.rows); set_max_col(screen, handshake.cols); - TTYSIZE_ROWS(ts) = screen->max_row + 1; - TTYSIZE_COLS(ts) = screen->max_col + 1; + TTYSIZE_ROWS(ts) = MaxRows(screen); + TTYSIZE_COLS(ts) = MaxCols(screen); ts.ws_xpixel = FullWidth(screen); ts.ws_ypixel = FullHeight(screen); } - sprintf(numbuf, "%d", screen->max_col + 1); + sprintf(numbuf, "%d", MaxCols(screen)); xtermSetenv("COLUMNS=", numbuf); - sprintf(numbuf, "%d", screen->max_row + 1); + sprintf(numbuf, "%d", MaxRows(screen)); xtermSetenv("LINES=", numbuf); /* reconstruct dead environ variable */ @@ -1812,6 +1865,8 @@ * to command that the user gave anyway. */ if (command_to_exec_with_luit) { + xtermSetenv("XTERM_SHELL=", + xtermFindShell(*command_to_exec_with_luit, False)); TRACE(("spawning command \"%s\"\n", *command_to_exec_with_luit)); execvp(*command_to_exec_with_luit, command_to_exec_with_luit); /* print error message on screen */ @@ -1822,6 +1877,8 @@ } #endif if (command_to_exec) { + xtermSetenv("XTERM_SHELL=", + xtermFindShell(*command_to_exec, False)); TRACE(("spawning command \"%s\"\n", *command_to_exec)); execvpe(*command_to_exec, command_to_exec, gblenvp); @@ -1838,6 +1895,7 @@ ptr = getenv("OS2_SHELL"); if (!ptr) ptr = "SORRY_NO_SHELL_FOUND"; + xtermSetenv("XTERM_SHELL=", ptr); shname = x_basename(ptr); if (command_to_exec) { @@ -1854,9 +1912,7 @@ exargv[8] = command_to_exec[6]; exargv[9] = 0; execvpe(exargv[0], exargv, gblenvp); -/* - execvpe(*command_to_exec, command_to_exec, gblenvp); -*/ + /* print error message on screen */ fprintf(stderr, "%s: Can't execvp %s\n", xterm_name, *command_to_exec); @@ -1954,7 +2010,7 @@ fputs("Exiting\n", stderr); #endif if (!hold_screen) - Cleanup(0); + need_cleanup = TRUE; } } while ((pid = nonblocking_wait()) > 0); Index: xc/programs/xterm/plink.sh diff -u xc/programs/xterm/plink.sh:3.1 xc/programs/xterm/plink.sh:3.2 --- xc/programs/xterm/plink.sh:3.1 Tue Mar 13 04:48:43 2001 +++ xc/programs/xterm/plink.sh Mon May 2 20:38:24 2005 @@ -1,8 +1,9 @@ #!/bin/sh -# $XFree86: xc/programs/xterm/plink.sh,v 3.1 2001/03/13 09:48:43 dickey Exp $ +# $XTermId: plink.sh,v 1.3 2005/05/01 13:16:44 tom Exp $ +# $XFree86: xc/programs/xterm/plink.sh,v 3.2 2005/05/03 00:38:24 dickey Exp $ # # Reduce the number of dynamic libraries used to link an executable. -CMD= +LINKIT= while test $# != 0 do OPT="$1" @@ -10,17 +11,17 @@ case $OPT in -l*) echo "testing if $OPT is needed" - if ( eval $CMD $* >/dev/null 2>/dev/null ) + if ( eval $LINKIT $* >/dev/null 2>/dev/null ) then : echo ...no else echo ...yes - CMD="$CMD $OPT" + LINKIT="$LINKIT $OPT" fi ;; *) - CMD="$CMD $OPT" + LINKIT="$LINKIT $OPT" ;; esac done -eval $CMD +eval $LINKIT Index: xc/programs/xterm/print.c diff -u xc/programs/xterm/print.c:1.21 xc/programs/xterm/print.c:1.23 --- xc/programs/xterm/print.c:1.21 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/print.c Sun Feb 12 20:14:59 2006 @@ -1,12 +1,12 @@ -/* $XTermId: print.c,v 1.59 2005/01/10 01:02:42 tom Exp $ */ +/* $XTermId: print.c,v 1.66 2006/02/01 01:03:15 tom Exp $ */ /* - * $XFree86: xc/programs/xterm/print.c,v 1.21 2005/01/14 01:50:03 dickey Exp $ + * $XFree86: xc/programs/xterm/print.c,v 1.23 2006/02/13 01:14:59 dickey Exp $ */ /************************************************************ -Copyright 1997-2004,2005 by Thomas E. Dickey +Copyright 1997-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -122,11 +122,12 @@ printLine(int row, int chr) { TScreen *screen = &term->screen; - Char *c = SCRN_BUF_CHARS(screen, row); - Char *a = SCRN_BUF_ATTRS(screen, row); + int inx = ROW2INX(screen, row); + Char *c = SCRN_BUF_CHARS(screen, inx); + Char *a = SCRN_BUF_ATTRS(screen, inx); Char attr = 0; unsigned ch; - int last = screen->max_col + 1; + int last = MaxCols(screen); int col; #if OPT_ISO_COLORS && OPT_PRINT_COLORS #if OPT_EXT_COLORS @@ -143,19 +144,19 @@ int cs = CSET_IN; int last_cs = CSET_IN; - TRACE(("printLine(row=%d, top=%d:%d, chr=%d):%s\n", - row, screen->topline, screen->max_row, chr, + TRACE(("printLine(row=%d/%d, top=%d:%d, chr=%d):%s\n", + row, ROW2INX(screen, row), screen->topline, screen->max_row, chr, visibleChars(PAIRED_CHARS(c, screen->utf8_mode - ? SCRN_BUF_WIDEC(screen, row) + ? SCRN_BUF_WIDEC(screen, inx) : 0), (unsigned) last))); if_OPT_EXT_COLORS(screen, { - fbf = SCRN_BUF_FGRND(screen, row); - fbb = SCRN_BUF_BGRND(screen, row); + fbf = SCRN_BUF_FGRND(screen, inx); + fbb = SCRN_BUF_BGRND(screen, inx); }); if_OPT_ISO_TRADITIONAL_COLORS(screen, { - fb = SCRN_BUF_COLOR(screen, row); + fb = SCRN_BUF_COLOR(screen, inx); }); while (last > 0) { if ((a[last - 1] & CHARDRAWN) == 0) @@ -171,7 +172,7 @@ for (col = 0; col < last; col++) { ch = c[col]; if_OPT_WIDE_CHARS(screen, { - ch = getXtermCell(screen, row, col); + ch = XTERM_CELL(row, col); }); #if OPT_PRINT_COLORS if (screen->colorMode) { @@ -224,6 +225,12 @@ charToPrinter((int) ((cs == CSET_OUT) ? (ch == 0x7f ? 0x5f : (ch + 0x5f)) : ch)); + if_OPT_WIDE_CHARS(screen, { + if ((ch = XTERM_CELL_C1(row, col)) != 0) + charToPrinter(ch); + if ((ch = XTERM_CELL_C2(row, col)) != 0) + charToPrinter(ch); + }); } if (screen->print_attributes) { send_SGR(0, NO_COLOR, NO_COLOR); @@ -239,21 +246,25 @@ void xtermPrintScreen(Bool use_DECPEX) { - TScreen *screen = &term->screen; - Bool extent = (use_DECPEX && screen->printer_extent); - int top = extent ? 0 : screen->top_marg; - int bot = extent ? screen->max_row : screen->bot_marg; - int was_open = initialized; - - TRACE(("xtermPrintScreen, rows %d..%d\n", top, bot)); - - while (top <= bot) - printLine(top++, '\n'); - if (screen->printer_formfeed) - charToPrinter('\f'); + if (XtIsRealized((Widget) term)) { + TScreen *screen = &term->screen; + Bool extent = (use_DECPEX && screen->printer_extent); + int top = extent ? 0 : screen->top_marg; + int bot = extent ? screen->max_row : screen->bot_marg; + int was_open = initialized; + + TRACE(("xtermPrintScreen, rows %d..%d\n", top, bot)); + + while (top <= bot) + printLine(top++, '\n'); + if (screen->printer_formfeed) + charToPrinter('\f'); - if (!was_open || screen->printer_autoclose) { - closePrinter(); + if (!was_open || screen->printer_autoclose) { + closePrinter(); + } + } else { + Bell(XkbBI_MinorError, 0); } } @@ -484,7 +495,7 @@ if (screen->printer_controlmode == 1) { TRACE(("AutoPrint %d\n", chr)); - printLine(screen->cursor_row, chr); + printLine(screen->cursorp.row, chr); if (Printer != 0) fflush(Printer); } Index: xc/programs/xterm/ptydata.c diff -u xc/programs/xterm/ptydata.c:1.22 xc/programs/xterm/ptydata.c:1.25 --- xc/programs/xterm/ptydata.c:1.22 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/ptydata.c Sun Feb 12 20:14:59 2006 @@ -1,12 +1,12 @@ -/* $XTermId: ptydata.c,v 1.59 2005/01/10 00:26:13 tom Exp $ */ +/* $XTermId: ptydata.c,v 1.71 2006/02/11 12:01:35 tom Exp $ */ /* - * $XFree86: xc/programs/xterm/ptydata.c,v 1.22 2005/01/14 01:50:03 dickey Exp $ + * $XFree86: xc/programs/xterm/ptydata.c,v 1.25 2006/02/13 01:14:59 dickey Exp $ */ /************************************************************ -Copyright 1999-2004,2005 by Thomas E. Dickey +Copyright 1999-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -38,6 +38,10 @@ #include +#if OPT_WIDE_CHARS +#include +#endif + /* * Check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX * systems are broken and return EWOULDBLOCK when they should return EAGAIN. @@ -190,7 +194,7 @@ if (FD_ISSET(screen->respond, select_mask)) { trimPtyData(screen, data); - size = read(screen->respond, (char *) data->last, BUF_SIZE); + size = read(screen->respond, (char *) data->last, (unsigned) FRG_SIZE); if (size <= 0) { /* * Yes, I know this is a majorly f*ugly hack, however it seems to @@ -231,7 +235,7 @@ #endif data->last += size; #ifdef ALLOWLOGGING - term->screen.logstart = VTbuffer.next; + term->screen.logstart = VTbuffer->next; #endif } @@ -248,7 +252,7 @@ morePtyData(TScreen * screen GCC_UNUSED, PtyData * data) { Bool result = (data->last > data->next); - if (result && screen->utf8_mode) { + if (result && screen->utf8_inparse) { if (!data->utf_size) result = decodeUtf8(data); } @@ -267,7 +271,7 @@ nextPtyData(TScreen * screen, PtyData * data) { IChar result; - if (screen->utf8_mode) { + if (screen->utf8_inparse) { result = data->utf_data; data->next += data->utf_size; data->utf_size = 0; @@ -290,18 +294,38 @@ { if (screen->utf8_mode != flag) { screen->utf8_mode = flag; + screen->utf8_inparse = (flag != 0); TRACE(("turning UTF-8 mode %s\n", BtoS(flag))); + update_font_utf8_mode(); } } #endif void -initPtyData(PtyData * data) +initPtyData(PtyData ** result) { + PtyData *data; + + TRACE(("initPtyData given minBufSize %d, maxBufSize %d\n", + FRG_SIZE, BUF_SIZE)); + + if (FRG_SIZE < 64) + FRG_SIZE = 64; + if (BUF_SIZE < FRG_SIZE) + BUF_SIZE = FRG_SIZE; + if (BUF_SIZE % FRG_SIZE) + BUF_SIZE = BUF_SIZE + FRG_SIZE - (BUF_SIZE % FRG_SIZE); + + TRACE(("initPtyData using minBufSize %d, maxBufSize %d\n", + FRG_SIZE, BUF_SIZE)); + + data = (PtyData *) XtMalloc(sizeof(*data) + BUF_SIZE + FRG_SIZE); + memset(data, 0, sizeof(*data)); data->next = data->buffer; data->last = data->buffer; + *result = data; } /* @@ -341,16 +365,16 @@ /* remove the used portion of the buffer */ trimPtyData(screen, data); - VTbuffer.last += length; - size = VTbuffer.last - VTbuffer.next; + VTbuffer->last += length; + size = VTbuffer->last - VTbuffer->next; /* shift the unused portion up to make room */ for (n = size; n >= length; --n) - VTbuffer.next[n] = VTbuffer.next[n - length]; + VTbuffer->next[n] = VTbuffer->next[n - length]; /* insert the new bytes to interpret */ for (n = 0; n < length; n++) - VTbuffer.next[n] = CharOf(value[n]); + VTbuffer->next[n] = CharOf(value[n]); } #if OPT_WIDE_CHARS @@ -380,17 +404,31 @@ void writePtyData(int f, IChar * d, unsigned len) { - static Char *dbuf; - static unsigned dlen; unsigned n = (len << 1); - if (dlen <= len) { - dlen = n; - dbuf = (Char *) XtRealloc((char *) dbuf, dlen); + if (VTbuffer->write_len <= len) { + VTbuffer->write_len = n; + VTbuffer->write_buf = (Char *) XtRealloc((char *) + VTbuffer->write_buf, VTbuffer->write_len); } for (n = 0; n < len; n++) - dbuf[n] = d[n]; - v_write(f, dbuf, n); + VTbuffer->write_buf[n] = d[n]; + v_write(f, VTbuffer->write_buf, n); +} +#endif /* OPT_WIDE_CHARS */ + +#ifdef NO_LEAKS +void +noleaks_ptydata(void) +{ + if (VTbuffer != 0) { +#if OPT_WIDE_CHARS + if (VTbuffer->write_buf != 0) + free(VTbuffer->write_buf); +#endif + free(VTbuffer); + VTbuffer = 0; + } } #endif Index: xc/programs/xterm/ptyx.h diff -u xc/programs/xterm/ptyx.h:3.121 xc/programs/xterm/ptyx.h:3.133 --- xc/programs/xterm/ptyx.h:3.121 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/ptyx.h Sun Apr 30 17:55:39 2006 @@ -1,13 +1,9 @@ -/* $XTermId: ptyx.h,v 1.357 2005/01/12 21:47:55 tom Exp $ */ +/* $XTermId: ptyx.h,v 1.421 2006/04/30 16:55:52 tom Exp $ */ -/* - * $Xorg: ptyx.h,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/ptyx.h,v 3.121 2005/01/14 01:50:03 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/ptyx.h,v 3.133 2006/04/30 21:55:39 dickey Exp $ */ /* - * Copyright 1999-2004,2005 by Thomas E. Dickey + * Copyright 1999-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -139,7 +135,7 @@ #define USE_PTY_DEVICE 1 #define USE_PTY_SEARCH 1 -#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__NetBSD__) +#if defined(__osf__) || (defined(linux) && defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #undef USE_PTY_DEVICE #undef USE_PTY_SEARCH #define USE_PTS_DEVICE 1 @@ -148,6 +144,8 @@ #undef USE_PTY_SEARCH #elif defined(PUCC_PTYD) #undef USE_PTY_SEARCH +#elif (defined(sun) && defined(SVR4)) || defined(_ALL_SOURCE) || defined(__CYGWIN__) +#undef USE_PTY_SEARCH #endif #if defined(SYSV) && defined(i386) && !defined(SVR4) @@ -213,7 +211,7 @@ #ifdef __hpux #define PTYCHAR2 "fedcba9876543210" #else /* !__hpux */ -#ifdef __FreeBSD__ +#if defined(__DragonFly__) || defined(__FreeBSD__) #define PTYCHAR2 "0123456789abcdefghijklmnopqrstuv" #else /* !__FreeBSD__ */ #define PTYCHAR2 "0123456789abcdef" @@ -262,12 +260,18 @@ /* Until the translation manager comes along, I have to do my own translation of * mouse events into the proper routines. */ -typedef enum {NORMAL, LEFTEXTENSION, RIGHTEXTENSION} EventMode; +typedef enum { + NORMAL + , LEFTEXTENSION + , RIGHTEXTENSION +} EventMode; /* * The origin of a screen is 0, 0. Therefore, the number of rows * on a screen is screen->max_row + 1, and similarly for columns. */ +#define MaxCols(screen) ((screen)->max_col + 1) +#define MaxRows(screen) ((screen)->max_row + 1) typedef unsigned char Char; /* to support 8 bit chars */ typedef Char *ScrnPtr; @@ -275,6 +279,15 @@ #define CharOf(n) ((unsigned char)(n)) +typedef struct { + int row; + int col; +} CELL; + +#define isSameRow(a,b) ((a)->row == (b)->row) +#define isSameCol(a,b) ((a)->col == (b)->col) +#define isSameCELL(a,b) (isSameRow(a,b) && isSameCol(a,b)) + /* * ANSI emulation, special character codes */ @@ -524,6 +537,10 @@ #define OPT_NUM_LOCK 1 /* use NumLock key only for numeric-keypad */ #endif +#ifndef OPT_PASTE64 +#define OPT_PASTE64 0 /* program control of select/paste via base64 */ +#endif + #ifndef OPT_PC_COLORS #define OPT_PC_COLORS 1 /* true if xterm supports PC-style (bold) colors */ #endif @@ -564,6 +581,10 @@ #define OPT_SCO_FUNC_KEYS 0 /* true if xterm supports SCO-style function keys */ #endif +#ifndef OPT_SELECT_REGEX +#define OPT_SELECT_REGEX 0 /* true if xterm supports regular-expression selects */ +#endif + #ifndef OPT_SESSION_MGT #if defined(XtNdieCallback) && defined(XtNsaveCallback) #define OPT_SESSION_MGT 1 @@ -632,6 +653,12 @@ #define OPT_COLOR_RES2 0 #endif +#if OPT_PASTE64 && !OPT_READLINE +/* OPT_PASTE64 uses logic from OPT_READLINE */ +#undef OPT_READLINE +#define OPT_READLINE 1 +#endif + #if OPT_PC_COLORS && !OPT_ISO_COLORS /* You must have ANSI/ISO colors to support PC colors */ #undef OPT_PC_COLORS @@ -664,6 +691,19 @@ /***====================================================================***/ +/* + * Indices for menu_font_names[][] + */ +typedef enum { + fNorm = 0 /* normal font */ + , fBold /* bold font */ +#if OPT_WIDE_CHARS + , fWide /* double-width font */ + , fWBold /* double-width bold font */ +#endif + , fMAX +} VTFontEnum; + /* indices for the normal terminal colors in screen.Tcolors[] */ typedef enum { TEXT_FG = 0 /* text foreground */ @@ -684,6 +724,20 @@ , NCOLORS /* total number of colors */ } TermColors; +/* indices for mapping multiple clicks to selection types */ +typedef enum { + Select_CHAR=0 + ,Select_WORD + ,Select_LINE + ,Select_GROUP + ,Select_PAGE + ,Select_ALL +#if OPT_SELECT_REGEX + ,Select_REGEX +#endif + ,NSELECTUNITS +} SelectUnit; + #define COLOR_DEFINED(s,w) ((s)->which & (1<<(w))) #define COLOR_VALUE(s,w) ((s)->colors[w]) #define SET_COLOR_VALUE(s,w,v) (((s)->colors[w] = (v)), ((s)->which |= (1<<(w)))) @@ -697,7 +751,7 @@ #if OPT_ISO_COLORS #define if_OPT_ISO_COLORS(screen, code) if(screen->colorMode) code -#define TERM_COLOR_FLAGS (term->flags & (FG_COLOR|BG_COLOR)) +#define TERM_COLOR_FLAGS(xw) ((xw)->flags & (FG_COLOR|BG_COLOR)) #define COLOR_0 0 #define COLOR_1 1 #define COLOR_2 2 @@ -754,7 +808,7 @@ #else /* !OPT_ISO_COLORS */ #define if_OPT_ISO_COLORS(screen, code) /* nothing */ -#define TERM_COLOR_FLAGS 0 +#define TERM_COLOR_FLAGS(xw) 0 #define ReverseOrHilite(screen,flags,hilite) \ (( (flags & INVERSE) && !hilite) || \ @@ -795,6 +849,10 @@ #define COLOR_RES2(name,class,offset,value) Cres(name, class, offset, value) #endif +#define CLICK_RES_NAME(count) "on" count "Clicks" +#define CLICK_RES_CLASS(count) "On" count "Clicks" +#define CLICK_RES(count,offset,value) Sres(CLICK_RES_NAME(count), CLICK_RES_CLASS(count), offset, value) + /***====================================================================***/ #if OPT_DEC_CHRSET @@ -835,10 +893,10 @@ #endif /* the number of pointers per row in 'ScrnBuf' */ -#if OPT_ISO_COLORS || OPT_DEC_CHRSET || OPT_WIDE_CHARS +#if OPT_WIDE_CHARS #define MAX_PTRS term->num_ptrs #else -#define MAX_PTRS (OFF_ATTRS+1) +#define MAX_PTRS (OFF_FINAL) #endif #define BUF_HEAD 1 @@ -890,7 +948,7 @@ #if OPT_XMC_GLITCH #define if_OPT_XMC_GLITCH(screen, code) if(screen->xmc_glitch) code #define XMC_GLITCH 1 /* the character we'll show */ -#define XMC_FLAGS (INVERSE|UNDERLINE|BOLD) +#define XMC_FLAGS (INVERSE|UNDERLINE|BOLD|BLINK) #else #define if_OPT_XMC_GLITCH(screen, code) /* nothing */ #endif @@ -949,90 +1007,58 @@ /***====================================================================***/ -#define BUF_SIZE 4096 -#define FRG_SIZE 128 +#define FRG_SIZE resource.minBufSize +#define BUF_SIZE resource.maxBufSize typedef struct { - Char buffer[BUF_SIZE + FRG_SIZE]; Char * next; Char * last; int update; /* HandleInterpret */ #if OPT_WIDE_CHARS IChar utf_data; /* resulting character */ int utf_size; /* ...number of bytes decoded */ + Char *write_buf; + unsigned write_len; #endif + Char buffer[1]; } PtyData; /***====================================================================***/ -#if OPT_TRACE -#include -#undef NDEBUG /* turn on assert's */ -#else -#ifndef NDEBUG -#define NDEBUG /* not debugging, don't do assert's */ -#endif -#endif - -#ifndef TRACE -#define TRACE(p) /*nothing*/ -#endif - -#ifndef TRACE_ARGV -#define TRACE_ARGV(tag,argv) /*nothing*/ -#endif - -#ifndef TRACE_CHILD -#define TRACE_CHILD /*nothing*/ -#endif - -#ifndef TRACE_HINTS -#define TRACE_HINTS(hints) /*nothing*/ -#endif - -#ifndef TRACE_OPTS -#define TRACE_OPTS(opts,ress,lens) /*nothing*/ -#endif - -#ifndef TRACE_TRANS -#define TRACE_TRANS(name,w) /*nothing*/ -#endif - -#ifndef TRACE_XRES -#define TRACE_XRES() /*nothing*/ -#endif - -#ifndef TRACE2 -#define TRACE2(p) /*nothing*/ -#endif - -/***====================================================================***/ - /* The order of ifdef's matches the logic for num_ptrs in VTInitialize */ typedef enum { OFF_FLAGS = 0 /* BUF_HEAD */ - , OFF_CHARS = 1 - , OFF_ATTRS = 2 + , OFF_ATTRS /* video attributes */ #if OPT_ISO_COLORS #if OPT_256_COLORS || OPT_88_COLORS - , OFF_FGRND - , OFF_BGRND + , OFF_FGRND /* foreground color number */ + , OFF_BGRND /* background color number */ #else - , OFF_COLOR + , OFF_COLOR /* foreground+background color numbers */ #endif #endif #if OPT_DEC_CHRSET - , OFF_CSETS + , OFF_CSETS /* DEC character-set */ #endif + /* wide (16-bit) characters begin here */ + , OFF_CHARS /* first (or only) byte of cell's character */ #if OPT_WIDE_CHARS - , OFF_WIDEC - , OFF_COM1L + , OFF_WIDEC /* second byte of first wide-character */ + , OFF_COM1L /* first combining character */ , OFF_COM1H - , OFF_COM2L + , OFF_COM2L /* second combining character */ , OFF_COM2H #endif + , OFF_FINAL /* this is the last item in the enum */ } BufOffsets; + /* + * A "row" is the index within the visible part of the screen, and an + * "inx" is the index within the whole set of scrollable lines. + */ +#define ROW2INX(screen, row) ((row) + (screen)->topline) +#define INX2ROW(screen, inx) ((inx) - (screen)->topline) + /* ScrnBuf-level macros */ #define BUF_FLAGS(buf, row) (buf[MAX_PTRS * (row) + OFF_FLAGS]) #define BUF_CHARS(buf, row) (buf[MAX_PTRS * (row) + OFF_CHARS]) @@ -1158,6 +1184,8 @@ #endif } SavedCursor; +#define SAVED_CURSORS 2 + typedef struct { int width; /* if > 0, width of scrollbar, */ /* and scrollbar is showing */ @@ -1173,6 +1201,7 @@ typedef struct { Widget menu_bar; /* toolbar, if initialized */ Dimension menu_height; /* ...and its height */ + Dimension menu_border; /* ...and its border */ } TbInfo; #define VT100_TB_INFO(name) screen.fullVwin.tb_info.name #endif @@ -1229,6 +1258,7 @@ Boolean boldColors; /* can we make bold colors? */ Boolean colorMode; /* are we using color mode? */ Boolean colorULMode; /* use color for underline? */ + Boolean italicULMode; /* italic font for underline? */ Boolean colorBDMode; /* use color for bold? */ Boolean colorBLMode; /* use color for blink? */ Boolean colorRVMode; /* use color for reverse? */ @@ -1247,13 +1277,18 @@ #if OPT_WIDE_CHARS Boolean wide_chars; /* true when 16-bit chars */ Boolean vt100_graphics; /* true to allow vt100-graphics */ + Boolean utf8_inparse; /* true to enable UTF-8 parser */ int utf8_mode; /* use UTF-8 decode/encode: 0-2 */ + Boolean utf8_latin1; /* use UTF-8 with Latin-1 bias */ + Boolean utf8_title; /* use UTF-8 titles */ int latin9_mode; /* poor man's luit, latin9 */ int unicode_font; /* font uses unicode encoding */ int utf_count; /* state of utf_char */ IChar utf_char; /* in-progress character */ int last_written_col; int last_written_row; + XChar2b *draw_buf; /* drawXtermText() data */ + Cardinal draw_len; /* " " " */ #endif #if OPT_BROKEN_OSC Boolean brokenLinuxOSC; /* true to ignore Linux palette ctls */ @@ -1265,10 +1300,22 @@ Boolean c1_printable; /* true if we treat C1 as print */ #endif int border; /* inner border */ + int scrollBarBorder; /* scrollBar border */ Cursor arrow; /* arrow cursor */ unsigned long event_mask; unsigned short send_mouse_pos; /* user wants mouse transition */ /* and position information */ +#if OPT_PASTE64 + int base64_paste; /* set to send paste in base64 */ + int base64_final; /* string-terminator for paste */ + /* _qWriteSelectionData expects these to be initialized to zero. + * base64_flush() is the last step of the conversion, it clears these + * variables. + */ + int base64_accu; + int base64_count; + int base64_pad; +#endif #if OPT_READLINE unsigned click1_moves; unsigned paste_moves; @@ -1297,6 +1344,8 @@ Boolean poponbell; /* pop on bell mode */ Boolean allowSendEvents;/* SendEvent mode */ Boolean allowWindowOps; /* WindowOps mode */ + Boolean allowSendEvent0;/* initial SendEvent mode */ + Boolean allowWindowOp0; /* initial WindowOps mode */ Boolean awaitInput; /* select-timeout mode */ Boolean grabbedKbd; /* keyboard is grabbed */ #ifdef ALLOWLOGGING @@ -1314,9 +1363,6 @@ struct _vtwin iconVwin; struct _vtwin * whichVwin; #endif /* NO_ACTIVE_ICON */ -#if OPT_TOOLBAR - Boolean toolbars; /* true if toolbars are used */ -#endif Cursor pointer_cursor; /* pointer cursor in window */ @@ -1336,13 +1382,8 @@ #endif Dimension fnt_wide; Dimension fnt_high; - XFontStruct *fnt_norm; /* normal font of terminal */ - XFontStruct *fnt_bold; /* bold font of terminal */ + XFontStruct *fnts[fMAX]; /* normal/bold/etc for terminal */ Boolean free_bold_box; /* same_font_size's austerity */ -#if OPT_WIDE_CHARS - XFontStruct *fnt_dwd; /* wide font of terminal */ - XFontStruct *fnt_dwdb; /* wide bold font of terminal */ -#endif #ifndef NO_ACTIVE_ICON XFontStruct *fnt_icon; /* icon font */ #endif /* NO_ACTIVE_ICON */ @@ -1367,9 +1408,7 @@ #endif int cursor_GC; /* see ShowCursor() */ int cursor_set; /* requested state */ - int cursor_col; /* previous cursor column */ - int cursor_row; /* previous cursor row */ - Boolean cursor_moved; /* scrolling makes cursor move */ + CELL cursorp; /* previous cursor row/column */ int cur_col; /* current cursor column */ int cur_row; /* current cursor row */ int max_col; /* rightmost column */ @@ -1377,24 +1416,46 @@ int top_marg; /* top line of scrolling region */ int bot_marg; /* bottom line of " " */ Widget scrollWidget; /* pointer to scrollbar struct */ + /* + * Indices used to keep track of the top of the vt100 window and + * the saved lines, taking scrolling into account. + */ int topline; /* line number of top, <= 0 */ int savedlines; /* number of lines that've been saved */ int savelines; /* number of lines off top to save */ - int scrolllines; /* number of lines to button scroll */ - Boolean scrollttyoutput; /* scroll to bottom on tty output */ - Boolean scrollkey; /* scroll to bottom on key */ - + int scroll_amt; /* amount to scroll */ + int refresh_amt; /* amount to refresh */ + /* + * Pointer to the current visible buffer, e.g., allbuf or altbuf. + */ ScrnBuf visbuf; /* ptr to visible screen buf (main) */ + /* + * Data for the normal buffer, which may have saved lines to which + * the user can scroll. + */ ScrnBuf allbuf; /* screen buffer (may include lines scrolled off top) */ Char *sbuf_address; /* main screen memory address */ + /* + * Data for the alternate buffer. + */ ScrnBuf altbuf; /* alternate screen buffer */ Char *abuf_address; /* alternate screen memory address */ + Boolean alternate; /* true if using alternate buf */ + /* + * Workspace used for screen operations. + */ Char **save_ptr; /* workspace for save-pointers */ size_t save_len; /* ...and its length */ - Boolean alternate; /* true if using alternate buf */ + + int scrolllines; /* number of lines to button scroll */ + Boolean scrollttyoutput; /* scroll to bottom on tty output */ + Boolean scrollkey; /* scroll to bottom on key */ + Boolean cursor_moved; /* scrolling makes cursor move */ + unsigned short do_wrap; /* true if cursor in last column and character just output */ + int incopy; /* 0 idle; 1 XCopyArea issued; -1 first GraphicsExpose seen, but last not seen */ @@ -1404,16 +1465,17 @@ unsigned int copy_height; int copy_dest_x; int copy_dest_y; + Boolean c132; /* allow change to 132 columns */ Boolean curses; /* kludge line wrap for more */ Boolean hp_ll_bc; /* kludge HP-style ll for xdb */ Boolean marginbell; /* true if margin bell on */ int nmarginbell; /* columns from right margin */ int bellarmed; /* cursor below bell margin */ - Boolean multiscroll; /* true if multi-scroll */ + Boolean multiscroll; /* true if multi-scroll */ int scrolls; /* outstanding scroll count, used only with multiscroll */ - SavedCursor sc[2]; /* data for restore cursor */ + SavedCursor sc[SAVED_CURSORS]; /* data for restore cursor */ unsigned char save_modes[DP_LAST]; /* save dec/xterm private modes */ /* Improved VT100 emulation stuff. */ @@ -1426,13 +1488,11 @@ int terminal_id; /* 100=vt100, 220=vt220, etc. */ int vtXX_level; /* 0=vt52, 1,2,3 = vt100 ... vt320 */ int ansi_level; /* levels 1,2,3 */ - int scroll_amt; /* amount to scroll */ - int refresh_amt; /* amount to refresh */ int protected_mode; /* 0=off, 1=DEC, 2=ISO */ Boolean old_fkeys; /* true for compatible fkeys */ Boolean delete_is_del; /* true for compatible Delete key */ Boolean jumpscroll; /* whether we should jumpscroll */ - Boolean always_highlight; /* whether to highlight cursor */ + Boolean always_highlight; /* whether to highlight cursor */ Boolean underline; /* whether to underline text */ Boolean bold_mode; /* whether to use bold font */ @@ -1484,10 +1544,25 @@ int gin_terminator; /* Tek strap option */ #endif /* OPT_TEK4014 */ - int multiClickTime; /* time between multiclick selects */ + /* + * Bell + */ int visualBellDelay; /* msecs to delay for visibleBell */ int bellSuppressTime; /* msecs after Bell before another allowed */ Boolean bellInProgress; /* still ringing/flashing prev bell? */ + /* + * Select/paste state. + */ + Boolean selectToClipboard; /* primary vs clipboard */ + String *mappedSelect; /* mapping for "SELECT" to "PRIMARY" */ + + int numberOfClicks; + int maxClicks; + int multiClickTime; /* time between multiclick selects */ + SelectUnit selectUnit; + SelectUnit selectMap[NSELECTUNITS]; + String onClick[NSELECTUNITS + 1]; + char *charClass; /* for overriding word selection */ Boolean cutNewline; /* whether or not line cut has \n */ Boolean cutToBeginningOfLine; /* line cuts to BOL? */ @@ -1495,31 +1570,58 @@ Boolean trim_selection; /* controls trimming of selection */ Boolean i18nSelections; Boolean brokenSelections; + Boolean replyToEmacs; /* Send emacs escape code when done selecting or extending? */ Char *selection_data; /* the current selection */ int selection_size; /* size of allocated buffer */ int selection_length; /* number of significant bytes */ Time selection_time; /* latest event timestamp */ - int startHRow, startHCol, /* highlighted text */ - endHRow, endHCol, - startHCoord, endHCoord; + Time lastButtonUpTime; + + CELL rawPos; /* raw position for selection start */ + CELL startRaw; /* area before selectUnit processing */ + CELL endRaw; /* " " */ + CELL startSel; /* area after selectUnit processing */ + CELL endSel; /* " " */ + CELL startH; /* start highlighted text */ + CELL endH; /* end highlighted text */ + CELL saveStartW; /* saved WORD state, for LINE */ + CELL startExt; /* Start, end of extension */ + CELL endExt; /* " " */ + CELL saveStartR; /* Saved values of raw selection for extend to restore to */ + CELL saveEndR; /* " " */ + int startHCoord, endHCoord; + int firstValidRow; /* Valid rows for selection clipping */ + int lastValidRow; /* " " */ + Atom* selection_atoms; /* which selections we own */ Cardinal sel_atoms_size; /* how many atoms allocated */ Cardinal selection_count; /* how many atoms in use */ +#if OPT_SELECT_REGEX + char * selectExpr[NSELECTUNITS]; +#endif + /* + * Input/output state. + */ Boolean input_eight_bits;/* use 8th bit instead of ESC prefix */ Boolean output_eight_bits; /* honor all bits or strip */ Boolean control_eight_bits; /* send CSI as 8-bits */ Boolean backarrow_key; /* backspace/delete */ Boolean meta_sends_esc; /* Meta-key sends ESC prefix */ + /* + * Fonts + */ Pixmap menu_item_bitmap; /* mask for checking items */ - String bold_font_names[NMENUFONTS]; - String menu_font_names[NMENUFONTS]; + String menu_font_names[NMENUFONTS][fMAX]; +#define MenuFontName(n) menu_font_names[n][fNorm] long menu_font_sizes[NMENUFONTS]; int menu_font_number; #if OPT_RENDERFONT XftFont * renderFontNorm[NMENUFONTS]; XftFont * renderFontBold[NMENUFONTS]; + XftFont * renderFontItal[NMENUFONTS]; XftFont * renderWideNorm[NMENUFONTS]; XftFont * renderWideBold[NMENUFONTS]; + XftFont * renderWideItal[NMENUFONTS]; XftDraw * renderDraw; #endif #if OPT_INPUT_METHOD @@ -1570,6 +1672,35 @@ keyboardIsVT220 } xtermKeyboardType; +typedef enum { /* legal values for screen.utf8_mode */ + uFalse = 0, + uTrue = 1, + uAlways = 2, + uDefault = 3 +} utf8ModeTypes; + +#if OPT_HP_FUNC_KEYS +#define NAME_HP_KT " hp" +#else +#define NAME_HP_KT /*nothing*/ +#endif + +#if OPT_SCO_FUNC_KEYS +#define NAME_SCO_KT " sco" +#else +#define NAME_SCO_KT /*nothing*/ +#endif + +#define NAME_SUN_KT " sun" + +#if OPT_SUNPC_KBD +#define NAME_VT220_KT " vt220" +#else +#define NAME_VT220_KT /*nothing*/ +#endif + +#define KEYBOARD_TYPES NAME_HP_KT NAME_SCO_KT NAME_SUN_KT NAME_VT220_KT + #if OPT_TRACE extern const char * visibleKeyboardType(xtermKeyboardType); #endif @@ -1598,7 +1729,8 @@ char *geo_metry; char *T_geometry; #if OPT_WIDE_CHARS - Boolean cjk_width; /* true when CJK width convention is turned on */ + Boolean cjk_width; /* true for built-in CJK wcwidth() */ + Boolean mk_width; /* true for simpler built-in wcwidth() */ #endif #if OPT_LUIT_PROG Boolean callfilter; /* true to invoke luit */ @@ -1713,21 +1845,23 @@ TKeyboard keyboard; /* terminal keyboard */ TScreen screen; /* terminal screen */ unsigned flags; /* mode flags */ - int cur_foreground; /* current foreground color */ - int cur_background; /* current background color */ - Pixel dft_foreground; /* default foreground color */ - Pixel dft_background; /* default background color */ + int cur_foreground; /* current foreground color */ + int cur_background; /* current background color */ + Pixel dft_foreground; /* default foreground color */ + Pixel dft_background; /* default background color */ #if OPT_ISO_COLORS - int sgr_foreground; /* current SGR foreground color */ - int sgr_background; /* current SGR background color */ - Boolean sgr_extended; /* SGR set with extended codes? */ + int sgr_foreground; /* current SGR foreground color */ + int sgr_background; /* current SGR background color */ + Boolean sgr_extended; /* SGR set with extended codes? */ #endif #if OPT_ISO_COLORS || OPT_DEC_CHRSET || OPT_WIDE_CHARS - int num_ptrs; /* number of pointers per row in 'ScrnBuf' */ + int num_ptrs; /* number of pointers per row in 'ScrnBuf' */ #endif unsigned initflags; /* initial mode flags */ Tabs tabs; /* tabstops of the terminal */ Misc misc; /* miscellaneous parameters */ + Bool init_vt_menu; + Bool init_tek_menu; } XtermWidgetRec, *XtermWidget; #if OPT_TEK4014 @@ -1741,7 +1875,7 @@ * terminal flags * There are actually two namespaces mixed together here. * One is the set of flags that can go in screen->visbuf attributes - * and which must fit in a char. + * and which must fit in a char (see OFF_ATTRS). * The other is the global setting stored in * term->flags and screen->save_modes. This need only fit in an unsigned. */ @@ -1796,7 +1930,7 @@ #define SMOOTHSCROLL 0x10000 /* true if in smooth scroll mode */ #define IN132COLUMNS 0x20000 /* true if in 132 column mode */ #define INVISIBLE 0x40000 /* true if writing invisible text */ -#define NATIONAL 0x100000 /* true if writing national charset */ +#define NATIONAL 0x100000 /* true if writing national charset */ /* * Per-line flags @@ -1825,13 +1959,15 @@ #define OriginX(screen) (ScrollbarWidth(screen) + screen->border) #endif +#define OriginY(screen) (screen->border) + #define CursorMoved(screen) \ ((screen)->cursor_moved || \ - ((screen)->cursor_col != (screen)->cur_col || \ - (screen)->cursor_row != (screen)->cur_row)) + ((screen)->cursorp.col != (screen)->cur_col || \ + (screen)->cursorp.row != (screen)->cur_row)) #define CursorX(screen,col) ((col) * FontWidth(screen) + OriginX(screen)) -#define CursorY(screen,row) ((((row) - screen->topline) * FontHeight(screen)) \ +#define CursorY(screen,row) ((INX2ROW(screen, row) * FontHeight(screen)) \ + screen->border) /* @@ -1844,7 +1980,7 @@ #define WhichTWin(screen) ((screen)->whichTwin) #define WhichVFont(screen,name) (IsIcon(screen) ? (screen)->fnt_icon \ - : (screen)->name) + : (screen)->name) #define FontAscent(screen) (IsIcon(screen) ? (screen)->fnt_icon->ascent \ : WhichVWin(screen)->f_ascent) #define FontDescent(screen) (IsIcon(screen) ? (screen)->fnt_icon->descent \ @@ -1865,7 +2001,7 @@ /* * Macro to check if we are iconified; do not use render for that case. */ -#define UsingRenderFont() (term->misc.render_font && !IsIcon(&(term->screen))) +#define UsingRenderFont(xw) ((xw)->misc.render_font && !IsIcon(&((xw)->screen))) /* * These definitions do not depend on whether xterm supports active-icon. @@ -1882,8 +2018,8 @@ #define FontWidth(screen) WhichVWin(screen)->f_width #define FontHeight(screen) WhichVWin(screen)->f_height -#define NormalFont(screen) WhichVFont(screen, fnt_norm) -#define BoldFont(screen) WhichVFont(screen, fnt_bold) +#define NormalFont(screen) WhichVFont(screen, fnts[fNorm]) +#define BoldFont(screen) WhichVFont(screen, fnts[fBold]) #define ScrollbarWidth(screen) WhichVWin(screen)->sb_info.width #define NormalGC(screen) WhichVWin(screen)->normalGC @@ -1897,6 +2033,18 @@ #define TFullHeight(screen) WhichTWin(screen)->fullheight #define TekScale(screen) WhichTWin(screen)->tekscale +#define BorderWidth(w) ((w)->core.border_width) +#define BorderPixel(w) ((w)->core.border_pixel) + +#if OPT_TOOLBAR +#define ToolbarHeight(w) ((resource.toolBar) \ + ? (term->VT100_TB_INFO(menu_height) \ + + term->VT100_TB_INFO(menu_border) * 2) \ + : 0) +#else +#define ToolbarHeight(w) 0 +#endif + #if OPT_TEK4014 #define TEK_LINK_BLOCK_SIZE 1024 @@ -1925,4 +2073,51 @@ #define I_SIGNAL 0x02 #define I_TEK 0x04 +/***====================================================================***/ + +#if OPT_TRACE +#include +#undef NDEBUG /* turn on assert's */ +#else +#ifndef NDEBUG +#define NDEBUG /* not debugging, don't do assert's */ +#endif +#endif + +#ifndef TRACE +#define TRACE(p) /*nothing*/ +#endif + +#ifndef TRACE_ARGV +#define TRACE_ARGV(tag,argv) /*nothing*/ +#endif + +#ifndef TRACE_CHILD +#define TRACE_CHILD /*nothing*/ +#endif + +#ifndef TRACE_HINTS +#define TRACE_HINTS(hints) /*nothing*/ +#endif + +#ifndef TRACE_OPTS +#define TRACE_OPTS(opts,ress,lens) /*nothing*/ +#endif + +#ifndef TRACE_TRANS +#define TRACE_TRANS(name,w) /*nothing*/ +#endif + +#ifndef TRACE_WM_HINTS +#define TRACE_WM_HINTS(w) /*nothing*/ +#endif + +#ifndef TRACE_XRES +#define TRACE_XRES() /*nothing*/ +#endif + +#ifndef TRACE2 +#define TRACE2(p) /*nothing*/ +#endif + #endif /* included_ptyx_h */ Index: xc/programs/xterm/resize.c diff -u xc/programs/xterm/resize.c:3.58 xc/programs/xterm/resize.c:3.62 --- xc/programs/xterm/resize.c:3.58 Tue Nov 30 20:27:47 2004 +++ xc/programs/xterm/resize.c Sun Feb 12 20:14:59 2006 @@ -1,13 +1,9 @@ -/* $XTermId: resize.c,v 1.91 2004/11/30 20:24:30 tom Exp $ */ +/* $XTermId: resize.c,v 1.98 2006/02/12 22:45:50 tom Exp $ */ -/* - * $Xorg: resize.c,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/resize.c,v 3.58 2004/12/01 01:27:47 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/resize.c,v 3.62 2006/02/13 01:14:59 dickey Exp $ */ /* - * Copyright 2003,2004 by Thomas E. Dickey + * Copyright 2003-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -71,7 +67,7 @@ #endif #ifndef USE_TERMINFO /* avoid conflict with configure script */ -#if defined(__QNX__) || defined(__SCO__) || defined(linux) || defined(__OpenBSD__) +#if defined(__QNX__) || defined(__SCO__) || defined(linux) || defined(__OpenBSD__) || defined(__UNIXWARE__) #define USE_TERMINFO #endif #endif @@ -470,7 +466,7 @@ } i = ptr - termcap + 3; - strncpy(newtc, termcap, i); + strncpy(newtc, termcap, (unsigned) i); sprintf(newtc + i, "%d", cols); ptr = strchr(ptr, ':'); strcat(newtc, ptr); @@ -482,7 +478,7 @@ } i = ptr - newtc + 3; - strncpy(termcap, newtc, i); + strncpy(termcap, newtc, (unsigned) i); sprintf(termcap + i, "%d", rows); ptr = strchr(ptr, ':'); strcat(termcap, ptr); Index: xc/programs/xterm/resize.man diff -u xc/programs/xterm/resize.man:1.10 xc/programs/xterm/resize.man:1.12 --- xc/programs/xterm/resize.man:1.10 Sat Aug 17 15:52:27 2002 +++ xc/programs/xterm/resize.man Sun Feb 12 20:14:59 2006 @@ -1,8 +1,8 @@ -.\" $Xorg: resize.man,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ +.\" $XTermId: resize.man,v 1.14 2006/02/12 22:43:55 tom Exp $ .\" .\" updated by Thomas E. Dickey for XFree86, 1998-2002. .\" -.\" $XFree86: xc/programs/xterm/resize.man,v 1.10 2002/08/17 19:52:27 dickey Exp $ +.\" $XFree86: xc/programs/xterm/resize.man,v 1.12 2006/02/13 01:14:59 dickey Exp $ .TH RESIZE 1 __vendorversion__ .SH NAME resize \- set TERMCAP and terminal settings to current xterm window size Index: xc/programs/xterm/screen.c diff -u xc/programs/xterm/screen.c:3.68 xc/programs/xterm/screen.c:3.76 --- xc/programs/xterm/screen.c:3.68 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/screen.c Sun Feb 12 20:14:59 2006 @@ -1,11 +1,7 @@ -/* $XTermId: screen.c,v 1.162 2005/01/11 02:34:42 tom Exp $ */ +/* $XTermId: screen.c,v 1.190 2006/02/12 22:43:55 tom Exp $ */ /* - * $Xorg: screen.c,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ - */ - -/* - * Copyright 1999-2004,2005 by Thomas E. Dickey + * Copyright 1999-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -56,7 +52,7 @@ * SOFTWARE. */ -/* $XFree86: xc/programs/xterm/screen.c,v 3.68 2005/01/14 01:50:03 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/screen.c,v 3.76 2006/02/13 01:14:59 dickey Exp $ */ /* screen.c */ @@ -69,6 +65,7 @@ #if OPT_WIDE_CHARS #include +#include #endif #include @@ -222,6 +219,38 @@ } #if OPT_WIDE_CHARS +#if 0 +static void +dump_screen(const char *tag, + ScrnBuf sbuf, + Char * sbufaddr, + unsigned nrow, + unsigned ncol) +{ + unsigned y, x; + + TRACE(("DUMP %s, ptrs %d\n", tag, term->num_ptrs)); + TRACE((" sbuf %p\n", sbuf)); + TRACE((" sbufaddr %p\n", sbufaddr)); + TRACE((" nrow %d\n", nrow)); + TRACE((" ncol %d\n", ncol)); + + for (y = 0; y < nrow; ++y) { + ScrnPtr ptr = BUF_CHARS(sbuf, y); + TRACE(("%3d:%p:", y, ptr)); + for (x = 0; x < ncol; ++x) { + Char c = ptr[x]; + if (c == 0) + c = '~'; + TRACE(("%c", c)); + } + TRACE(("\n")); + } +} +#else +#define dump_screen(tag, sbuf, sbufaddr, nrow, ncol) /* nothing */ +#endif + /* * This function reallocates memory if changing the number of Buf offsets. * The code is based on Reallocate(). @@ -249,6 +278,8 @@ assert(ncol != 0); assert(new_max_offsets != 0); + dump_screen("before", *sbuf, *sbufaddr, nrow, ncol); + term->num_ptrs = new_max_offsets; entries = MAX_PTRS * nrow; @@ -270,6 +301,7 @@ memcpy(tmp, base[k++], ncol); tmp += ncol; } + tmp += ncol * (new_max_offsets - old_max_ptrs); } /* @@ -286,6 +318,8 @@ /* Now free the old buffer and restore num_ptrs */ free(oldbuf); + dump_screen("after", *sbuf, *sbufaddr, nrow, ncol); + term->num_ptrs = old_max_ptrs; } @@ -301,22 +335,44 @@ if (screen->wide_chars) return; - if (xtermLoadVTFonts(term, "utf8Fonts", "Utf8Fonts")) { + TRACE(("ChangeToWide\n")); + if (xtermLoadWideFonts(term, True)) { if (savelines < 0) savelines = 0; + + /* + * If we're displaying the alternate screen, switch the pointers back + * temporarily so ReallocateBufOffsets() will operate on the proper + * data in altbuf. + */ + if (screen->alternate) + SwitchBufPtrs(screen); + ReallocateBufOffsets(&screen->allbuf, &screen->sbuf_address, - (unsigned) (screen->max_row + 1 + savelines), - (unsigned) (screen->max_col + 1), + (unsigned) (MaxRows(screen) + savelines), + (unsigned) MaxCols(screen), new_bufoffset); - if (screen->altbuf) + if (screen->altbuf) { ReallocateBufOffsets(&screen->altbuf, &screen->abuf_address, - (unsigned) (screen->max_row + 1), - (unsigned) (screen->max_col + 1), + (unsigned) MaxRows(screen), + (unsigned) MaxCols(screen), new_bufoffset); + } + screen->wide_chars = True; term->num_ptrs = new_bufoffset; screen->visbuf = &screen->allbuf[MAX_PTRS * savelines]; + + /* + * Switch the pointers back before we start painting on the screen. + */ + if (screen->alternate) + SwitchBufPtrs(screen); + + update_font_utf8_mode(); + SetVTFont(term, screen->menu_font_number, TRUE, NULL); } + TRACE(("...ChangeToWide\n")); } #endif @@ -355,19 +411,14 @@ Char *cb = 0; #endif Char *attrs; - int avail = screen->max_col - screen->cur_col + 1; + int avail = MaxCols(screen) - screen->cur_col; Char *chars; int wrappedbit; #if OPT_WIDE_CHARS Char starcol1, starcol2; Char *comb1l = 0, *comb1h = 0, *comb2l = 0, *comb2h = 0; #endif - -#if OPT_WIDE_CHARS unsigned real_width = visual_width(PAIRED_CHARS(str, str2), length); -#else - unsigned real_width = length; -#endif if (avail <= 0) return; @@ -554,8 +605,8 @@ len); /* clear contents of old rows */ - if (TERM_COLOR_FLAGS) { - int flags = TERM_COLOR_FLAGS; + if (TERM_COLOR_FLAGS(term)) { + int flags = TERM_COLOR_FLAGS(term); for (i = 0; i < last; i += MAX_PTRS) { for (j = 0; j < MAX_PTRS; j++) { if (j < BUF_HEAD) @@ -681,14 +732,14 @@ ScrnInsertChar(TScreen * screen, unsigned n) { ScrnBuf sb = screen->visbuf; - unsigned last = screen->max_col + 1; + unsigned last = MaxCols(screen); int row = screen->cur_row; unsigned col = screen->cur_col; unsigned i; Char *ptr = BUF_CHARS(sb, row); Char *attrs = BUF_ATTRS(sb, row); int wrappedbit = ScrnTstWrapped(screen, row); - int flags = CHARDRAWN | TERM_COLOR_FLAGS; + int flags = CHARDRAWN | TERM_COLOR_FLAGS(term); size_t nbytes; if (last <= (col + n)) { @@ -768,7 +819,7 @@ ScrnDeleteChar(TScreen * screen, unsigned n) { ScrnBuf sb = screen->visbuf; - unsigned last = screen->max_col + 1; + unsigned last = MaxCols(screen); unsigned row = screen->cur_row; unsigned col = screen->cur_col; Char *ptr = BUF_CHARS(sb, row); @@ -790,7 +841,7 @@ memmove(ptr + col, ptr + col + n, nbytes); memmove(attrs + col, attrs + col + n, nbytes); bzero(ptr + last - n, n); - memset(attrs + last - n, (Char) (TERM_COLOR_FLAGS), n); + memset(attrs + last - n, (Char) (TERM_COLOR_FLAGS(term)), n); if_OPT_EXT_COLORS(screen, { ptr = BUF_FGRND(sb, row); @@ -851,7 +902,6 @@ { int y = toprow * FontHeight(screen) + screen->border; int row; - int topline = screen->topline; int maxrow = toprow + nrows - 1; int scrollamt = screen->scroll_amt; int max = screen->max_row; @@ -866,10 +916,10 @@ nrows, ncols, force ? " force" : "")); - if (screen->cursor_col >= leftcol - && screen->cursor_col <= (leftcol + ncols - 1) - && screen->cursor_row >= toprow + topline - && screen->cursor_row <= maxrow + topline) + if (screen->cursorp.col >= leftcol + && screen->cursorp.col <= (leftcol + ncols - 1) + && screen->cursorp.row >= ROW2INX(screen, toprow) + && screen->cursorp.row <= ROW2INX(screen, maxrow)) screen->cursor_state = OFF; for (row = toprow; row <= maxrow; y += FontHeight(screen), row++) { @@ -917,15 +967,15 @@ if (lastind < 0 || lastind > max) continue; - chars = SCRN_BUF_CHARS(screen, lastind + topline); - attrs = SCRN_BUF_ATTRS(screen, lastind + topline); + chars = SCRN_BUF_CHARS(screen, ROW2INX(screen, lastind)); + attrs = SCRN_BUF_ATTRS(screen, ROW2INX(screen, lastind)); if_OPT_DEC_CHRSET({ - cb = SCRN_BUF_CSETS(screen, lastind + topline); + cb = SCRN_BUF_CSETS(screen, ROW2INX(screen, lastind)); }); if_OPT_WIDE_CHARS(screen, { - widec = SCRN_BUF_WIDEC(screen, lastind + topline); + widec = SCRN_BUF_WIDEC(screen, ROW2INX(screen, lastind)); }); if_OPT_WIDE_CHARS(screen, { @@ -947,9 +997,9 @@ } }); - if (row < screen->startHRow || row > screen->endHRow || - (row == screen->startHRow && maxcol < screen->startHCol) || - (row == screen->endHRow && col >= screen->endHCol)) { + if (row < screen->startH.row || row > screen->endH.row || + (row == screen->startH.row && maxcol < screen->startH.col) || + (row == screen->endH.row && col >= screen->endH.col)) { #if OPT_DEC_CHRSET /* * Temporarily change dimensions to double-sized characters so @@ -981,17 +1031,17 @@ hilite = False; } else { /* row intersects selection; split into pieces of single type */ - if (row == screen->startHRow && col < screen->startHCol) { + if (row == screen->startH.row && col < screen->startH.col) { recurse++; - ScrnRefresh(screen, row, col, 1, screen->startHCol - col, + ScrnRefresh(screen, row, col, 1, screen->startH.col - col, force); - col = screen->startHCol; + col = screen->startH.col; } - if (row == screen->endHRow && maxcol >= screen->endHCol) { + if (row == screen->endH.row && maxcol >= screen->endH.col) { recurse++; - ScrnRefresh(screen, row, screen->endHCol, 1, - maxcol - screen->endHCol + 1, force); - maxcol = screen->endHCol - 1; + ScrnRefresh(screen, row, screen->endH.col, 1, + maxcol - screen->endH.col + 1, force); + maxcol = screen->endH.col - 1; } /* @@ -1044,8 +1094,8 @@ wideness = 0; #endif if_OPT_EXT_COLORS(screen, { - fbf = SCRN_BUF_FGRND(screen, lastind + topline); - fbb = SCRN_BUF_BGRND(screen, lastind + topline); + fbf = SCRN_BUF_FGRND(screen, ROW2INX(screen, lastind)); + fbb = SCRN_BUF_BGRND(screen, ROW2INX(screen, lastind)); fg_bg = ColorOf(col); /* this combines them, then splits them again. but extract_fg does more, so seems reasonable */ @@ -1053,7 +1103,7 @@ bg = extract_bg(fg_bg, flags); }); if_OPT_ISO_TRADITIONAL_COLORS(screen, { - fb = SCRN_BUF_COLOR(screen, lastind + topline); + fb = SCRN_BUF_COLOR(screen, ROW2INX(screen, lastind)); fg_bg = ColorOf(col); fg = extract_fg(fg_bg, flags); bg = extract_bg(fg_bg, flags); @@ -1062,7 +1112,7 @@ gc = updatedXtermGC(screen, flags, fg_bg, hilite); gc_changes |= (flags & (FG_COLOR | BG_COLOR)); - x = CurCursorX(screen, row + topline, col); + x = CurCursorX(screen, ROW2INX(screen, row), col); lastind = col; for (; col <= maxcol; col++) { @@ -1100,18 +1150,20 @@ if_OPT_WIDE_CHARS(screen, { int i; - Char *comb1l = BUF_COM1L(screen->visbuf, row + topline); - Char *comb2l = BUF_COM2L(screen->visbuf, row + topline); - Char *comb1h = BUF_COM1H(screen->visbuf, row + topline); - Char *comb2h = BUF_COM2H(screen->visbuf, row + topline); + Char *comb1l = BUF_COM1L(screen->visbuf, ROW2INX(screen, row)); + Char *comb2l = BUF_COM2L(screen->visbuf, ROW2INX(screen, row)); + Char *comb1h = BUF_COM1H(screen->visbuf, ROW2INX(screen, row)); + Char *comb2h = BUF_COM2H(screen->visbuf, ROW2INX(screen, row)); for (i = lastind; i < col; i++) { - int my_x = CurCursorX(screen, row + topline, i); + int my_x = CurCursorX(screen, ROW2INX(screen, row), i); int base = chars[i] | (widec[i] << 8); int comb1 = comb1l[i] | (comb1h[i] << 8); int comb2 = comb2l[i] | (comb2h[i] << 8); if (iswide(base)) - my_x = CurCursorX(screen, row + topline, i - 1); + my_x = CurCursorX(screen, + ROW2INX(screen, row), + i - 1); if (comb1 != 0) { drawXtermText(screen, (test & DRAWX_MASK) @@ -1183,18 +1235,18 @@ if_OPT_WIDE_CHARS(screen, { int i; - Char *comb1l = BUF_COM1L(screen->visbuf, row + topline); - Char *comb2l = BUF_COM2L(screen->visbuf, row + topline); - Char *comb1h = BUF_COM1H(screen->visbuf, row + topline); - Char *comb2h = BUF_COM2H(screen->visbuf, row + topline); + Char *comb1l = BUF_COM1L(screen->visbuf, ROW2INX(screen, row)); + Char *comb2l = BUF_COM2L(screen->visbuf, ROW2INX(screen, row)); + Char *comb1h = BUF_COM1H(screen->visbuf, ROW2INX(screen, row)); + Char *comb2h = BUF_COM2H(screen->visbuf, ROW2INX(screen, row)); for (i = lastind; i < col; i++) { - int my_x = CurCursorX(screen, row + topline, i); + int my_x = CurCursorX(screen, ROW2INX(screen, row), i); int base = chars[i] | (widec[i] << 8); int comb1 = comb1l[i] | (comb1h[i] << 8); int comb2 = comb2l[i] | (comb2h[i] << 8); if (iswide(base)) - my_x = CurCursorX(screen, row + topline, i - 1); + my_x = CurCursorX(screen, ROW2INX(screen, row), i - 1); if (comb1 != 0) { drawXtermText(screen, (test & DRAWX_MASK) | @@ -1255,8 +1307,8 @@ Bool force) /* ... leading/trailing spaces */ { if (ScrnHaveSelection(screen) - && (toprow <= screen->endHRow) - && (toprow + nrows - 1 >= screen->startHRow)) { + && (toprow <= screen->endH.row) + && (toprow + nrows - 1 >= screen->startH.row)) { ScrnDisownSelection(screen); } ScrnRefresh(screen, toprow, leftcol, nrows, ncols, force); @@ -1272,9 +1324,9 @@ int last) { ScrnBuf buf = screen->visbuf; - unsigned len = screen->max_col + 1; + unsigned len = MaxCols(screen); int row; - int flags = TERM_COLOR_FLAGS; + int flags = TERM_COLOR_FLAGS(term); TRACE(("ClearBufRows %d..%d\n", first, last)); for (row = first; row <= last; row++) { @@ -1331,7 +1383,10 @@ #endif Window tw = VWindow(screen); - TRACE(("ScreenResize %dx%d\n", height, width)); + TRACE(("ScreenResize %dx%d border %d font %dx%d\n", + height, width, border, + FontHeight(screen), FontWidth(screen))); + assert(width > 0); assert(height > 0); @@ -1350,22 +1405,23 @@ False); } - /* round so that it is unlikely the screen will change size on */ - /* small mouse movements. */ - rows = (height + FontHeight(screen) / 2 - border) / - FontHeight(screen); - cols = (width + FontWidth(screen) / 2 - border - ScrollbarWidth(screen)) / - FontWidth(screen); + TRACE(("..computing rows/cols: %.2f %.2f\n", + (double) (height - border) / FontHeight(screen), + (double) (width - border - ScrollbarWidth(screen)) / FontWidth(screen))); + + rows = (height - border) / FontHeight(screen); + cols = (width - border - ScrollbarWidth(screen)) / FontWidth(screen); if (rows < 1) rows = 1; if (cols < 1) cols = 1; /* update buffers if the screen has changed size */ - if (screen->max_row != rows - 1 || screen->max_col != cols - 1) { - int savelines = screen->scrollWidget - ? screen->savelines : 0; - int delta_rows = rows - (screen->max_row + 1); + if (MaxRows(screen) != rows || MaxCols(screen) != cols) { + int savelines = (screen->scrollWidget + ? screen->savelines + : 0); + int delta_rows = rows - MaxRows(screen); TRACE(("...ScreenResize chars %dx%d\n", rows, cols)); @@ -1380,13 +1436,13 @@ &screen->abuf_address, rows, cols, - screen->max_row + 1, - screen->max_col + 1); + MaxRows(screen), + MaxCols(screen)); move_down_by = Reallocate(&screen->allbuf, &screen->sbuf_address, rows + savelines, cols, - screen->max_row + 1 + savelines, - screen->max_col + 1); + MaxRows(screen) + savelines, + MaxCols(screen)); screen->visbuf = &screen->allbuf[MAX_PTRS * savelines]; set_max_row(screen, screen->max_row + delta_rows); @@ -1400,8 +1456,8 @@ screen->savedlines = screen->savelines; if (screen->topline < -screen->savedlines) screen->topline = -screen->savedlines; - screen->cur_row += move_down_by; - screen->cursor_row += move_down_by; + set_cur_row(screen, screen->cur_row + move_down_by); + screen->cursorp.row += move_down_by; ScrollSelection(screen, move_down_by, True); if (screen->alternate) @@ -1413,9 +1469,9 @@ *flags &= ~ORIGIN; if (screen->cur_row > screen->max_row) - screen->cur_row = screen->max_row; + set_cur_row(screen, screen->max_row); if (screen->cur_col > screen->max_col) - screen->cur_col = screen->max_col; + set_cur_col(screen, screen->max_col); screen->fullVwin.height = height - border; screen->fullVwin.width = width - border - screen->fullVwin.sb_info.width; @@ -1427,7 +1483,7 @@ screen->fullVwin.fullwidth = width; if (screen->scrollWidget) - ResizeScrollBar(screen); + ResizeScrollBar(term); ResizeSelection(screen, rows, cols); @@ -1435,19 +1491,20 @@ if (screen->iconVwin.window) { XWindowChanges changes; screen->iconVwin.width = - (screen->max_col + 1) * screen->iconVwin.f_width; + MaxCols(screen) * screen->iconVwin.f_width; screen->iconVwin.height = - (screen->max_row + 1) * screen->iconVwin.f_height; + MaxRows(screen) * screen->iconVwin.f_height; changes.width = screen->iconVwin.fullwidth = - screen->iconVwin.width + 2 * screen->border; - + screen->iconVwin.width + 2 * term->misc.icon_border_width; changes.height = screen->iconVwin.fullheight = - screen->iconVwin.height + 2 * screen->border; + screen->iconVwin.height + 2 * term->misc.icon_border_width; + changes.border_width = term->misc.icon_border_width; + TRACE(("resizing icon window %dx%d\n", changes.height, changes.width)); XConfigureWindow(XtDisplay(term), screen->iconVwin.window, - CWWidth | CWHeight, &changes); + CWWidth | CWHeight | CWBorderWidth, &changes); } #endif /* NO_ACTIVE_ICON */ @@ -1467,8 +1524,11 @@ if (screen->pid > 1) { int pgrp; - if (ioctl(screen->respond, TIOCGPGRP, &pgrp) != -1) + TRACE(("getting process-group\n")); + if (ioctl(screen->respond, TIOCGPGRP, &pgrp) != -1) { + TRACE(("sending SIGWINCH to process group %d\n", pgrp)); kill_process_group(pgrp, SIGWINCH); + } } #endif /* SIGWINCH */ Index: xc/programs/xterm/scrollbar.c diff -u xc/programs/xterm/scrollbar.c:3.41 xc/programs/xterm/scrollbar.c:3.48 --- xc/programs/xterm/scrollbar.c:3.41 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/scrollbar.c Sun Feb 12 20:14:59 2006 @@ -1,11 +1,9 @@ -/* - * $Xorg: scrollbar.c,v 1.4 2000/08/17 19:55:09 cpqbld Exp $ - */ +/* $XTermId: scrollbar.c,v 1.119 2006/02/12 22:43:55 tom Exp $ */ -/* $XFree86: xc/programs/xterm/scrollbar.c,v 3.41 2005/01/14 01:50:03 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/scrollbar.c,v 3.48 2006/02/13 01:14:59 dickey Exp $ */ /* - * Copyright 2000-2003,2004 by Thomas E. Dickey + * Copyright 2000-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -75,20 +73,34 @@ #include #include +/* + * The scrollbar's border overlaps the border of the vt100 window. If there + * is no border for the vt100, there can be no border for the scrollbar. + */ +#define SCROLLBAR_BORDER(xw) ((xw)->screen.scrollBarBorder) +#if OPT_TOOLBAR +#define ScrollBarBorder(xw) (BorderWidth(xw) ? SCROLLBAR_BORDER(xw) : 0) +#else +#define ScrollBarBorder(xw) SCROLLBAR_BORDER(xw) +#endif + /* Event handlers */ static void ScrollTextTo PROTO_XT_CALLBACK_ARGS; static void ScrollTextUpDownBy PROTO_XT_CALLBACK_ARGS; -/* resize the text window for a terminal screen, modifying the +/* Resize the text window for a terminal screen, modifying the * appropriate WM_SIZE_HINTS and taking advantage of bit gravity. */ - -static void -ResizeScreen(XtermWidget xw, int min_width, int min_height) +void +DoResizeScreen(XtermWidget xw) { TScreen *screen = &xw->screen; -#ifndef nothack + + int border = 2 * xw->screen.border; + int min_wide = border + xw->screen.fullVwin.sb_info.width; + int min_high = border; +#if 1 /* ndef nothack */ XSizeHints sizehints; long supp; #endif @@ -145,85 +157,75 @@ * to have time to completely rewrite xterm. */ - TRACE(("ResizeScreen(min_width=%d, min_height=%d) xw=%#lx\n", - min_width, min_height, (long) xw)); + TRACE(("DoResizeScreen\n")); -#ifndef nothack +#if 1 /* ndef nothack */ /* - * NOTE: If you change the way any of the hints are calculated - * below, make sure you change the calculation both in the - * sizehints assignments and in the XtVaSetValues. + * NOTE: the hints and the XtVaSetValues() must match. */ - - if (!XGetWMNormalHints(screen->display, XtWindow(XtParent(xw)), + TRACE(("%s@%d -- ", __FILE__, __LINE__)); + TRACE_WM_HINTS(xw); + if (!XGetWMNormalHints(screen->display, XtWindow(SHELL_OF(xw)), &sizehints, &supp)) bzero(&sizehints, sizeof(sizehints)); - sizehints.base_width = min_width; - sizehints.base_height = min_height; - sizehints.width_inc = FontWidth(screen); - sizehints.height_inc = FontHeight(screen); - sizehints.min_width = sizehints.base_width + sizehints.width_inc; - sizehints.min_height = sizehints.base_height + sizehints.height_inc; - sizehints.flags |= (PBaseSize | PMinSize | PResizeInc); + + xtermSizeHints(xw, &sizehints, ScrollbarWidth(screen)); + /* These are obsolete, but old clients may use them */ - sizehints.width = (screen->max_col + 1) * FontWidth(screen) - + min_width; - sizehints.height = (screen->max_row + 1) * FontHeight(screen) - + min_height; + sizehints.width = MaxCols(screen) * FontWidth(screen) + sizehints.min_width; + sizehints.height = MaxRows(screen) * FontHeight(screen) + sizehints.min_height; #endif - /* - * Note: width and height are not set here because they are - * obsolete. - */ - XtVaSetValues(XtParent(xw), - XtNbaseWidth, min_width, - XtNbaseHeight, min_height, - XtNwidthInc, FontWidth(screen), - XtNheightInc, FontHeight(screen), - XtNminWidth, min_width + FontWidth(screen), - XtNminHeight, min_height + FontHeight(screen), - (XtPointer) 0); + XSetWMNormalHints(screen->display, XtWindow(SHELL_OF(xw)), &sizehints); - reqWidth = screen->fullVwin.f_width * (screen->max_col + 1) + min_width; - reqHeight = screen->fullVwin.f_height * (screen->max_row + 1) + min_height; + reqWidth = MaxCols(screen) * FontWidth(screen) + min_wide; + reqHeight = MaxRows(screen) * FontHeight(screen) + min_high; TRACE(("...requesting screensize chars %dx%d, pixels %dx%d\n", - (screen->max_row + 1), - (screen->max_col + 1), + MaxRows(screen), + MaxCols(screen), reqHeight, reqWidth)); geomreqresult = XtMakeResizeRequest((Widget) xw, reqWidth, reqHeight, &repWidth, &repHeight); + TRACE(("scrollbar.c XtMakeResizeRequest %dx%d -> %dx%d (status %d)\n", + reqHeight, reqWidth, + repHeight, repWidth, + geomreqresult)); if (geomreqresult == XtGeometryAlmost) { TRACE(("...almost, retry screensize %dx%d\n", repHeight, repWidth)); geomreqresult = XtMakeResizeRequest((Widget) xw, repWidth, repHeight, NULL, NULL); } +#if 1 /* ndef nothack */ + /* + * XtMakeResizeRequest() has the undesirable side-effect of clearing + * the window manager's hints, even on a failed request. This would + * presumably be fixed if the shell did its own work. + */ + if (sizehints.flags + && repHeight + && repWidth) { + sizehints.height = repHeight; + sizehints.width = repWidth; + TRACE_HINTS(&sizehints); + XSetWMNormalHints(screen->display, VShellWindow, &sizehints); + } +#endif XSync(screen->display, FALSE); /* synchronize */ if (XtAppPending(app_con)) xevents(); -#ifndef nothack - XSetWMNormalHints(screen->display, XtWindow(XtParent(xw)), &sizehints); -#endif #ifndef NO_ACTIVE_ICON WhichVWin(screen) = saveWin; #endif /* NO_ACTIVE_ICON */ } -void -DoResizeScreen(XtermWidget xw) -{ - int border = 2 * xw->screen.border; - ResizeScreen(xw, border + xw->screen.fullVwin.sb_info.width, border); -} - static Widget CreateScrollBar(XtermWidget xw, int x, int y, int height) { - Widget scrollWidget; + Widget result; Arg args[6]; XtSetArg(args[0], XtNx, x); @@ -231,13 +233,13 @@ XtSetArg(args[2], XtNheight, height); XtSetArg(args[3], XtNreverseVideo, xw->misc.re_verse); XtSetArg(args[4], XtNorientation, XtorientVertical); - XtSetArg(args[5], XtNborderWidth, 1); + XtSetArg(args[5], XtNborderWidth, ScrollBarBorder(xw)); - scrollWidget = XtCreateWidget("scrollbar", scrollbarWidgetClass, - (Widget) xw, args, XtNumber(args)); - XtAddCallback(scrollWidget, XtNscrollProc, ScrollTextUpDownBy, 0); - XtAddCallback(scrollWidget, XtNjumpProc, ScrollTextTo, 0); - return (scrollWidget); + result = XtCreateWidget("scrollbar", scrollbarWidgetClass, + (Widget) xw, args, XtNumber(args)); + XtAddCallback(result, XtNscrollProc, ScrollTextUpDownBy, 0); + XtAddCallback(result, XtNjumpProc, ScrollTextTo, 0); + return (result); } void @@ -281,8 +283,8 @@ TScreen *screen = &term->screen; int thumbTop, thumbHeight, totalHeight; - thumbTop = screen->topline + screen->savedlines; - thumbHeight = screen->max_row + 1; + thumbTop = ROW2INX(screen, screen->savedlines); + thumbHeight = MaxRows(screen); totalHeight = thumbHeight + screen->savedlines; XawScrollbarSetThumb(scrollWidget, @@ -291,23 +293,32 @@ } void -ResizeScrollBar(TScreen * screen) +ResizeScrollBar(XtermWidget xw) { - XtConfigureWidget( - screen->scrollWidget, + TScreen *screen = &(xw->screen); + + int height = screen->fullVwin.height + screen->border * 2; + int width = screen->scrollWidget->core.width; + int ypos = -ScrollBarBorder(xw); #ifdef SCROLLBAR_RIGHT - (term->misc.useRight) - ? (screen->fullVwin.fullwidth - - screen->scrollWidget->core.width - - screen->scrollWidget->core.border_width) - : -1, + int xpos = ((term->misc.useRight) + ? (screen->fullVwin.fullwidth - + screen->scrollWidget->core.width - + BorderWidth(screen->scrollWidget)) + : -ScrollBarBorder(xw)); #else - -1, + int xpos = -ScrollBarBorder(xw); #endif - -1, - screen->scrollWidget->core.width, - screen->fullVwin.height + screen->border * 2, - screen->scrollWidget->core.border_width); + + TRACE(("ResizeScrollBar at %d,%d %dx%d\n", ypos, xpos, height, width)); + + XtConfigureWidget( + screen->scrollWidget, + xpos, + ypos, + width, + height, + BorderWidth(screen->scrollWidget)); ScrollBarDrawThumb(screen->scrollWidget); } @@ -316,7 +327,6 @@ { int i, lines; int scrolltop, scrollheight, refreshtop; - int x = 0; if (top < -screen->savedlines) top = -screen->savedlines; @@ -330,8 +340,8 @@ if (screen->cursor_state) HideCursor(); lines = i > 0 ? i : -i; - if (lines > screen->max_row + 1) - lines = screen->max_row + 1; + if (lines > MaxRows(screen)) + lines = MaxRows(screen); scrollheight = screen->max_row - lines + 1; if (i > 0) refreshtop = scrolltop = 0; @@ -339,7 +349,6 @@ scrolltop = lines; refreshtop = scrollheight; } - x = OriginX(screen); scrolling_copy_area(screen, scrolltop, scrollheight, -i); screen->topline = top; @@ -348,114 +357,133 @@ XClearArea( screen->display, VWindow(screen), - (int) x, - (int) refreshtop * FontHeight(screen) + screen->border, + OriginX(screen), + OriginY(screen) + refreshtop * FontHeight(screen), (unsigned) Width(screen), (unsigned) lines * FontHeight(screen), FALSE); - ScrnRefresh(screen, refreshtop, 0, lines, screen->max_col + 1, False); + ScrnRefresh(screen, refreshtop, 0, lines, MaxCols(screen), False); ScrollBarDrawThumb(screen->scrollWidget); } +#ifdef SCROLLBAR_RIGHT +/* + * Adjust the scrollbar position if we're asked to turn on scrollbars for the + * first time (or after resizing) after the xterm is already running. That + * makes the window grow after we've initially configured the scrollbar's + * position. (There must be a better way). + */ +void +updateRightScrollbar(XtermWidget xw) +{ + TScreen *screen = &xw->screen; + + if (xw->misc.useRight + && screen->fullVwin.fullwidth < xw->core.width) + XtVaSetValues(screen->scrollWidget, + XtNx, screen->fullVwin.fullwidth - BorderWidth(screen->scrollWidget), + (XtPointer) 0); +} + +#endif void ScrollBarOn(XtermWidget xw, int init, int doalloc) { TScreen *screen = &xw->screen; int i, j, k; - if (screen->fullVwin.sb_info.width) + if (screen->fullVwin.sb_info.width || IsIcon(screen)) return; + TRACE(("ScrollBarOn\n")); if (init) { /* then create it only */ - if (screen->scrollWidget) - return; - - /* make it a dummy size and resize later */ - if ((screen->scrollWidget = CreateScrollBar(xw, -1, -1, 5)) - == NULL) { - Bell(XkbBI_MinorError, 0); - return; + if (screen->scrollWidget == 0) { + /* make it a dummy size and resize later */ + screen->scrollWidget = CreateScrollBar(xw, + -ScrollBarBorder(xw), + -ScrollBarBorder(xw), + 5); + if (screen->scrollWidget == NULL) { + Bell(XkbBI_MinorError, 0); + } } - - return; - - } - - if (!screen->scrollWidget) { + } else if (!screen->scrollWidget || !XtIsRealized((Widget) term)) { Bell(XkbBI_MinorError, 0); Bell(XkbBI_MinorError, 0); - return; - } + } else { - if (doalloc && screen->allbuf) { - /* FIXME: this is not integrated well with Allocate */ - if ((screen->allbuf = - TypeRealloc(ScrnPtr, - MAX_PTRS * (screen->max_row + 2 + screen->savelines), - screen->visbuf)) == NULL) { - SysError(ERROR_SBRALLOC); - } - screen->visbuf = &screen->allbuf[MAX_PTRS * screen->savelines]; - memmove((char *) screen->visbuf, (char *) screen->allbuf, - MAX_PTRS * (screen->max_row + 2) * sizeof(char *)); - for (i = k = 0; i < screen->savelines; i++) { - k += BUF_HEAD; - for (j = BUF_HEAD; j < MAX_PTRS; j++) { - if ((screen->allbuf[k++] = - TypeCallocN(Char, (unsigned) screen->max_col + 1) - ) == NULL) - SysError(ERROR_SBRALLOC2); + if (doalloc && screen->allbuf) { + /* FIXME: this is not integrated well with Allocate */ + if ((screen->allbuf = + TypeRealloc(ScrnPtr, + MAX_PTRS * (screen->max_row + 2 + screen->savelines), + screen->visbuf)) == NULL) { + SysError(ERROR_SBRALLOC); + } + screen->visbuf = &screen->allbuf[MAX_PTRS * screen->savelines]; + memmove((char *) screen->visbuf, (char *) screen->allbuf, + MAX_PTRS * (screen->max_row + 2) * sizeof(char *)); + for (i = k = 0; i < screen->savelines; i++) { + k += BUF_HEAD; + for (j = BUF_HEAD; j < MAX_PTRS; j++) { + if ((screen->allbuf[k++] = + TypeCallocN(Char, (unsigned) MaxCols(screen)) + ) == NULL) + SysError(ERROR_SBRALLOC2); + } } } - } - ResizeScrollBar(screen); - xtermAddInput(screen->scrollWidget); - XtRealizeWidget(screen->scrollWidget); - TRACE_TRANS("scrollbar", screen->scrollWidget); - - screen->fullVwin.sb_info.rv_cached = False; - screen->fullVwin.sb_info.width = screen->scrollWidget->core.width + - screen->scrollWidget->core.border_width; + ResizeScrollBar(xw); + xtermAddInput(screen->scrollWidget); + XtRealizeWidget(screen->scrollWidget); + TRACE_TRANS("scrollbar", screen->scrollWidget); + + screen->fullVwin.sb_info.rv_cached = False; + + screen->fullVwin.sb_info.width = (screen->scrollWidget->core.width + + BorderWidth(screen->scrollWidget)); + + TRACE(("setting scrollbar width %d = %d + %d\n", + screen->fullVwin.sb_info.width, + screen->scrollWidget->core.width, + BorderWidth(screen->scrollWidget))); - ScrollBarDrawThumb(screen->scrollWidget); - DoResizeScreen(xw); + ScrollBarDrawThumb(screen->scrollWidget); + DoResizeScreen(xw); #ifdef SCROLLBAR_RIGHT - /* - * Adjust the scrollbar position if we're asked to turn on scrollbars - * for the first time after the xterm is already running. That makes - * the window grow after we've initially configured the scrollbar's - * position. (There must be a better way). - */ - if (term->misc.useRight - && screen->fullVwin.fullwidth < term->core.width) - XtVaSetValues(screen->scrollWidget, - XtNx, screen->fullVwin.fullwidth - screen->scrollWidget->core.border_width, - (XtPointer) 0); + updateRightScrollbar(term); #endif - XtMapWidget(screen->scrollWidget); - update_scrollbar(); - if (screen->visbuf) { - XClearWindow(screen->display, XtWindow(term)); - Redraw(); + XtMapWidget(screen->scrollWidget); + update_scrollbar(); + if (screen->visbuf) { + XClearWindow(screen->display, XtWindow(term)); + Redraw(); + } } } void ScrollBarOff(TScreen * screen) { - if (!screen->fullVwin.sb_info.width) + if (!screen->fullVwin.sb_info.width || IsIcon(screen)) return; - XtUnmapWidget(screen->scrollWidget); - screen->fullVwin.sb_info.width = 0; - DoResizeScreen(term); - update_scrollbar(); - if (screen->visbuf) { - XClearWindow(screen->display, XtWindow(term)); - Redraw(); + + TRACE(("ScrollBarOff\n")); + if (XtIsRealized((Widget) term)) { + XtUnmapWidget(screen->scrollWidget); + screen->fullVwin.sb_info.width = 0; + DoResizeScreen(term); + update_scrollbar(); + if (screen->visbuf) { + XClearWindow(screen->display, XtWindow(term)); + Redraw(); + } + } else { + Bell(XkbBI_MinorError, 0); } } @@ -467,12 +495,18 @@ { TScreen *screen = &w->screen; - if (screen->fullVwin.sb_info.width) { - ScrollBarOff(screen); + if (IsIcon(screen)) { + Bell(XkbBI_MinorError, 0); } else { - ScrollBarOn(w, FALSE, FALSE); + TRACE(("ToggleScrollBar{{\n")); + if (screen->fullVwin.sb_info.width) { + ScrollBarOff(screen); + } else { + ScrollBarOn(w, FALSE, FALSE); + } + update_scrollbar(); + TRACE(("...ToggleScrollBar}}\n")); } - update_scrollbar(); } /*ARGSUSED*/ @@ -487,13 +521,11 @@ int thumbTop; /* relative to first saved line */ int newTopLine; -/* - screen->savedlines : Number of offscreen text lines, - screen->maxrow + 1 : Number of onscreen text lines, - screen->topline : -Number of lines above the last screen->max_row+1 lines -*/ - - thumbTop = (int) (*topPercent * (screen->savedlines + screen->max_row + 1)); + /* + * screen->savedlines : Number of offscreen text lines, + * MaxRows(screen) : Number of onscreen text lines, + */ + thumbTop = (int) (*topPercent * (screen->savedlines + MaxRows(screen))); newTopLine = thumbTop - screen->savedlines; WindowScroll(screen, newTopLine); } @@ -517,7 +549,7 @@ else if (pixels > 0) rowOnScreen = 1; } - newTopLine = screen->topline + rowOnScreen; + newTopLine = ROW2INX(screen, rowOnScreen); WindowScroll(screen, newTopLine); } @@ -571,9 +603,9 @@ case 2: s = params[1]; if (specialcmplowerwiths(s, "page", &modifier)) { - mult = (screen->max_row + 1 + modifier) * FontHeight(screen); + mult = (MaxRows(screen) + modifier) * FontHeight(screen); } else if (specialcmplowerwiths(s, "halfpage", &modifier)) { - mult = ((screen->max_row + 1 + modifier) * FontHeight(screen)) / 2; + mult = ((MaxRows(screen) + modifier) * FontHeight(screen)) / 2; } else if (specialcmplowerwiths(s, "pixel", &modifier)) { mult = 1; } else { Index: xc/programs/xterm/sinstall.sh diff -u xc/programs/xterm/sinstall.sh:1.3 xc/programs/xterm/sinstall.sh:1.5 --- xc/programs/xterm/sinstall.sh:1.3 Fri Mar 3 15:02:35 2000 +++ xc/programs/xterm/sinstall.sh Tue Jan 3 21:10:27 2006 @@ -1,37 +1,79 @@ #!/bin/sh -# $XFree86: xc/programs/xterm/sinstall.sh,v 1.3 2000/03/03 20:02:35 dawes Exp $ +# $XTermId: sinstall.sh,v 1.14 2005/11/24 17:50:42 tom Exp $ +# $XFree86: xc/programs/xterm/sinstall.sh,v 1.5 2006/01/04 02:10:27 dickey Exp $ # # Install program setuid if the installer is running as root, and if xterm is # already installed on the system with setuid privilege. This is a safeguard # for ordinary users installing xterm for themselves on systems where the # setuid is not needed to access a PTY, but only for things like utmp. # +# Options: +# u+s, g+s as in chmod +# -u, -g and -m as in install. If any options are given, $3 is ignored. +# # Parameters: # $1 = program to invoke as "install" # $2 = program to install # $3 = previously-installed program, for reference # $4 = final installed-path, if different from reference -# -# + trace=: trace=echo +OPTS_SUID= +OPTS_SGID= +OPTS_MODE= +OPTS_USR= +OPTS_GRP= + +while test $# != 0 +do + case $1 in + -*) + OPT="$1" + shift + if test $# != 0 + then + case $OPT in + -u) OPTS_USR="$1"; shift;; + -g) OPTS_GRP="$1"; shift;; + -m) OPTS_MODE="$1"; shift;; + esac + else + break + fi + ;; + u+s) shift; OPTS_SUID=4000;; + g+s) shift; OPTS_SGID=2000;; + *) break + ;; + esac +done + SINSTALL="$1" -NEW_PROG="$2" +SRC_PROG="$2" REF_PROG="$3" -TST_PROG="$4" +DST_PROG="$4" test -z "$SINSTALL" && SINSTALL=install -test -z "$NEW_PROG" && NEW_PROG=xterm +test -z "$SRC_PROG" && SRC_PROG=xterm test -z "$REF_PROG" && REF_PROG=/usr/bin/X11/xterm -test -z "$TST_PROG" && TST_PROG="$REF_PROG" +test -z "$DST_PROG" && DST_PROG="$REF_PROG" -PROG_MODE=755 +test -n "$OPTS_SUID" && test -n "$OPTS_USR" && REF_PROG= +test -n "$OPTS_SGID" && test -n "$OPTS_GRP" && REF_PROG= + +echo checking for presumed installation-mode + +PROG_SUID= +PROG_SGID= +PROG_MODE= PROG_USR= PROG_GRP= -echo checking for presumed installation-mode -if test -f "$REF_PROG" ; then +if test -z "$REF_PROG" ; then + $trace "... reference program not used" +elif test -f "$REF_PROG" ; then cf_option="-l -L" MYTEMP=${TMPDIR-/tmp}/sinstall$$ @@ -58,28 +100,44 @@ PROG_GRP=$cf_grp; fi fi - $trace "... derived user \"$PROG_USR\", group \"$PROG_GRP\" of previously-installed $NEW_PROG" + $trace "... derived user \"$PROG_USR\", group \"$PROG_GRP\" of previously-installed $SRC_PROG" $trace "... see if mode \"$cf_mode\" has s-bit set" case ".$cf_mode" in #(vi + .???s??s*) #(vi + PROG_SUID=4000 + PROG_SGID=2000 + ;; .???s*) #(vi - PROG_MODE=4711 + PROG_SUID=4000 PROG_GRP= ;; .??????s*) - PROG_MODE=2711 + PROG_SGID=2000 PROG_USR= ;; esac + PROG_MODE=`echo ".$cf_mode" | sed -e 's/^..//' -e 's/rw./7/g' -e 's/r-./5/g' -e 's/---/0/g' -e 's/--[sxt]/1/g' -e 's/+//g'` fi +# passed-in options override the reference +test -n "$OPTS_SUID" && PROG_SUID="$OPTS_SUID" +test -n "$OPTS_SGID" && PROG_SGID="$OPTS_SGID" +test -n "$OPTS_MODE" && PROG_MODE="$OPTS_MODE" +test -n "$OPTS_USR" && PROG_USR="$OPTS_USR" +test -n "$OPTS_GRP" && PROG_GRP="$OPTS_GRP" + +# we always need a mode +test -z "$PROG_MODE" && PROG_MODE=755 + if test -n "${PROG_USR}${PROG_GRP}" ; then cf_uid=`id | sed -e 's/^[^=]*=//' -e 's/(.*$//'` cf_usr=`id | sed -e 's/^[^(]*(//' -e 's/).*$//'` cf_grp=`id | sed -e 's/^.* gid=[^(]*(//' -e 's/).*$//'` - $trace "... installing $NEW_PROG as user \"$cf_usr\", group \"$cf_grp\"" + $trace "... installing $SRC_PROG as user \"$cf_usr\", group \"$cf_grp\"" if test "$cf_uid" != 0 ; then - PROG_MODE=755 + PROG_SUID= + PROG_SGID= PROG_USR="" PROG_GRP="" fi @@ -87,8 +145,12 @@ test "$PROG_GRP" = "$cf_grp" && PROG_GRP="" fi +test -n "${PROG_SUID}${PROG_SGID}" && PROG_MODE=`expr $PROG_MODE % 1000` +test -n "$PROG_SUID" && PROG_MODE=`expr $PROG_SUID + $PROG_MODE` +test -n "$PROG_SGID" && PROG_MODE=`expr $PROG_SGID + $PROG_MODE` + test -n "$PROG_USR" && PROG_USR="-o $PROG_USR" test -n "$PROG_GRP" && PROG_GRP="-g $PROG_GRP" -echo "$SINSTALL -m $PROG_MODE $PROG_USR $PROG_GRP $NEW_PROG $TST_PROG" -eval "$SINSTALL -m $PROG_MODE $PROG_USR $PROG_GRP $NEW_PROG $TST_PROG" +echo "$SINSTALL -m $PROG_MODE $PROG_USR $PROG_GRP $SRC_PROG $DST_PROG" +eval "$SINSTALL -m $PROG_MODE $PROG_USR $PROG_GRP $SRC_PROG $DST_PROG" Index: xc/programs/xterm/tabs.c diff -u xc/programs/xterm/tabs.c:3.11 xc/programs/xterm/tabs.c:3.14 --- xc/programs/xterm/tabs.c:3.11 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/tabs.c Sun Feb 12 20:14:59 2006 @@ -1,11 +1,11 @@ +/* $XTermId: tabs.c,v 1.25 2006/02/12 22:43:55 tom Exp $ */ + /* - * $XFree86: xc/programs/xterm/tabs.c,v 3.11 2005/01/14 01:50:03 dickey Exp $ + * $XFree86: xc/programs/xterm/tabs.c,v 3.14 2006/02/13 01:14:59 dickey Exp $ */ -/* $Xorg: tabs.c,v 1.3 2000/08/17 19:55:09 cpqbld Exp $ */ - /* - * Copyright 2000-2002,2005 by Thomas E. Dickey + * Copyright 2000-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -109,14 +109,13 @@ * (or MAX_TABS - 1 if there are no more). * A tabstop at col is ignored. */ -int -TabNext(Tabs tabs, int col) +static int +TabNext(TScreen * screen, Tabs tabs, int col) { - TScreen *screen = &term->screen; - if (screen->curses && screen->do_wrap && (term->flags & WRAPAROUND)) { xtermIndex(screen, 1); - col = screen->cur_col = screen->do_wrap = 0; + set_cur_col(screen, 0); + col = screen->do_wrap = 0; } for (++col; col < MAX_TABS; ++col) if (TST_TAB(tabs, col)) @@ -130,7 +129,7 @@ * (or 0 if there are no more). * A tabstop at col is ignored. */ -int +static int TabPrev(Tabs tabs, int col) { for (--col; col >= 0; --col) @@ -144,14 +143,15 @@ * Tab to the next stop, returning true if the cursor moved */ Bool -TabToNextStop(void) +TabToNextStop(TScreen * screen) { - TScreen *screen = &term->screen; int saved_column = screen->cur_col; + int next = TabNext(screen, term->tabs, screen->cur_col); + int max = CurMaxCol(screen, screen->cur_row); - screen->cur_col = TabNext(term->tabs, screen->cur_col); - if (screen->cur_col > CurMaxCol(screen, screen->cur_row)) - screen->cur_col = CurMaxCol(screen, screen->cur_row); + if (next > max) + next = max; + set_cur_col(screen, next); return (screen->cur_col > saved_column); } @@ -160,12 +160,11 @@ * Tab to the previous stop, returning true if the cursor moved */ Bool -TabToPrevStop(void) +TabToPrevStop(TScreen * screen) { - TScreen *screen = &term->screen; int saved_column = screen->cur_col; - screen->cur_col = TabPrev(term->tabs, screen->cur_col); + set_cur_col(screen, TabPrev(term->tabs, screen->cur_col)); return (screen->cur_col < saved_column); } Index: xc/programs/xterm/termcap diff -u xc/programs/xterm/termcap:3.35 xc/programs/xterm/termcap:3.38 --- xc/programs/xterm/termcap:3.35 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/termcap Sun Feb 12 20:14:59 2006 @@ -1,6 +1,4 @@ -# $XTermId: termcap,v 1.65 2005/02/06 18:58:44 tom Exp $ -# -# $Xorg: termcap,v 1.3 2000/08/17 19:55:10 cpqbld Exp $ +# $XTermId: termcap,v 1.70 2006/02/12 23:08:27 tom Exp $ # # This file is formatted using ncurses' "tic -CNx". # @@ -19,7 +17,7 @@ # I checked the limits using ncurses "captoinfo -CrTUvx", which prints # the resolved length of each entry in a comment at the end - T.Dickey # -# $XFree86: xc/programs/xterm/termcap,v 3.35 2005/02/06 21:42:38 dickey Exp $ +# $XFree86: xc/programs/xterm/termcap,v 3.38 2006/02/13 01:14:59 dickey Exp $ # xf|xterm-new|modern xterm:\ :*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:Km=\E[M:k1=\EOP:\ @@ -38,7 +36,7 @@ :cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:\ :ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E>:\ :kD=\E[3~:kb=^H:ke=\E[?1l\E>:ks=\E[?1h\E=:le=^H:md=\E[1m:\ - :me=\E[m\E(B:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\ + :me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\ :rc=\E8:rs=\E[!p\E[?3;4l\E[4l\E>:sc=\E7:se=\E[27m:sf=^J:\ :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\ :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l: @@ -86,8 +84,7 @@ # # These aliases are for compatibility with the terminfo; termcap cannot provide # the extra features such as color initialization, but termcap applications -# still want the names. Note that AF/AB really should be Sf/Sb, but there are -# applications which expect the former. The terminfo contains both strings. +# still want the names. x1|xterm-16color|xterm alias:\ :tc=xterm-new: @@ -121,7 +118,7 @@ :k6=\23317~:k7=\23318~:k8=\23319~:k9=\23320~:kD=\2333~:\ :kI=\2332~:kN=\2336~:kP=\2335~:kb=^H:kd=\217B:\ :ke=\233?1l\E>:kh=\2331~:kl=\217D:kr=\217C:ks=\233?1h\E=:\ - :ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m\E(B:\ + :ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m:\ :mr=\2337m:nd=\233C:rc=\E8:sc=\E7:se=\23327m:sf=^J:\ :so=\2337m:sr=\215:st=\210:ta=^I:te=\233?1049l:\ :ti=\233?1049h:ue=\23324m:up=\233A:us=\2334m:\ Index: xc/programs/xterm/terminfo diff -u xc/programs/xterm/terminfo:3.55 xc/programs/xterm/terminfo:3.59 --- xc/programs/xterm/terminfo:3.55 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/terminfo Sun Feb 12 20:14:59 2006 @@ -1,13 +1,11 @@ -# $XTermId: terminfo,v 1.105 2005/02/06 18:53:07 tom Exp $ -# -# $Xorg: terminfo,v 1.3 2000/08/17 19:55:10 cpqbld Exp $ +# $XTermId: terminfo,v 1.113 2006/02/12 23:06:02 tom Exp $ # # meml locks memory above the cursor; memu unlocks (ala HP terminals) # # XFree86 updates/notes/new entries (including xterm-8bit, xterm-16color) # - Thomas E. Dickey # -# $XFree86: xc/programs/xterm/terminfo,v 3.55 2005/02/06 21:42:38 dickey Exp $ +# $XFree86: xc/programs/xterm/terminfo,v 3.59 2006/02/13 01:14:59 dickey Exp $ # # Special Capabilities: # -------------------- @@ -124,13 +122,19 @@ kent=\EOM, khome=\EOH, kich1=\E[2~, + kind=\E[1;2B, kmous=\E[M, knp=\E[6~, kpp=\E[5~, + kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys, use=xterm-basic, +# Encode modifiers using parameters (see ctlseqs.msg). +# Note that this is unrelated to PCTERM. # +# Some names are extensions allowed by ncurses: +# kDN, kDN5, kDN6, kLFT5, kLFT6, kRIT5, kRIT6, kUP, kUP5, kUP6 xterm+pcfkeys|fragment for PC-style keys, kf1=\EOP, kf10=\E[21~, @@ -195,6 +199,16 @@ kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, + kDN=\E[1;2B, + kDN5=\E[1;5B, + kDN6=\E[1;6B, + kLFT5=\E[1;5D, + kLFT6=\E[1;6D, + kRIT5=\E[1;5C, + kRIT6=\E[1;6C, + kUP=\E[1;2A, + kUP5=\E[1;5A, + kUP6=\E[1;6A, # # This chunk is used for building the VT220/Sun/PC keyboard variants. xterm-basic|modern xterm terminal emulator - common, @@ -635,8 +649,6 @@ initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\, setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm, - setb=\E[48;5;%p1%dm, - setf=\E[38;5;%p1%dm, use=xterm-new, xterm-88color|xterm with 88 colors, colors#88, Index: xc/programs/xterm/testxmc.c diff -u xc/programs/xterm/testxmc.c:3.12 xc/programs/xterm/testxmc.c:3.14 --- xc/programs/xterm/testxmc.c:3.12 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/testxmc.c Sun Feb 12 20:14:59 2006 @@ -1,7 +1,7 @@ -/* $XTermId: testxmc.c,v 1.27 2005/01/10 22:01:49 tom Exp $ */ +/* $XTermId: testxmc.c,v 1.31 2006/02/01 01:07:55 tom Exp $ */ /* - * $XFree86: xc/programs/xterm/testxmc.c,v 3.12 2005/01/14 01:50:03 dickey Exp $ + * $XFree86: xc/programs/xterm/testxmc.c,v 3.14 2006/02/13 01:14:59 dickey Exp $ */ /************************************************************ @@ -182,7 +182,7 @@ /* Find the preceding cell. */ - if (getXtermCell(screen, row, col) != XMC_GLITCH) { + if (XTERM_CELL(row, col) != XMC_GLITCH) { if (col != 0) { col--; } else if (!screen->xmc_inline && row != 0) { @@ -203,7 +203,7 @@ col = 0; } else break; - if (getXtermCell(screen, row, col) == XMC_GLITCH) + if (XTERM_CELL(row, col) == XMC_GLITCH) break; if ((SCRN_BUF_ATTRS(screen, row)[col] & my_attrs) != start) { SCRN_BUF_ATTRS(screen, row)[col] = start | @@ -221,6 +221,6 @@ if (changed) { ScrnUpdate(screen, screen->cur_row, 0, row + 1 - screen->cur_row, - screen->max_col + 1, True); + MaxCols(screen), True); } } Index: xc/programs/xterm/trace.c diff -u xc/programs/xterm/trace.c:3.22 xc/programs/xterm/trace.c:3.23 --- xc/programs/xterm/trace.c:3.22 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/trace.c Sun Sep 18 19:48:13 2005 @@ -1,7 +1,7 @@ -/* $XTermId: trace.c,v 1.59 2005/01/10 22:39:21 tom Exp $ */ +/* $XTermId: trace.c,v 1.62 2005/09/16 00:01:54 tom Exp $ */ /* - * $XFree86: xc/programs/xterm/trace.c,v 3.22 2005/01/14 01:50:03 dickey Exp $ + * $XFree86: xc/programs/xterm/trace.c,v 3.23 2005/09/18 23:48:13 dickey Exp $ */ /************************************************************ @@ -208,23 +208,40 @@ { TRACE(("size hints:\n")); if (hints->flags & (USPosition | PPosition)) - TRACE((" position %d,%d\n", hints->y, hints->x)); + TRACE((" position %d,%d%s%s\n", hints->y, hints->x, + hints->flags & USPosition ? " user" : "", + hints->flags & PPosition ? " prog" : "")); if (hints->flags & (USSize | PSize)) - TRACE((" size %d,%d\n", hints->height, hints->width)); + TRACE((" size %d,%d%s%s\n", hints->height, hints->width, + hints->flags & USSize ? " user" : "", + hints->flags & PSize ? " prog" : "")); if (hints->flags & PMinSize) - TRACE((" min %d,%d\n", hints->min_height, hints->min_width)); + TRACE((" min %d,%d\n", hints->min_height, hints->min_width)); if (hints->flags & PMaxSize) - TRACE((" max %d,%d\n", hints->max_height, hints->max_width)); + TRACE((" max %d,%d\n", hints->max_height, hints->max_width)); if (hints->flags & PResizeInc) - TRACE((" inc %d,%d\n", hints->height_inc, hints->width_inc)); + TRACE((" inc %d,%d\n", hints->height_inc, hints->width_inc)); if (hints->flags & PAspect) - TRACE((" min aspect %d/%d\n", hints->min_aspect.y, hints->min_aspect.y)); + TRACE((" min aspect %d/%d\n", hints->min_aspect.y, hints->min_aspect.y)); if (hints->flags & PAspect) - TRACE((" max aspect %d/%d\n", hints->max_aspect.y, hints->max_aspect.y)); + TRACE((" max aspect %d/%d\n", hints->max_aspect.y, hints->max_aspect.y)); if (hints->flags & PBaseSize) - TRACE((" base %d,%d\n", hints->base_height, hints->base_width)); + TRACE((" base %d,%d\n", hints->base_height, hints->base_width)); if (hints->flags & PWinGravity) - TRACE((" gravity %d\n", hints->win_gravity)); + TRACE((" gravity %d\n", hints->win_gravity)); +} + +void +TraceWMSizeHints(XtermWidget xw) +{ + XSizeHints sizehints; + long supp = 0; + + bzero(&sizehints, sizeof(sizehints)); + if (!XGetWMNormalHints(xw->screen.display, XtWindow(SHELL_OF(xw)), + &sizehints, &supp)) + bzero(&sizehints, sizeof(sizehints)); + TraceSizeHints(&sizehints); } /* Index: xc/programs/xterm/trace.h diff -u xc/programs/xterm/trace.h:3.16 xc/programs/xterm/trace.h:3.17 --- xc/programs/xterm/trace.h:3.16 Mon Jul 19 21:14:41 2004 +++ xc/programs/xterm/trace.h Sun Sep 18 19:48:13 2005 @@ -1,12 +1,12 @@ -/* $XTermId: trace.h,v 1.32 2004/07/17 14:53:34 tom Exp $ */ +/* $XTermId: trace.h,v 1.34 2005/09/15 23:57:29 tom Exp $ */ /* - * $XFree86: xc/programs/xterm/trace.h,v 3.16 2004/07/20 01:14:41 dickey Exp $ + * $XFree86: xc/programs/xterm/trace.h,v 3.17 2005/09/18 23:48:13 dickey Exp $ */ /************************************************************ -Copyright 1997-2003,2004 by Thomas E. Dickey +Copyright 1997-2004,2005 by Thomas E. Dickey All Rights Reserved @@ -53,24 +53,27 @@ extern char * visibleChars (PAIRED_CHARS(Char *buf, Char *buf2), unsigned len); extern char * visibleIChar (IChar *, unsigned); +extern void TraceArgv(const char *tag, char **argv); +#define TRACE_ARGV(tag,argv) TraceArgv(tag,argv) + extern char *trace_who; #define TRACE_CHILD int tracing_child = (trace_who = "child") != 0; extern void TraceSizeHints(XSizeHints *); #define TRACE_HINTS(hints) TraceSizeHints(hints) +extern void TraceOptions(OptionHelp *options, XrmOptionDescRec *resources, Cardinal count); +#define TRACE_OPTS(opts,ress,lens) TraceOptions(opts,ress,lens) + extern void TraceTranslations(const char *, Widget); #define TRACE_TRANS(name,w) TraceTranslations(name,w) +extern void TraceWMSizeHints(XtermWidget); +#define TRACE_WM_HINTS(w) TraceWMSizeHints(w) + extern void TraceXtermResources(void); #define TRACE_XRES() TraceXtermResources() -extern void TraceArgv(const char *tag, char **argv); -#define TRACE_ARGV(tag,argv) TraceArgv(tag,argv) - -extern void TraceOptions(OptionHelp *options, XrmOptionDescRec *resources, Cardinal count); -#define TRACE_OPTS(opts,ress,lens) TraceOptions(opts,ress,lens) - #endif #endif /* included_trace_h */ Index: xc/programs/xterm/util.c diff -u xc/programs/xterm/util.c:3.88 xc/programs/xterm/util.c:3.97 --- xc/programs/xterm/util.c:3.88 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/util.c Sun Mar 12 20:27:59 2006 @@ -1,13 +1,9 @@ -/* $XTermId: util.c,v 1.222 2005/01/30 23:39:14 tom Exp $ */ +/* $XTermId: util.c,v 1.269 2006/03/12 23:12:07 tom Exp $ */ -/* - * $Xorg: util.c,v 1.3 2000/08/17 19:55:10 cpqbld Exp $ - */ - -/* $XFree86: xc/programs/xterm/util.c,v 3.88 2005/02/06 21:42:38 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/util.c,v 3.97 2006/03/13 01:27:59 dickey Exp $ */ /* - * Copyright 1999-2004,2005 by Thomas E. Dickey + * Copyright 1999-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -66,15 +62,19 @@ #include #include #include - -#if OPT_WIDE_CHARS -#include -#endif +#include #include #include #include +#if OPT_WIDE_CHARS +#if defined(HAVE_WCHAR_H) && defined(HAVE_WCWIDTH) +#include +#endif +#include +#endif + static int ClearInLine(TScreen * screen, int row, int col, unsigned len); static int handle_translated_exposure(TScreen * screen, int rect_x, @@ -92,6 +92,10 @@ int nlines, int amount); +#if OPT_WIDE_CHARS +int (*my_wcwidth) (wchar_t); +#endif + /* * These routines are used for the jump scroll feature */ @@ -99,7 +103,7 @@ FlushScroll(TScreen * screen) { int i; - int shift = -screen->topline; + int shift = INX2ROW(screen, 0); int bot = screen->max_row - shift; int refreshtop; int refreshheight; @@ -169,7 +173,7 @@ (unsigned) refreshheight * FontHeight(screen), (unsigned) Width(screen)); ScrnRefresh(screen, refreshtop, 0, refreshheight, - screen->max_col + 1, False); + MaxCols(screen), False); } return; } @@ -208,7 +212,7 @@ * If the selection is not contained within the scrolled region, clear it. */ static void -adjustHiliteOnFwdScroll(TScreen * screen, int amount, Boolean all_lines) +adjustHiliteOnFwdScroll(TScreen * screen, int amount, Bool all_lines) { int lo_row = (all_lines ? (screen->bot_marg - screen->savelines) @@ -220,46 +224,46 @@ amount, all_lines ? "all" : "visible")); TRACE2((" before highlite %d.%d .. %d.%d\n", - screen->startHRow, - screen->startHCol, - screen->endHRow, - screen->endHCol)); + screen->startH.row, + screen->startH.col, + screen->endH.row, + screen->endH.col)); TRACE2((" margins %d..%d\n", screen->top_marg, screen->bot_marg)); TRACE2((" limits %d..%d\n", lo_row, hi_row)); - if (screen->startHRow >= lo_row - && screen->startHRow - amount < lo_row) { + if (screen->startH.row >= lo_row + && screen->startH.row - amount < lo_row) { /* truncate the selection because its start would move out of region */ - if (lo_row + amount <= screen->endHRow) { + if (lo_row + amount <= screen->endH.row) { TRACE2(("truncate selection by changing start %d.%d to %d.%d\n", - screen->startHRow, - screen->startHCol, + screen->startH.row, + screen->startH.col, lo_row + amount, 0)); - screen->startHRow = lo_row + amount; - screen->startHCol = 0; + screen->startH.row = lo_row + amount; + screen->startH.col = 0; } else { TRACE2(("deselect because %d.%d .. %d.%d shifted %d is outside margins %d..%d\n", - screen->startHRow, - screen->startHCol, - screen->endHRow, - screen->endHCol, + screen->startH.row, + screen->startH.col, + screen->endH.row, + screen->endH.col, -amount, lo_row, hi_row)); ScrnDisownSelection(screen); } - } else if (screen->startHRow <= hi_row && screen->endHRow > hi_row) { + } else if (screen->startH.row <= hi_row && screen->endH.row > hi_row) { ScrnDisownSelection(screen); - } else if (screen->startHRow < lo_row && screen->endHRow > lo_row) { + } else if (screen->startH.row < lo_row && screen->endH.row > lo_row) { ScrnDisownSelection(screen); } TRACE2((" after highlite %d.%d .. %d.%d\n", - screen->startHRow, - screen->startHCol, - screen->endHRow, - screen->endHCol)); + screen->startH.row, + screen->startH.col, + screen->endH.row, + screen->endH.col)); } /* @@ -277,45 +281,45 @@ amount, "visible")); TRACE2((" before highlite %d.%d .. %d.%d\n", - screen->startHRow, - screen->startHCol, - screen->endHRow, - screen->endHCol)); + screen->startH.row, + screen->startH.col, + screen->endH.row, + screen->endH.col)); TRACE2((" margins %d..%d\n", screen->top_marg, screen->bot_marg)); - if (screen->endHRow >= hi_row - && screen->endHRow + amount > hi_row) { + if (screen->endH.row >= hi_row + && screen->endH.row + amount > hi_row) { /* truncate the selection because its start would move out of region */ - if (hi_row - amount >= screen->startHRow) { + if (hi_row - amount >= screen->startH.row) { TRACE2(("truncate selection by changing start %d.%d to %d.%d\n", - screen->startHRow, - screen->startHCol, + screen->startH.row, + screen->startH.col, hi_row - amount, 0)); - screen->endHRow = hi_row - amount; - screen->endHCol = 0; + screen->endH.row = hi_row - amount; + screen->endH.col = 0; } else { TRACE2(("deselect because %d.%d .. %d.%d shifted %d is outside margins %d..%d\n", - screen->startHRow, - screen->startHCol, - screen->endHRow, - screen->endHCol, + screen->startH.row, + screen->startH.col, + screen->endH.row, + screen->endH.col, amount, lo_row, hi_row)); ScrnDisownSelection(screen); } - } else if (screen->endHRow >= lo_row && screen->startHRow < lo_row) { + } else if (screen->endH.row >= lo_row && screen->startH.row < lo_row) { ScrnDisownSelection(screen); - } else if (screen->endHRow > hi_row && screen->startHRow > hi_row) { + } else if (screen->endH.row > hi_row && screen->startH.row > hi_row) { ScrnDisownSelection(screen); } TRACE2((" after highlite %d.%d .. %d.%d\n", - screen->startHRow, - screen->startHCol, - screen->endHRow, - screen->endHCol)); + screen->startH.row, + screen->startH.col, + screen->endH.row, + screen->endH.col)); } /* @@ -373,7 +377,7 @@ return; } - shift = -screen->topline; + shift = INX2ROW(screen, 0); bot = screen->max_row - shift; scrollheight = i - amount; refreshheight = amount; @@ -431,20 +435,20 @@ screen->bot_marg + screen->savelines, 0, (unsigned) amount, - (unsigned) (screen->max_col + 1)); + (unsigned) MaxCols(screen)); } else { ScrnDeleteLine(screen, screen->visbuf, screen->bot_marg, screen->top_marg, (unsigned) amount, - (unsigned) (screen->max_col + 1)); + (unsigned) MaxCols(screen)); } } if (refreshheight > 0) { ScrnRefresh(screen, refreshtop, 0, refreshheight, - screen->max_col + 1, False); + MaxCols(screen), False); } screen->cursor_busy -= 1; @@ -495,7 +499,7 @@ screen->refresh_amt = -amount; } } else { - shift = -screen->topline; + shift = INX2ROW(screen, 0); bot = screen->max_row - shift; refreshheight = amount; scrollheight = screen->bot_marg - screen->top_marg - @@ -531,7 +535,7 @@ screen->bot_marg, screen->top_marg, (unsigned) amount, - (unsigned) (screen->max_col + 1)); + (unsigned) MaxCols(screen)); } screen->cursor_busy -= 1; return; @@ -553,7 +557,7 @@ int scrolltop; int scrollheight; - if (!ScrnIsLineInMargins(screen, screen->cur_row - screen->topline)) + if (!ScrnIsLineInMargins(screen, INX2ROW(screen, screen->cur_row))) return; TRACE(("InsertLine count=%d\n", n)); @@ -572,7 +576,7 @@ if (screen->jumpscroll) { if (screen->scroll_amt <= 0 && screen->cur_row <= -screen->refresh_amt) { - if (-screen->refresh_amt + n > screen->max_row + 1) + if (-screen->refresh_amt + n > MaxRows(screen)) FlushScroll(screen); screen->scroll_amt -= n; screen->refresh_amt -= n; @@ -580,7 +584,7 @@ FlushScroll(screen); } if (!screen->scroll_amt) { - shift = -screen->topline; + shift = INX2ROW(screen, 0); bot = screen->max_row - shift; refreshheight = n; scrollheight = screen->bot_marg - screen->cur_row - refreshheight + 1; @@ -605,7 +609,7 @@ screen->bot_marg, screen->cur_row, (unsigned) n, - (unsigned) (screen->max_col + 1)); + (unsigned) MaxCols(screen)); } } @@ -624,7 +628,7 @@ int scrolltop; int scrollheight; - if (!ScrnIsLineInMargins(screen, screen->cur_row - screen->topline)) + if (!ScrnIsLineInMargins(screen, INX2ROW(screen, screen->cur_row))) return; TRACE(("DeleteLine count=%d\n", n)); @@ -642,7 +646,7 @@ n = i; if (screen->jumpscroll) { if (screen->scroll_amt >= 0 && screen->cur_row == screen->top_marg) { - if (screen->refresh_amt + n > screen->max_row + 1) + if (screen->refresh_amt + n > MaxRows(screen)) FlushScroll(screen); screen->scroll_amt += n; screen->refresh_amt += n; @@ -651,7 +655,7 @@ } if (!screen->scroll_amt) { - shift = -screen->topline; + shift = INX2ROW(screen, 0); bot = screen->max_row - shift; scrollheight = i - n; refreshheight = n; @@ -696,14 +700,14 @@ screen->bot_marg + screen->savelines, 0, (unsigned) n, - (unsigned) (screen->max_col + 1)); + (unsigned) MaxCols(screen)); else ScrnDeleteLine(screen, screen->visbuf, screen->bot_marg, screen->cur_row, (unsigned) n, - (unsigned) (screen->max_col + 1)); + (unsigned) MaxCols(screen)); } } @@ -714,7 +718,7 @@ InsertChar(TScreen * screen, unsigned n) { unsigned limit; - int row = screen->cur_row - screen->topline; + int row = INX2ROW(screen, screen->cur_row); if (screen->cursor_state) HideCursor(); @@ -728,7 +732,7 @@ screen->do_wrap = 0; assert(screen->cur_col <= screen->max_col); - limit = screen->max_col + 1 - screen->cur_col; + limit = MaxCols(screen) - screen->cur_col; if (n > limit) n = limit; @@ -736,13 +740,13 @@ assert(n != 0); if (row <= screen->max_row) { if (!AddToRefresh(screen)) { - int col = screen->max_col + 1 - n; + int col = MaxCols(screen) - n; if (screen->scroll_amt) FlushScroll(screen); #if OPT_DEC_CHRSET if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, screen->cur_row)[0])) { - col = (screen->max_col + 1) / 2 - n; + col = MaxCols(screen) / 2 - n; } #endif /* @@ -750,7 +754,7 @@ * if it is being appended to */ if (non_blank_line(screen->visbuf, screen->cur_row, - screen->cur_col, screen->max_col + 1)) + screen->cur_col, MaxCols(screen))) horizontal_copy_area(screen, screen->cur_col, col - screen->cur_col, (int) n); @@ -773,7 +777,7 @@ DeleteChar(TScreen * screen, unsigned n) { unsigned limit; - int row = screen->cur_row - screen->topline; + int row = INX2ROW(screen, screen->cur_row); if (screen->cursor_state) HideCursor(); @@ -787,20 +791,21 @@ screen->do_wrap = 0; assert(screen->cur_col <= screen->max_col); - limit = screen->max_col + 1 - screen->cur_col; + limit = MaxCols(screen) - screen->cur_col; + if (n > limit) n = limit; assert(n != 0); if (row <= screen->max_row) { if (!AddToRefresh(screen)) { - int col = screen->max_col + 1 - n; + int col = MaxCols(screen) - n; if (screen->scroll_amt) FlushScroll(screen); #if OPT_DEC_CHRSET if (CSET_DOUBLE(SCRN_BUF_CSETS(screen, screen->cur_row)[0])) { - col = (screen->max_col + 1) / 2 - n; + col = MaxCols(screen) / 2 - n; } #endif horizontal_copy_area(screen, @@ -829,7 +834,7 @@ { if (screen->protected_mode != OFF_PROTECT) { int row; - unsigned len = screen->max_col + 1; + unsigned len = MaxCols(screen); assert(screen->max_col >= 0); for (row = 0; row <= screen->max_row; row++) @@ -839,7 +844,7 @@ if (screen->cursor_state) HideCursor(); - if ((top = -screen->topline) <= screen->max_row) { + if ((top = INX2ROW(screen, 0)) <= screen->max_row) { if (screen->scroll_amt) FlushScroll(screen); if ((height = screen->cur_row + top) > screen->max_row) @@ -855,7 +860,7 @@ ClearBufRows(screen, 0, screen->cur_row - 1); } - if (screen->cur_row - screen->topline <= screen->max_row) + if (INX2ROW(screen, screen->cur_row) <= screen->max_row) ClearLeft(screen); } @@ -869,7 +874,7 @@ if (screen->protected_mode != OFF_PROTECT) { int row; - unsigned len = screen->max_col + 1; + unsigned len = MaxCols(screen); assert(screen->max_col >= 0); for (row = screen->cur_row + 1; row <= screen->max_row; row++) @@ -877,7 +882,7 @@ } else { int top; - if ((top = screen->cur_row - screen->topline) <= screen->max_row) { + if ((top = INX2ROW(screen, screen->cur_row)) <= screen->max_row) { if (screen->scroll_amt) FlushScroll(screen); if (++top <= screen->max_row) { @@ -901,12 +906,12 @@ ClearInLine(TScreen * screen, int row, int col, unsigned len) { int rc = 1; - int flags = TERM_COLOR_FLAGS; + int flags = TERM_COLOR_FLAGS(term); TRACE(("ClearInLine(row=%d, col=%d, len=%d) vs %d..%d\n", row, col, len, - screen->startHRow, - screen->startHCol)); + screen->startH.row, + screen->startH.col)); if (ScrnHaveSelection(screen) && ScrnIsLineInSelection(screen, row)) { @@ -919,10 +924,10 @@ * so this has the effect of suppressing trailing blanks from a * selection. */ - if (col + (int) len < screen->max_col + 1) { + if (col + (int) len < MaxCols(screen)) { flags |= CHARDRAWN; } else { - len = screen->max_col + 1 - col; + len = MaxCols(screen) - col; } /* If we've marked protected text on the screen, we'll have to @@ -969,7 +974,7 @@ HideCursor(); screen->do_wrap = 0; - if (row - screen->topline <= screen->max_row) { + if (INX2ROW(screen, row) <= screen->max_row) { if (!AddToRefresh(screen)) { if (screen->scroll_amt) FlushScroll(screen); @@ -1013,13 +1018,13 @@ void ClearRight(TScreen * screen, int n) { - unsigned len = (screen->max_col - screen->cur_col + 1); + unsigned len = (MaxCols(screen) - screen->cur_col); assert(screen->max_col >= 0); assert(screen->max_col >= screen->cur_col); if (n < 0) /* the remainder of the line */ - n = screen->max_col + 1; + n = MaxCols(screen); if (n == 0) /* default for 'ECH' */ n = 1; @@ -1050,7 +1055,7 @@ static void ClearLine(TScreen * screen) { - unsigned len = screen->max_col + 1; + unsigned len = MaxCols(screen); assert(screen->max_col >= 0); (void) ClearInLine(screen, screen->cur_row, 0, len); @@ -1066,7 +1071,7 @@ ScrnDisownSelection(screen); screen->do_wrap = 0; - if ((top = -screen->topline) <= screen->max_row) { + if ((top = INX2ROW(screen, 0)) <= screen->max_row) { if (screen->scroll_amt) FlushScroll(screen); ClearCurBackground(screen, @@ -1155,7 +1160,7 @@ if (screen->protected_mode != OFF_PROTECT) { int row; int rc = 1; - unsigned len = screen->max_col + 1; + unsigned len = MaxCols(screen); assert(screen->max_col >= 0); for (row = 0; row <= screen->max_row; row++) @@ -1313,11 +1318,16 @@ #ifndef NO_ACTIVE_ICON if (reply->window == screen->iconVwin.window) { WhichVWin(screen) = &screen->iconVwin; - TRACE(("HandleExposure - icon\n")); + TRACE(("HandleExposure - icon")); } else { WhichVWin(screen) = &screen->fullVwin; - TRACE(("HandleExposure - normal\n")); + TRACE(("HandleExposure - normal")); } + TRACE((" event %d,%d %dx%d\n", + reply->y, + reply->x, + reply->height, + reply->width)); #endif /* NO_ACTIVE_ICON */ /* if not doing CopyArea or if this is a GraphicsExpose, don't translate */ @@ -1368,30 +1378,37 @@ int rect_height) { int toprow, leftcol, nrows, ncols; + int x0, x1; + int y0, y1; - TRACE(("handle_translated_exposure (%d,%d) - (%d,%d)\n", + TRACE(("handle_translated_exposure at %d,%d size %dx%d\n", rect_y, rect_x, rect_height, rect_width)); - toprow = (rect_y - screen->border) / FontHeight(screen); + x0 = (rect_x - OriginX(screen)); + x1 = (x0 + rect_width); + + y0 = (rect_y - OriginY(screen)); + y1 = (y0 + rect_height); + + toprow = y0 / FontHeight(screen); if (toprow < 0) toprow = 0; - leftcol = (rect_x - OriginX(screen)) - / CurFontWidth(screen, screen->cur_row); + + leftcol = x0 / CurFontWidth(screen, screen->cur_row); if (leftcol < 0) leftcol = 0; - nrows = (rect_y + rect_height - 1 - screen->border) / - FontHeight(screen) - toprow + 1; - ncols = (rect_x + rect_width - 1 - OriginX(screen)) / - FontWidth(screen) - leftcol + 1; + + nrows = (y1 - 1) / FontHeight(screen) - toprow + 1; + ncols = (x1 - 1) / FontWidth(screen) - leftcol + 1; toprow -= screen->scrolls; if (toprow < 0) { nrows += toprow; toprow = 0; } - if (toprow + nrows - 1 > screen->max_row) - nrows = screen->max_row - toprow + 1; - if (leftcol + ncols - 1 > screen->max_col) - ncols = screen->max_col - leftcol + 1; + if (toprow + nrows > MaxRows(screen)) + nrows = MaxRows(screen) - toprow; + if (leftcol + ncols > MaxCols(screen)) + ncols = MaxCols(screen) - leftcol; if (nrows > 0 && ncols > 0) { ScrnRefresh(screen, toprow, leftcol, nrows, ncols, False); @@ -1425,6 +1442,7 @@ void ChangeColors(XtermWidget tw, ScrnColors * pNew) { + Bool repaint = False; TScreen *screen = &tw->screen; #if OPT_TEK4014 Window tek = TWindow(screen); @@ -1435,37 +1453,46 @@ if (COLOR_DEFINED(pNew, TEXT_CURSOR)) { T_COLOR(screen, TEXT_CURSOR) = COLOR_VALUE(pNew, TEXT_CURSOR); TRACE(("... TEXT_CURSOR: %#lx\n", T_COLOR(screen, TEXT_CURSOR))); + /* no repaint needed */ } else if ((T_COLOR(screen, TEXT_CURSOR) == T_COLOR(screen, TEXT_FG)) && (COLOR_DEFINED(pNew, TEXT_FG))) { T_COLOR(screen, TEXT_CURSOR) = COLOR_VALUE(pNew, TEXT_FG); TRACE(("... TEXT_CURSOR: %#lx\n", T_COLOR(screen, TEXT_CURSOR))); + repaint = screen->Vshow; } if (COLOR_DEFINED(pNew, TEXT_FG)) { Pixel fg = COLOR_VALUE(pNew, TEXT_FG); T_COLOR(screen, TEXT_FG) = fg; TRACE(("... TEXT_FG: %#lx\n", T_COLOR(screen, TEXT_FG))); - XSetForeground(screen->display, NormalGC(screen), fg); - XSetBackground(screen->display, ReverseGC(screen), fg); - XSetForeground(screen->display, NormalBoldGC(screen), fg); - XSetBackground(screen->display, ReverseBoldGC(screen), fg); + if (screen->Vshow) { + XSetForeground(screen->display, NormalGC(screen), fg); + XSetBackground(screen->display, ReverseGC(screen), fg); + XSetForeground(screen->display, NormalBoldGC(screen), fg); + XSetBackground(screen->display, ReverseBoldGC(screen), fg); + repaint = True; + } } if (COLOR_DEFINED(pNew, TEXT_BG)) { Pixel bg = COLOR_VALUE(pNew, TEXT_BG); T_COLOR(screen, TEXT_BG) = bg; TRACE(("... TEXT_BG: %#lx\n", T_COLOR(screen, TEXT_BG))); - XSetBackground(screen->display, NormalGC(screen), bg); - XSetForeground(screen->display, ReverseGC(screen), bg); - XSetBackground(screen->display, NormalBoldGC(screen), bg); - XSetForeground(screen->display, ReverseBoldGC(screen), bg); - XSetWindowBackground(screen->display, VWindow(screen), - T_COLOR(screen, TEXT_BG)); + if (screen->Vshow) { + XSetBackground(screen->display, NormalGC(screen), bg); + XSetForeground(screen->display, ReverseGC(screen), bg); + XSetBackground(screen->display, NormalBoldGC(screen), bg); + XSetForeground(screen->display, ReverseBoldGC(screen), bg); + XSetWindowBackground(screen->display, VWindow(screen), + T_COLOR(screen, TEXT_BG)); + repaint = True; + } } #if OPT_HIGHLIGHT_COLOR if (COLOR_DEFINED(pNew, HIGHLIGHT_BG)) { T_COLOR(screen, HIGHLIGHT_BG) = COLOR_VALUE(pNew, HIGHLIGHT_BG); TRACE(("... HIGHLIGHT_BG: %#lx\n", T_COLOR(screen, HIGHLIGHT_BG))); + repaint = screen->Vshow; } #endif @@ -1492,24 +1519,31 @@ if (tek) XDefineCursor(screen->display, tek, screen->arrow); #endif + /* no repaint needed */ + } + + if (COLOR_DEFINED(pNew, TEXT_FG) || + COLOR_DEFINED(pNew, TEXT_BG) || + COLOR_DEFINED(pNew, TEXT_CURSOR)) { + set_cursor_gcs(screen); } #if OPT_TEK4014 if (COLOR_DEFINED(pNew, TEK_FG) || - COLOR_DEFINED(pNew, TEK_BG) || - COLOR_DEFINED(pNew, TEK_CURSOR)) { + COLOR_DEFINED(pNew, TEK_BG)) { + ChangeTekColors(screen, pNew); + if (screen->Tshow) { + XClearWindow(screen->display, tek); + TekExpose((Widget) NULL, (XEvent *) NULL, (Region) NULL); + } + } else if (COLOR_DEFINED(pNew, TEK_CURSOR)) { ChangeTekColors(screen, pNew); } #endif - set_cursor_gcs(screen); - XClearWindow(screen->display, VWindow(screen)); - ScrnRefresh(screen, 0, 0, screen->max_row + 1, - screen->max_col + 1, False); -#if OPT_TEK4014 - if (screen->Tshow) { - XClearWindow(screen->display, tek); - TekExpose((Widget) NULL, (XEvent *) NULL, (Region) NULL); + if (repaint) { + XClearWindow(screen->display, VWindow(screen)); + ScrnRefresh(screen, 0, 0, MaxRows(screen), + MaxCols(screen), False); } -#endif } void @@ -1519,8 +1553,8 @@ XClearWindow(screen->display, VWindow(screen)); ScrnRefresh(screen, 0, 0, - screen->max_row + 1, - screen->max_col + 1, False); + MaxRows(screen), + MaxCols(screen), False); } /***====================================================================***/ @@ -1535,6 +1569,8 @@ Window tek = TWindow(screen); #endif + TRACE(("ReverseVideo\n")); + /* * Swap SGR foreground and background colors. By convention, these are * the colors assigned to "black" (SGR #0) and "white" (SGR #7). Also, @@ -1578,7 +1614,9 @@ termw->misc.re_verse = !termw->misc.re_verse; - XDefineCursor(screen->display, VWindow(screen), screen->pointer_cursor); + if (XtIsRealized((Widget) termw)) { + XDefineCursor(screen->display, VWindow(screen), screen->pointer_cursor); + } #if OPT_TEK4014 if (tek) XDefineCursor(screen->display, tek, screen->arrow); @@ -1587,19 +1625,24 @@ if (screen->scrollWidget) ScrollBarReverseVideo(screen->scrollWidget); - XSetWindowBackground(screen->display, VWindow(screen), T_COLOR(screen, TEXT_BG)); - - /* the shell-window's background will be used in the first repainting - * on resizing - */ - XSetWindowBackground(screen->display, VShellWindow, T_COLOR(screen, TEXT_BG)); + if (XtIsRealized((Widget) termw)) { + XSetWindowBackground(screen->display, VWindow(screen), + T_COLOR(screen, TEXT_BG)); + /* the shell-window's background will be used in the first repainting + * on resizing + */ + XSetWindowBackground(screen->display, VShellWindow, + T_COLOR(screen, TEXT_BG)); + } #if OPT_TEK4014 TekReverseVideo(screen); #endif - XClearWindow(screen->display, VWindow(screen)); - ScrnRefresh(screen, 0, 0, screen->max_row + 1, - screen->max_col + 1, False); + if (XtIsRealized((Widget) termw)) { + XClearWindow(screen->display, VWindow(screen)); + ScrnRefresh(screen, 0, 0, MaxRows(screen), + MaxCols(screen), False); + } #if OPT_TEK4014 if (screen->Tshow) { XClearWindow(screen->display, tek); @@ -1607,7 +1650,9 @@ } #endif ReverseOldColors(); + set_cursor_gcs(screen); update_reversevideo(); + TRACE(("...ReverseVideo\n")); } void @@ -1705,9 +1750,15 @@ if (len == 0 || !(*text || *text2)) { return; } - - if ((flags & BOLDATTR(screen)) - && screen->renderFontBold[fontnum]) { +#if OPT_ISO_COLORS + if ((flags & UNDERLINE) + && screen->italicULMode + && screen->renderWideItal[fontnum]) { + wfont = screen->renderWideItal[fontnum]; + } else +#endif + if ((flags & BOLDATTR(screen)) + && screen->renderWideBold[fontnum]) { wfont = screen->renderWideBold[fontnum]; } else { wfont = screen->renderWideNorm[fontnum]; @@ -1728,7 +1779,7 @@ sbuf[n].x = x + fwidth * ncells; sbuf[n].y = y; charWidth = my_wcwidth((int) wc); - currFont = (charWidth == 2) ? wfont : font; + currFont = (charWidth == 2 && wfont != 0) ? wfont : font; ncells += charWidth; if (lastFont != currFont) { if (lastFont != 0) { @@ -1875,6 +1926,7 @@ /* Intended width of the font to draw (as opposed to the actual width of the X font, and the width of the default font) */ int font_width = ((flags & DOUBLEWFONT) ? 2 : 1) * screen->fnt_wide; + Bool did_ul = False; #if OPT_WIDE_CHARS /* @@ -2023,7 +2075,7 @@ } #endif #if OPT_RENDERFONT - if (UsingRenderFont()) { + if (UsingRenderFont(term)) { Display *dpy = screen->display; XftFont *font; XGCValues values; @@ -2039,11 +2091,20 @@ screen->renderDraw = XftDrawCreate(dpy, draw, visual, DefaultColormap(dpy, scr)); } - if ((flags & BOLDATTR(screen)) - && screen->renderFontBold[fontnum]) +#if OPT_ISO_COLORS + if ((flags & UNDERLINE) + && screen->italicULMode + && screen->renderFontItal[fontnum]) { + font = screen->renderFontItal[fontnum]; + did_ul = True; + } else +#endif + if ((flags & BOLDATTR(screen)) + && screen->renderFontBold[fontnum]) { font = screen->renderFontBold[fontnum]; - else + } else { font = screen->renderFontNorm[fontnum]; + } XGetGCValues(dpy, gc, GCForeground | GCBackground, &values); if (!(flags & NOBACKGROUND)) XftDrawRect(screen->renderDraw, @@ -2076,7 +2137,7 @@ unsigned part = ucs2dec(full); if (xtermIsDecGraphic(part) && (xtermIsLineDrawing(part) - || xtermXftMissing(font, full))) + || xtermXftMissing(term, font, full))) ch = part; else ch = full; @@ -2101,7 +2162,7 @@ old_high = screen->fnt_high; screen->fnt_wide = FontWidth(screen); screen->fnt_high = FontHeight(screen); - xtermDrawBoxChar(screen, ch, flags, gc, + xtermDrawBoxChar(term, ch, flags, gc, curX, y - FontAscent(screen)); curX += FontWidth(screen); screen->fnt_wide = old_wide; @@ -2127,7 +2188,7 @@ (int) len, FontWidth(screen), NULL); } - if ((flags & UNDERLINE) && screen->underline) { + if ((flags & UNDERLINE) && screen->underline && !did_ul) { if (FontDescent(screen) > 1) y++; XDrawLine(screen->display, VWindow(screen), gc, @@ -2204,13 +2265,13 @@ if (text2 != 0) ch |= (text2[last] << 8); isMissing = (ch != HIDDEN_CHAR) - && (xtermMissingChar(ch, + && (xtermMissingChar(term, ch, ((on_wide || iswide((int) ch)) - && screen->fnt_dwd) - ? screen->fnt_dwd + && screen->fnts[fWide]) + ? screen->fnts[fWide] : font)); #else - isMissing = xtermMissingChar(ch, font); + isMissing = xtermMissingChar(term, ch, font); #endif if (isMissing) { if (last > first) @@ -2219,7 +2280,7 @@ if (!ucs_workaround(screen, ch, flags, gc, DrawX(last), y, chrset, on_wide)) #endif - xtermDrawBoxChar(screen, ch, flags, gc, DrawX(last), y); + xtermDrawBoxChar(term, ch, flags, gc, DrawX(last), y); first = last + 1; } } @@ -2260,24 +2321,24 @@ #if OPT_WIDE_CHARS if (screen->wide_chars || screen->unicode_font) { int ascent_adjust = 0; - static XChar2b *sbuf; - static Cardinal slen; int n; unsigned ch = text[0] | (text2[0] << 8); int wideness = (!IsIcon(screen) && ((on_wide || iswide((int) ch) != 0) - && (screen->fnt_dwd != NULL))); + && (screen->fnts[fWide] != NULL))); unsigned char *endtext = text + len; - if (slen < len) { - slen = (len + 1) * 2; - sbuf = (XChar2b *) XtRealloc((char *) sbuf, slen * sizeof(*sbuf)); + if (screen->draw_len < len) { + screen->draw_len = (len + 1) * 2; + screen->draw_buf = (XChar2b *) XtRealloc((char *) screen->draw_buf, + screen->draw_len * + sizeof(*screen->draw_buf)); } for (n = 0; n < (int) len; n++) { - sbuf[n].byte2 = *text; - sbuf[n].byte1 = *text2; + screen->draw_buf[n].byte2 = *text; + screen->draw_buf[n].byte1 = *text2; #if OPT_MINI_LUIT -#define UCS2SBUF(n,value) sbuf[n].byte2 = (value & 0xff);\ - sbuf[n].byte1 = (value >> 8) +#define UCS2SBUF(n,value) screen->draw_buf[n].byte2 = (value & 0xff);\ + screen->draw_buf[n].byte1 = (value >> 8) #define Map2Sbuf(n,from,to) (*text == from) { UCS2SBUF(n,to); } if (screen->latin9_mode && !screen->utf8_mode && *text2 == 0) { @@ -2297,7 +2358,7 @@ if (screen->unicode_font && *text2 == 0 && (*text == 0x7f || *text < 0x20)) { - int ni = dec2ucs(*text == 0x7f ? 0 : *text); + int ni = dec2ucs((unsigned) ((*text == 0x7f) ? 0 : *text)); UCS2SBUF(n, ni); } #endif /* OPT_MINI_LUIT */ @@ -2321,16 +2382,16 @@ if (flags & (DOUBLEHFONT | DOUBLEWFONT)) { ; /* Do nothing: font is already set */ } else if (wideness - && (screen->fnt_dwd->fid || screen->fnt_dwdb->fid)) { + && (screen->fnts[fWide]->fid || screen->fnts[fWBold]->fid)) { underline_len = real_length = len * 2; if ((flags & BOLDATTR(screen)) != 0 - && screen->fnt_dwdb->fid) { - XSetFont(screen->display, gc, screen->fnt_dwdb->fid); - ascent_adjust = (screen->fnt_dwdb->ascent + && screen->fnts[fWBold]->fid) { + XSetFont(screen->display, gc, screen->fnts[fWBold]->fid); + ascent_adjust = (screen->fnts[fWBold]->ascent - NormalFont(screen)->ascent); } else { - XSetFont(screen->display, gc, screen->fnt_dwd->fid); - ascent_adjust = (screen->fnt_dwd->ascent + XSetFont(screen->display, gc, screen->fnts[fWide]->fid); + ascent_adjust = (screen->fnts[fWide]->ascent - NormalFont(screen)->ascent); } /* fix ascent */ @@ -2345,17 +2406,19 @@ XDrawString16(screen->display, VWindow(screen), gc, x, y + ascent_adjust, - sbuf, n); + screen->draw_buf, n); else XDrawImageString16(screen->display, VWindow(screen), gc, x, y + ascent_adjust, - sbuf, n); + screen->draw_buf, n); if ((flags & BOLDATTR(screen)) && screen->enbolden) { beginClipping(screen, gc, font_width, len); XDrawString16(screen->display, VWindow(screen), gc, - x + 1, y + ascent_adjust, sbuf, n); + x + 1, + y + ascent_adjust, + screen->draw_buf, n); endClipping(screen, gc); } @@ -2379,7 +2442,7 @@ } } - if ((flags & UNDERLINE) && screen->underline) { + if ((flags & UNDERLINE) && screen->underline && !did_ul) { if (FontDescent(screen) > 1) y++; XDrawLine(screen->display, VWindow(screen), gc, @@ -2389,6 +2452,40 @@ return x + real_length * FontWidth(screen); } +/* set up size hints for window manager; min 1 char by 1 char */ +void +xtermSizeHints(XtermWidget xw, XSizeHints * sizehints, int scrollbarWidth) +{ + TScreen *screen = &xw->screen; + + TRACE(("xtermSizeHints\n")); + TRACE((" border %d\n", xw->core.border_width)); + TRACE((" scrollbar %d\n", scrollbarWidth)); + + sizehints->base_width = 2 * screen->border + scrollbarWidth; + sizehints->base_height = 2 * screen->border; + +#if OPT_TOOLBAR + TRACE((" toolbar %d\n", ToolbarHeight(xw))); + + sizehints->base_height += ToolbarHeight(xw); + sizehints->base_height += BorderWidth(xw) * 2; + sizehints->base_width += BorderWidth(xw) * 2; +#endif + + sizehints->width_inc = FontWidth(screen); + sizehints->height_inc = FontHeight(screen); + sizehints->min_width = sizehints->base_width + sizehints->width_inc; + sizehints->min_height = sizehints->base_height + sizehints->height_inc; + + sizehints->width = MaxCols(screen) * FontWidth(screen) + sizehints->min_width; + sizehints->height = MaxRows(screen) * FontHeight(screen) + sizehints->min_height; + + sizehints->flags |= (PSize | PBaseSize | PMinSize | PResizeInc); + + TRACE_HINTS(sizehints); +} + /* * Returns a GC, selected according to the font (reverse/bold/normal) that is * required for the current position (implied). The GC is updated with the @@ -2750,3 +2847,124 @@ update_keyboard_type(); } } + +/* + * If the keyboardType resource is set, use that, overriding the individual + * boolean resources for different keyboard types. + */ +void +decode_keyboard_type(XTERM_RESOURCE * rp) +{ +#define DATA(n, t, f) { n, t, XtOffsetOf(XTERM_RESOURCE, f) } +#define FLAG(n) *(Boolean *)(((char *)rp) + table[n].offset) + static struct { + const char *name; + xtermKeyboardType type; + unsigned offset; + } table[] = { +#if OPT_HP_FUNC_KEYS + DATA(NAME_HP_KT, keyboardIsHP, hpFunctionKeys), +#endif +#if OPT_SCO_FUNC_KEYS + DATA(NAME_SCO_KT, keyboardIsSCO, scoFunctionKeys), +#endif + DATA(NAME_SUN_KT, keyboardIsSun, sunFunctionKeys), +#if OPT_SUNPC_KBD + DATA(NAME_VT220_KT, keyboardIsVT220, sunKeyboard), +#endif + }; + Cardinal n; + + if (x_strcasecmp(rp->keyboardType, "unknown")) { + Bool found = False; + for (n = 0; n < XtNumber(table); ++n) { + if (!x_strcasecmp(rp->keyboardType, table[n].name + 1)) { + FLAG(n) = True; + found = True; + init_keyboard_type(table[n].type, FLAG(n)); + } else { + FLAG(n) = False; + } + } + if (!found) { + fprintf(stderr, + "KeyboardType resource \"%s\" not found\n", + rp->keyboardType); + } + } else { + for (n = 0; n < XtNumber(table); ++n) + init_keyboard_type(table[n].type, FLAG(n)); + } +#undef DATA +#undef FLAG +} + +#if OPT_WIDE_CHARS +#if defined(HAVE_WCHAR_H) && defined(HAVE_WCWIDTH) +/* + * If xterm is running in a UTF-8 locale, it is still possible to encounter + * old runtime configurations which yield incomplete or inaccurate data. + */ +static Bool +systemWcwidthOk(void) +{ + wchar_t n; + int oops = 0; + int last = 1024; + + for (n = 0; n < last; ++n) { + int system_code = wcwidth(n); + int intern_code = mk_wcwidth(n); + + /* + * Since mk_wcwidth() is designed to check for nonspacing characters, + * and has rough range-checks for double-width characters, it will + * generally not detect cases where a code has not been assigned. + * + * Some experimentation with GNU libc suggests that up to 1/4 of the + * codes would differ, simply because the runtime library would have a + * table listing the unassigned codes, and return -1 for those. If + * mk_wcwidth() has no information about a code, it returns 1. On the + * other hand, if the runtime returns a positive number, the two should + * agree. + * + * The "up to" is measured for 4k, 8k, 16k of data. With only 1k, the + * number of differences was only 77. However, that is only one + * system, and this is only a sanity check to avoid using broken + * libraries. + */ + if ((system_code < 0 && intern_code >= 1) + || (system_code >= 0 && intern_code != system_code)) { + ++oops; + } + } + TRACE(("systemWcwidthOk: %d/%d mismatches\n", oops, last)); + return (oops < (last / 4)); +} +#endif /* HAVE_WCWIDTH */ + +void +decode_wcwidth(int mode) +{ + switch (mode) { + default: +#if defined(HAVE_WCHAR_H) && defined(HAVE_WCWIDTH) + if (xtermEnvUTF8() && systemWcwidthOk()) { + my_wcwidth = wcwidth; + TRACE(("using system wcwidth() function\n")); + break; + } + /* FALLTHRU */ + case 2: +#endif + my_wcwidth = &mk_wcwidth; + TRACE(("using MK wcwidth() function\n")); + break; + case 3: + case 4: + my_wcwidth = &mk_wcwidth_cjk; + TRACE(("using MK-CJK wcwidth() function\n")); + break; + } +} +#endif Index: xc/programs/xterm/uxterm diff -u xc/programs/xterm/uxterm:1.10 xc/programs/xterm/uxterm:1.12 --- xc/programs/xterm/uxterm:1.10 Tue Nov 30 20:27:47 2004 +++ xc/programs/xterm/uxterm Tue Jan 3 21:10:27 2006 @@ -1,10 +1,14 @@ #!/bin/sh -# $XTermId: uxterm,v 1.17 2004/11/29 20:39:26 tom Exp $ -# $XFree86: xc/programs/xterm/uxterm,v 1.10 2004/12/01 01:27:47 dickey Exp $ +# $XTermId: uxterm,v 1.22 2005/11/26 01:06:52 tom Exp $ +# $XFree86: xc/programs/xterm/uxterm,v 1.12 2006/01/04 02:10:27 dickey Exp $ # wrapper script to setup xterm with UTF-8 locale -program=xterm -locale=`(LC_ALL=C LC_CTYPE=C LANG=C locale >/dev/null) 2>&1` +: ${XTERM_PROGRAM=xterm} + +# Check if there is a workable locale program. If there is not, we will read +# something via the standard error. Ignore whatever is written to the +# standard output. +locale=`sh -c "LC_ALL=C LC_CTYPE=C LANG=C locale >/dev/null" 2>&1` found=no # Check for -version and -help options, to provide a simple return without @@ -13,7 +17,7 @@ then case $1 in -v|-ver*|-h|-he*) - $program "$@" + $XTERM_PROGRAM "$@" exit $? ;; esac @@ -52,20 +56,27 @@ name="LC_CTYPE" value="en_US.UTF-8" fi + eval save=\$${name} eval ${name}=${value} eval export ${name} if test -z "$locale" ; then # The 'locale' program tries to do a sanity check. - check=`(locale >/dev/null) 2>&1` + check=`sh -c "locale >/dev/null" 2>&1` if test -n "$check" ; then - echo "uxterm tried to use locale $value" >&2 - echo "$check" >&2 + eval ${name}=${save} + eval export ${name} + + echo "uxterm tried to use locale $value by setting \$$name" >&2 + xmessage -file - < struct interval { - int first; - int last; + unsigned long first; + unsigned long last; }; /* auxiliary function for binary search in interval table */ -static int bisearch(wchar_t ucs, const struct interval *table, int max) { +static int bisearch(unsigned long ucs, const struct interval *table, int max) { int min = 0; int mid; - if (ucs < table[0].first || ucs > table[max].last) - return 0; - while (max >= min) { - mid = (min + max) / 2; - if (ucs > table[mid].last) - min = mid + 1; - else if (ucs < table[mid].first) - max = mid - 1; - else - return 1; + if (ucs >= table[0].first && ucs <= table[max].last) { + while (max >= min) { + mid = (min + max) / 2; + if (ucs > table[mid].last) + min = mid + 1; + else if (ucs < table[mid].first) + max = mid - 1; + else + return 1; + } } return 0; @@ -122,78 +125,84 @@ int mk_wcwidth(wchar_t ucs) { + unsigned long cmp = (unsigned long) ucs; + /* sorted list of non-overlapping intervals of non-spacing characters */ /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ static const struct interval combining[] = { - { 0x0300, 0x0357 }, { 0x035D, 0x036F }, { 0x0483, 0x0486 }, - { 0x0488, 0x0489 }, { 0x0591, 0x05A1 }, { 0x05A3, 0x05B9 }, - { 0x05BB, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C4 }, { 0x0600, 0x0603 }, { 0x0610, 0x0615 }, - { 0x064B, 0x0658 }, { 0x0670, 0x0670 }, { 0x06D6, 0x06E4 }, - { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, - { 0x0711, 0x0711 }, { 0x0730, 0x074A }, { 0x07A6, 0x07B0 }, - { 0x0901, 0x0902 }, { 0x093C, 0x093C }, { 0x0941, 0x0948 }, - { 0x094D, 0x094D }, { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, - { 0x0981, 0x0981 }, { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, - { 0x09CD, 0x09CD }, { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, - { 0x0A3C, 0x0A3C }, { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, - { 0x0A4B, 0x0A4D }, { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, - { 0x0ABC, 0x0ABC }, { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, - { 0x0ACD, 0x0ACD }, { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, - { 0x0B3C, 0x0B3C }, { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, - { 0x0B4D, 0x0B4D }, { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, - { 0x0BC0, 0x0BC0 }, { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, - { 0x0C46, 0x0C48 }, { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, - { 0x0CBC, 0x0CBC }, { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, - { 0x0CCC, 0x0CCD }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, - { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, - { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, - { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, - { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, - { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, - { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, - { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, - { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, - { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x1712, 0x1714 }, + { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, + { 0x0591, 0x05B9 }, { 0x05BB, 0x05BD }, { 0x05BF, 0x05BF }, + { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, + { 0x0600, 0x0603 }, { 0x0610, 0x0615 }, { 0x064B, 0x065E }, + { 0x0670, 0x0670 }, { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, + { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, { 0x0711, 0x0711 }, + { 0x0730, 0x074A }, { 0x07A6, 0x07B0 }, { 0x0901, 0x0902 }, + { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, + { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, + { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, + { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, + { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, + { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, + { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, + { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, + { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, + { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, + { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, + { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, + { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, + { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, { 0x0DCA, 0x0DCA }, + { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, { 0x0E31, 0x0E31 }, + { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, { 0x0EB1, 0x0EB1 }, + { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, { 0x0EC8, 0x0ECD }, + { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, { 0x0F37, 0x0F37 }, + { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, { 0x0F80, 0x0F84 }, + { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, { 0x0F99, 0x0FBC }, + { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, { 0x1032, 0x1032 }, + { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, { 0x1058, 0x1059 }, + { 0x1160, 0x11FF }, { 0x135F, 0x135F }, { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, { 0x1927, 0x1928 }, - { 0x1932, 0x1932 }, { 0x1939, 0x193B }, { 0x200B, 0x200F }, - { 0x202A, 0x202E }, { 0x2060, 0x2063 }, { 0x206A, 0x206F }, - { 0x20D0, 0x20EA }, { 0x302A, 0x302F }, { 0x3099, 0x309A }, - { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE23 }, - { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, { 0x1D167, 0x1D169 }, - { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, - { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, { 0xE0100, 0xE01EF } + { 0x1932, 0x1932 }, { 0x1939, 0x193B }, { 0x1A17, 0x1A18 }, + { 0x1DC0, 0x1DC3 }, { 0x200B, 0x200F }, { 0x202A, 0x202E }, + { 0x2060, 0x2063 }, { 0x206A, 0x206F }, { 0x20D0, 0x20EB }, + { 0x302A, 0x302F }, { 0x3099, 0x309A }, { 0xA806, 0xA806 }, + { 0xA80B, 0xA80B }, { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, + { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, + { 0xFFF9, 0xFFFB }, { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, + { 0x10A0C, 0x10A0F }, { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, + { 0x1D167, 0x1D169 }, { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, + { 0x1D1AA, 0x1D1AD }, { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, + { 0xE0020, 0xE007F }, { 0xE0100, 0xE01EF } }; /* test for 8-bit control characters */ - if (ucs == 0) + if (cmp == 0) return 0; - if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0)) + if (cmp < 32 || (cmp >= 0x7f && cmp < 0xa0)) return -1; /* binary search in table of non-spacing characters */ - if (bisearch(ucs, combining, + if (bisearch(cmp, combining, sizeof(combining) / sizeof(struct interval) - 1)) return 0; - /* if we arrive here, ucs is not a combining or C0/C1 control character */ + /* if we arrive here, cmp is not a combining or C0/C1 control character */ return 1 + - (ucs >= 0x1100 && - (ucs <= 0x115f || /* Hangul Jamo init. consonants */ - ucs == 0x2329 || ucs == 0x232a || - (ucs >= 0x2e80 && ucs <= 0xa4cf && - ucs != 0x303f) || /* CJK ... Yi */ - (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */ - (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */ - (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */ - (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */ - (ucs >= 0xffe0 && ucs <= 0xffe6) || - (ucs >= 0x20000 && ucs <= 0x2fffd) || - (ucs >= 0x30000 && ucs <= 0x3fffd))); + (cmp >= 0x1100 && + (cmp <= 0x115f || /* Hangul Jamo init. consonants */ + cmp == 0x2329 || cmp == 0x232a || + (cmp >= 0x2e80 && cmp <= 0xa4cf && + cmp != 0x303f) || /* CJK ... Yi */ + (cmp >= 0xac00 && cmp <= 0xd7a3) || /* Hangul Syllables */ + (cmp >= 0xf900 && cmp <= 0xfaff) || /* CJK Compatibility Ideographs */ + (cmp >= 0xfe30 && cmp <= 0xfe6f) || /* CJK Compatibility Forms */ + (cmp >= 0xff00 && cmp <= 0xff60) || /* Fullwidth Forms */ + (cmp >= 0xffe0 && cmp <= 0xffe6) || + (cmp >= 0x20000 && cmp <= 0x2fffd) || + (cmp >= 0x30000 && cmp <= 0x3fffd))); } Index: xc/programs/xterm/wcwidth.h diff -u xc/programs/xterm/wcwidth.h:1.4 xc/programs/xterm/wcwidth.h:1.5 --- xc/programs/xterm/wcwidth.h:1.4 Sun Sep 29 20:39:07 2002 +++ xc/programs/xterm/wcwidth.h Mon May 2 20:38:25 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xterm/wcwidth.h,v 1.4 2002/09/30 00:39:07 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/wcwidth.h,v 1.5 2005/05/03 00:38:25 dickey Exp $ */ #ifndef included_wcwidth_h #define included_wcwidth_h 1 @@ -9,7 +9,6 @@ extern int mk_wcswidth_cjk(const wchar_t * pwcs, size_t n); extern int mk_wcwidth(wchar_t ucs); extern int mk_wcwidth_cjk(wchar_t ucs); -extern int wcswidth(const wchar_t * pwcs, size_t n); extern int wcswidth_cjk(const wchar_t * pwcs, size_t n); #endif /* included_wcwidth_h */ Index: xc/programs/xterm/xstrings.c diff -u xc/programs/xterm/xstrings.c:1.9 xc/programs/xterm/xstrings.c:1.10 --- xc/programs/xterm/xstrings.c:1.9 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/xstrings.c Sun Feb 12 20:14:59 2006 @@ -1,10 +1,10 @@ -/* $XTermId: xstrings.c,v 1.21 2005/01/11 00:13:47 tom Exp $ */ +/* $XTermId: xstrings.c,v 1.24 2006/01/29 22:34:04 tom Exp $ */ -/* $XFree86: xc/programs/xterm/xstrings.c,v 1.9 2005/01/14 01:50:03 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/xstrings.c,v 1.10 2006/02/13 01:14:59 dickey Exp $ */ /************************************************************ -Copyright 2000-2004,2005 by Thomas E. Dickey +Copyright 2000-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -55,6 +55,22 @@ return (cp ? cp + 1 : name); } +char * +x_skip_blanks(char *s) +{ + while (isspace(CharOf(*s))) + ++s; + return s; +} + +char * +x_skip_nonblanks(char *s) +{ + while (*s != '\0' && !isspace(CharOf(*s))) + ++s; + return s; +} + int x_strcasecmp(const char *s1, const char *s2) { @@ -63,11 +79,19 @@ if (len != strlen(s2)) return 1; - while (len-- != 0) { + return x_strncasecmp(s1, s2, len); +} + +int +x_strncasecmp(const char *s1, const char *s2, unsigned n) +{ + while (n-- != 0) { int c1 = toupper(CharOf(*s1)); int c2 = toupper(CharOf(*s2)); if (c1 != c2) return 1; + if (c1 == 0) + break; s1++, s2++; } @@ -111,8 +135,7 @@ } /* - * Trims leading/trailing spaces from the string, returns a copy of it if it - * is modified. + * Trims leading/trailing spaces from a copy of the string. */ char * x_strtrim(char *s) @@ -124,9 +147,7 @@ char *t = x_strdup(base); s = t; d = s; - while (isspace(CharOf(*s))) { - ++s; - } + s = x_skip_blanks(s); while ((*d++ = *s++) != '\0') { ; } @@ -136,11 +157,7 @@ *--s = '\0'; } } - if (!strcmp(t, base)) { - free(t); - } else { - base = t; - } + base = t; } return base; } Index: xc/programs/xterm/xstrings.h diff -u xc/programs/xterm/xstrings.h:1.4 xc/programs/xterm/xstrings.h:1.5 --- xc/programs/xterm/xstrings.h:1.4 Sat Aug 17 15:52:27 2002 +++ xc/programs/xterm/xstrings.h Sun Feb 12 20:14:59 2006 @@ -1,8 +1,10 @@ -/* $XFree86: xc/programs/xterm/xstrings.h,v 1.4 2002/08/17 19:52:27 dickey Exp $ */ +/* $XTermId: xstrings.h,v 1.10 2006/01/29 22:15:06 tom Exp $ */ + +/* $XFree86: xc/programs/xterm/xstrings.h,v 1.5 2006/02/13 01:14:59 dickey Exp $ */ /************************************************************ -Copyright 2000-2001,2002 by Thomas E. Dickey +Copyright 2000-2002,2005 by Thomas E. Dickey All Rights Reserved @@ -36,9 +38,12 @@ #define included_xstrings_h 1 extern char *x_basename(char *name); +extern char *x_skip_blanks(char *s); +extern char *x_skip_nonblanks(char *s); extern char *x_strdup(const char *s); extern char *x_strindex(char *s1, char *s2); extern char *x_strtrim(char *s); extern int x_strcasecmp(const char *s1, const char *s2); +extern int x_strncasecmp(const char *s1, const char *s2, unsigned n); #endif /* included_xstrings_h */ Index: xc/programs/xterm/xterm.dat diff -u xc/programs/xterm/xterm.dat:1.4 xc/programs/xterm/xterm.dat:1.5 --- xc/programs/xterm/xterm.dat:1.4 Sun Sep 29 20:39:07 2002 +++ xc/programs/xterm/xterm.dat Wed Jul 6 20:46:14 2005 @@ -1,4 +1,4 @@ -! $XFree86: xc/programs/xterm/xterm.dat,v 1.4 2002/09/30 00:39:07 dickey Exp $ +! $XFree86: xc/programs/xterm/xterm.dat,v 1.5 2005/07/07 00:46:14 dickey Exp $ ! *title: Xterm *iconName: Xterm @@ -130,6 +130,7 @@ ! Uncomment this use color for underline attribute !*VT100*colorULMode: on +!*VT100*italicULMode: on !*VT100*underLine: off ! Uncomment this to use color for the bold attribute Index: xc/programs/xterm/xterm.h diff -u xc/programs/xterm/xterm.h:3.104 xc/programs/xterm/xterm.h:3.116 --- xc/programs/xterm/xterm.h:3.104 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/xterm.h Sun Apr 30 17:55:39 2006 @@ -1,10 +1,10 @@ -/* $XTermId: xterm.h,v 1.325 2005/01/13 23:37:15 tom Exp $ */ +/* $XTermId: xterm.h,v 1.380 2006/04/30 16:54:58 tom Exp $ */ -/* $XFree86: xc/programs/xterm/xterm.h,v 3.104 2005/01/14 01:50:03 dickey Exp $ */ +/* $XFree86: xc/programs/xterm/xterm.h,v 3.116 2006/04/30 21:55:39 dickey Exp $ */ /************************************************************ -Copyright 1999-2004,2005 by Thomas E. Dickey +Copyright 1999-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -85,7 +85,14 @@ #endif #define HAVE_STDLIB_H 1 + +#if defined(sun) +/* errno is declared in */ +#else #define DECL_ERRNO 1 +#endif + +#undef DECL_PTSNAME /* ptsname() is normally in stdlib.h */ #ifndef NOPUTENV #define HAVE_PUTENV 1 @@ -116,7 +123,7 @@ #define HAVE_TCGETATTR 1 #endif -#if defined(__UNIXOS2__) || defined(__SCO__) +#if defined(__UNIXOS2__) || defined(__SCO__) || defined(__UNIXWARE__) #define USE_TERMCAP 1 #endif @@ -147,11 +154,13 @@ #if defined(linux) || defined(__CYGWIN__) #define USE_LASTLOG #define HAVE_LASTLOG_H +#define USE_STRUCT_LASTLOG #elif defined(BSD) && (BSD >= 199103) #ifdef BSD_UTMPX #define USE_LASTLOGX #else #define USE_LASTLOG +#define USE_STRUCT_LASTLOG #endif #endif @@ -161,7 +170,7 @@ #define DEF_INITIAL_ERASE TRUE #endif -#if defined(__SCO__) +#if defined(__SCO__) || defined(__UNIXWARE__) #define DEFDELETE_DEL TRUE #define OPT_SCO_FUNC_KEYS 1 #endif @@ -286,9 +295,11 @@ # endif #endif -#ifdef USE_SYS_SELECT_H - +/* these may be needed for sig_atomic_t */ #include +#include + +#ifdef USE_SYS_SELECT_H #if defined(USE_XPOLL_H) && defined(AIXV3) && defined(NFDBITS) #undef NFDBITS /* conflict between X11/Xpoll.h and sys/select.h */ @@ -304,7 +315,7 @@ #define environ gblenvp /* circumvent a bug */ #endif -#if !defined(VMS) && !(defined(linux) && defined(__USE_GNU)) +#if !defined(VMS) && !(defined(linux) && defined(__USE_GNU)) && !defined(__hpux) && !defined(_ALL_SOURCE) && !defined(__osf__) extern char **environ; #endif @@ -371,6 +382,7 @@ #define XtNhpLowerleftBugCompat "hpLowerleftBugCompat" #define XtNi18nSelections "i18nSelections" #define XtNinternalBorder "internalBorder" +#define XtNitalicULMode "italicULMode" #define XtNjumpScroll "jumpScroll" #define XtNkeyboardDialect "keyboardDialect" #define XtNlimitResize "limitResize" @@ -384,6 +396,7 @@ #define XtNmenuBar "menuBar" #define XtNmenuHeight "menuHeight" #define XtNmetaSendsEscape "metaSendsEscape" +#define XtNmkWidth "mkWidth" #define XtNmodifyCursorKeys "modifyCursorKeys" #define XtNmultiClickTime "multiClickTime" #define XtNmultiScroll "multiScroll" @@ -406,10 +419,12 @@ #define XtNrightScrollBar "rightScrollBar" #define XtNsaveLines "saveLines" #define XtNscrollBar "scrollBar" +#define XtNscrollBarBorder "scrollBarBorder" #define XtNscrollKey "scrollKey" #define XtNscrollLines "scrollLines" #define XtNscrollPos "scrollPos" #define XtNscrollTtyOutput "scrollTtyOutput" +#define XtNselectToClipboard "selectToClipboard" #define XtNshiftFonts "shiftFonts" #define XtNshowBlinkAsBold "showBlinkAsBold" #define XtNshowMissingGlyphs "showMissingGlyphs" @@ -418,12 +433,14 @@ #define XtNtekInhibit "tekInhibit" #define XtNtekSmall "tekSmall" #define XtNtekStartup "tekStartup" -#define XtNtoolBar "toolBar" #define XtNtiXtraScroll "tiXtraScroll" #define XtNtiteInhibit "titeInhibit" +#define XtNtoolBar "toolBar" #define XtNtrimSelection "trimSelection" #define XtNunderLine "underLine" #define XtNutf8 "utf8" +#define XtNutf8Latin1 "utf8Latin1" +#define XtNutf8Title "utf8Title" #define XtNveryBoldColors "veryBoldColors" #define XtNvisualBell "visualBell" #define XtNvisualBellDelay "visualBellDelay" @@ -504,6 +521,7 @@ #define XtCMenuBar "MenuBar" #define XtCMenuHeight "MenuHeight" #define XtCMetaSendsEscape "MetaSendsEscape" +#define XtCMkWidth "MkWidth" #define XtCModifyCursorKeys "ModifyCursorKeys" #define XtCMultiClickTime "MultiClickTime" #define XtCMultiScroll "MultiScroll" @@ -522,9 +540,11 @@ #define XtCRightScrollBar "RightScrollBar" #define XtCSaveLines "SaveLines" #define XtCScrollBar "ScrollBar" +#define XtCScrollBarBorder "ScrollBarBorder" #define XtCScrollCond "ScrollCond" #define XtCScrollLines "ScrollLines" #define XtCScrollPos "ScrollPos" +#define XtCSelectToClipboard "SelectToClipboard" #define XtCShiftFonts "ShiftFonts" #define XtCShowBlinkAsBold "ShowBlinkAsBold" #define XtCShowMissingGlyphs "ShowMissingGlyphs" @@ -534,10 +554,12 @@ #define XtCTekStartup "TekStartup" #define XtCTiXtraScroll "TiXtraScroll" #define XtCTiteInhibit "TiteInhibit" -#define XtCTrimSelection "TrimSelection" #define XtCToolBar "ToolBar" +#define XtCTrimSelection "TrimSelection" #define XtCUnderLine "UnderLine" #define XtCUtf8 "Utf8" +#define XtCUtf8Latin1 "Utf8Latin1" +#define XtCUtf8Title "Utf8Title" #define XtCVT100Graphics "VT100Graphics" #define XtCVeryBoldColors "VeryBoldColors" #define XtCVisualBell "VisualBell" @@ -572,6 +594,8 @@ extern "C" { #endif +struct XTERM_RESOURCE; + /* Tekproc.c */ extern int TekInit (void); extern int TekPtyData(void); @@ -598,34 +622,41 @@ (s)->event_mask |= PointerMotionMask; \ XSelectInput(XtDisplay((t)), XtWindow((t)), (long) (s)->event_mask); } -extern Bool SendMousePosition (Widget w, XEvent* event); -extern void DiredButton PROTO_XT_ACTIONS_ARGS; +extern Bool SendMousePosition (XtermWidget w, XEvent* event); +extern void DiredButton PROTO_XT_ACTIONS_ARGS; extern void DisownSelection (XtermWidget termw); -extern void HandleGINInput PROTO_XT_ACTIONS_ARGS; -extern void HandleInsertSelection PROTO_XT_ACTIONS_ARGS; -extern void HandleKeyboardSelectEnd PROTO_XT_ACTIONS_ARGS; -extern void HandleKeyboardSelectStart PROTO_XT_ACTIONS_ARGS; -extern void HandleKeyboardStartExtend PROTO_XT_ACTIONS_ARGS; -extern void HandleSecure PROTO_XT_ACTIONS_ARGS; -extern void HandleSelectEnd PROTO_XT_ACTIONS_ARGS; -extern void HandleSelectExtend PROTO_XT_ACTIONS_ARGS; -extern void HandleSelectSet PROTO_XT_ACTIONS_ARGS; -extern void HandleSelectStart PROTO_XT_ACTIONS_ARGS; -extern void HandleStartExtend PROTO_XT_ACTIONS_ARGS; -extern void ReadLineButton PROTO_XT_ACTIONS_ARGS; +extern void HandleGINInput PROTO_XT_ACTIONS_ARGS; +extern void HandleInsertSelection PROTO_XT_ACTIONS_ARGS; +extern void HandleKeyboardSelectEnd PROTO_XT_ACTIONS_ARGS; +extern void HandleKeyboardSelectExtend PROTO_XT_ACTIONS_ARGS; +extern void HandleKeyboardSelectStart PROTO_XT_ACTIONS_ARGS; +extern void HandleKeyboardStartExtend PROTO_XT_ACTIONS_ARGS; +extern void HandleSelectEnd PROTO_XT_ACTIONS_ARGS; +extern void HandleSelectExtend PROTO_XT_ACTIONS_ARGS; +extern void HandleSelectSet PROTO_XT_ACTIONS_ARGS; +extern void HandleSelectStart PROTO_XT_ACTIONS_ARGS; +extern void HandleStartExtend PROTO_XT_ACTIONS_ARGS; extern void ResizeSelection (TScreen *screen, int rows, int cols); -extern void ScrollSelection (TScreen* screen, int amount, Bool); -extern void TrackMouse (int func, int startrow, int startcol, int firstrow, int lastrow); -extern void TrackText (int frow, int fcol, int trow, int tcol); -extern void ViButton PROTO_XT_ACTIONS_ARGS; +extern void ScrollSelection (TScreen *screen, int amount, Bool); +extern void TrackMouse (TScreen *screen, int func, CELL * start, int firstrow, int lastrow); +extern void ViButton PROTO_XT_ACTIONS_ARGS; #if OPT_DEC_LOCATOR -extern Bool SendLocatorPosition (Widget w, XEvent* event); -extern void CheckLocatorPosition (Widget w, XEvent *event); extern void GetLocatorPosition (XtermWidget w); extern void InitLocatorFilter (XtermWidget w); #endif /* OPT_DEC_LOCATOR */ +#if OPT_PASTE64 +extern void AppendToSelectionBuffer (TScreen *screen, unsigned c); +extern void ClearSelectionBuffer (TScreen *screen); +extern void CompleteSelection (XtermWidget xw, char **args, Cardinal len); +extern void xtermGetSelection (Widget w, Time ev_time, String *params, Cardinal num_params, Atom *targets); +#endif + +#if OPT_READLINE +extern void ReadLineButton PROTO_XT_ACTIONS_ARGS; +#endif + #if OPT_WIDE_CHARS extern Bool iswide(int i); #endif @@ -661,6 +692,10 @@ extern void SGR_Foreground (int color); #endif +#ifdef NO_LEAKS +extern void noleaks_charproc (void); +#endif + /* charsets.c */ extern unsigned xtermCharSetIn (unsigned code, int charset); extern int xtermCharSetOut (IChar *buf, IChar *ptr, int charset); @@ -679,6 +714,14 @@ extern void RevIndex (TScreen *screen, int amount); extern void xtermIndex (TScreen *screen, int amount); +#if OPT_TRACE +extern int set_cur_col(TScreen *screen, int value); +extern int set_cur_row(TScreen *screen, int value); +#else +#define set_cur_col(screen, value) screen->cur_col = value +#define set_cur_row(screen, value) screen->cur_row = value +#endif + /* doublechr.c */ extern void xterm_DECDHL (Bool top); extern void xterm_DECSWL (void); @@ -698,7 +741,7 @@ #endif #if OPT_TCAP_QUERY -extern int xtermcapKeycode(char *params, unsigned *state); +extern int xtermcapKeycode(char **params, unsigned *state); #endif /* main.c */ @@ -718,12 +761,17 @@ extern SIGNAL_T Exit (int n); #endif +#ifndef SIG_ATOMIC_T +#define SIG_ATOMIC_T int +#endif + #if OPT_WIDE_CHARS extern int (*my_wcwidth)(wchar_t); #endif /* menu.c */ extern void do_hangup PROTO_XT_CALLBACK_ARGS; +extern void repairSizeHints (void); extern void show_8bit_control (Bool value); /* misc.c */ @@ -734,6 +782,9 @@ extern XrmOptionDescRec * sortedOptDescs(XrmOptionDescRec *, Cardinal); extern char *SysErrorMsg (int n); extern char *udk_lookup (int keycode, int *len); +extern char *xtermEnvEncoding (void); +extern char *xtermEnvLocale (void); +extern char *xtermFindShell(char *leaf, Bool warning); extern char *xtermVersion(void); extern int XStrCmp (char *s1, char *s2); extern int creat_as (uid_t uid, gid_t gid, Bool append, char *pathname, int mode); @@ -745,14 +796,14 @@ extern void Changename (char *name); extern void Changetitle (char *name); extern void Cleanup (int code); -extern void HandleBellPropertyChange PROTO_XT_EV_HANDLER_ARGS; -extern void HandleEightBitKeyPressed PROTO_XT_ACTIONS_ARGS; -extern void HandleEnterWindow PROTO_XT_EV_HANDLER_ARGS; -extern void HandleFocusChange PROTO_XT_EV_HANDLER_ARGS; -extern void HandleInterpret PROTO_XT_ACTIONS_ARGS; -extern void HandleKeyPressed PROTO_XT_ACTIONS_ARGS; -extern void HandleLeaveWindow PROTO_XT_EV_HANDLER_ARGS; -extern void HandleStringEvent PROTO_XT_ACTIONS_ARGS; +extern void HandleBellPropertyChange PROTO_XT_EV_HANDLER_ARGS; +extern void HandleEightBitKeyPressed PROTO_XT_ACTIONS_ARGS; +extern void HandleEnterWindow PROTO_XT_EV_HANDLER_ARGS; +extern void HandleFocusChange PROTO_XT_EV_HANDLER_ARGS; +extern void HandleInterpret PROTO_XT_ACTIONS_ARGS; +extern void HandleKeyPressed PROTO_XT_ACTIONS_ARGS; +extern void HandleLeaveWindow PROTO_XT_EV_HANDLER_ARGS; +extern void HandleStringEvent PROTO_XT_ACTIONS_ARGS; extern void Panic (char *s, int a); extern void Redraw (void); extern void ReverseOldColors (void); @@ -775,18 +826,24 @@ extern void xtermSetenv (char *var, char *value); #if OPT_DABBREV -extern void HandleDabbrevExpand PROTO_XT_ACTIONS_ARGS; +extern void HandleDabbrevExpand PROTO_XT_ACTIONS_ARGS; #endif #if OPT_MAXIMIZE -extern int QueryMaximize (TScreen *screen, unsigned *width, unsigned *height); -extern void HandleDeIconify PROTO_XT_ACTIONS_ARGS; -extern void HandleIconify PROTO_XT_ACTIONS_ARGS; -extern void HandleMaximize PROTO_XT_ACTIONS_ARGS; -extern void HandleRestoreSize PROTO_XT_ACTIONS_ARGS; +extern int QueryMaximize (XtermWidget termw, unsigned *width, unsigned *height); +extern void HandleDeIconify PROTO_XT_ACTIONS_ARGS; +extern void HandleIconify PROTO_XT_ACTIONS_ARGS; +extern void HandleMaximize PROTO_XT_ACTIONS_ARGS; +extern void HandleRestoreSize PROTO_XT_ACTIONS_ARGS; extern void RequestMaximize (XtermWidget termw, int maximize); #endif +#if OPT_WIDE_CHARS +extern Bool xtermEnvUTF8(void); +#else +#define xtermEnvUTF8() False +#endif + #ifdef ALLOWLOGGING extern void StartLog (TScreen *screen); extern void CloseLog (TScreen *screen); @@ -812,9 +869,13 @@ extern int readPtyData (TScreen *screen, PtySelect *select_mask, PtyData *data); extern void fillPtyData (TScreen *screen, PtyData *data, char *value, int length); -extern void initPtyData (PtyData *data); +extern void initPtyData (PtyData **data); extern void trimPtyData (TScreen *screen, PtyData *data); +#ifdef NO_LEAKS +extern void noleaks_ptydata (void); +#endif + #if OPT_WIDE_CHARS extern Bool morePtyData (TScreen *screen, PtyData *data); extern Char *convertToUTF8 (Char *lp, unsigned c); @@ -848,15 +909,15 @@ extern void xtermParseRect (TScreen *, int, int *, XTermRect *); #define ScrnClrFlag(screen, row, flag) \ - SCRN_BUF_FLAGS(screen, row + screen->topline) = \ - (Char *)((long)SCRN_BUF_FLAGS(screen, row + screen->topline) & ~ (flag)) + SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) = \ + (Char *)((long)SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) & ~ (flag)) #define ScrnSetFlag(screen, row, flag) \ - SCRN_BUF_FLAGS(screen, row + screen->topline) = \ - (Char *)(((long)SCRN_BUF_FLAGS(screen, row + screen->topline) | (flag))) + SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) = \ + (Char *)(((long)SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) | (flag))) #define ScrnTstFlag(screen, row, flag) \ - ((row + screen->savelines + screen->topline) >= 0 && ((long)SCRN_BUF_FLAGS(screen, row + screen->topline) & (flag)) != 0) + (ROW2INX(screen, row + screen->savelines) >= 0 && ((long)SCRN_BUF_FLAGS(screen, ROW2INX(screen, row)) & (flag)) != 0) #define ScrnClrBlinked(screen, row) ScrnClrFlag(screen, row, BLINK) #define ScrnSetBlinked(screen, row) ScrnSetFlag(screen, row, BLINK) @@ -867,14 +928,14 @@ #define ScrnTstWrapped(screen, row) ScrnTstFlag(screen, row, LINEWRAPPED) #define ScrnHaveSelection(screen) \ - ((screen)->startHRow != (screen)->endHRow \ - || (screen)->startHCol != (screen)->endHCol) + ((screen)->startH.row != (screen)->endH.row \ + || (screen)->startH.col != (screen)->endH.col) #define ScrnAreLinesInSelection(screen, first, last) \ - ((last) >= (screen)->startHRow && (first) <= (screen)->endHRow) + ((last) >= (screen)->startH.row && (first) <= (screen)->endH.row) #define ScrnIsLineInSelection(screen, line) \ - ((line) >= (screen)->startHRow && (line) <= (screen)->endHRow) + ((line) >= (screen)->startH.row && (line) <= (screen)->endH.row) #define ScrnHaveLineMargins(screen) \ ((screen)->top_marg != 0 \ @@ -895,9 +956,9 @@ /* scrollbar.c */ extern void DoResizeScreen (XtermWidget xw); -extern void HandleScrollBack PROTO_XT_ACTIONS_ARGS; -extern void HandleScrollForward PROTO_XT_ACTIONS_ARGS; -extern void ResizeScrollBar (TScreen *screen); +extern void HandleScrollBack PROTO_XT_ACTIONS_ARGS; +extern void HandleScrollForward PROTO_XT_ACTIONS_ARGS; +extern void ResizeScrollBar (XtermWidget xw); extern void ScrollBarDrawThumb (Widget scrollWidget); extern void ScrollBarOff (TScreen *screen); extern void ScrollBarOn (XtermWidget xw, int init, int doalloc); @@ -905,11 +966,15 @@ extern void ToggleScrollBar (XtermWidget w); extern void WindowScroll (TScreen *screen, int top); +#ifdef SCROLLBAR_RIGHT +extern void updateRightScrollbar(XtermWidget xw); +#else +#define updateRightScrollbar(xw) /* nothing */ +#endif + /* tabs.c */ -extern Bool TabToNextStop (void); -extern Bool TabToPrevStop (void); -extern int TabNext (Tabs tabs, int col); -extern int TabPrev (Tabs tabs, int col); +extern Bool TabToNextStop (TScreen *screen); +extern Bool TabToPrevStop (TScreen *screen); extern void TabClear (Tabs tabs, int col); extern void TabReset (Tabs tabs); extern void TabSet (Tabs tabs, int col); @@ -919,7 +984,7 @@ extern GC updatedXtermGC (TScreen *screen, unsigned flags, unsigned fg_bg, Bool hilite); extern int AddToRefresh (TScreen *screen); extern int HandleExposure (TScreen *screen, XEvent *event); -extern int char2lower(int ch); +extern int char2lower (int ch); extern int drawXtermText (TScreen *screen, unsigned flags, GC gc, int x, int y, int chrset, PAIRED_CHARS(Char *text, Char *text2), Cardinal len, int on_wide); extern void ChangeAnsiColors (XtermWidget tw); extern void ChangeColors (XtermWidget tw, ScrnColors *pNew); @@ -933,6 +998,8 @@ extern void InsertLine (TScreen *screen, int n); extern void RevScroll (TScreen *screen, int amount); extern void ReverseVideo (XtermWidget termw); +extern void decode_keyboard_type (struct XTERM_RESOURCE *rp); +extern void decode_wcwidth (int mode); extern void do_erase_display (TScreen *screen, int param, int mode); extern void do_erase_line (TScreen *screen, int param, int mode); extern void init_keyboard_type (xtermKeyboardType, Bool set); @@ -943,6 +1010,7 @@ extern void toggle_keyboard_type (xtermKeyboardType type); extern void update_keyboard_type (void); extern void xtermScroll (TScreen *screen, int amount); +extern void xtermSizeHints (XtermWidget xw, XSizeHints *sizehints, int scrollbarWidth); #if OPT_ISO_COLORS @@ -1024,6 +1092,10 @@ #define curXtermChrSet(row) 0 #endif +#define XTERM_CELL(row,col) getXtermCell(screen, ROW2INX(screen, row), col) +#define XTERM_CELL_C1(row,col) getXtermCellComb1(screen, ROW2INX(screen, row), col) +#define XTERM_CELL_C2(row,col) getXtermCellComb2(screen, ROW2INX(screen, row), col) + extern unsigned getXtermCell (TScreen *screen, int row, int col); extern void putXtermCell (TScreen *screen, int row, int col, int ch); Index: xc/programs/xterm/xterm.log.html diff -u xc/programs/xterm/xterm.log.html:1.136 xc/programs/xterm/xterm.log.html:1.149 --- xc/programs/xterm/xterm.log.html:1.136 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/xterm.log.html Sun Apr 30 17:55:39 2006 @@ -1,7 +1,7 @@ @@ -31,7 +31,7 @@
-Copyright 1997-2004,2005 by Thomas E. Dickey

Contents

@@ -46,6 +46,19 @@ is the latest version of this file. +

Patch #213 - 2006/4/30 - XFree86 4.5.99.905

+
    +
  • minor optimization to cell layout; will use that to simplify some + logic and allow for more than two combining characters in another + patch. + +
  • add utf8Latin1 resource to make optional the + feature from patch #209 which + allowed ISO-8859-1 fonts to be used in cases + where a wide font was given. This would only + work for the special case where the user normally used Latin-1 + and wanted some wide characters (report by Rostislav Krasny). + +
  • add utf8Title resource to manpage (Novell #52655). + +
  • fix typo in table entry for utf8Title resource which + made it treated as an integer rather than boolean (patch by Mike + Fabian, Novell #52655). +
+ +

Patch #212 - 2006/4/9 - XFree86 4.5.99.904

+
    +
  • improve description of forceBoxChars in manpage + (discussion with Joe Wells). + +
  • set checkmark for "Select To Clipboard" menu entry on startup, + from resource setting. + +
  • update manpage to note that *customization:color is + not needed, though it is useful (Redhat #188034). + +
  • add underscore to sample pattern for URL in XTerm.ad + (Redhat #188037). + +
  • modify install rule for manpage to use the configured app-defaults + directory (Redhat #188031). + +
  • add checks in releaseCursorGCs() to ensure GC's are + distinct, needed since memory leak changes for + patch #208 + (Redhat #186935, patch by Jason Vas Dias). + +
  • modify Imakefile definitions to allow + imake to set InstallXtermSetGID. + Add symbol InstGidFlags. + +
  • add configure script check to ensure that SIGWINCH if defined even + when headers undefine this as a side-effect of + _POSIX_C_SOURCE, etc. + +
  • resync with XFree86 CVS: +
      +
    • ifdef-out chmod of terminal device for OS/2 (XFree86 #1663, + Frank Giessler). +
    • move new Imakefile chunk which defines + $(CSGIDFLAGS) before DEFINES, + e.g., for IRIX64 (Marc La France). +
    +
+ +

Patch #211 - 2006/3/19 - XFree86 4.5.99.902

+
    +
  • modify prefix/suffix transformation in makefile to make + uxterm install properly on Cygwin. + +
  • restore the sizeof-comparison for struct lastlog + added in patch #208, + rendered (mostly) obsolete in patch #210, + since an imake configuration can still turn that code on + (prompted by comment by David Dawes). + +
  • remove feature for FreeBSDArchitecture from + Imakefile which would install xterm using the + utmp group since a standard FreeBSD system has no such + group, though it would support this configuration. FreeBSD + packager uses the configure script, which can make the + appropriate check (prompted by comment by David Dawes). + +
  • fixes for gcc redefinition warnings when built using imake + (reports by David Dawes, Marc La France). +
+ +

Patch #210 - 2006/3/12 - XFree86 4.5.99.902

+
    +
  • add configure check for workaround in + patch #208 + for Solaris' inconsistent support for struct lastlog to quiet + compiler warnings + (prompted by David Dawes commit message for XFree86). + +
  • fixes for BASE64 selection manipulation, + e.g., ensure that the string + terminator is written after cut-buffer data (report by Joe Allen). + +
  • add vttests/paste64.pl script to test experimental option for + setting/getting selection data. + +
  • add some error-checking in fontutils.c + (prompted by David Dawes commit message for XFree86). + +
  • change xterm manpage to show the actual color resource names + XtDefaultForeground and + XtDefaultBackground rather than black and white + (prompted by discussion with Emanuele Giaquinta). + +
  • add utf8Title resource and menu entry, allowing the + user to control whether title strings are interpreted as ISO-8859-1 + or UTF-8 encoding (Novell #52655, #113206). + +
  • change order of ifdef's for utempter versus platforms in + Imakefile to ensure a proper value for + InstallXtermSetGID + (prompted by Marc La France commit message for XFree86). + +
  • update the cursor GCs when menu entry for reverse video is toggled. + (Redhat #183993). + +
  • a memory-leak fix for set_cursor_gcs() + in patch #208 broke the + -cm option (Redhat #182382). +
+ +

Patch #209 - 2006/2/12 - XFree86 4.5.99.22

+
    +
  • remove setf and setb from + xterm-256color terminfo entry to avoid issues with + applications that ignore the ANSI strings (report by Emanuele + Giaquinta). + +
  • remove obsolete references to "Xorg" to avoid confusion with + "X.org" (prompted by David Dawes commit message for XFree86). + +
  • improve initial layout performance for the toolbar configuration + by precalculating the height of the toolbar. + +
  • remove menu entry for "Enable Curses Emulation" (to make room for + "Select To Clipboard"). + +
  • add resource selectToClipboard, + action set-select and a menu entry to allow + users to switch between PRIMARY and CLIPBOARD for select/paste. + +
  • allow cursor to have the same color as foreground (text), since it + is rendered as reverse (Debian #350664). + +
  • amend change for loading utf8Fonts resource from patch #204 to allow an ISO-8859-1 "normal" + font to be combined with an ISO-10646 font if the latter is given + via the -fw option or its corresponding resource + value (prompted by comment in Novell #49305). + +
  • add TIOCSCTTY ioctl() ifdef'd for + __GNU__ to set the controlling terminal (Debian + #348457). + +
  • add configure option --disable-leaks. + +
  • add a check in Bell to ensure that the VT100 widget + is realized, since it may be called by xtermLoadFont + given an incorrect font resource (Redhat #180450). + +
  • improve initialization of wide-bold font by not using the derived + value when it happens to have few glyphs (report by Mboso Sampson). + +
  • improve dynamic colors by not repainting the screen if only the + cursor color changes (request by Bram Moolenaar). + +
  • fix menu initialization for tek4014 window broken in + patch #206. + +
  • typo in manpage (Debian #351425). + +
  • correct loop logic in dotext to prevent an infinite + loop if a wide character was just at the right margin when wrapping + was disabled (report by Serge van den Boom). + +
  • initialize the saved-cursor data so a restore-cursor operation + without a preceding save-cursor operation will not modify the + foreground color. + +
  • add a new selection feature: regular expressions, and new resources + which specify what happens on multiple mouse clicks: + on2Clicks, + on3Clicks, + on4Clicks and + on5Clicks. + +
  • revert the XTerm.ad change from + patch #208 (Debian #348384). + +
  • fixes for the print-window to make it handle combining + characters in UTF-8 mode. + +
  • add check to ensure that double-clicking to extend selection will + not extend it into the scrollback area. This still allows users + to scroll back and select text (Debian #347415). + +
  • add configure option --with-tty-group to help work + around deficiencies in packager's build environment (Debian + #349142). + +
  • fix typo in configure script option + --disable-narrowproto + (report by David Martínez Moreno). + +
  • amend CF_X_FREETYPE changes for pkg-config check to + ensure that Xft is known to that tool (report and + patch by Emanuele Giaquinta). + +
  • add an ifdef to allow ./configure --disable-active-icon + to work, broken by new code for testing memory leaks in + patch #208 (report by Brian Lindholm). +
+ +

Patch #208 - 2006/1/3 - XFree86 4.5.99.19

+
    +
  • add charClass resource to XTerm.ad and + UXTerm.ad which simplifies selecting URLs (prompted + by Kirill Ponomarew). + +
  • modify install rule for uxterm to account for the + --program-prefix, etc., options by invoking the + transformed name of xterm rather than simply "xterm". + +
  • modify configure --with-app-defaults option to allow + --without-app-defaults. + +
  • add configure --with-symlink option to make it simpler + to install successive versions of xterm renamed using + the --program-prefix, etc., options with a symbolic + link pointing to the most recent. + +
  • make -iconic option work with toolbar configuration + (GenToo #113604). + +
  • suppress lastlog feature for 64-bit Solaris + configuration since that platform provides only a 32-bit interface + (report by Peter Bray). + +
  • fix memory reallocation for the "UTF-8" menu entry when xterm is + started using the +u8 option (reported by Jan Willem + Stumpel). + +
  • add a configure check for the actual path of luit, + to work around broken imake configurations. + +
  • add a configure check for pkg-config (Redhat Bugzilla + #173541). + +
  • modify install-rule for uxterm to omit executable + suffix, e.g., for Cygwin. + +
  • modify sinstall.sh to work around quirks in Cygwin + configuration. +
+ +

Patch #207 - 2005/11/13 - XFree86 4.5.99.16

+
    +
  • enable lastlogx support for NetBSD (was added, but + not enabled in patch #186). + +
  • work around broken lastlog.h in glibc 2.3.5, which + includes utmp.h. + +
  • revert part of recent XFree86 Imakefile change, restoring the + -I. needed for xmkmf builds of xterm + (XFree86 Bugzilla #1633, reports by Alexander Pohoyda and Matthieu + Herrb). + +
  • change compiled-in default for printerCommand + resource to an empty string. People who want to use the + printer should be able to read the manual (Debian #311490). + +
  • modify Imakefile to work around old problems in + imake configuration to allow test-builds using + xmkmf on Linux. (This was not noticed since several + releases had broken definitions relating to Xft which were harder + to work around). + +
  • link resize for SCO platforms (Kean Johnston). +
+ +

Patch #206 - 2005/11/3 - XFree86 4.5.99.15

+
    +
  • add configure --with-app-defaults option to allow + app-defaults directory for install-rules to be customized. + +
  • remove default translations for dabbrev-expand() + due to conflicts with existing keyboard arrangements. + +
  • remove redundant check for _NET_WM_PID + (report by Emanuele Giaquinta). + +
  • set icon border width explicitly to work around fvwm problem + with active icon resizing (report by Steve Morris, analysis + by Dominik Vogt). + +
  • modify resource files to make the font-resources a little + more specific, e.g., changing "*VT100*" to "*VT100.", to + make the distinction between VT100.font and VT100.utf8Fonts.font + sharper, in case a packager modifies one of those. + +
  • expanded comments in UXTerm.ad regarding the + font resources (Debian #319179). + +
  • add --enable-narrowproto configure option to + accommodate X.org "modular" build (report by Stephan Hermann, + GenToo #17220). + +
  • fix typo in xterm.man description of +wf (patch + by Tobias Stoeckmann). + +
  • add scrollBarBorder resource (request by Floyd L + Davidson). + +
  • modify xterm-new terminfo entry to use capabilities + for shifted scroll forward/reverse as shifted cursor up/down. + +
  • correct updating of checkmark for toolbar entry in popup menu + (report by Emanuele Giaquinta). + +
  • fix ifdef's to allow compiling with toolbar and without tek4014 + (patch by Emanuele Giaquinta). + +
  • use openpty() for Darwin port (patch by Emanuele + Giaquinta). + +
  • fix GenToo #90697 a different way, postponing the logic in + SetupToolbar until the toolbar is actually needed, + i.e., the +tb option is handled as expected. + +
  • revert fix made in patch #203 for GenToo + #90697. That introduced a problem with the control mouse + click-popups, while most of the performance problems can be + resolved by restricting the menu fonts (report by Emanuele + Giaquinta). + +
  • fix a file-descriptor leak when calling openpty() + (OpenBSD system/4561). + +
  • make a special case of resizing work like vt100: a hard reset + also resets the 132/80 mode. The code to support this was + present since X11R5, but not used because the corresponding + initial state of the -132 option was not saved. + +
  • restore window manager hints after XtMakeResizeRequest() + calls. One instance from patch #205 + resulted in the window manager displaying pixels rather than + than characters after selecting a different font size (FreeBSD + ports/87424). + +
  • remove special case for Darwin in CF_XOPEN_SOURCE + (Emanuele Giaquinta). + +
  • modify parsing of control sequence CSI T + to allow scroll-down + to be sent while mouse tracking is enabled (request by + D Hugh Redelmeier). + +
  • correct termcap "me" (mode-end) string so it does not modify the + alternate character set (report by Andrey Chernov). + +
  • correct size-comparison in HandleInterpret() broken in changes + from patch #201 to allocate input + buffer (Debian #334317). + +
  • amend adjustments for scrollbar layout from + patch #204 to make + this apply only to the toolbar configuration. In the non-toolbar + configuration, the resulting scrollbar was shifted by its + borderwidth (report by Matthieu Herrb). + +
  • add select-cursor-extend() action. + +
  • fix some broken href's in xterm.log.html, and typo in the + INSTALL file (report/patch by David Martínez Moreno). + +
  • modify Imakefile to use setgid mode for installing + with Linux, OpenBSD and FreeBSD. + +
  • add configure --with-setuid and --with-reference options to + allow packagers more flexibility in customizing install + permissions. + +
  • generalize and make optional (configure --with-utmp-setgid) + the change made for XFree86 Bugzilla #878 in + patch #205 + (FreeBSD bug report #ports/86663). +
+ +

Patch #205 - 2005/9/18 - XFree86 4.5.99.12

+
    +
  • correct a typo in CF_FUNC_TGETENT introduced in patch #198 fix for Gentoo #69926. + +
  • implement logic in termcap query to process multiple parameters + as documented in ctlseqs.ms + +
  • fix buffer size used for termcap query, which was not long enough + for the terminfo "colors" name (patch by Bradd W. Szonye). + +
  • add configure option --enable-readline-mouse, which turns on the + experimental OPT_READLINE code (patch by Ilya Zakharevich). + +
  • for FreeBSD, drop setuid privileges after startup + (XFree86 Bugzilla #878, report/patch by Alexander Pohoyda) + +
  • add menu entry (alt-esc) and corresponding action (alt-sends-esc) + to toggle the eightBitInput resource setting. + +
  • generate configure script with autoconf 2.52 (patched) to use + the feature therein which forces the script's locale to POSIX + (Gentoo Bugzilla #105369). + +
  • modify computation of rows/columns on resize to avoid extending + beyond the given limits, e.g., if resizing in response to a + "maximize" in Gnome or KDE which do not use the window manager + hints for this case (Debian #289123, Novell #61153). + +
  • modifications to work with z/OS 1.4 (Paul Giordano). + +
  • improve error-reporting when chown/chmod of the pseudo-terminal + fails, e.g., if a copy of xterm which was designed to work with + old-style pseudo-terminals is not installed setuid or setgid + (report by Jeremy C. Reed). + +
  • patches from Emanuele Giaquinta: +
      +
    • ctlseqs.ms says that primary and secondary DA accept a + nonzero parameter, which is incorrect. Also modify code + to agree with this. + +
    • correct a comment in 88colres.pl + +
    • ctlseqs.ms says that the DEC Set/Reset control sequences for + the backarrow key make it send DEL/BS, respectively, while it's + the opposite. + +
    • update the menu entries for the metaSendsEscape, deleteIsDEL + and numLock resources when changing them with the corresponding + DEC Set/Reset control sequences. +
    + +
  • fixes for configure script: +
      +
    • add special case for QNX, defining _QNX_SOURCE. +
    • check for preprocessors which do not perform -U and -D options + in the given order. +
    • improve macro to determine gcc version +
    • improve check for Intel compiler and related warning options +
    + +
  • update config.guess, config.sub + +
  • improve fix from patch #198 for + Cleanup() by ensuring it is not called from the + SIGCHLD handler (patch from OpenBSD by Todd Miller). + +
  • eliminate a retry for a better-matching bold font, to work around + recent font server changes. + +
  • fixes for Novell #113277: +
      +
    • specify weight for wide font which may be derived from + normal fontname. +
    • cache the derived wide- and widebolt-fontnames. +
    + +
  • workaround for GenToo Bugzilla #100728. + +
  • add menubar's border width to layout computation. Normally this + is zero, but patterns such as XTerm*borderWidth:1 + would give poor layout for the toolbar configuration. +
+ +

Patch #204 - 2005/8/4 - XFree86 4.5.99.9

+
    +
  • work around quirk in shell which allowed user to "run" uxterm + script when there was no UTF-8 locale installed by entering + "sh -x uxterm". Also popup an xmessage to show the problem + for users who run this via a GUI (Debian #318513). + +
  • disallow changes to fonts, toolbar and scrollbar when the vt100 + window is iconified, to simplify management of the active icon. + +
  • fixes to make -geom option work properly with the + toolbar configuration (Gentoo Bugzilla #90717, #91967). + +
  • minor improvements to scrollbar layout: ensure that the scrollbar + border is zero if the vt100 border is zero. + +
  • improve initialization due to utf8 resource by + loading the utf8Fonts resource in the case where + locale resource is false. Also in this case, do + not disable switching UTF-8 mode on/off. + +
  • minor optimization of TrueType font-loading, loads italic font + only when needed. + +
  • correct variable used to store temporary result from lookup of bold + font, when initializing the wide-bold-font data and no immediate + match is found by asking for a bold variant of the wide-font. The + result was to use overstriking rather than the actual bold font + (Debian #318162, patch by Eugene Konev). + +
  • add checks to ensure vt100 widget is realized when it might be + updated via actions handled from a tek4014-only configuration. +
+ +

Patch #203 - 2005/7/6 - XFree86 4.5.99.7

+
    +
  • modify initialization of allowSendEvents and + allowWindowOps to prevent modification with the + editres protocol. + +
  • fix compiler warning for NetBSD by including util.h in main.c + (XFree86 Bugzilla #1596). + +
  • fix to build on Darwin 8.x, which no longer provides + setpgrp() (patch by Min Sik Kim). + +
  • adapted fixes for Legend (SCO) from diffs attached to + Freedesktop.Org Bugzilla #3180. + +
  • fix typo in xterm manpage description of -ls option + (Freedesktop.Org Bugzilla #3543). + +
  • add support for interpreting the underline attribute as an italic + font in Xft mode (patch by Chuck Blake). + +
  • improve initialization of toolbar so that individual pulldown + menus are initialized on demand, as they are in the scenario + where they are invoked as popup menus (GenToo Bugzilla #90697). + +
  • fix logic in find_utmp, which did not reset result + in getutid(), causing an infinite loop in some + conditions (report by Emil Mikulic). + +
  • set the _NET_WM_PID property (GenToo Bugzilla #91008). + +
  • modify ifdef's in ptyx.h and xterm_io.h to build with DragonFly + (patch by Jeroen Ruigrok). + +
  • change default values for minBufSize and + maxBufSize to 4096 and 32768 respectively so that the + initial read request will match the value from before changes to + use sched_yield(). + +
  • make paste of UTF-8 faster for Western character sets by checking + range of incoming data (patch by Joe Allen). + +
  • adapted patch by Joe Allen to add experimental option to allow + applications to get or set the selection data as a BASE64 string. + +
  • fix an off-by-one error parsing -S/nn option + (Debian #311438, report/fix by Peter Chubb). + +
  • fix an initialization bug from + patch #201 that broke logging + (report by Rodney Thayer). + +
  • amend change to command-line processing in + patch #201 to avoid + conflict with -e option (report by Servatius Brandt). + +
  • suppress configure check for _XOPEN_SOURCE on + darwin. + +
  • update config.guess, config.sub +
+ +

Patch #202 - 2005/5/2 - XFree86 4.5.99.3

+
    +
  • add extended shift- and control-modifier cursor keys to + "xterm+pcfkeys" terminfo entry to correspond to ncurses 20050430 + patch. + +
  • fix a rare case where text would be written with the wrong colors + because output of scrolled text would reset the colors and the + new text would be written with the same colors (report/testcase + by Thomas Glanzmann). + +
  • rename $CMD variable in plink.sh because + it is a reserved symbol in bash 3.00.16 (report by Ted Taylor). + +
  • add environment variables $XTERM_SHELL and $XTERM_VERSION + (request by Zdenek Sekera). + +
  • corrected workaround for background color of menubar, which gave + a too-broad expression, coloring the background of the VT100 + widget unless overridden by another resource setting. + +
  • correct an error in the logic which decides when + sched_yield() is run; it would occasionally hang when + contending with other pseudo-terminal applications such as screen + (report by Kirill Ponomarew). + +
  • modify initialization to decide whether to default to built-in + wcwidth() versus system's version based on the + starting locale and whether the system's version is poor quality + (suggested by Bram Moolenaar). + +
  • update table for mk_width() from UnicodeData 4.1.0 + using Markus Kuhn's uniset script. +
+ +

Patch #201 - 2005/4/21 - XFree86 4.5.99.2

+
    +
  • improve resource files to show how the menubar and popup menus can + be colored (prompted by report by Joe Wells). + +
  • modify parsing of OSC (and SOS, etc), strings so their contents + are not interpreted as UTF-8. This allows non-ASCII title strings + to be set, provided that the window manager complies (report by + Thomas Wolff). + +
  • improved some of the built-in line-drawing glyphs. + +
  • correct color of "box" character drawn for line-drawing glyph 1 + (report by Nicolas George). + +
  • improve behavior when switching to UTF-8 mode after startup so + xterm will check if the current fonts are already wide + (ISO10646-1). If they are not, xterm will use the + utf8Fonts subresource to load appropriate fonts + (request by Bram Moolenaar). + +
  • modify logic for setting title-string so it applies to the current + widget rather than the vt100 widget. + +
  • modify initialization for wide-bold fontname, to search for one + if none is given (report by Michael Schroeder). + +
  • add resource mkWidth and command-line option + -mk_width to control whether xterm uses the built-in + version of wcwidth(). + +
  • add resource settings for minimum/maximum input buffer size, and + call to sched_yield to improve performance with newer + Linux kernels (adapted from patch by Nicolas George). + +
  • correct computation of width for wide characters with the invisible + attribute (report by Thomas Wolff). + +
  • modify interaction between +u8 and locale + resource to allow the command-line option to override the resource + (requested by Thomas Wolff). + +
  • add a limit check for scrolling margins in a one-line screen, + overlooked in fixes for + patch #198 (Debian #297430). + +
  • correct treatment of iconBorderWidth for resizing + an active-icon, and its description in manpage (Debian #296592). + +
  • modify configure script --disable-imake to use the + script's definitions anyway if it cannot detect imake (prompted + by FreeBSD bug 77408). + +
  • ignore error in the I/O initialization that tries to set the + tty to 7-bit input for the case where eightBitInput + resource is false (Debian #298551). + +
  • modify command-processing to accept an optional parameter that + tells xterm which shell program to use (request by Zdenek Sekera). + +
  • add simpler resource keyboardType which, when set, + overrides the individual keyboard-type resources and eliminates + the possibility of conflict between them. + +
  • add initialization for scoFunctionKeys resource + (report by Rick K). + +
  • correct logic of ReallocateBufOffsets() which did not + copy the content of the old screen buffer to the proper location, + making a repaint clear after switching to wide-character mode + (report by Bram Moolenaar): + +
  • implement the remaining pieces to make xterm allocate cells for + wide-characters when the "UTF-8" menu entry is selected. Also, + load the UTF-8 font when that menu entry is selected, or the escape + sequence for UTF-8 mode is received (report by Bram Moolenaar): + +
  • add command-line options (-tb, +tb) and + resource toolBar to allow menu/toolbar to disabled or + enabled at startup (prompted by reports by Joe Wells). + +
  • correct typo in configure script's --enable-dec-locator option + (report by Bram Moolenaar). +
+

Patch #200 - 2005/2/6 - XFree86 4.4.99.23

  • increase color pairs value for xterm-256color and xterm-88color to @@ -321,7 +1025,7 @@
  • improve $WINDOWID for configuration with toolbar by making it refer to the top-level shell rather than the parent of the current window. For that case, the parent is a form widget, - which does not have a name, which made the $WINDOWID + which does not have a name, which made the $WINDOWID not very useful as a parameter for xwininfo (suggested by Dave Bodenstab). @@ -788,7 +1492,7 @@
  • replace ifdef's using SCO, sco and SCO325 with __SCO__ - (XFree86 Bugzilla #1301, Kean Johnson). + (XFree86 Bugzilla #1301, Kean Johnston). But ensure that it still builds on platforms where this symbol is not defined. @@ -1311,10 +2015,10 @@ on a shell-window no longer work. The tek4014 emulation used this. Use the next lower window (report by Karl Rudolf Bauchspiess). -
  • add a resource setting to control whether the extended window - operations should be allowed, e.g., resize, iconify, report - window attributes. This is to accommodate people who are not - capable of using a pager to view log-files. +
  • add a resource setting allowWindowOps to control + whether the extended window operations should be allowed, e.g., + resize, iconify, report window attributes. This is to accommodate + people who are not capable of using a pager to view log-files.

Patch #173 - 2003/2/6 - XFree86 4.2.99.902

@@ -2974,7 +3678,7 @@

Patch #123 - 2000/1/22 - XFree86 3.9.17a

  • add a note reserving OSC 51 for use in Emacs shell (request by - Rob Myoff <mayoff@dqd.com>). + Rob Mayoff <mayoff@dqd.com>).
  • correct a missing backslash in xterm-vt220 termcap. Index: xc/programs/xterm/xterm.man diff -u xc/programs/xterm/xterm.man:3.112 xc/programs/xterm/xterm.man:3.124 --- xc/programs/xterm/xterm.man:3.112 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/xterm.man Sun Apr 30 17:55:39 2006 @@ -1,8 +1,6 @@ -.\" $XTermId: xterm.man,v 1.287 2004/11/30 00:02:18 tom Exp $ -.\" $Xorg: xterm.man,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ +.\" $XTermId: xterm.man,v 1.340 2006/04/30 18:00:36 tom Exp $ .\" -.\" -.\" Copyright 1996-2003,2004 by Thomas E. Dickey +.\" Copyright 1996-2005,2006 by Thomas E. Dickey .\" .\" All Rights Reserved .\" @@ -55,15 +53,28 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xterm/xterm.man,v 3.112 2005/01/14 01:50:03 dickey Exp $ +.\" $XFree86: xc/programs/xterm/xterm.man,v 3.124 2006/04/30 21:55:39 dickey Exp $ .\" -.\" updated by Thomas E. Dickey for XFree86, July 1996 - July 2004. +.\" updated by Thomas E. Dickey for XFree86, July 1996 - February 2006. +. +.de DS +.sp +.in +4 +.nf +.ft C \" Courier +.. +.de DE +.fi +.ft P +.sp +.in -4 +.. .TH XTERM 1 __vendorversion__ .SH NAME xterm \- terminal emulator for X .SH SYNOPSIS .B xterm -[-\fItoolkitoption\fP ...] [-option ...] +[-\fItoolkitoption\fP ...] [-\fIoption\fP ...] [\fIshell\fP] .SH DESCRIPTION The \fIxterm\fP program is a terminal emulator for the X Window System. It provides DEC VT102/VT220 (VTxxx) and Tektronix 4014 @@ -200,26 +211,52 @@ . .SH OPTIONS The \fIxterm\fP terminal emulator -accepts all of the standard X Toolkit command line options as well as -the following. +accepts the standard X Toolkit command line options as well as +many application-specific options. If the option begins with a .RB ` + ' instead of a .RB ` - ', the option is restored to its default value. -The \fB-version\fP and \fB-help\fP options are interpreted even if \fIxterm\fP cannot -open the display, and are useful for testing and configuration scripts: +The \fB-version\fP and \fB-help\fP options are interpreted even if \fIxterm\fP +cannot open the display, and are useful for testing and configuration scripts: .TP 8 .B -version This causes \fIxterm\fP to print a version number to the standard output. .TP 8 .B -help -This causes \fIxterm\fP to print out a verbose message describing its options. -The message is written to the standard error. -. +This causes \fIxterm\fP to print out a verbose message describing its options, +one per line. +The message is written to the standard output. +\fIXterm\fP generates this message, sorting it and noting whether +a "\fB-option\fP" +or a "\fB+option\fP" turns the feature on or off, +since some features historically have been one or the other. +\fIXterm\fP generates a concise help message (multiple options per line) +when an unknown option is used, e.g., +.RS + \fBxterm -z\fP +.RE +.IP +If the logic for a particular option such as logging is not compiled +into \fIxterm\fP, the help text for that option also is not displayed +by the \fB-help\fP option. +. +.PP +One parameter (after all options) may be given. +That overrides \fIxterm\fP's built-in choice of shell program. +Normally \fIxterm\fP checks the SHELL variable. +If that is not set, \fIxterm\fP tries to use the shell program specified +in the password file. +If that is not set, \fIxterm\fP uses \fI/bin/sh\fP. +If the parameter names an executable file, \fIxterm\fP uses that instead. +The parameter must be an absolute path, or name a file found on the user's +PATH (and thereby construct an absolute path). +The \fB-e\fP option cannot be used with this parameter since +it uses all parameters following the option. .PP The other options are used to control the appearance and behavior. -Not all options are necessarily configured into your copy of \fIxterm\fP. +Not all options are necessarily configured into your copy of \fIxterm\fP: .TP 8 .B -132 Normally, the VT102 DECCOLM escape sequence that switches between 80 and @@ -246,13 +283,13 @@ This option disables active icon support if that feature was compiled into \fIxterm\fP. This is equivalent to setting the \fIvt100\fP resource -\fBactiveIcon\fP to FALSE. +\fBactiveIcon\fP to ``false''. .TP 8 .B +ai This option enables active icon support if that feature was compiled into \fIxterm\fP. This is equivalent to setting the \fIvt100\fP resource -\fBactiveIcon\fP to TRUE. +\fBactiveIcon\fP to ``true''. .TP 8 .B -aw This option indicates that auto-wraparound should be allowed. @@ -267,6 +304,7 @@ .BI -b " number" This option specifies the size of the inner border (the distance between the outer edge of the characters and the window border) in pixels. +That is the \fIvt100\fP \fIinternalBorder\fP resource. The default is 2. .TP 8 @@ -279,40 +317,43 @@ This overrides the \fBcursorBlink\fR resource. .TP 8 .BI -bcf " milliseconds" -time text cursor is off when blinking +set the amount of time text cursor is off when blinking via the +\fIcursorOffTime\fP resource. .TP 8 .BI -bcn " milliseconds" -time text cursor is on when blinking +set the amount of time text cursor is on when blinking via the +\fIcursorOffTime\fP resource. .TP 8 .B "-bdc" -Set the \fIvt100\fP resource \fBcolorBDMode\fR to FALSE, +Set the \fIvt100\fP resource \fBcolorBDMode\fR to ``false'', disabling the display of characters with bold attribute as color .TP 8 .B "+bdc" -Set the \fIvt100\fP resource \fBcolorBDMode\fR to TRUE, +Set the \fIvt100\fP resource \fBcolorBDMode\fR to ``true'', enabling the display of characters with bold attribute as color rather than bold .TP 8 .B "-cb" -Set the \fIvt100\fP resource \fBcutToBeginningOfLine\fP to FALSE. +Set the \fIvt100\fP resource \fBcutToBeginningOfLine\fP to ``false''. .TP 8 .B "+cb" -Set the \fIvt100\fP resource \fBcutToBeginningOfLine\fP to TRUE. +Set the \fIvt100\fP resource \fBcutToBeginningOfLine\fP to ``true''. .TP 8 .B "-cc \fIcharacterclassrange\fP:\fIvalue\fP[,...]" This sets classes indicated by the given ranges for using in selecting by words. See the section specifying character classes. +and discussion of the \fIcharClass\fP resource. .TP 8 .B "-cjk_width" Set the \fBcjkWidth\fP resource to ``true''. When turned on, characters with East Asian Ambiguous (A) category in UTR 11 have a column width of 2. -Othrwise, they have a column width of 1. +Otherwise, they have a column width of 1. This may be useful for some legacy CJK text terminal-based programs assuming box drawings and others to have a column width of 2. -It also has to be turned on when you specify a truetype +It also has to be turned on when you specify a TrueType CJK double-width (bi-width/monospace) font either with \fB-fa\fP at the command line or \fBfaceName\fP resource. The default is ``false'' @@ -327,6 +368,7 @@ .TP 8 .B "-cm" This option disables recognition of ANSI color-change escape sequences. +It sets the \fIcolorMode\fP resource to ``false''. .TP 8 .B "+cm" This option enables recognition of ANSI color-change escape sequences. @@ -335,14 +377,17 @@ .B "-cn" This option indicates that newlines should not be cut in line-mode selections. +It sets the \fIcutNewline\fP resource to ``false''. .TP 8 .B +cn This option indicates that newlines should be cut in line-mode selections. +It sets the \fIcutNewline\fP resource to ``true''. .TP 8 .BI -cr " color" This option specifies the color to use for text cursor. The default is to use the same foreground color that is used for text. +It sets the \fIcursorColor\fP resource according to the parameter. .TP 8 .B -cu This option indicates that \fIxterm\fP should work around a bug in the @@ -369,9 +414,11 @@ the Tektronix emulator foreground and background colors, its text cursor color and highlight color. +The option sets the \fIdynamicColors\fP option to ``false''. .TP 8 .B "+dc" This option enables the escape sequence to change dynamic colors. +The option sets the \fIdynamicColors\fP option to ``true''. .TP 8 .BI -e " program \fP[ \fIarguments \fP.\|.\|. ]\fI" This option specifies the program (and its command line arguments) to be @@ -383,7 +430,7 @@ .TP 8 .BI -en " encoding" This option determines the encoding on which \fIxterm\fP runs. -It corresponds to the \fBlocale\fR resource. +It sets the \fBlocale\fR resource. Encodings other than UTF-8 are supported by using \fIluit\fR. The \fB-lc\fR option should be used instead of \fB-en\fR for systems with locale support. @@ -407,19 +454,23 @@ .BI -fbb This option indicates that \fIxterm\fP should compare normal and bold fonts bounding boxes to ensure they are compatible. +It sets the \fBfreeBoldBox\fP resource to ``false''. .TP 8 .BI +fbb This option indicates that \fIxterm\fP should not compare normal and bold fonts bounding boxes to ensure they are compatible. +It sets the \fBfreeBoldBox\fP resource to ``true''. .TP 8 .BI -fbx This option indicates that \fIxterm\fP should not assume that the normal and bold fonts have VT100 line-drawing characters. If any are missing, \fIxterm\fP will draw the characters directly. +It sets the \fBforceBoxChars\fP resource to ``false''. .TP 8 .BI +fbx This option indicates that \fIxterm\fP should assume that the normal and bold fonts have VT100 line-drawing characters. +It sets the \fBforceBoxChars\fP resource to ``true''. .TP 8 .BI -fd " pattern" This option sets the pattern for double-width fonts selected from the FreeType @@ -464,14 +515,17 @@ selected or otherwise highlighted text. If not specified, reverse video is used. +See the discussion of the \fBhighlightColor\fP resource. .TP 8 .BI -hf This option indicates that HP Function Key escape codes should be generated for function keys. +It sets the \fBhpFunctionKeys\fP resource to ``true''. .TP 8 .BI +hf This option indicates that HP Function Key escape codes should not be generated for function keys. +It sets the \fBhpFunctionKeys\fP resource to ``false''. .TP 8 .BI -hold Turn on the \fBhold\fP resource, i.e., @@ -493,7 +547,9 @@ a reference, if available. .TP 8 .B -im -Turn on the \fBuseInsertMode\fP resource. +Turn on the \fBuseInsertMode\fP resource, +which forces use of insert mode by adding appropriate entries to the TERMCAP +environment variable. .TP 8 .B +im Turn off the \fBuseInsertMode\fP resource. @@ -505,6 +561,7 @@ .TP 8 .B -j This option indicates that \fIxterm\fP should do jump scrolling. +It corresponds to the \fBjumpScroll\fP resource. Normally, text is scrolled one line at a time; this option allows \fIxterm\fP to move multiple lines at a time so that it does not fall as far behind. @@ -527,6 +584,12 @@ .B +k8 This option resets the \fBallowC1Printable\fP resource. .TP 8 +.BI -kt " keyboardtype" +This option sets the \fBkeyboardType\fP resource. +Possible values include: ``hp'', ``sco'', ``sun'' and ``vt220''. +The default value ``unknown'', +causes the corresponding resource to be ignored. +.TP 8 .B -l Turn logging on. Normally logging is not supported, due to security concerns. @@ -591,7 +654,7 @@ programs in a window, and if \fBloginShell\fP were not ignored, the result of ~/.profile might interfere with that. .IP -If you do want the effect of \fB-ls\fP and \fB-a\fP simultaneously, you +If you do want the effect of \fB-ls\fP and \fB-e\fP simultaneously, you may get away with something like .RS 15 xterm -e /bin/bash -l -c "my command here" @@ -626,10 +689,20 @@ Turn on the \fBmessages\fP resource, i.e., allow write access to the terminal. .TP 8 +.B "-mk_width" +Set the \fBmkWidth\fP resource to ``true''. +This makes \fIxterm\fP use a built-in version of the wide-character width +calculation. +The default is ``false'' +.TP 8 +.B "+mk_width" +Reset the \fBmkWidth\fP resource. +.TP 8 .BI -ms " color" This option specifies the color to be used for the pointer cursor. The default is to use the foreground color. +This sets the \fIpointerColor\fP resource. .TP 8 .BI -nb " number" This option specifies the number of characters from the right end of a line @@ -778,6 +851,17 @@ .B +t This option indicates that \fIxterm\fP should start in VT102 mode. .TP 8 +.B -tb +This option, corresponding to the \fBtoolBar\fR resource, +indicates that \fIxterm\fR should display a toolbar (or menubar) +at the top of its window. +The buttons in the toolbar correspond to +the popup menus, e.g., control/left/mouse for "Main Options". +.TP 8 +.B +tb +This option indicates that \fIxterm\fR should +not set up a toolbar. +.TP 8 .BI -ti " term_id" Specify the name used by \fIxterm\fP to select the correct response to terminal ID queries. @@ -870,7 +954,7 @@ responsibility to catch subsequent terminal size changes. .TP 8 .B +wf -This option indicates that \fIxterm\fP show not wait before starting the +This option indicates that \fIxterm\fP should not wait before starting the subprocess. .TP 8 .B -ziconbeep \fIpercent\fP @@ -956,11 +1040,11 @@ .TP 8 .B -bd \fIcolor\fP This option specifies the color to use for the border of the window. -The default is ``black.'' +\fIxterm\fP uses the X Toolkit default, which is ``XtDefaultForeground''. .TP 8 .B -bg \fIcolor\fP This option specifies the color to use for the background of the window. -The default is ``white.'' +The default is ``XtDefaultBackground.'' .TP 8 .B -bw \fInumber\fP This option specifies the width in pixels of the border surrounding the window. @@ -971,7 +1055,7 @@ .B -fg \fIcolor\fP This option specifies the color to use for displaying text. The default is -``black.'' +``XtDefaultForeground.'' .TP 8 .B -fn \fIfont\fP This option specifies the font to be used for displaying normal text. @@ -1037,6 +1121,7 @@ .B "hpFunctionKeys (\fPclass\fB HpFunctionKeys)" Specifies whether or not HP Function Key escape codes should be generated for function keys instead of standard escape sequences. +See also the \fBkeyboardType\fP resource. .TP 8 .B "iconGeometry (\fPclass\fB IconGeometry)" Specifies the preferred size and position of the application when iconified. @@ -1046,18 +1131,44 @@ Specifies the icon name. The default is the application name. .TP 8 +.B "keyboardType (\fPclass\fB KeyboardType)" +Enables one (or none) of the various keyboard-type resources: +\fBhpFunctionKeys\fP, +\fBscoFunctionKeys\fP, +\fBsunFunctionKeys\fP and +\fBsunKeyboard\fP. +The resource's value should be one of the corresponding strings +hp, sco, sun or vt220. +The individual resources are provided for legacy support; +this resource is simpler to use. +.TP 8 +.B "maxBufSize (\fPclass\fB MaxBufSize)" +Specify the maximum size of the input buffer. +The default is 32768. +You cannot set this to a value less than the \fBminBufSize\fR resource. +It will be increased as needed to make that value evenly divide this one. +.IP +On some systems you may want to increase one or both of the +\fBmaxBufSize\fP and +\fBminBufSize\fP resource values to achieve better performance +if the operating system prefers larger buffer sizes. +.TP 8 .B "messages (\fPclass\fB Messages)" Specifies whether write access to the terminal is allowed initially. See .BR mesg (1). The default is ``true''. .TP 8 -.B "ptyHandshake (\fPclass\fBPtyHandshake) +.B "minBufSize (\fPclass\fB MinBufSize)" +Specify the minimum size of the input buffer, i.e., the amount of data +that \fIxterm\fR requests on each read. +The default is 4096. +You cannot set this to a value less than 64. +.TP 8 +.B "ptyHandshake (\fPclass\fB PtyHandshake) If ``true'', \fIxterm\fP will perform handshaking during initialization to ensure that the parent and child processes update the \fButmp\fP and \fBstty\fP state. -Platforms with newer pseudo-terminal interfaces do not require this feature; -normally it is not configured. The default is ``true''. .TP 8 .B "ptyInitialErase (\fPclass\fB PtyInitialErase)" @@ -1084,6 +1195,7 @@ .B "scoFunctionKeys (\fPclass\fB ScoFunctionKeys)" Specifies whether or not SCP Function Key escape codes should be generated for function keys instead of standard escape sequences. +See also the \fBkeyboardType\fP resource. .TP 8 .B "sessionMgt (\fPclass\fB SessionMgt)" If the value of this resource is ``true'', @@ -1094,6 +1206,7 @@ .B "sunFunctionKeys (\fPclass\fB SunFunctionKeys)" Specifies whether or not Sun Function Key escape codes should be generated for function keys instead of standard escape sequences. +See also the \fBkeyboardType\fP resource. .TP 8 .B "sunKeyboard (\fPclass\fB SunKeyboard)" Specifies whether or not Sun/PC keyboard layout should be assumed rather @@ -1114,6 +1227,7 @@ Normally these bindings do not conflict with the use of the Meta key as described for the \fBeightBitInput\fP resource. If they do, note that the PC-style bindings are evaluated first. +See also the \fBkeyboardType\fP resource. .TP 8 .B "termName (\fPclass\fB TermName)" Specifies the terminal type name to be set in the TERM environment variable. @@ -1122,6 +1236,11 @@ Specifies a string that may be used by the window manager when displaying this application. .TP 8 +.B "toolBar (\fPclass\fB ToolBar)" +Specifies whether or not the toolbar should be displayed. +The default is +``true.'' +.TP 8 .B "ttyModes (\fPclass\fB TtyModes)" Specifies a string containing terminal setting keywords and the characters to which they may be bound. @@ -1165,7 +1284,7 @@ .TP 8 .B "utmpDisplayId (\fPclass\fB UtmpDisplayId)" Specifies whether or not \fIxterm\fP should try to record the display -identifier (display number and screen number) as well as the hostname in +identifier (display number and screen number) as well as the hostname in the system \fIutmp\fP log file. The default is ``true.'' .TP 8 @@ -1279,7 +1398,7 @@ .B "background (\fPclass\fB Background)" Specifies the color to use for the background of the window. The default is -``white.'' +``XtDefaultBackground.'' .TP 8 .B "bellOnReset (\fPclass\fB BellOnReset)" Specifies whether to sound a bell when doing a hard reset. @@ -1382,7 +1501,7 @@ [\fIlow\fP-]\fIhigh\fP:\fIvalue\fP. These are used in determining which sets of characters should be treated the same when doing cut and paste. -See the CHARACTER CLASSES section. +See the \fBCHARACTER CLASSES\fP section. .TP 8 .B "cjkWidth (\fPclass\fB CjkWidth)" Specifies whether \fIxterm\fP should follow @@ -1463,8 +1582,8 @@ 232 through 255 to make a grayscale ramp. .TP 8 .B "colorAttrMode (\fPclass\fB ColorAttrMode)" -Specifies whether ``colorBD'', ``colorBL'', ``colorUL'', and -``colorRV'' should override ANSI colors. +Specifies whether \fBcolorBD\fP, \fBcolorBL\fP, \fBcolorRV\fP, and +\fBcolorUL\fP should override ANSI colors. If not, these are displayed only when no ANSI colors have been set for the corresponding position. The default is ``false.'' @@ -1540,7 +1659,10 @@ .TP 8 .B "cursorColor (\fPclass\fB CursorColor)" Specifies the color to use for the text cursor. -The default is ``black.'' +The default is ``XtDefaultForeground.'' +\fIXterm\fP attempts to keep this color from being the same as the background +color, since it draws the cursor by filling the background of a text cell. +The same restriction applies to control sequences which may change this color. .TP 8 .B "cursorOffTime (\fPclass\fB CursorOffTime)" Specifies the duration of the "off" part of the cursor blink cycle-time @@ -1588,16 +1710,22 @@ .TP 8 .B "eightBitInput (\fPclass\fB EightBitInput\fP)" If ``true'', Meta characters -(a character combined with the \fIkeys\fP modifier key) +(a single-byte character combined with the \fIkeys\fP modifier key) input from the keyboard are presented as a single character with the eighth bit turned on. The terminal is put into 8-bit mode. If ``false'', Meta characters are converted into a two-character sequence with the character itself preceded by ESC. -The terminal is put into 7-bit mode. +On startup, \fIxterm\fP tries to put the terminal into 7-bit mode. The \fBmetaSendsEscape\fP resource may override this. The default is ``true.'' .IP +Generally keyboards do not have a key labeled "Meta", +but "Alt" keys are common, and they are conventionally used for "Meta". +If they were synonymous, it would have been reasonable to name this +resource "altSendsEscape", reversing its sense. +For more background on this, see the \fBmeta\fP function in curses. +.IP Note that the \fIAlt\fP key is not necessarily the same as the \fIMeta\fP modifier. \fIxmodmap\fP lists your key modifiers. @@ -1697,13 +1825,22 @@ .TP 8 .B "forceBoxChars (\fPclass\fB ForceBoxChars)" Specifies whether \fIxterm\fP should assume the normal and bold fonts -have VT100 line-drawing characters. -The fixed-pitch fonts used by \fIxterm\fP +have VT100 line-drawing characters: +.RS +.TP 5 +- +The fixed-pitch ISO-8859-*-encoded fonts used by \fIxterm\fP normally have the VT100 line-drawing glyphs in cells 1-31. Other fixed-pitch fonts may be more attractive, but lack these glyphs. -If ``false'', \fIxterm\fP will check for missing glyphs in cells 1-31 -and make line-drawing characters directly. -If ``true'', \fIxterm\fP uses whatever is in cells 1-31 without checking. +.TP +- +When using an ISO-10646-1 font and the \fBwideChars\fP resource is true, +\fIxterm\fP uses the Unicode glyphs which match the VT100 line-drawing glyphs. +.RE +.IP +If ``false'', \fIxterm\fP checks for missing glyphs in the font +and makes line-drawing characters directly as needed. +If ``true'', \fIxterm\fP uses whatever is in the font without checking. The default is ``false.'' .TP 8 .B "foreground (\fPclass\fB Foreground)" @@ -1712,7 +1849,7 @@ class name instead of the instance name is an easy way to have everything that would normally appear in the text color change color. The default -is ``black.'' +is ``XtDefaultForeground.'' .TP 8 .B "freeBoldBox (\fPclass\fB freeBoldBox)" Specifies whether \fIxterm\fP should assume the bounding boxes for @@ -1772,9 +1909,8 @@ .B "iconBorderWidth (\fPclass\fB BorderWidth)" Specifies the border width for the active icon window if this feature is compiled into \fIxterm\fR. -The default is 0 (no border). -Not all window -managers will make the border visible. +The default is 2. +Not all window managers will make the border visible. .TP 8 .B "iconFont (\fPclass\fB IconFont)" Specifies the font for the miniature active icon window, if this feature @@ -1785,6 +1921,10 @@ Specifies the number of pixels between the characters and the window border. The default is 2. .TP 8 +.B "italicULMode (\fPclass\fB ColorAttrMode)" +Specifies whether characters with the underline attribute should be displayed +in an italic font or as underlined characters. +.TP 8 .B "jumpScroll (\fPclass\fB JumpScroll)" Specifies whether or not jump scroll should be used. This corresponds to the VT102 DECSCLM private mode. @@ -1828,7 +1968,8 @@ .TP .I checkfont If mini-luit is compiled-in, \fIxterm\fR will check if a Unicode font has -been specified. If so, it checks if the character encoding for the +been specified. +If so, it checks if the character encoding for the current locale is POSIX, Latin-1 or Latin-9, uses the appropriate mapping to support those with the Unicode font. For other encodings, \fIxterm\fR assumes that UTF-8 encoding is required. @@ -1886,6 +2027,11 @@ to the \fBeightBitInput\fP resource. The default is ``false.'' .TP 8 +.B "mkWidth (\fPclass\fB MkWidth)" +Specifies whether \fIxterm\fP should use a built-in version of the wide +character width calculation. +The default is ``false.'' +.TP 8 .B "modifyCursorKeys (\fPclass\fB ModifyCursorKeys\fP)" Tells how to handle the special case where Control-, Shift-, Alt- or Meta-modifiers are used to add a parameter to @@ -1924,6 +2070,57 @@ codes for PF1 to PF4. The default is ``false.'' .TP 8 +.B "on2Clicks (\fPclass\fB On2Clicks)" +.TP +.B "on3Clicks (\fPclass\fB On3Clicks)" +.TP +.B "on4Clicks (\fPclass\fB On4Clicks)" +.TP +.B "on5Clicks (\fPclass\fB On5Clicks)" +Specify selection behavior in response to multiple mouse clicks. +A single mouse click is always interpreted as described in +the \fBSELECTION\fP section (see \fBPOINTER USAGE\fP). +Multiple mouse clicks (using the button which activates the \fBselect-start\fP +action) are interpreted according to the resource values of +\fBon2Clicks\fP, etc. +The resource value can be one of these: +.RS +.TP 3 +word +Select a ``word'' as determined by the \fBcharClass\fP resource. +See the \fBCHARACTER CLASSES\fP section. +.TP +line +Select a line (counting wrapping). +.TP +group +Select a group of adjacent lines (counting wrapping). +The selection stops on a blank line. +.TP +page +Select all visible lines, i.e., the page. +.TP +all +Select all lines, i.e., including the saved lines. +.TP +regex +Select a ``word'' as determined by the regular expression which +follows in the resource value. +.TP +none +No selection action is associated with this resource. +\fIxterm\fP interprets it as the end of the list. +For example, you may use it to disable triple (and higher) clicking +by setting \fBon3Clicks\fP to ``none''. +.RE +.IP +The default values for \fBon2Clicks\fP and \fBon3Clicks\fP are +``word'' and ``line'', respectively. +There is no default value for \fBon4Clicks\fP or \fBon5Clicks\fP, +making those inactive. +On startup, \fIxterm\fP determines the maximum number of clicks +by the \fBon\fP\fIX\fP\fBClicks\fP resource values which are set. +.TP 8 .B "pointerColor (\fPclass\fB PointerColor)" Specifies the foreground color of the pointer. The default is @@ -1939,7 +2136,7 @@ The default is ``xterm.'' .TP 8 .B "popOnBell (\fPclass\fB PopOnBell)" -Specifies whether the window whould be raised when Control-G is +Specifies whether the window would be raised when Control-G is received. The default is ``false.'' .TP 8 @@ -1963,7 +2160,7 @@ .I xterm will open a pipe when the first MC (Media Copy) command is initiated. -The default is ``lpr.'' +The default is a blank string. If the resource value is given as a blank string, the printer is disabled. .TP 8 .B "printerControlMode (\fPclass\fB PrinterControlMode)" @@ -2035,6 +2232,13 @@ The default is ``false.'' .TP 8 +.B "scrollBarBorder (\fPclass\fB ScrollBarBorder)" +Specifies the width of the scrollbar border. +Note that this is drawn to overlap the border of the \fIxterm\fP window. +Modifying the scrollbar's border affects only the line between the VT100 +widget and the scrollbar. +The default value is 1. +.TP 8 .B "scrollKey (\fPclass\fB ScrollCond)" Specifies whether or not pressing a key should automatically cause the scrollbar to go to the bottom of the scrolling region. @@ -2051,6 +2255,14 @@ Specifies whether or not output to the terminal should automatically cause the scrollbar to go to the bottom of the scrolling region. The default is ``true.'' +.TP +.B "selectToClipboard (\fPclass\fB SelectToClipboard)" +Tells \fIxterm\fP whether to use the PRIMARY or CLIPBOARD for +SELECT tokens in the selection mechanism. +The \fBset-select\fP action can change this at runtime, +allowing the user to work with programs that handle only one of these +mechanisms. +The default is ``false'', which tells it to use PRIMARY. .TP 8 .B "shiftFonts (\fPclass\fB ShiftFonts)" Specifies whether to enable the actions @@ -2118,12 +2330,6 @@ sequences (also known as private modes) 1047, 1048 and 1049 which have the same effect as the original 47 control sequence. The default for this resource is ``false.'' -.\" -- resource does not work properly (forms/layout issues) -.\".TP 8 -.\".B "toolBar (\fPclass\fB ToolBar)" -.\"Specifies whether or not the toolbar should be displayed. -.\"The default is -.\"``false.'' .TP 8 .B "translations (\fPclass\fB Translations)" Specifies the key and button bindings for menus, selections, ``programmed @@ -2158,9 +2364,10 @@ If you set this resource, \fIxterm\fP also sets the \fBwideChars\fP resource as a side-effect. The resource is an integer, expected to range from 0 to 3: .RS -.TP +.TP 3 0 UTF-8 mode is initially off. +The command-line option \fB+u8\fP sets the resource to this value. Escape sequences for turning UTF-8 mode on/off are allowed. .TP 1 @@ -2179,20 +2386,49 @@ .RE .IP If you want to set the value of \fButf8\fP, it should be in this range. -Other nonzero values are treated the same a ``1'', +Other nonzero values are treated the same as ``1'', i.e., UTF-8 mode is initially on, and escape sequences for turning UTF-8 mode on/off are allowed. .TP 8 .B "utf8Fonts (\fPclass\fB Utf8Fonts)" See the discussion of the \fBlocale\fP resource. .TP 8 +.B "utf8Latin1 (\fPclass\fB Utf8Latin1)" +If true, +allow an ISO-8859-1 \fInormal\fP +font to be combined with an ISO-10646 font if the latter is given +via the \fB-fw\fP option or its corresponding resource value. +The default is ``false.'' +.TP 8 +.B "utf8Title (\fPclass\fB Utf8Title)" +Applications can set \fIxterm\fP's title by writing a control sequence. +Normally this control sequence follows the VT220 convention, +which encodes the string in ISO-8859-1 and +allows for an 8-bit string terminator. +If \fIxterm\fP is started in a UTF-8 locale, +it translates the ISO-8859-1 string to UTF-8 to work with the X libraries +which assume the string is UTF-8. +.IP +However, some users may wish to write a title string encoded in UTF-8. +Set this resource to ``true'' to allow UTF-8 encoded title strings. +That cancels the translation to UTF-8, +allowing UTF-8 strings to be displayed as is. +.IP +The default is ``false.'' +.TP 8 .B "veryBoldColors (\fPclass\fB VeryBoldColors)" Specifies whether to combine video attributes with colors specified by -\fBcolorBD\fR, \fBcolorBL\fR and \fBcolorUL\fR. +\fBcolorBD\fR, \fBcolorBL\fR, \fBcolorRV\fR and \fBcolorUL\fR. The resource value is the sum of values for each attribute: +.RS 10 +.nf +1 for reverse, 2 for underline, 4 for bold and 8 for blink. +.fi +.RE +.IP The default is ``0.'' .TP 8 .B "visualBell (\fPclass\fB VisualBell)" @@ -2322,6 +2558,9 @@ .B "num-lock (\fPclass\fB SmeBSB)" This entry invokes the \fBset-num-lock(toggle)\fP action. .TP 8 +.B "alt-esc (\fPclass\fB SmeBSB)" +This entry invokes the \fBalt-sends-escape(toggle)\fP action. +.TP 8 .B "meta-esc (\fPclass\fB SmeBSB)" This entry invokes the \fBmeta-sends-escape(toggle)\fP action. .TP 8 @@ -2489,6 +2728,9 @@ .TP 8 .B "utf8-mode (\fPclass\fB SmeBSB)" This entry invokes the \fBset-utf8-mode(s)\fP action. +.TP 8 +.B "utf8-title (\fPclass\fB SmeBSB)" +This entry invokes the \fBset-utf8-title(s)\fP action. . .PP The \fItekMenu\fP has the following entries: @@ -2547,6 +2789,7 @@ .I xterm allows you to select text and copy it within the same or other windows. . +.SS "SELECTION" .PP The selection functions are invoked when the pointer buttons are used with no modifiers, and when they are used with the ``shift'' key. @@ -2560,10 +2803,20 @@ and releasing the button. The selected text is highlighted and is saved in the global cut buffer and made the PRIMARY selection when the button is released. +Normally (but see the discussion of \fBon2Clicks\fP, etc): +.RS +.TP 3 +- Double-clicking selects by words. +.TP +- Triple-clicking selects by lines. +.TP +- Quadruple-clicking goes back to characters, etc. +.RE +.PP Multiple-click is determined by the time from button up to button down, so you can change the selection unit in the middle of a selection. Logical words and lines selected by double- or triple-clicking may wrap @@ -2606,6 +2859,7 @@ The terminal emulator and other text programs should be treating it as if it were a text file, i.e., the text is delimited by new lines. . +.SS "SCROLLING" .PP The scroll region displays the position and amount of text currently showing in the window (highlighted) relative to the amount of text actually saved. @@ -2624,6 +2878,7 @@ Clicking button two moves the display to a position in the saved text that corresponds to the pointer's position in the scrollbar. . +.SS "TEKTRONIX POINTER" .PP Unlike the VT102 window, the Tektronix window does not allow the copying of text. @@ -2665,6 +2920,7 @@ name in parenthesis. . .\" ************************************************************************ +.SS "Main Options" .PP The \fIxterm\fP \fImainMenu\fP pops up when the ``control'' key and pointer button one are pressed in a window. @@ -2674,6 +2930,10 @@ Commands for managing X events: .RS .TP +Toolbar +Clicking on the "Toolbar" menu entry hides the toolbar if it is visible, +and shows it if it is not. +.TP Secure Keyboard (securekbd) The .B Secure Keyboard @@ -2792,6 +3052,7 @@ .PP . .\" ************************************************************************ +.SS "VT Options" .PP The .I vtMenu @@ -2897,13 +3158,14 @@ resource. . .TP -Enable Curses Emulation (cursesemul) -Enable (or disable) a workaround for the so-called "curses bug". +Select to Clipboard (selectToClipboard) +Tell \fIxterm\fP whether to use the PRIMARY or CLIPBOARD +for SELECT tokens in the \fBtranslations\fP resource which +maps keyboard and mouse actions to select/paste actions. This corresponds to the -.B -cu -option and the -.B curses +.B selectToClipboard resource. +There is no corresponding command-line option. . .TP Enable Visual Bell (visualbell) @@ -3033,8 +3295,11 @@ .RE .PP . +.SS "VT Fonts" .PP -The \fIfontMenu\fP sets the font used in the VT102 window, +The \fIfontMenu\fP pops up when +when the ``control'' key and pointer button three are pressed in a window. +It sets the font used in the VT102 window, or modifies the way the font is specified or displayed. There are three sections. .PP @@ -3091,6 +3356,7 @@ Line-Drawing Characters (font-linedrawing) When set, tells \fIxterm\fP to draw its own line-drawing characters. Otherwise it relies on the font containing these. +Compare to the \fBforceBoxChars\fP resource. .TP Doublesized Characters (font-doublesize) When set, \fIxterm\fP may ask the font server to produce scaled versions @@ -3113,6 +3379,7 @@ text from an application which does not follow the locale settings. .RE . +.SS "TEK Options" .PP The .I tekMenu @@ -3228,9 +3495,9 @@ . . .SH "CHARACTER CLASSES" -Clicking the left mouse button twice in rapid succession will cause all -characters of the same class (e.g., letters, white space, punctuation) to be -selected. +Clicking the left mouse button twice in rapid succession +(double-clicking) causes all characters of the same class +(e.g., letters, white space, punctuation) to be selected as a ``word''. Since different people have different preferences for what should be selected (for example, should filenames be selected as a whole or only the separate subnames), the default mapping can be overridden through the use @@ -3251,10 +3518,7 @@ . .PP The default table starts as follows - -.sp -.in +8 -.ft C \" Courier -.nf +.DS static int charClass[256] = { /\(** NUL SOH STX ETX EOT ENQ ACK BEL */ 32, 1, 1, 1, 1, 1, 1, 1, @@ -3321,10 +3585,7 @@ 48, 48, 48, 48, 48, 48, 48, 247, /\(** o/ u` u' u^ u: y' P y: */ 48, 48, 48, 48, 48, 48, 48, 48}; -.fi -.ft P -.in -8 -.sp +.DE For example, the string ``33:48,37:48,45-47:48,38:48'' indicates that the exclamation mark, percent sign, dash, period, slash, and ampersand characters should be treated the same way as characters and numbers. @@ -3347,6 +3608,9 @@ This action set or toggles the \fBallowSendEvents\fP resource and is also invoked by the \fBallowsends\fP entry in \fImainMenu\fP. .TP 8 +.B "alt-sends-escape()" +This action toggles the state of the \fBeightBitInput\fP resource. +.TP 8 .B "bell([\fIpercent\fP])" This action rings the keyboard bell at the specified percentage above or below the base volume. @@ -3367,7 +3631,6 @@ Expands the word before cursor by searching in the preceding text on the screen and in the scrollback buffer for words starting with that abbreviation. -By default bound to \fBMeta\ /\fP. Repeating \fBdabbrev-expand()\fP several times in sequence searches for an alternative expansion by looking farther back. Lack of more matches is signaled by a \fBbeep()\fP. @@ -3377,7 +3640,12 @@ Consecutive identical expansions are ignored. The word here is defined as a sequence of non-whitespace characters. This feature partially emulates the behavior -of `dynamic abbreviation' expansion in Emacs (also bound there to M-/). +of `dynamic abbreviation' expansion in Emacs (bound there to M-/). +Here is a resource setting for \fIxterm\fP which will do the same thing: +.DS +*VT100*translations: #override \\n\\\& + Meta /:dabbrev-expand() +.DE .TP 8 .B "deiconify()" Changes the window state back to normal, if it was iconified. @@ -3414,9 +3682,17 @@ .B "insert-eight-bit()" This action inserts an eight-bit (Meta) version of the character or string associated with the key that was pressed. +This only applies to single-byte values. The exact action depends on the value of the \fBmetaSendsEscape\fP and the \fBeightBitInput\fP resources. +The \fBmetaSendsEscape\fP resource is tested first. +.IP +The term "eight-bit" is misleading: +\fIxterm\fP checks if the key's value is less than 128. +If so, \fIxterm\fP adds 128 to the value, setting its eighth bit. +Otherwise \fIxterm\fP sends an ESC byte before the key. +In other applications' documentation, that is referred to as a "meta key". .TP 8 .B "insert-selection(\fIsourcename\fP [, ...])" This action inserts the string found in the selection or cutbuffer indicated @@ -3430,6 +3706,9 @@ .TP 8 .B "insert-seven-bit()" This action is a synonym for \fBinsert()\fP +The term "seven-bit" is misleading: +it only implies that \fIxterm\fP does not try to add 128 to the key's value +as in \fBinsert-eight-bit()\fP. .TP 8 .B "interpret(\fIcontrol-sequence\fP)" Interpret the given control sequence locally, i.e., without passing it to @@ -3655,6 +3934,10 @@ This action toggles the \fBscrollbar\fP resource and is also invoked by the \fBscrollbar\fP entry in \fIvtMenu\fP. .TP 8 +.B "set-select(\fIon/off/toggle\fP)" +This action toggles the \fBselectToClipboard\fP resource and is also invoked by +the \fBselectToClipboard\fP entry in \fIvtMenu\fP. +.TP 8 .B "set-sco-function-keys(\fIon/off/toggle\fP)" This action toggles the \fBscoFunctionKeys\fP resource and is also invoked by the \fBscoFunctionKeys\fP entry in \fImainMenu\fP. @@ -3685,7 +3968,6 @@ This action toggles the \fBtiteInhibit\fP resource, which controls switching between the alternate and current screens. .TP 8 -.\" should toggle "toolBar" resource (see note). .B "set-toolbar(\fIon/off/toggle\fP)" This action toggles the toolbar feature and is also invoked by the \fBtoolbar\fP entry in \fImainMenu\fP. @@ -3694,6 +3976,10 @@ This action toggles the \fButf8\fP resource and is also invoked by the \fButf8-mode\fP entry in \fIfontMenu\fP. .TP 8 +.B "set-utf8-title(\fIon/off/toggle\fP)" +This action toggles the \fButf8Title\fP resource and is also invoked by +the \fButf8-title\fP entry in \fIfontMenu\fP. +.TP 8 .B "set-visibility(\fIvt/tek\fP,\fIon/off/toggle\fP)" This action controls whether or not the \fIvt\fP or \fItek\fP windows are visible. @@ -3798,17 +4084,15 @@ This action sends the indicated graphics input code. . .PP -The default bindings in the VT102 window are: -.sp -.in +4 +The default bindings in the VT102 window use the SELECT token, +which is set by the \fBselectToClipboard\fP resource: +.DS .ta 2.5i -.ft C \" Courier -.nf Shift Prior:scroll-back(1,halfpage) \\n\\\& Shift Next:scroll-forw(1,halfpage) \\n\\\& Shift Select:select-cursor-start() \\\& - select-cursor-end(PRIMARY, CUT_BUFFER0) \\n\\\& - Shift Insert:insert-selection(PRIMARY, CUT_BUFFER0) \\n\\\& + select-cursor-end(SELECT, CUT_BUFFER0) \\n\\\& + Shift Insert:insert-selection(SELECT, CUT_BUFFER0) \\n\\\& Shift~Ctrl KP_Add:larger-vt-font() \\n\\\& Shift Ctrl KP_Add:smaller-vt-font() \\n\\\& Shift KP_Subtract:smaller-vt-font() \\n\\\& @@ -3826,7 +4110,7 @@ ! @Num_Lock Ctrl :popup-menu(vtMenu) \\n\\\& ~Ctrl ~Meta :ignore() \\n\\\& Meta :clear-saved-lines() \\n\\\& - ~Ctrl ~Meta :insert-selection(PRIMARY, CUT_BUFFER0) \\n\\\& + ~Ctrl ~Meta :insert-selection(SELECT, CUT_BUFFER0) \\n\\\& !Ctrl :popup-menu(fontMenu) \\n\\\& !Lock Ctrl :popup-menu(fontMenu) \\n\\\& !Lock Ctrl @Num_Lock :popup-menu(fontMenu) \\n\\\& @@ -3843,19 +4127,13 @@ Lock @Num_Lock Ctrl :scroll-forw(1,halfpage,m) \\n\\\& @Num_Lock Ctrl :scroll-forw(1,halfpage,m) \\n\\\& :scroll-forw(5,line,m) \\n\\\& - :select-end(PRIMARY, CUT_BUFFER0) \\n\\\& + :select-end(SELECT, CUT_BUFFER0) \\n\\\& :ignore() -.fi -.ft P -.sp -.in -4 +.DE .PP The default bindings in the Tektronix window are: -.sp -.in +4 +.DS .ta 2.5i -.nf -.ft C \" Courier ~Meta: insert-seven-bit() \\n\\\& Meta: insert-eight-bit() \\n\\\& !Ctrl : popup-menu(mainMenu) \\n\\\& @@ -3872,10 +4150,7 @@ ~Meta: gin-press(m) \\n\\\& Shift ~Meta: gin-press(R) \\n\\\& ~Meta: gin-press(r) -.fi -.ft P -.sp -.in -4 +.DE .PP Here is an example which uses shifted select/paste to copy to the clipboard, and unshifted select/paste for the primary selection. @@ -3887,30 +4162,19 @@ While \fIxterm\fP owns the selection, it highlights it. When it loses the selection, it removes the corresponding highlight. But you can still paste from the corresponding cut buffer. -.sp -.in +4 -.nf +.DS .ta .5i 1.5i -.nf -.ft C \" Courier *VT100*translations: #override \\n\\\& ~Shift~Ctrl: insert-selection(PRIMARY, CUT_BUFFER0) \\n\\\& Shift~Ctrl: insert-selection(CLIPBOARD, CUT_BUFFER1) \\n\\\& ~Shift: select-end(PRIMARY, CUT_BUFFER0) \\n\\\& Shift: select-end(CLIPBOARD, CUT_BUFFER1) -.fi -.ft P -.sp -.in -4 +.DE .PP Below is a sample how of the \fBkeymap()\fP action is used to add special keys for entering commonly-typed works: -.sp -.in +4 -.nf +.DS .ta .5i 1.5i -.nf -.ft C \" Courier *VT100.Translations: #override F13: keymap(dbx) *VT100.dbxKeymap.translations: \\\& F14: keymap(None) \\n\\\& @@ -3918,10 +4182,7 @@ F18: string("step") string(0x0d) \\n\\\& F19: string("continue") string(0x0d) \\n\\\& F20: string("print ") insert-selection(PRIMARY, CUT_BUFFER0) -.fi -.ft P -.sp -.in -4 +.DE .SH "CONTROL SEQUENCES AND KEYBOARD" The \fIXterm Control Sequences\fP document lists the control sequences which an application can send \fIxterm\fP to make it perform various operations. @@ -3931,13 +4192,32 @@ . .SH ENVIRONMENT .I Xterm -sets the environment variables ``TERM'' for the window you have created. -It also uses and sets the environment -variable ``DISPLAY'' to specify which bit map display terminal to use. -The environment variable ``WINDOWID'' is set to the X window id number -of the -.I xterm -window. +sets several environment variables: +.TP 5 +DISPLAY +is the display name, +pointing to the X server (see \fBDISPLAY NAMES\fP in X(__miscmansuffix__)). +.TP 5 +TERM +is set according to the termcap (or terminfo) entry which it is using as +a reference. +.TP 5 +WINDOWID +is set to the X window id number of the \fIxterm\fP window. +.TP 5 +XTERM_SHELL +is set to the pathname of the program which is invoked. +Usually that is a shell program, e.g., \fB/bin/sh\fP. +Since it is not necessarily a shell program however, +it is distinct from ``SHELL''. +.TP 5 +XTERM_VERSION +is set to the string displayed by the \fB-version\fP option. +That is normally an identifier for the X Window libraries used to +build \fIxterm\fP, followed by +\fIxterm\fP's patch number in parenthesis. +The patch number is also part of the response to a Secondary Device Attributes +(DA) control sequence (see \fIXterm Control Sequences\fP). . .PP Depending on your system configuration, \fIxterm\fP may also set the @@ -3957,6 +4237,7 @@ .TP 5 SHELL when \fIxterm\fP is configured to update utmp. +It is also set if you provide the shell name as the optional parameter. .TP 5 TERMCAP the contents of the termcap entry corresponding to $TERM, @@ -3987,7 +4268,10 @@ *customization: -color .in -10 in your .Xdefaults file to -automatically turn on color in \fIxterm\fP and similar applications. +automatically use this resource file rather than +.IR __apploaddir__/XTerm . +If you do not do this, +\fIxterm\fP uses its compiled-in default resource settings for colors. . . .SH ERROR MESSAGES Index: xc/programs/xterm/xterm_io.h diff -u xc/programs/xterm/xterm_io.h:1.17 xc/programs/xterm/xterm_io.h:1.20 --- xc/programs/xterm/xterm_io.h:1.17 Sun Feb 6 16:42:38 2005 +++ xc/programs/xterm/xterm_io.h Sun Feb 12 20:15:00 2006 @@ -1,9 +1,11 @@ +/* $XTermId: xterm_io.h,v 1.46 2006/02/12 16:39:51 tom Exp $ */ + /* - * $XFree86: xc/programs/xterm/xterm_io.h,v 1.17 2005/02/06 21:42:38 dickey Exp $ + * $XFree86: xc/programs/xterm/xterm_io.h,v 1.20 2006/02/13 01:15:00 dickey Exp $ */ /* - * Copyright 2000-2003,2004 by Thomas E. Dickey + * Copyright 2000-2005,2006 by Thomas E. Dickey * * All Rights Reserved * @@ -58,7 +60,7 @@ #define USE_SYSV_TERMIO #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || defined(__APPLE__) +#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || defined(__APPLE__) || defined(__UNIXWARE__) #ifndef USE_POSIX_TERMIOS #define USE_POSIX_TERMIOS #endif @@ -77,8 +79,10 @@ #ifdef __SCO__ #define USE_TERMIOS +#ifndef _SVID3 #define _SVID3 #endif +#endif #ifdef Lynx #define USE_SYSV_TERMIO @@ -126,7 +130,7 @@ */ #ifdef __QNX__ #include -#elif !defined(__CYGWIN__) +#else #include #endif @@ -270,11 +274,11 @@ #undef TIOCSLTC #endif -#if defined (__sgi) || (defined(__linux__) && defined(__sparc__)) +#if defined (__sgi) || (defined(__linux__) && defined(__sparc__)) || defined(__UNIXWARE__) #undef TIOCLSET /* XXX why is this undef-ed again? */ #endif -#ifdef sun +#if defined(sun) || defined(__UNIXWARE__) #include #endif Index: xc/programs/xterm/xtermcfg.hin diff -u xc/programs/xterm/xtermcfg.hin:3.53 xc/programs/xterm/xtermcfg.hin:3.60 --- xc/programs/xterm/xtermcfg.hin:3.53 Thu Jan 13 20:50:03 2005 +++ xc/programs/xterm/xtermcfg.hin Sun Mar 12 20:28:00 2006 @@ -1,12 +1,12 @@ -/* $XTermId: xtermcfg.hin,v 1.132 2005/01/13 23:33:37 tom Exp $ */ +/* $XTermId: xtermcfg.hin,v 1.149 2006/03/12 22:36:17 tom Exp $ */ /* - * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.53 2005/01/14 01:50:03 dickey Exp $ + * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.60 2006/03/13 01:28:00 dickey Exp $ */ /************************************************************ -Copyright 1997-2004,2005 by Thomas E. Dickey +Copyright 1997-2005,2006 by Thomas E. Dickey All Rights Reserved @@ -47,12 +47,15 @@ #undef HAVE_LANGINFO_CODESET /* AM_LANGINFO_CODESET */ #undef HAVE_LASTLOG_H /* CF_LASTLOG */ #undef HAVE_LIB_NEXTAW /* CF_X_ATHENA(--with-neXtaw) */ +#undef HAVE_LIB_PCRE /* CF_WITH_PCRE */ #undef HAVE_LIB_XAW /* CF_X_ATHENA */ #undef HAVE_LIB_XAW3D /* CF_X_ATHENA(--with-Xaw3d) */ #undef HAVE_LIB_XAWPLUS /* CF_X_ATHENA(--with-XawPlus) */ #undef HAVE_NCURSES_TERM_H /* AC_CHECK_HEADERS(ncurses/term.h) */ #undef HAVE_PATHS_H /* CF_LASTLOG */ +#undef HAVE_PCREPOSIX_H /* CF_WITH_PCRE */ #undef HAVE_PUTENV /* AC_CHECK_FUNCS(putenv) */ +#undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */ #undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */ #undef HAVE_STRERROR /* AC_CHECK_FUNCS(strerror) */ #undef HAVE_STRFTIME /* AC_CHECK_FUNCS(strftime) */ @@ -69,11 +72,16 @@ #undef HAVE_UTMP_UT_XSTATUS /* CF_UTMP_UT_XSTATUS */ #undef HAVE_UTMP_UT_XTIME /* CF_UTMP_UT_XTIME */ #undef HAVE_WAITPID /* AC_CHECK_FUNCS(waitpid) */ +#undef HAVE_WCHAR_H /* AC_CHECK_HEADERS(wchar.h) */ +#undef HAVE_WCSWIDTH /* AC_CHECK_FUNCS(wcswidth) */ +#undef HAVE_WCWIDTH /* AC_CHECK_FUNCS(wcwidth) */ #undef HAVE_X11_DECKEYSYM_H /* AC_CHECK_HEADERS(X11/DECkeysym.h) */ #undef HAVE_X11_SUNKEYSYM_H /* AC_CHECK_HEADERS(X11/Sunkeysym.h) */ #undef HAVE_X11_XPOLL_H /* AC_CHECK_HEADERS(X11/Xpoll.h) */ #undef HAVE_XKB_BELL_EXT /* CF_XKB_BELL_EXT */ +#undef LUIT_PATH /* CF_ARG_ENABLE(luit) */ #undef NO_ACTIVE_ICON /* CF_ARG_DISABLE(active-icon) */ +#undef NO_LEAKS /* CF_ARG_DISABLE(leaks) */ #undef OPT_256_COLORS /* CF_ARG_ENABLE(256-color) */ #undef OPT_88_COLORS /* CF_ARG_ENABLE(88-color) */ #undef OPT_AIX_COLORS /* CF_ARG_DISABLE(16-color) */ @@ -98,12 +106,14 @@ #undef OPT_MAXIMIZE /* CF_ARG_DISABLE(maximize) */ #undef OPT_MINI_LUIT /* CF_ARG_ENABLE(mini-luit) */ #undef OPT_NUM_LOCK /* CF_ARG_DISABLE(num-lock) */ +#undef OPT_PASTE64 /* CF_ARG_ENABLE(past64) */ #undef OPT_PC_COLORS /* CF_ARG_DISABLE(pc-color) */ #undef OPT_PTY_HANDSHAKE /* CF_ARG_ENABLE(pty-handshake) */ -#undef OPT_SAME_NAME +#undef OPT_SAME_NAME /* CF_ARG_DISABLE(samename) */ #undef OPT_SCO_FUNC_KEYS /* CF_ARG_ENABLE(sco-fkeys) */ +#undef OPT_SELECT_REGEX /* CF_ARG_DISABLE(regex) */ #undef OPT_SESSION_MGT /* CF_ARG_DISABLE(session-mgt) */ -#undef OPT_TCAP_QUERY +#undef OPT_TCAP_QUERY /* CF_ARG_ENABLE(tcap-query) */ #undef OPT_TEK4014 /* CF_ARG_DISABLE(tek4014) */ #undef OPT_TOOLBAR /* CF_ARG_ENABLE(toolbar) */ #undef OPT_TRACE /* CF_ARG_ENABLE(trace) */ @@ -113,6 +123,7 @@ #undef OPT_ZICONBEEP /* CF_ARG_DISABLE(ziconbeep) */ #undef OWN_TERMINFO_DIR /* AC_ARG_WITH(own-terminfo) */ #undef SCROLLBAR_RIGHT /* CF_ARG_ENABLE(rightbar) */ +#undef SIG_ATOMIC_T /* CF_SIG_ATOMIC_T */ #undef SVR4 /* CF_SVR4, imake */ #undef SYSV /* CF_SYSV, imake */ #undef TIME_WITH_SYS_TIME /* AC_HEADER_TIME */ @@ -121,12 +132,14 @@ #undef USE_MY_MEMMOVE /* CF_FUNC_MEMMOVE */ #undef USE_OK_BCOPY /* CF_FUNC_MEMMOVE */ #undef USE_POSIX_WAIT /* CF_POSIX_WAIT */ +#undef USE_STRUCT_LASTLOG /* CF_STRUCT_LASTLOG */ #undef USE_SYSV_UTMP /* CF_UTMP */ #undef USE_SYS_SELECT_H /* CF_TYPE_FD_SET */ #undef USE_TERMCAP /* CF_FUNC_TGETENT */ #undef USE_TERMINFO /* CF_FUNC_TGETENT */ #undef USE_TTY_GROUP /* CF_TTY_GROUP */ #undef USE_UTEMPTER /* CF_UTEMPTER */ +#undef USE_UTMP_SETGID /* AC_ARG_WITH(utmp-setgid) */ #undef UTMPX_FOR_UTMP /* CF_UTMP */ #undef XRENDERFONT /* CF_X_FREETYPE */ #undef const /* AC_CONST */ Index: xc/programs/xterm/unicode/make-precompose.sh diff -u xc/programs/xterm/unicode/make-precompose.sh:1.3 xc/programs/xterm/unicode/make-precompose.sh:1.4 --- xc/programs/xterm/unicode/make-precompose.sh:1.3 Tue Nov 30 20:27:49 2004 +++ xc/programs/xterm/unicode/make-precompose.sh Mon Mar 28 23:00:32 2005 @@ -1,5 +1,6 @@ #!/bin/sh # $XTermId: make-precompose.sh,v 1.4 2004/11/30 21:16:54 tom Exp $ +# $XFree86: xc/programs/xterm/unicode/make-precompose.sh,v 1.4 2005/03/29 04:00:32 tsi Exp $ cat precompose.c.head | sed -e's/@/$/g' cut UnicodeData.txt -d ";" -f 1,6 | \ grep ";[0-9,A-F]" | grep " " | \ Index: xc/programs/xterm/vttests/paste64.pl diff -u /dev/null xc/programs/xterm/vttests/paste64.pl:1.1 --- /dev/null Tue May 9 21:58:51 2006 +++ xc/programs/xterm/vttests/paste64.pl Sun Mar 12 20:28:02 2006 @@ -0,0 +1,143 @@ +#!/usr/bin/perl -w +# $XTermId: paste64.pl,v 1.8 2006/03/12 20:20:57 tom Exp $ +# $XFree86: xc/programs/xterm/vttests/paste64.pl,v 1.1 2006/03/13 01:28:02 dickey Exp $ +# +# -- Thomas Dickey (2006/3/7) +# Test the paste64 option of xterm. + +use strict; + +use Term::ReadKey; +use IO::Handle; +use MIME::Base64; + +our $target = ""; + +sub to_hex($) { + my $value = $_[0]; + my $result = ""; + my $n; + + for ( $n = 0; $n < length($value); ++$n) { + $result .= sprintf("%02X", ord substr($value,$n,1)); + } + return $result; +} + +sub show_string($) { + my $value = $_[0]; + my $n; + + my $result = ""; + for ( $n = 0; $n < length($value); $n += 1) { + my $c = ord substr($value,$n,1); + if ( $c == ord '\\' ) { + $result .= "\\\\"; + } elsif ( $c == 0x1b ) { + $result .= "\\E"; + } elsif ( $c == 0x7f ) { + $result .= "^?"; + } elsif ( $c == 32 ) { + $result .= "\\s"; + } elsif ( $c < 32 ) { + $result .= sprintf("^%c", $c + 64); + } elsif ( $c > 128 ) { + $result .= sprintf("\\%03o", $c); + } else { + $result .= chr($c); + } + } + + printf "%s\r\n", $result; +} + +sub get_reply($) { + my $command = $_[0]; + my $reply = ""; + + printf "send: "; + show_string($command); + + print STDOUT $command; + autoflush STDOUT 1; + while (1) { + my $test=ReadKey 1; + last if not defined $test; + #printf "%d:%s\r\n", length($reply), to_hex($test); + $reply .= $test; + } + return $reply; +} + +sub get_paste() { + my $reply = get_reply("\x1b]52;" . $target . ";?\x1b\\"); + + printf "read: "; + show_string($reply); + + my $data = $reply; + $data =~ s/^\x1b]52;[[:alnum:]]*;//; + $data =~ s/\x1b\\$//; + printf "chop: "; + show_string($data); + + $data = decode_base64($data); + printf "data: "; + show_string($data); +} + +sub put_paste() { + ReadMode 1; + + printf "data: "; + my $data = ReadLine 0; + chomp $data; + ReadMode 5; + + $data = encode_base64($data); + chomp $data; + printf "data: "; + show_string($data); + + my $send = "\x1b]52;" . $target . ";" . $data . "\x1b\\"; + + printf "send: "; + show_string($send); +} + +sub set_target() { + ReadMode 1; + + printf "target: "; + $target = ReadLine 0; + $target =~ s/[^[:alnum:]]//g; + ReadMode 5; + printf "result: %s\r\n", $target; +} + +ReadMode 5, 'STDIN'; # allow single-character inputs +while (1) { + my $cmd; + + printf "\r\nCommand (? for help):"; + $cmd = ReadKey 0; + if ( $cmd eq "?" ) { + printf "\r\np=put selection, g=get selection, q=quit, r=reset target, s=set target\r\n"; + } elsif ($cmd eq "p") { + printf " ...put selection\r\n"; + put_paste(); + } elsif ($cmd eq "g") { + printf " ...get selection\r\n"; + get_paste(); + } elsif ($cmd eq "q") { + printf " ...quit\r\n"; + last; + } elsif ($cmd eq "r") { + printf " ...reset\r\n"; + $target = ""; + } elsif ($cmd eq "s") { + printf " ...set target\r\n"; + set_target(); + } +} +ReadMode 0, 'STDIN'; # Reset tty mode before exiting Index: xc/programs/xterm/vttests/tcapquery.pl diff -u xc/programs/xterm/vttests/tcapquery.pl:1.1 xc/programs/xterm/vttests/tcapquery.pl:1.3 --- xc/programs/xterm/vttests/tcapquery.pl:1.1 Wed Mar 3 21:21:58 2004 +++ xc/programs/xterm/vttests/tcapquery.pl Sun Mar 12 20:28:02 2006 @@ -1,22 +1,18 @@ -#!/usr/bin/perl -# $XFree86: xc/programs/xterm/vttests/tcapquery.pl,v 1.1 2004/03/04 02:21:58 dickey Exp $ +#!/usr/bin/perl -w +# $XTermId: tcapquery.pl,v 1.6 2006/03/08 01:18:05 tom Exp $ +# $XFree86: xc/programs/xterm/vttests/tcapquery.pl,v 1.3 2006/03/13 01:28:02 dickey Exp $ # # -- Thomas Dickey (2004/3/3) # Test the tcap-query option of xterm. -use IO::Handle; +use strict; -sub write_tty { - open TTY, "+ 0 ) { - $first =~ s/^[\d]+//; - $first =~ s/^[^\d]+//; - } - $first =~ s/[^\d]+.*$//; - return $first; -} - -sub hexified { - my $value = @_[0]; +sub hexified($) { + my $value = $_[0]; my $result = ""; + my $n; + for ( $n = 0; $n < length($value); ++$n) { $result .= sprintf("%02X", ord substr($value,$n,1)); } return $result; } -sub query_tcap { - my $tcap = @_[0]; - my $tinfo = @_[1]; +sub query_tcap($$) { + my $tcap = $_[0]; + my $tinfo = $_[1]; my $param1 = hexified($tcap); my $param2 = hexified($tinfo); - #FIXME: should be able to do both at once - #$reply=get_reply("\x1bP+q" . $param1 . ";" . $param2 . "\x1b\\"); - $reply=get_reply("\x1bP+q" . $param1 . "\x1b\\"); + # uncomment one of the following lines + my $reply=get_reply("\x1bP+q" . $param1 . ";" . $param2 . "\x1b\\"); + #my $reply=get_reply("\x1bP+q" . $param2 . "\x1b\\"); if ( $reply =~ /\x1bP1\+r[[:xdigit:]]+=[[:xdigit:]]*.*/ ) { my $value = $reply; + my $n; - $value =~ s/^.*=//; - $value =~ s/[^[:xdigit:]]*//; # FIXME: should work, but doesn't - $value =~ s/\x1b.*//; # ...do this anyway + $value =~ s/^\x1bP1\+r//; + $value =~ s/\x1b\\//; my $result = ""; - for ( $n = 0; $n < length($value); $n += 2) { - my $k = hex substr($value,$n,2); - if ( $k == 0x1b ) { - $result .= "\\E"; - } elsif ( $k == 0x7f ) { - $result .= "^?"; - } elsif ( $k == 32 ) { - $result .= "\\s"; - } elsif ( $k < 32 ) { - $result .= sprintf("^%c", $k + 64); - } elsif ( $k > 128 ) { - $result .= sprintf("\\%03o", $k); + for ( $n = 0; $n < length($value); ) { + my $c = substr($value,$n,1); + # handle semicolon and equals + if ( $c =~ /[[:punct:]]/ ) { + $n += 1; + $result .= $c; } else { - $result .= chr($k); + # handle hex-data + my $k = hex substr($value,$n,2); + if ( $k == 0x1b ) { + $result .= "\\E"; + } elsif ( $k == 0x7f ) { + $result .= "^?"; + } elsif ( $k == 32 ) { + $result .= "\\s"; + } elsif ( $k < 32 ) { + $result .= sprintf("^%c", $k + 64); + } elsif ( $k > 128 ) { + $result .= sprintf("\\%03o", $k); + } else { + $result .= chr($k); + } + $n += 2; } } - printf "$tcap=$result\n"; + printf "%s\n", $result; } } @@ -93,8 +88,8 @@ query_tcap( "%i", "kRIT"); query_tcap( "*6", "kslt"); query_tcap( "*7", "kEND"); -query_tcap( "@0", "kfnd"); -query_tcap( "@7", "kend"); +query_tcap( "\@0", "kfnd"); +query_tcap( "\@7", "kend"); query_tcap( "F1", "kf11"); query_tcap( "F2", "kf12"); query_tcap( "F3", "kf13"); Index: xc/programs/xtrap/Imakefile diff -u xc/programs/xtrap/Imakefile:1.3 xc/programs/xtrap/Imakefile:1.4 --- xc/programs/xtrap/Imakefile:1.3 Thu Nov 15 07:56:16 2001 +++ xc/programs/xtrap/Imakefile Thu Mar 24 21:23:00 2005 @@ -1,5 +1,6 @@ -XCOMM $XFree86: xc/programs/xtrap/Imakefile,v 1.3 2001/11/15 12:56:16 alanh Exp $ +XCOMM $XFree86: xc/programs/xtrap/Imakefile,v 1.4 2005/03/25 02:23:00 dawes Exp $ + DEFINES = $(SIGNAL_DEFINES) DEPLIBS = $(DEPXTRAPLIB) $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB) KEYSRC = XEKeybCtrl.c KEYOBJ = XEKeybCtrl.o Index: xc/programs/xtrap/xtrapchar.c diff -u xc/programs/xtrap/xtrapchar.c:1.3 xc/programs/xtrap/xtrapchar.c:1.4 --- xc/programs/xtrap/xtrapchar.c:1.3 Tue Dec 11 19:43:50 2001 +++ xc/programs/xtrap/xtrapchar.c Mon Jan 9 10:01:55 2006 @@ -1,19 +1,14 @@ -/* $XFree86: xc/programs/xtrap/xtrapchar.c,v 1.3 2001/12/12 00:43:50 dawes Exp $ */ +/* $XFree86: xc/programs/xtrap/xtrapchar.c,v 1.4 2006/01/09 15:01:55 dawes Exp $ */ /* * @DEC_COPYRIGHT@ */ /* * HISTORY - * Log: xtrapchar.c,v $ * Revision 1.1.2.2 1993/12/14 12:37:15 Kenneth_Miller * ANSI-standardize code and turn client build on * [1993/12/09 20:15:33 Kenneth_Miller] * - * EndLog$ */ -#if !defined(lint) && 0 -static char *rcsid = "@(#)RCSfile: xtrapchar.c,v $ Revision: 1.1.2.2 $ (DEC) Date: 1993/12/14 12:37:15 $"; -#endif /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991, 1993 by Digital Equipment Corp., Maynard, MA Index: xc/programs/xtrap/xtrapout.c diff -u xc/programs/xtrap/xtrapout.c:1.2 xc/programs/xtrap/xtrapout.c:1.4 --- xc/programs/xtrap/xtrapout.c:1.2 Tue Dec 11 19:43:50 2001 +++ xc/programs/xtrap/xtrapout.c Tue Mar 29 13:17:02 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xtrap/xtrapout.c,v 1.2 2001/12/12 00:43:50 dawes Exp $ */ +/* $XFree86: xc/programs/xtrap/xtrapout.c,v 1.4 2005/03/29 18:17:02 tsi Exp $ */ /* * @DEC_COPYRIGHT@ */ @@ -104,11 +104,16 @@ /* Forward declarations */ -static void SetGlobalDone (void ); +#ifdef SIGNALRETURNSINT +typedef int sigRetType; +#else +typedef void sigRetType; +#endif +static sigRetType SetGlobalDone (int sig); static void print_req_callback (XETC *tc , XETrapDatum *data , - char *my_buf ); + BYTE *my_buf ); static void print_evt_callback (XETC *tc , XETrapDatum *data , - char *my_buf ); + BYTE *my_buf ); FILE *ofp; @@ -120,14 +125,18 @@ {"-v", "*verbose", XrmoptionSkipArg, (caddr_t) NULL}, }; -static void SetGlobalDone(void) +static sigRetType SetGlobalDone(int sig) { GlobalDone = 1L; fprintf(stderr,"Process Completed!\n"); +#ifdef SIGNALRETURNSINT + return 0; +#else return; +#endif } -static void print_req_callback(XETC *tc, XETrapDatum *data, char *my_buf) +static void print_req_callback(XETC *tc, XETrapDatum *data, BYTE *my_buf) { char *req_type; req_type = (data->u.req.reqType == XETrapGetExtOpcode(tc) ? "XTrap" : @@ -137,7 +146,7 @@ (long)data->u.req.id); } -static void print_evt_callback(XETC *tc, XETrapDatum *data, char *my_buf) +static void print_evt_callback(XETC *tc, XETrapDatum *data, BYTE *my_buf) { static Time last_time = 0; int delta; @@ -268,8 +277,8 @@ XEPrintCurrent(stderr,&ret_cur); /* Add signal handlers so that we clean up properly */ - _InitExceptionHandling((void_function)SetGlobalDone); - (void)XEEnableCtrlKeys((void_function)SetGlobalDone); + _InitExceptionHandling(SetGlobalDone); + (void)XEEnableCtrlKeys(SetGlobalDone); XETrapAppWhileLoop(app,tc,&GlobalDone); Index: xc/programs/xtrap/xtrapproto.c diff -u xc/programs/xtrap/xtrapproto.c:1.4 xc/programs/xtrap/xtrapproto.c:1.5 --- xc/programs/xtrap/xtrapproto.c:1.4 Tue May 27 18:27:13 2003 +++ xc/programs/xtrap/xtrapproto.c Mon Jan 9 10:01:55 2006 @@ -1,19 +1,14 @@ -/* $XFree86: xc/programs/xtrap/xtrapproto.c,v 1.4 2003/05/27 22:27:13 tsi Exp $ */ +/* $XFree86: xc/programs/xtrap/xtrapproto.c,v 1.5 2006/01/09 15:01:55 dawes Exp $ */ /* * @DEC_COPYRIGHT@ */ /* * HISTORY - * Log: xtrapproto.c,v $ * Revision 1.1.2.2 1993/12/14 12:37:32 Kenneth_Miller * ANSI-standardize code and turn client build on * [1993/12/09 20:16:08 Kenneth_Miller] * - * EndLog$ */ -#if !defined(lint) && 0 -static char *rcsid = "@(#)RCSfile: xtrapproto.c,v $ Revision: 1.1.2.2 $ (DEC) Date: 1993/12/14 12:37:32 $"; -#endif /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1993 by Digital Equipment Corp., Maynard, MA Index: xc/programs/xvidtune/xvidtune.c diff -u xc/programs/xvidtune/xvidtune.c:3.36 xc/programs/xvidtune/xvidtune.c:3.37 --- xc/programs/xvidtune/xvidtune.c:3.36 Fri Oct 24 16:38:24 2003 +++ xc/programs/xvidtune/xvidtune.c Thu Sep 15 13:12:46 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xvidtune/xvidtune.c,v 3.36 2003/10/24 20:38:24 tsi Exp $ */ +/* $XFree86: xc/programs/xvidtune/xvidtune.c,v 3.37 2005/09/15 17:12:46 tsi Exp $ */ /* @@ -1551,9 +1551,7 @@ } else usage(); - } - - if (argc > 1) { + } else if (argc > 1) { int i = 0; if (argc != 2) Index: xc/programs/xwd/Imakefile diff -u xc/programs/xwd/Imakefile:1.6 xc/programs/xwd/Imakefile:1.7 --- xc/programs/xwd/Imakefile:1.6 Tue May 27 13:58:26 2003 +++ xc/programs/xwd/Imakefile Mon Jan 9 10:01:56 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:11 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xwd/Imakefile,v 1.6 2003/05/27 17:58:26 tsi Exp $ +XCOMM $XFree86: xc/programs/xwd/Imakefile,v 1.7 2006/01/09 15:01:56 dawes Exp $ DEPLIBS = XkbClientDepLibs $(DEPXMUULIB) $(DEPXONLYLIB) LOCAL_LIBRARIES = XkbClientLibs $(XMUULIB) $(XONLYLIB) Index: xc/programs/xwd/list.c diff -u xc/programs/xwd/list.c:3.7 xc/programs/xwd/list.c:3.8 --- xc/programs/xwd/list.c:3.7 Mon Nov 17 17:20:54 2003 +++ xc/programs/xwd/list.c Mon Jan 9 10:01:56 2006 @@ -1,4 +1,3 @@ -/* $Xorg: list.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains routines for manipulating generic lists. Lists are implemented with a "harness". In other words, each @@ -34,7 +33,7 @@ from The Open Group. ----------------------------------------------------------------------- **/ -/* $XFree86: xc/programs/xwd/list.c,v 3.7 2003/11/17 22:20:54 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/list.c,v 3.8 2006/01/09 15:01:56 dawes Exp $ */ #include #include Index: xc/programs/xwd/list.h diff -u xc/programs/xwd/list.h:1.6 xc/programs/xwd/list.h:1.7 --- xc/programs/xwd/list.h:1.6 Mon Nov 17 17:20:54 2003 +++ xc/programs/xwd/list.h Mon Jan 9 10:01:56 2006 @@ -1,4 +1,3 @@ -/* $Xorg: list.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains routines for manipulating generic lists. Lists are implemented with a "harness". In other words, each @@ -34,7 +33,7 @@ from The Open Group. -------------------------------------------------------------------- **/ -/* $XFree86: xc/programs/xwd/list.h,v 1.6 2003/11/17 22:20:54 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/list.h,v 1.7 2006/01/09 15:01:56 dawes Exp $ */ #ifndef LIST_DEF #define LIST_DEF Index: xc/programs/xwd/multiVis.c diff -u xc/programs/xwd/multiVis.c:1.10 xc/programs/xwd/multiVis.c:1.11 --- xc/programs/xwd/multiVis.c:1.10 Mon Nov 17 17:20:54 2003 +++ xc/programs/xwd/multiVis.c Mon Jan 9 10:01:56 2006 @@ -1,4 +1,3 @@ -/* $Xorg: multiVis.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains functions to create a list of regions which tile a specified window. Each region contains all visible @@ -34,7 +33,7 @@ from The Open Group. ------------------------------------------------------------------------ **/ -/* $XFree86: xc/programs/xwd/multiVis.c,v 1.10 2003/11/17 22:20:54 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/multiVis.c,v 1.11 2006/01/09 15:01:56 dawes Exp $ */ #include #include Index: xc/programs/xwd/multiVis.h diff -u xc/programs/xwd/multiVis.h:1.3 xc/programs/xwd/multiVis.h:1.4 --- xc/programs/xwd/multiVis.h:1.3 Mon Nov 17 17:20:54 2003 +++ xc/programs/xwd/multiVis.h Mon Jan 9 10:01:56 2006 @@ -1,4 +1,3 @@ -/* $Xorg: multiVis.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains routines for manipulating generic lists. Lists are implemented with a "harness". In other words, each @@ -34,7 +33,7 @@ from The Open Group. ------------------------------------------------------------------------ **/ -/* $XFree86: xc/programs/xwd/multiVis.h,v 1.3 2003/11/17 22:20:54 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/multiVis.h,v 1.4 2006/01/09 15:01:56 dawes Exp $ */ extern int GetMultiVisualRegions( Display *, Window, int, int, unsigned int, Index: xc/programs/xwd/wsutils.h diff -u xc/programs/xwd/wsutils.h:1.3 xc/programs/xwd/wsutils.h:1.4 --- xc/programs/xwd/wsutils.h:1.3 Mon Nov 17 17:20:54 2003 +++ xc/programs/xwd/wsutils.h Mon Jan 9 10:01:56 2006 @@ -1,4 +1,3 @@ -/* $Xorg: wsutils.h,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ */ /** ------------------------------------------------------------------------ This file contains routines for manipulating generic lists. Lists are implemented with a "harness". In other words, each @@ -34,7 +33,7 @@ from The Open Group. ------------------------------------------------------------------------ **/ -/* $XFree86: xc/programs/xwd/wsutils.h,v 1.3 2003/11/17 22:20:54 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/wsutils.h,v 1.4 2006/01/09 15:01:56 dawes Exp $ */ /****************************************************************************** * Index: xc/programs/xwd/xwd.c diff -u xc/programs/xwd/xwd.c:3.12 xc/programs/xwd/xwd.c:3.13 --- xc/programs/xwd/xwd.c:3.12 Wed Sep 18 20:19:56 2002 +++ xc/programs/xwd/xwd.c Mon Jan 9 10:01:56 2006 @@ -1,5 +1,3 @@ -/* $Xorg: xwd.c,v 1.5 2001/02/09 02:06:03 xorgcvs Exp $ */ - /* Copyright 1987, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xwd/xwd.c,v 3.12 2002/09/19 00:19:56 dawes Exp $ */ +/* $XFree86: xc/programs/xwd/xwd.c,v 3.13 2006/01/09 15:01:56 dawes Exp $ */ /* * xwd.c MIT Project Athena, X Window system window raster image dumper. Index: xc/programs/xwd/xwd.man diff -u xc/programs/xwd/xwd.man:1.10 xc/programs/xwd/xwd.man:1.11 --- xc/programs/xwd/xwd.man:1.10 Thu Feb 10 22:03:22 2005 +++ xc/programs/xwd/xwd.man Mon Jan 9 10:01:56 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xwd.man,v 1.4 2001/02/09 02:06:03 xorgcvs Exp $ .\" Copyright 1988, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xwd/xwd.man,v 1.10 2005/02/11 03:03:22 dawes Exp $ +.\" $XFree86: xc/programs/xwd/xwd.man,v 1.11 2006/01/09 15:01:56 dawes Exp $ .\" .TH XWD 1 __vendorversion__ .SH NAME Index: xc/programs/xwininfo/Imakefile diff -u xc/programs/xwininfo/Imakefile:1.5 xc/programs/xwininfo/Imakefile:1.6 --- xc/programs/xwininfo/Imakefile:1.5 Sun Apr 1 10:00:25 2001 +++ xc/programs/xwininfo/Imakefile Mon Jan 9 10:01:56 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:15 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/xwininfo/Imakefile,v 1.5 2001/04/01 14:00:25 tsi Exp $ +XCOMM $XFree86: xc/programs/xwininfo/Imakefile,v 1.6 2006/01/09 15:01:56 dawes Exp $ DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) LOCAL_LIBRARIES = $(XMUULIB) $(XLIB) Index: xc/programs/xwininfo/xwininfo.c diff -u xc/programs/xwininfo/xwininfo.c:1.10 xc/programs/xwininfo/xwininfo.c:1.11 --- xc/programs/xwininfo/xwininfo.c:1.10 Sat Sep 20 12:08:32 2003 +++ xc/programs/xwininfo/xwininfo.c Mon Jan 9 10:01:56 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xwininfo.c,v 1.4 2001/02/09 02:06:04 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -29,7 +28,7 @@ of the copyright holder. */ -/* $XFree86: xc/programs/xwininfo/xwininfo.c,v 1.10 2003/09/20 16:08:32 herrb Exp $ */ +/* $XFree86: xc/programs/xwininfo/xwininfo.c,v 1.11 2006/01/09 15:01:56 dawes Exp $ */ /* Index: xc/programs/xwininfo/xwininfo.man diff -u xc/programs/xwininfo/xwininfo.man:1.10 xc/programs/xwininfo/xwininfo.man:1.11 --- xc/programs/xwininfo/xwininfo.man:1.10 Thu Feb 10 22:03:22 2005 +++ xc/programs/xwininfo/xwininfo.man Mon Jan 9 10:01:56 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xwininfo.man,v 1.4 2001/02/09 02:06:04 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xwininfo/xwininfo.man,v 1.10 2005/02/11 03:03:22 dawes Exp $ +.\" $XFree86: xc/programs/xwininfo/xwininfo.man,v 1.11 2006/01/09 15:01:56 dawes Exp $ .\" .TH XWININFO 1 __vendorversion__ .SH NAME Index: xc/programs/xwud/Imakefile diff -u xc/programs/xwud/Imakefile:1.1.1.2 xc/programs/xwud/Imakefile:1.2 --- xc/programs/xwud/Imakefile:1.1.1.2 Tue Jan 16 18:07:17 2001 +++ xc/programs/xwud/Imakefile Mon Jan 9 10:01:57 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:17 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xwud/Imakefile,v 1.2 2006/01/09 15:01:57 dawes Exp $ + DEPLIBS = $(DEPXONLYLIB) LOCAL_LIBRARIES = $(XONLYLIB) Index: xc/programs/xwud/xwud.c diff -u xc/programs/xwud/xwud.c:3.11 xc/programs/xwud/xwud.c:3.12 --- xc/programs/xwud/xwud.c:3.11 Mon Nov 17 10:18:08 2003 +++ xc/programs/xwud/xwud.c Mon Jan 9 10:01:57 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xwud.c,v 1.5 2001/02/09 02:06:04 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1988, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/programs/xwud/xwud.c,v 3.11 2003/11/17 15:18:08 tsi Exp $ */ +/* $XFree86: xc/programs/xwud/xwud.c,v 3.12 2006/01/09 15:01:57 dawes Exp $ */ /* xwud - marginally useful raster image undumper */ Index: xc/programs/xwud/xwud.man diff -u xc/programs/xwud/xwud.man:1.11 xc/programs/xwud/xwud.man:1.12 --- xc/programs/xwud/xwud.man:1.11 Thu Feb 10 22:03:22 2005 +++ xc/programs/xwud/xwud.man Mon Jan 9 10:01:57 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xwud.man,v 1.4 2001/02/09 02:06:04 xorgcvs Exp $ .\" Copyright 1988, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xwud/xwud.man,v 1.11 2005/02/11 03:03:22 dawes Exp $ +.\" $XFree86: xc/programs/xwud/xwud.man,v 1.12 2006/01/09 15:01:57 dawes Exp $ .\" .TH XWUD 1 __vendorversion__ .SH NAME Index: xc/util/memleak/Imakefile diff -u xc/util/memleak/Imakefile:3.5 xc/util/memleak/Imakefile:3.8 --- xc/util/memleak/Imakefile:3.5 Wed Jan 17 18:20:07 2001 +++ xc/util/memleak/Imakefile Mon Apr 3 14:13:45 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:55:19 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/util/memleak/Imakefile,v 3.5 2001/01/17 23:20:07 dawes Exp $ +XCOMM $XFree86: xc/util/memleak/Imakefile,v 3.8 2006/04/03 18:13:45 dawes Exp $ #define DoNormalLib YES #define DoSharedLib NO @@ -12,53 +7,74 @@ #define IncSubdir X11 #include +#if HasGcc2 && UseGccBuiltinFrameAddress + +GRET_NAME = getretgcc +#define HasGetReturnAddress YES + +#else + #ifdef MipsArchitecture -#define TopOfStack 0x7fffbbb0 -#define BottomOfData 0x10000000 +#define TopOfStack 0x7fffbbb0 +#define BottomOfData 0x10000000 #define HasGetReturnAddress YES -GRA_OBJS = getretmips.o mipsstack.o -GRA_SRCS = getretmips.c +GRET_NAME = getretmips +STACK_SRCS = mipsstack.s +STACK_OBJS = mipsstack.o #endif #ifdef SparcArchitecture #define HasGetReturnAddress YES -#define BottomOfData \&environ -#ifdef SystemV4 -GRA_OBJS = getretspar.o sparcsolstack.o -#define TopOfStack 0xeffffc70 +#define BottomOfData \&environ +GRET_NAME = getretspar +#if !HasGcc +#if SystemV4 +STACK_SRCS = sparcsolstack.s +STACK_OBJS = sparcsolstack.o #else -LOCAL_DEFS = -Datexit=on_exit -GRA_OBJS = getretspar.o sparcstack.o -#define TopOfStack 0xf7fffbdc +STACK_SRCS = sparcstack.s +STACK_OBJS = sparcstack.o #endif -GRA_SRCS = getretspar.c #endif - -#ifdef i386BsdArchitecture -#define HasGetReturnAddress YES -#define TopOfStack 'GC_get_stack_base()' -#define BottomOfData \&etext -GRA_OBJS = getreti386.o stackbottom.o -GRA_SRCS = getreti386.c stackbottom.c +#if SystemV4 +#define TopOfStack 0xeffffc70 +#else +LOCAL_DEFS = -Datexit=on_exit +#define TopOfStack 0xf7fffbdc +#endif #endif -#ifdef LinuxArchitecture #ifdef i386Architecture + +GRET_NAME = getreti386 + +#if defined(i386BsdArchitecture) +#define HasGetReturnAddress YES +#define TopOfStack 'GC_get_stack_base()' +#define BottomOfData \&etext +GETSTACK_SRCS = stackbottom.c +GETSTACK_OBJS = stackbottom.o +#elif defined(LinuxArchitecture) +#define HasGetReturnAddress YES +#define TopOfStack 0xbffff800 +#define BottomOfData \&__data_start +#elif SystemV4 #define HasGetReturnAddress YES #define TopOfStack 0xbffff800 -#define BottomOfData \&__data_start -GRA_OBJS = getreti386.o stackbottom.o -GRA_SRCS = getreti386.c stackbottom.c -#endif +#define BottomOfData \&__data_start #endif +#endif /* i386Architecture */ + #ifdef AlphaArchitecture #define HasGetReturnAddress NO -#define TopOfData \&_end -#define TopOfStack 0x11ffffff0 -#define BottomOfData \&xf86DriverList +#define TopOfData \&_end +#define TopOfStack 0x11ffffff0 +#define BottomOfData \&xf86DriverList #endif +#endif /* HasGcc */ + #ifndef HasGetReturnAddress #define HasGetReturnAddress NO #endif @@ -70,21 +86,44 @@ #ifdef TopOfData TOD_DEFS = -DTOP_OF_DATA=TopOfData #endif +#ifdef TopOfStack + BOD_DEFS = -DBOTTOM_OF_DATA=BottomOfData +#endif +#ifdef TopOfStack + TOS_DEFS = -DTOP_OF_STACK=TopOfStack +#endif -DEFINES = -DTOP_OF_STACK=TopOfStack -DBOTTOM_OF_DATA=BottomOfData\ - $(GRA_DEFS) $(TOD_DEFS) $(LOCAL_DEFS) +DEFINES = $(TOS_DEFS) $(BOD_DEFS) $(GRA_DEFS) $(TOD_DEFS) \ + $(LOCAL_DEFS) $(STACKBASE) -CDEBUGFLAGS = DebuggableCDebugFlags +#if UseMemLeak +MSRCS = fmalloc.c $(GETSTACK_SRCS) +MOBJS = fmalloc.o $(GETSTACK_OBJS) +#endif + +GRET_SRCS = $(GRET_NAME).c +GRET_OBJS = $(GRET_NAME).o -SRCS = fmalloc.c $(GRA_SRCS) +GRA_SRCS = $(GRET_SRCS) $(STACK_SRCS) +GRA_OBJS = $(GRET_OBJS) $(STACK_OBJS) -OBJS = fmalloc.o $(GRA_OBJS) +SRCS = $(MSRCS) $(GRA_SRCS) + +OBJS = $(MOBJS) $(GRA_OBJS) + +#if HasGetReturnAddress +SpecialCObjectRule($(GRET_NAME),NullParameter,-O0) +#endif LibraryObjectRule() #if DoNormalLib +#if UseMemLeak NormalLibraryTarget(memleak,$(OBJS)) InstallLibrary(memleak,$(USRLIBDIR)) +#elif UseStackTrace +NormalLibraryTarget(stacktrace,$(GRA_OBJS)) +#endif #endif InstallNamedProg(find-rtns.sh,find-routines,$(BINDIR)) Index: xc/util/memleak/README diff -u xc/util/memleak/README:1.1.1.2 xc/util/memleak/README:1.2 --- xc/util/memleak/README:1.1.1.2 Tue Jan 16 18:41:15 2001 +++ xc/util/memleak/README Mon Jan 9 10:01:57 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: README,v 1.3 2000/08/17 19:55:19 cpqbld Exp $ +.\" $XFree86: xc/util/memleak/README,v 1.2 2006/01/09 15:01:57 dawes Exp $ This library replaces the C library allocator; providing malloc, free, realloc and calloc (sorry, no valloc) Index: xc/util/memleak/find-rtns.sh diff -u xc/util/memleak/find-rtns.sh:1.4 xc/util/memleak/find-rtns.sh:1.5 --- xc/util/memleak/find-rtns.sh:1.4 Sun Jun 30 22:26:08 2002 +++ xc/util/memleak/find-rtns.sh Mon Jan 9 10:01:57 2006 @@ -1,14 +1,12 @@ #!/bin/sh # -# $Xorg: find-rtns.sh,v 1.3 2000/08/17 19:55:19 cpqbld Exp $ -# # find-routines - convert leak tracer stack traces into file/lineno traces # modified to work with the an unmodified version of # gdb-4.18 # # Usage: find-routines {leak-tracing-output-files} # -# $XFree86: xc/util/memleak/find-rtns.sh,v 1.4 2002/07/01 02:26:08 tsi Exp $ +# $XFree86: xc/util/memleak/find-rtns.sh,v 1.5 2006/01/09 15:01:57 dawes Exp $ # TMP1=find-routine.tmp1 Index: xc/util/memleak/fmalloc.c diff -u xc/util/memleak/fmalloc.c:3.14 xc/util/memleak/fmalloc.c:3.16 --- xc/util/memleak/fmalloc.c:3.14 Thu Apr 4 09:06:00 2002 +++ xc/util/memleak/fmalloc.c Wed Mar 1 22:00:40 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: fmalloc.c,v 1.5 2001/02/09 02:06:19 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group @@ -26,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/util/memleak/fmalloc.c,v 3.14 2002/04/04 14:06:00 eich Exp $ */ +/* $XFree86: xc/util/memleak/fmalloc.c,v 3.16 2006/03/02 03:00:40 dawes Exp $ */ /* @@ -50,6 +49,9 @@ #ifndef TOP_OF_DATA #define TOP_OF_DATA 0 #endif +#ifdef TOP_OF_STACK +#include "stackbottom.h" +#endif #ifndef FALSE #define FALSE 0 Index: xc/util/memleak/ftest.c diff -u xc/util/memleak/ftest.c:1.3 xc/util/memleak/ftest.c:1.4 --- xc/util/memleak/ftest.c:1.3 Fri Dec 14 15:02:36 2001 +++ xc/util/memleak/ftest.c Mon Jan 9 10:01:57 2006 @@ -1,5 +1,5 @@ +/* $XFree86: xc/util/memleak/ftest.c,v 1.4 2006/01/09 15:01:57 dawes Exp $ */ /* - * $Xorg: ftest.c,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group Index: xc/util/memleak/getretgcc.c diff -u /dev/null xc/util/memleak/getretgcc.c:1.2 --- /dev/null Tue May 9 21:58:52 2006 +++ xc/util/memleak/getretgcc.c Sat Apr 8 13:53:40 2006 @@ -0,0 +1,35 @@ +/* + * Use gcc's __builtin_frame_address() function to get the stack trace. + */ + +/* $XFree86: xc/util/memleak/getretgcc.c,v 1.2 2006/04/08 17:53:40 dawes Exp $ */ + +#include "getstack.h" + +#define MIN_ADDR 0x1000 + +struct gccframe { + struct gccframe *next; + void *ret; +}; + +void +getStackTrace(unsigned long *results, int max) +{ + struct gccframe *frame; + + frame = (struct gccframe *)__builtin_frame_address(0); +#if defined(__powerpc__) + if (frame) + frame = frame->next; +#endif + while ((unsigned long)frame > MIN_ADDR && max-- > 1) { + *results = (unsigned long)frame->ret; + if (*results < MIN_ADDR) + break; + results++; + frame = frame->next; + } + *results = 0; +} + Index: xc/util/memleak/getreti386.c diff -u xc/util/memleak/getreti386.c:3.5 xc/util/memleak/getreti386.c:3.7 --- xc/util/memleak/getreti386.c:3.5 Fri Feb 16 08:24:10 2001 +++ xc/util/memleak/getreti386.c Sat Apr 1 19:16:52 2006 @@ -4,51 +4,45 @@ * Copyright (c) 1995 Jeffrey Hsu */ -/* $XFree86: xc/util/memleak/getreti386.c,v 3.5 2001/02/16 13:24:10 eich Exp $ */ +/* $XFree86: xc/util/memleak/getreti386.c,v 3.7 2006/04/02 00:16:52 dawes Exp $ */ #define get_current_fp(first_local) ((unsigned)&(first_local) + 4) #define prev_fp_from_fp(fp) *((unsigned *) fp) #define ret_addr_from_fp(fp) *((unsigned *) (fp+4)) -#ifdef __FreeBSD__ -#define CRT0_ADDRESS 0x10d3 -#endif -#if defined(__NetBSD__) || defined(__OpenBSD__) -#define CRT0_ADDRESS 0x109a -#endif -#ifdef linux -#define CRT0_ADDRESS 0x80482fc -#endif +#define MIN_ADDRESS 0x1000 + +#include "getstack.h" static unsigned long -junk (int *foo) +junk(int *foo) { - return (unsigned long) foo + 4; + return (unsigned long)foo + 4; } void getStackTrace(unsigned long *results, int max) { - int first_local; - unsigned long fp, ret_addr; - - first_local = 0; - fp = junk(&first_local); - fp = get_current_fp(first_local); - ret_addr = ret_addr_from_fp(fp); + int first_local; + unsigned long fp, ret_addr; - while (ret_addr > CRT0_ADDRESS && max-- > 1) { - *results++ = ret_addr; - if (fp < (unsigned long) &first_local) + first_local = 0; + fp = junk(&first_local); + fp = get_current_fp(first_local); + ret_addr = ret_addr_from_fp(fp); + + while (ret_addr > MIN_ADDRESS && max-- > 1) { + *results++ = ret_addr; + if (fp < (unsigned long)&first_local) break; - fp = prev_fp_from_fp(fp); - if (!fp) + fp = prev_fp_from_fp(fp); + if (!fp) break; - if (fp < (unsigned long) &first_local) + if (fp < (unsigned long)&first_local) break; - ret_addr = ret_addr_from_fp(fp); - } - *results++ = 0; + ret_addr = ret_addr_from_fp(fp); + } + *results++ = 0; } Index: xc/util/memleak/getretmips.c diff -u xc/util/memleak/getretmips.c:1.2 xc/util/memleak/getretmips.c:1.4 --- xc/util/memleak/getretmips.c:1.2 Fri Dec 14 15:02:36 2001 +++ xc/util/memleak/getretmips.c Sat Mar 11 12:36:50 2006 @@ -1,5 +1,5 @@ +/* $XFree86: xc/util/memleak/getretmips.c,v 1.4 2006/03/11 17:36:50 tsi Exp $ */ /* - * $Xorg: getretmips.c,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group @@ -72,7 +72,7 @@ /* jr $ra */ #define RETURN 0x03e00008 -#define CALL(f) (0x0c000000 | (((int) (f)) >> 2)) +#define CALL(f) (0x0c000000 | (((unsigned long) (f)) >> 2)) /* * This computation is expensive, so we cache the results; @@ -89,16 +89,15 @@ static ReturnCacheRec returnCache[HASH_SIZE]; -#define HASH(ra) ((((int) (ra)) >> 2) & (HASH_SIZE - 1)) +#define HASH(ra) ((((unsigned long) (ra)) >> 2) & (HASH_SIZE - 1)) typedef int Bool; #define TRUE 1 #define FALSE 0 -getStackTrace (results, max) - unsigned long *results; - int max; +void +getStackTrace (unsigned long *results, int max) { extern unsigned long *getReturnAddress (), *getStackPointer (); extern int main (); Index: xc/util/memleak/getretspar.c diff -u xc/util/memleak/getretspar.c:1.2 xc/util/memleak/getretspar.c:1.5 --- xc/util/memleak/getretspar.c:1.2 Fri Dec 14 15:02:36 2001 +++ xc/util/memleak/getretspar.c Mon Apr 24 23:09:42 2006 @@ -1,5 +1,5 @@ +/* $XFree86: xc/util/memleak/getretspar.c,v 1.5 2006/04/25 03:09:42 dawes Exp $ */ /* - * $Xorg: getretspar.c,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group @@ -28,39 +28,48 @@ /* Trace up the stack and build a call history -- SPARC specific code */ +#include "getstack.h" + /* hack -- flush out the register windows by recursing */ static void -flushWindows (depth) +flushWindows(int depth) { if (depth == 0) return; - flushWindows (depth-1); + flushWindows(depth - 1); } -getStackTrace (results, max) - unsigned long *results; - int max; +#ifndef __GNUC__ +extern unsigned long *getStackPointer(void); +#endif +extern int main(int, char **); + +void +getStackTrace(unsigned long *results, int max) { - unsigned long *sp, *getStackPointer (), *getFramePointer(); - unsigned long *ra, mainCall; - extern int main (); - - flushWindows (32); - sp = getFramePointer (); - while (max) - { + unsigned long *sp; + unsigned long *ra, mainCall; + + flushWindows(32); +#ifdef __GNUC__ + __asm__ volatile ("mov %%sp, %0" : "=r" (sp)); +#else + sp = getStackPointer(); +#endif + + while (max) { /* sparc stack traces are easy -- chain up the saved FP/SP values */ - ra = (unsigned long *) sp[15]; - sp = (unsigned long *) sp[14]; + ra = (unsigned long *)sp[15]; + sp = (unsigned long *)sp[14]; /* stop when we get the call to main */ - mainCall = ((((unsigned long) main) - ((unsigned long) ra)) >> 2) | 0x40000000; - if (ra[0] == mainCall) - { + mainCall = ((((unsigned long)main) - + ((unsigned long)ra)) >> 2) | 0x40000000; + if (!ra || ra[0] == mainCall) { *results++ = 0; break; } - *results++ = (unsigned long) ra; + *results++ = (unsigned long)ra; max--; } } Index: xc/util/memleak/getrettest.c diff -u xc/util/memleak/getrettest.c:1.2 xc/util/memleak/getrettest.c:1.3 --- xc/util/memleak/getrettest.c:1.2 Fri Dec 14 15:02:36 2001 +++ xc/util/memleak/getrettest.c Mon Jan 9 10:01:57 2006 @@ -1,5 +1,5 @@ +/* $XFree86: xc/util/memleak/getrettest.c,v 1.3 2006/01/09 15:01:57 dawes Exp $ */ /* - * $Xorg: getrettest.c,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group Index: xc/util/memleak/getstack.h diff -u /dev/null xc/util/memleak/getstack.h:1.1 --- /dev/null Tue May 9 21:58:52 2006 +++ xc/util/memleak/getstack.h Wed Mar 1 22:00:40 2006 @@ -0,0 +1,4 @@ +/* $XFree86: xc/util/memleak/getstack.h,v 1.1 2006/03/02 03:00:40 dawes Exp $ */ + +extern void getStackTrace(unsigned long *results, int max); + Index: xc/util/memleak/mipsstack.s diff -u xc/util/memleak/mipsstack.s:1.2 xc/util/memleak/mipsstack.s:1.3 --- xc/util/memleak/mipsstack.s:1.2 Fri Dec 14 15:02:37 2001 +++ xc/util/memleak/mipsstack.s Mon Jan 9 10:01:57 2006 @@ -1,5 +1,5 @@ +/* $XFree86: xc/util/memleak/mipsstack.s,v 1.3 2006/01/09 15:01:57 dawes Exp $ */ /* - * $Xorg: mipsstack.s,v 1.4 2001/02/09 02:06:19 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group Index: xc/util/memleak/sparcsolstack.s diff -u xc/util/memleak/sparcsolstack.s:1.1.1.2 xc/util/memleak/sparcsolstack.s:1.2 --- xc/util/memleak/sparcsolstack.s:1.1.1.2 Tue Jan 16 18:41:24 2001 +++ xc/util/memleak/sparcsolstack.s Mon Jan 9 10:01:57 2006 @@ -1,4 +1,4 @@ -! $Xorg: sparcsolstack.s,v 1.3 2000/08/17 19:55:20 cpqbld Exp $ +! $XFree86: xc/util/memleak/sparcsolstack.s,v 1.2 2006/01/09 15:01:57 dawes Exp $ .seg "text" .proc 16 .globl getStackPointer Index: xc/util/memleak/sparcstack.s diff -u xc/util/memleak/sparcstack.s:1.1.1.2 xc/util/memleak/sparcstack.s:1.2 --- xc/util/memleak/sparcstack.s:1.1.1.2 Tue Jan 16 18:41:25 2001 +++ xc/util/memleak/sparcstack.s Mon Jan 9 10:01:57 2006 @@ -1,4 +1,4 @@ -# $Xorg: sparcstack.s,v 1.3 2000/08/17 19:55:20 cpqbld Exp $ +# $XFree86: xc/util/memleak/sparcstack.s,v 1.2 2006/01/09 15:01:57 dawes Exp $ .seg "text" .proc 16 .globl _getStackPointer Index: xc/util/memleak/stackbottom.c diff -u xc/util/memleak/stackbottom.c:3.2 xc/util/memleak/stackbottom.c:3.3 --- xc/util/memleak/stackbottom.c:3.2 Wed Jul 25 11:05:31 2001 +++ xc/util/memleak/stackbottom.c Wed Mar 1 22:00:40 2006 @@ -4,14 +4,10 @@ * Cutter and Paster: Jeffrey Hsu */ -/* $XFree86: xc/util/memleak/stackbottom.c,v 3.2 2001/07/25 15:05:31 dawes Exp $ */ +/* $XFree86: xc/util/memleak/stackbottom.c,v 3.3 2006/03/02 03:00:40 dawes Exp $ */ #include - -typedef char * ptr_t; /* A generic pointer to which we can add */ - /* byte displacements. */ - /* Preferably identical to caddr_t, if it */ - /* exists. */ +#include "stackbottom.h" #ifndef bool typedef int bool; @@ -28,92 +24,94 @@ #define TRUE 1 #if defined(__alpha) || defined(__alpha__) - extern __start +extern __start # define HEURISTIC2_LIMIT ((ptr_t)((word)(&__start) & ~(getpagesize()-1))) #endif -void GC_noop() {} +static void +GC_noop(void) +{ +} - /* Some tools to implement HEURISTIC2 */ -# define MIN_PAGE_SIZE 256 /* Smallest conceivable page size, bytes */ -# include - /* static */ jmp_buf GC_jmp_buf; - - /*ARGSUSED*/ - void GC_fault_handler(sig) - int sig; - { - longjmp(GC_jmp_buf, 1); - } +/* Some tools to implement HEURISTIC2 */ +#define MIN_PAGE_SIZE 256 /* Smallest conceivable page size, bytes */ +#include +static jmp_buf GC_jmp_buf; + +/*ARGSUSED*/ +static void +GC_fault_handler(int sig) +{ + longjmp(GC_jmp_buf, 1); +} + +typedef void (*handler) (int); + +/* Return the first nonaddressible location > p (up) or */ +/* the smallest location q s.t. [q,p] is addressible (!up). */ +static ptr_t +GC_find_limit(ptr_t p, bool up) +{ + static VOLATILE ptr_t result; + + /* Needs to be static, since otherwise it may not be */ + /* preserved across the longjmp. Can safely be */ + /* static since it's only called once, with the */ + /* allocation lock held. */ - typedef void (*handler)(int); + static handler old_segv_handler, old_bus_handler; - /* Return the first nonaddressible location > p (up) or */ - /* the smallest location q s.t. [q,p] is addressible (!up). */ - ptr_t GC_find_limit(p, up) - ptr_t p; - bool up; - { - static VOLATILE ptr_t result; - /* Needs to be static, since otherwise it may not be */ - /* preserved across the longjmp. Can safely be */ - /* static since it's only called once, with the */ - /* allocation lock held. */ - - static handler old_segv_handler, old_bus_handler; - /* See above for static declaration. */ - - old_segv_handler = signal(SIGSEGV, GC_fault_handler); -# ifdef SIGBUS - old_bus_handler = signal(SIGBUS, GC_fault_handler); -# endif - if (setjmp(GC_jmp_buf) == 0) { - result = (ptr_t)(((word)(p)) - & ~(MIN_PAGE_SIZE-1)); - for (;;) { - if (up) { - result += MIN_PAGE_SIZE; - } else { - result -= MIN_PAGE_SIZE; - } - GC_noop(*result); + /* See above for static declaration. */ + + old_segv_handler = signal(SIGSEGV, GC_fault_handler); +#ifdef SIGBUS + old_bus_handler = signal(SIGBUS, GC_fault_handler); +#endif + if (setjmp(GC_jmp_buf) == 0) { + result = (ptr_t) (((word) (p)) & ~(MIN_PAGE_SIZE - 1)); + for (;;) { + if (up) { + result += MIN_PAGE_SIZE; + } else { + result -= MIN_PAGE_SIZE; } + GC_noop(); } - (void) signal(SIGSEGV, old_segv_handler); -# ifdef SIGBUS - (void) signal(SIGBUS, old_bus_handler); -# endif - if (!up) { - result += MIN_PAGE_SIZE; - } - return(result); } + (void)signal(SIGSEGV, old_segv_handler); +#ifdef SIGBUS + (void)signal(SIGBUS, old_bus_handler); +#endif + if (!up) { + result += MIN_PAGE_SIZE; + } + return result; +} -ptr_t GC_get_stack_base() +ptr_t +GC_get_stack_base() { word dummy; static ptr_t result; if (!result) { -# ifdef STACK_GROWS_DOWN - result = GC_find_limit((ptr_t)(&dummy), TRUE); -# ifdef HEURISTIC2_LIMIT - if (result > HEURISTIC2_LIMIT - && (ptr_t)(&dummy) < HEURISTIC2_LIMIT) { - result = HEURISTIC2_LIMIT; - } -# endif -# else - result = GC_find_limit((ptr_t)(&dummy), FALSE); -# ifdef HEURISTIC2_LIMIT - if (result < HEURISTIC2_LIMIT - && (ptr_t)(&dummy) > HEURISTIC2_LIMIT) { - result = HEURISTIC2_LIMIT; - } -# endif -# endif +#ifdef STACK_GROWS_DOWN + result = GC_find_limit((ptr_t) (&dummy), TRUE); +#ifdef HEURISTIC2_LIMIT + if (result > HEURISTIC2_LIMIT && (ptr_t) (&dummy) < HEURISTIC2_LIMIT) { + result = HEURISTIC2_LIMIT; + } +#endif +#else + result = GC_find_limit((ptr_t) (&dummy), FALSE); +#ifdef HEURISTIC2_LIMIT + if (result < HEURISTIC2_LIMIT && (ptr_t) (&dummy) > HEURISTIC2_LIMIT) { + result = HEURISTIC2_LIMIT; + } +#endif +#endif } - return(result); + return result; } Index: xc/util/memleak/stackbottom.h diff -u /dev/null xc/util/memleak/stackbottom.h:1.1 --- /dev/null Tue May 9 21:58:52 2006 +++ xc/util/memleak/stackbottom.h Wed Mar 1 22:00:40 2006 @@ -0,0 +1,9 @@ +/* $XFree86: xc/util/memleak/stackbottom.h,v 1.1 2006/03/02 03:00:40 dawes Exp $ */ + +typedef char *ptr_t; /* A generic pointer to which we can add */ + /* byte displacements. */ + /* Preferably identical to caddr_t, if it */ + /* exists. */ + +extern ptr_t GC_get_stack_base(void); + Index: xc/util/misc/dlsym.c diff -u xc/util/misc/dlsym.c:1.1.1.2 xc/util/misc/dlsym.c:1.2 --- xc/util/misc/dlsym.c:1.1.1.2 Tue Jan 16 18:41:27 2001 +++ xc/util/misc/dlsym.c Mon Jan 9 10:01:58 2006 @@ -1,4 +1,4 @@ -/* $Xorg: dlsym.c,v 1.3 2000/08/17 19:55:21 cpqbld Exp $ */ +/* $XFree86: xc/util/misc/dlsym.c,v 1.2 2006/01/09 15:01:58 dawes Exp $ */ /* * Stub interface to dynamic linker routines * that SunOS uses but didn't ship with 4.1. Index: xc/util/misc/rt.stdarg.h diff -u xc/util/misc/rt.stdarg.h:1.1.1.2 xc/util/misc/rt.stdarg.h:1.2 --- xc/util/misc/rt.stdarg.h:1.1.1.2 Tue Jan 16 18:41:27 2001 +++ xc/util/misc/rt.stdarg.h Mon Jan 9 10:01:58 2006 @@ -1,4 +1,4 @@ -/* $Xorg: rt.stdarg.h,v 1.3 2000/08/17 19:55:21 cpqbld Exp $ */ +/* $XFree86: xc/util/misc/rt.stdarg.h,v 1.2 2006/01/09 15:01:58 dawes Exp $ */ #ifndef _STDARG_H #define _STDARG_H typedef int *va_list; Index: xc/util/misc/thr_stubs.c diff -u xc/util/misc/thr_stubs.c:1.1.1.2 xc/util/misc/thr_stubs.c:1.2 --- xc/util/misc/thr_stubs.c:1.1.1.2 Tue Jan 16 18:41:28 2001 +++ xc/util/misc/thr_stubs.c Mon Jan 9 10:01:58 2006 @@ -1,4 +1,4 @@ -/* $Xorg: thr_stubs.c,v 1.3 2000/08/17 19:55:21 cpqbld Exp $ */ +/* $XFree86: xc/util/misc/thr_stubs.c,v 1.2 2006/01/09 15:01:58 dawes Exp $ */ /* * Stub interface to thread routines that Solaris needs but shipped * broken/buggy versions in 5.2 and 5.3